Add a --list-approved option to the merge command.

Author: dobey

tarmac/bin/commands.py

@@ -1,3 +1,18 @@
+# Copyright 2009-2012 Paul Hummer
+# Copyright 2009-2014 Canonical Ltd.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Tarmac.  If not, see <http://www.gnu.org/licenses/>.
 '''Command handling for Tarmac.'''
 import httplib2
 import logging
@@ -158,7 +173,9 @@ class cmd_merge(TarmacCommand):
         options.http_debug_option,
         options.debug_option,
         options.imply_commit_message_option,
-        options.one_option]
+        options.one_option,
+        options.list_approved_option,
+    ]
 
     def _handle_merge_error(self, proposal, failure):
         """Handle TarmacMergeError cases from _do_merges."""
@@ -200,6 +217,11 @@ def _do_merges(self, branch_url):
                     'branch_url': branch_url})
             return
 
+        if self.config.list_approved:
+            for proposal in proposals:
+                print(get_review_url(proposal))
+            return
+
         try:
             target = Branch.create(lp_branch, self.config, create_tree=True,
                                    launchpad=self.launchpad)

tarmac/bin/options.py

@@ -1,3 +1,18 @@
+# Copyright 2010-2011 Paul Hummer
+# Copyright 2010-2014 Canonical Ltd.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by
+# the Free Software Foundation.
+#
+# Tarmac is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Tarmac.  If not, see <http://www.gnu.org/licenses/>.
 '''Command options.'''
 from bzrlib.option import Option
 
@@ -18,3 +33,6 @@
 one_option = Option(
     'one', short_name='1',
     help='Merge only one branch and exit.')
+list_approved_option = Option(
+    'list-approved', short_name='l',
+    help='List Approved merge proposals for the target branch.')

tarmac/tests/test_commands.py

@@ -449,6 +449,13 @@ def test_run_merge_with_invalid_workingtree(self, mocked):
         self.assertEqual(self.error.comment,
                          invalid_tree_comment)
 
+    @patch('tarmac.bin.commands.get_review_url')
+    def test_run_merge_with_list_approved_option(self, mocked):
+        """Test that --list-approved option prints a list and returns."""
+        self.addProposal('list_approved')
+        self.command.run(launchpad=self.launchpad, list_approved=True)
+        self.assertEqual(mocked.call_count, 2)
+
     def test__compare_proposals(self):
         """
         _compare_proposals is meant to be a sort routine comparison function