Merge lp:~dobey/tarmac/full-authors into lp:tarmac

[dobey]

Get all the authors for all unique changes in the source branch

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2010-09-02 15:18:07 +0000
+++ tarmac/bin/commands.py	2010-09-17 19:29:50 +0000
@@ -143,7 +143,7 @@
                     u'Preparing to merge %(source_branch)s' % {
                         'source_branch': proposal.source_branch.bzr_identity})
                 source = Branch.create(
-                    proposal.source_branch, self.config)
+                    proposal.source_branch, self.config, target)
 
                 try:
                     approved = proposal.reviewed_revid
 
=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2010-09-02 15:04:52 +0000
+++ tarmac/branch.py	2010-09-17 19:29:50 +0000
@@ -35,7 +35,7 @@
 
 class Branch(object):
 
-    def __init__(self, lp_branch, config=False):
+    def __init__(self, lp_branch, config=False, target=None):
         self.lp_branch = lp_branch
         self.bzr_branch = bzr_branch.Branch.open(self.lp_branch.bzr_identity)
         if config:
@@ -43,15 +43,14 @@
         else:
             self.config = None
 
+        self.target = target
         self.logger = logging.getLogger('tarmac')
 
     @classmethod
-    def create(cls, lp_branch, config, create_tree=False):
+    def create(cls, lp_branch, config, create_tree=False, target=None):
+        clazz = cls(lp_branch, config, target)
         if create_tree:
-            clazz = cls(lp_branch, config)
             clazz.create_tree()
-        else:
-            clazz = cls(lp_branch)
         return clazz
 
     def create_tree(self):
@@ -133,15 +132,38 @@
 
     @property
     def authors(self):
-        last_rev = self.bzr_branch.last_revision()
         author_list = []
 
-        # Only query for authors if last_rev is not null:
-        if last_rev != 'null:':
-            rev = self.bzr_branch.repository.get_revision(last_rev)
-            apparent_authors = rev.get_apparent_authors()
-            author_list.extend(
-                [a.replace('\n', '') for a in apparent_authors])
+        if self.target:
+            self.bzr_branch.lock_read()
+            self.target.bzr_branch.lock_read()
+
+            graph = self.bzr_branch.repository.get_graph(
+                self.target.bzr_branch.repository)
+
+            unique_ids = graph.find_unique_ancestors(
+                self.bzr_branch.last_revision(),
+                [self.target.bzr_branch.last_revision()])
+
+            revs = self.bzr_branch.repository._iter_revisions(unique_ids)
+            for rev in revs:
+                apparent_authors = rev[1].get_apparent_authors()
+                for author in apparent_authors:
+                    author.replace('\n', '')
+                    if author not in author_list:
+                        author_list.append(author)
+
+            self.target.bzr_branch.unlock()
+            self.bzr_branch.unlock()
+        else:
+            last_rev = self.bzr_branch.last_revision()
+            if last_rev != 'null:':
+                rev = self.bzr_branch.repository.get_revision(last_rev)
+                apparent_authors = rev.get_apparent_authors()
+                author_list.extend(
+                    [a.replace('\n', '') for a in apparent_authors])
+            
+
         return author_list
 
     @property
 
=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2010-09-14 16:53:54 +0000
+++ tarmac/tests/test_branch.py	2010-09-17 19:29:50 +0000
@@ -58,7 +58,8 @@
         branch1.lp_branch.revision_count += 1
 
         mock2 = MockLPBranch(branch2_dir, source_branch=branch1.lp_branch)
-        branch2 = branch.Branch.create(mock2, self.config, create_tree=True)
+        branch2 = branch.Branch.create(mock2, self.config, create_tree=True,
+                                       target=branch1)
         branch2.commit('ABC...')
 
         added_file = os.path.join(branch2.lp_branch.tree_dir, 'README')
@@ -124,10 +125,15 @@
     def test_merge_with_authors(self):
         '''A merge from a branch with authors'''
         authors = ['author1', 'author2']
-        self.branch1.commit('Authors test', authors=authors)
-        self.branch2.merge(self.branch1)
-        self.branch2.commit('Authors Merge test', authors=self.branch1.authors)
-        self.assertEqual(self.branch2.authors.sort(), authors.sort())
+        self.branch2.commit('Authors test', authors=authors)
+        self.branch2.commit('Another author', authors=['author3'])
+        self.branch2.lp_branch.revision_count += 2
+        orig_authors = self.branch2.authors
+        self.branch1.merge(self.branch2)
+        self.branch1.commit('Authors Merge test', authors=self.branch2.authors)
+        self.branch1.lp_branch.revision_count += 1
+        self.assertEqual(sorted(orig_authors),
+                         sorted(self.branch1.authors))
 
     def test_merge_with_bugs(self):
         '''A merge from a branch with authors'''