Merge lp:~andrea.corbellini/tarmac/save-commit-author into lp:tarmac

[Andrea Corbellini]

[Andrea Corbellini (andrea.corbellini)]

This branch allows Tarmac to pick up the author of the candidate branch and save it in the commit.

[dobey (dobey)]

This picks up the owner and their preferred e-mail, which may not be the e-mail they committed with, nor want to use for the commit. I think what we really want to do is pull the committer name/e-mail from the last commit in the pending merge before committing it to trunk.

[Paul Hummer (rockstar)]

Andrea-

  I really appreciate your effort in this, and for participating in Tarmac development. There are a number of flaws in this implementation. For instance, what if the user has elected to hide his email address from everyone. What if the user is committing code under a different user name (I do this a lot, since I have Canonical projects and non-Canonical projects).

  I'm quite happy to sit down with you and talk about an implementation that would work, and happy to help you along with it. I really appreciate your help in making Tarmac better.

review: Disapprove

[Andrea Corbellini (andrea.corbellini)]

No problem! :-)
I haven't much time in this period so I can't work on a different
implementation, for now. Thanks for the review.

Unmerged revisions

106. By Andrea Corbellini on 2009-06-05

Save the author of the branch in the commit message.

=== modified file 'tarmac/bin.py'
--- tarmac/bin.py	2009-05-28 18:40:35 +0000
+++ tarmac/bin.py	2009-06-05 14:52:58 +0000
@@ -99,6 +99,17 @@
         return [comment.reviewer for comment in candidate.all_comments
             if comment.vote == u'Approve'].join(', ')
 
+    def _get_author(self, source_branch):
+        '''Get the author of the branch and return a string in the form
+        "Display Name <email@address>"
+        '''
+        owner = source_branch.owner
+        if owner.hide_email_addresses:
+            return str(owner.display_name)
+        else:
+            return '%s <%s>' % (
+                owner.display_name, owner.preferred_email_address.email)
+
     def main(self):
         '''See `TarmacScript.main`.'''
 
@@ -152,6 +163,7 @@
                 'commit_message': commit_message}
 
             source_branch = Branch(candidate.source_branch)
+            commit_author = self._get_author(source_branch)
 
             try:
                 trunk.merge(source_branch)
@@ -168,10 +180,9 @@
                     trunk.cleanup()
                 else:
                     print 'Committing...'
-                    trunk.commit(commit_message)
+                    trunk.commit(commit_message, commit_author)
             except Exception, e:
                 print e
                 trunk.cleanup()
 
             tarmac_hooks['post_tarmac_commit'].fire()
-

=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2009-05-28 18:40:35 +0000
+++ tarmac/branch.py	2009-06-05 14:52:58 +0000
@@ -40,13 +40,16 @@
         if self.has_tree:
             self._set_up_working_tree()
 
-    def commit(self, commit_message):
+    def commit(self, commit_message, commit_author):
         '''Commit changes.'''
         if not self.has_tree:
             raise Exception('This branch has no working tree.')
-        self.tree.commit(commit_message)
+        self.tree.commit(commit_message, authors=[commit_author])
 
     @property
     def landing_candidates(self):
         return self.lp_branch.landing_candidates
 
+    @property
+    def owner(self):
+        return self.lp_branch.owner