Merge "Fix .mailmap file search location"

2 files changed, 15 insertions, 10 deletions

diff --git a/pbr/packaging.py b/pbr/packaging.py
index 25e3db8..ae58c95 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -94,10 +94,14 @@ def _pip_install(links, requires, root=None):
         throw_on_error=True, buffer=False)
 
 
-def read_git_mailmap(git_dir, mailmap='.mailmap'):
-    mailmap = os.path.join(git_dir, mailmap)
+def read_git_mailmap(root_dir=None, mailmap='.mailmap'):
+    if not root_dir:
+        root_dir = _run_shell_command('git rev-parse --show-toplevel')
+
+    mailmap = os.path.join(root_dir, mailmap)
     if os.path.exists(mailmap):
         return _parse_mailmap(open(mailmap, 'r').readlines())
+
     return dict()
 
 
@@ -241,7 +245,7 @@ def write_git_changelog(git_dir=None, dest_dir=os.path.curdir,
         if git_dir:
             git_log_cmd = 'git --git-dir=%s log' % git_dir
             changelog = _run_shell_command(git_log_cmd)
-            mailmap = read_git_mailmap(git_dir)
+            mailmap = read_git_mailmap()
             with open(new_changelog, "wb") as changelog_file:
                 changelog_file.write(canonicalize_emails(
                     changelog, mailmap).encode('utf-8'))
@@ -277,7 +281,7 @@ def generate_authors(git_dir=None, dest_dir='.', option_dict=dict()):
                      for signed in signed_entries.split("\n") if signed])
                 changelog = "\n".join((changelog, new_entries))
 
-            mailmap = read_git_mailmap(git_dir)
+            mailmap = read_git_mailmap()
             with open(new_authors, 'wb') as new_authors_fh:
                 if os.path.exists(old_authors):
                     with open(old_authors, "rb") as old_authors_fh:
diff --git a/pbr/tests/test_setup.py b/pbr/tests/test_setup.py
index 398c503..11f9a04 100644
--- a/pbr/tests/test_setup.py
+++ b/pbr/tests/test_setup.py
@@ -49,27 +49,26 @@ class MailmapTestCase(tests.BaseTestCase):
 
     def setUp(self):
         super(MailmapTestCase, self).setUp()
-        self.git_dir = self.useFixture(fixtures.TempDir()).path
-        self.mailmap = os.path.join(self.git_dir, '.mailmap')
+        self.root_dir = self.useFixture(fixtures.TempDir()).path
+        self.mailmap = os.path.join(self.root_dir, '.mailmap')
 
     def test_mailmap_with_fullname(self):
-        print(self.mailmap, self.git_dir)
         with open(self.mailmap, 'w') as mm_fh:
             mm_fh.write("Foo Bar <email@foo.com> Foo Bar <email@bar.com>\n")
         self.assertEqual({'<email@bar.com>': '<email@foo.com>'},
-                         packaging.read_git_mailmap(self.git_dir))
+                         packaging.read_git_mailmap(self.root_dir))
 
     def test_mailmap_with_firstname(self):
         with open(self.mailmap, 'w') as mm_fh:
             mm_fh.write("Foo <email@foo.com> Foo <email@bar.com>\n")
         self.assertEqual({'<email@bar.com>': '<email@foo.com>'},
-                         packaging.read_git_mailmap(self.git_dir))
+                         packaging.read_git_mailmap(self.root_dir))
 
     def test_mailmap_with_noname(self):
         with open(self.mailmap, 'w') as mm_fh:
             mm_fh.write("<email@foo.com> <email@bar.com>\n")
         self.assertEqual({'<email@bar.com>': '<email@foo.com>'},
-                         packaging.read_git_mailmap(self.git_dir))
+                         packaging.read_git_mailmap(self.root_dir))
 
 
 class SkipFileWrites(tests.BaseTestCase):
@@ -185,9 +184,11 @@ class GitLogsTest(tests.BaseTestCase):
 
         git_log_cmd = ("git --git-dir=%s log --format" % self.git_dir)
         git_co_log_cmd = ("git log --git-dir=%s" % self.git_dir)
+        git_top_level = "git rev-parse --show-toplevel"
         cmd_map = {
             git_log_cmd: author_new,
             git_co_log_cmd: co_author_by,
+            git_top_level: self.root_dir,
         }
 
         exist_files = [self.git_dir,