Merge lp:~dobey/tarmac/lp-committer into lp:tarmac

[dobey]

Use the display name for the bot/person running tarmac, as committer.

[Chris Johnston (cjohnston)]

Looks fine

review: Approve

=== modified file 'tarmac/bin/commands.py'
--- tarmac/bin/commands.py	2013-11-05 16:39:20 +0000
+++ tarmac/bin/commands.py	2013-11-07 17:30:48 +0000
@@ -190,7 +190,8 @@
             return
 
         try:
-            target = Branch.create(lp_branch, self.config, create_tree=True)
+            target = Branch.create(lp_branch, self.config, create_tree=True,
+                                   launchpad=self.launchpad)
         except TarmacMergeError as failure:
             self._handle_merge_error(proposals[0], failure)
             return

=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2013-11-06 21:46:43 +0000
+++ tarmac/branch.py	2013-11-07 17:30:48 +0000
@@ -34,7 +34,7 @@
 
 class Branch(object):
 
-    def __init__(self, lp_branch, config=False, target=None):
+    def __init__(self, lp_branch, config=False, target=None, launchpad=None):
         self.lp_branch = lp_branch
         self.bzr_branch = bzr_branch.Branch.open(self.lp_branch.bzr_identity)
         if config:
@@ -42,6 +42,7 @@
         else:
             self.config = None
 
+        self.launchpad = launchpad
         self.target = target
         self.logger = logging.getLogger('tarmac')
 
@@ -55,8 +56,10 @@
             pass
 
     @classmethod
-    def create(cls, lp_branch, config, create_tree=False, target=None):
-        clazz = cls(lp_branch, config, target)
+    def create(cls, lp_branch, config, create_tree=False, target=None,
+               launchpad=None):
+        clazz = cls(lp_branch, config=config, target=target,
+                    launchpad=launchpad)
         if create_tree:
             clazz.create_tree()
         return clazz
@@ -166,8 +169,13 @@
                                            'review identity or vote.')
             revprops['reviews'] = '\n'.join(reviews)
 
+        if self.launchpad is not None:
+            committer = self.launchpad.me.display_name
+        else:
+            committer = 'Tarmac'
+
         try:
-            self.tree.commit(commit_message, committer='Tarmac',
+            self.tree.commit(commit_message, committer=committer,
                              revprops=revprops, authors=authors)
         except AssertionError as error:
             raise TarmacMergeError(str(error))

=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2013-11-06 21:46:43 +0000
+++ tarmac/tests/test_branch.py	2013-11-07 17:30:48 +0000
@@ -28,6 +28,7 @@
 from tarmac.tests import (
     BranchTestCase,
     MockLPBranch,
+    Thing,
 )
 
 
@@ -223,3 +224,17 @@
         a_branch.bzr_branch.user_url = 'lp:invalid'
         self.assertRaises(InvalidWorkingTree,
                           a_branch.create_tree)
+
+    def test_committer_is_launchpad_user(self):
+        """Test that the committer when committing, is the LP user's name."""
+        tree_dir = os.path.join(self.TEST_ROOT, 'test_lp_committer')
+        self.add_branch_config(tree_dir)
+        self.addCleanup(self.remove_branch_config, tree_dir)
+        self.addCleanup(shutil.rmtree, tree_dir)
+
+        committer = 'LP User'
+        a_branch = branch.Branch.create(MockLPBranch(tree_dir), self.config,
+                                        create_tree=True, launchpad=Thing(
+                                            me=Thing(display_name=committer)))
+        a_branch.commit('Test LP User.')
+        self.assertEqual(committer, a_branch.authors[0])

=== modified file 'tarmac/tests/test_commands.py'
--- tarmac/tests/test_commands.py	2013-11-05 16:39:20 +0000
+++ tarmac/tests/test_commands.py	2013-11-07 17:30:48 +0000
@@ -172,7 +172,8 @@
                         reviewer=Thing(display_name=u'Reviewer2'))])]
         self.branches[1].landing_candidates = self.proposals
 
-        self.launchpad = Thing(branches=Thing(getByUrl=self.getBranchByUrl))
+        self.launchpad = Thing(branches=Thing(getByUrl=self.getBranchByUrl),
+                               me=Thing(display_name='Tarmac'))
         self.error = None
         registry = CommandRegistry(config=self.config)
         registry.register_command('merge', commands.cmd_merge)