Merge lp:~therve/bzr-pipeline/optional-webbrowser into lp:bzr-pipeline

[Thomas Herve]

[Thomas Herve (therve)]

This add a argument to run and submit to control the webbrowser.open.

[Aaron Bentley (abentley)]

You have not added an --open-webpage (or --no-open-webpage) option to the lp-submit command itself. Is this deliberate? If so, why?

Also, note that this command has been merged into bzr core as lp-propose, so it will be eliminated from pipeline soon.

review: Needs Information

[Thomas Herve (therve)]

Thanks for the review! It's somewhat deliberate, because we don't need it as our custom submit command will call lp_submit with the correct parameters, and not use the command line parameters.

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Thomas Herve wrote:
> Thanks for the review! It's somewhat deliberate, because we don't need it as our custom submit command will call lp_submit with the correct parameters, and not use the command line parameters.

Okay, I'll take it as-is. When you propose a similar change to bzr
core, I suggest changing Proposer to return the URL, and letting the
lp-propose command decide whether to open it in a web browser or print
it for the user or whatever.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkuAKukACgkQ0F+nu1YWqI2pbwCaA5i0+fMtYdcCTOrqvxxmnemm
LtsAni1ZSTMqc5YFB0OquDipiR2P0JrH
=LxMK
-----END PGP SIGNATURE-----

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'commands.py'
--- commands.py	2010-02-02 01:17:20 +0000
+++ commands.py	2010-02-04 12:52:15 +0000
@@ -384,7 +384,7 @@
     takes_args = ['submit_branch?']
 
     def run(self, submit_branch=None, review=None, staging=False,
-            message=None):
+            message=None, open_webpage=True):
         from bzrlib.plugins.pipeline import lp_submit
         checkout, manager = self._get_checkout_manager(checkout_optional=True,
                                                        allow_tree=True)
@@ -406,4 +406,4 @@
         submitter = lp_submit.Submitter(checkout, manager, target, message,
                                         reviews, staging)
         submitter.check_submission()
-        submitter.submit()
+        submitter.submit(open_webpage)

=== modified file 'lp_submit.py'
--- lp_submit.py	2009-12-18 22:28:50 +0000
+++ lp_submit.py	2010-02-04 12:52:15 +0000
@@ -247,7 +247,7 @@
                     'There is already a branch merge proposal: %s' %
                     canonical_url(mp))
 
-    def submit(self):
+    def submit(self, open_webpage):
         prev_pipe = self.manager.get_prev_pipe()
         if prev_pipe is not None:
             prerequisite_branch = MegaBranch.from_bzr(prev_pipe)
@@ -278,7 +278,8 @@
                     break
                 print line
         else:
-            webbrowser.open(canonical_url(mp))
+            if open_webpage:
+                webbrowser.open(canonical_url(mp))
 
 def canonical_url(object):
     url = object.self_link.replace('https://api.', 'https://code.')