Merge lp:~jelmer/bzr/push-suggests-parent into lp:bzr

[Jelmer Vernooij]

If no location is specified to "bzr push" or remembered, mention the parent alias to the user.

If no location is specified to "bzr push" or remembered, mention the parent alias to the user.

Several people complained that "bzr push" doesn't try to push to the parent location by
default (which we intentionally don't want to do). This is hopefully a reasonable compromise.

[Vincent Ladeuil (vila)]

It would be even better to display the parent url no ?

review: Needs Information

[Jelmer Vernooij (jelmer)]

On 12/21/2011 04:46 PM, Vincent Ladeuil wrote:
> Review: Needs Information
>
> It would be even better to display the parent url no ?
It's a lot quicker to type "bzr push :parent" than to type "bzr push
bzr+ssh://people.samba.org/data/bzr/jelmer/bzr-svn/trunk". And it makes
users aware of the location aliases.

I guess we could also display the parent location?

Cheers,

Jelmer

[Vincent Ladeuil (vila)]

>
> On 12/21/2011 04:46 PM, Vincent Ladeuil wrote:
> > Review: Needs Information
> >
> > It would be even better to display the parent url no ?
> It's a lot quicker to type "bzr push :parent" than to type "bzr push
> bzr+ssh://people.samba.org/data/bzr/jelmer/bzr-svn/trunk". And it makes
> users aware of the location aliases.

Hpmf, of course !

>
> I guess we could also display the parent location?

That's what I meant !

[Vincent Ladeuil (vila)]

I.e. we are in violent agreement :-D

With this tweak, please land !

review: Needs Fixing

[Jelmer Vernooij (jelmer)]

It's now:

bzr: ERROR: No push location known or specified. To push to the parent branch (at bzr+ssh://bazaar.launchpad.net/+branch/bzr/), use 'bzr push :parent'.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2011-12-21 16:52:39 +0000
+++ bzrlib/builtins.py	2011-12-21 17:57:40 +0000
@@ -1251,8 +1251,16 @@
         if location is None:
             stored_loc = br_from.get_push_location()
             if stored_loc is None:
-                raise errors.BzrCommandError(gettext(
-                    "No push location known or specified."))
+                parent_loc = br_from.get_parent()
+                if parent_loc:
+                    raise errors.BzrCommandError(gettext(
+                        "No push location known or specified. To push to the "
+                        "parent branch (at %s), use 'bzr push :parent'." %
+                        urlutils.unescape_for_display(parent_loc,
+                            self.outf.encoding)))
+                else:
+                    raise errors.BzrCommandError(gettext(
+                        "No push location known or specified."))
             else:
                 display_url = urlutils.unescape_for_display(stored_loc,
                         self.outf.encoding)

=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- bzrlib/tests/blackbox/test_push.py	2011-10-11 12:01:51 +0000
+++ bzrlib/tests/blackbox/test_push.py	2011-12-21 17:57:40 +0000
@@ -33,12 +33,10 @@
     )
 from bzrlib.repofmt import knitrepo
 from bzrlib.tests import (
-    blackbox,
     http_server,
     scenarios,
     script,
     test_foreign,
-    test_server,
     )
 from bzrlib.transport import memory
 
@@ -58,6 +56,26 @@
                            ['push', public_url],
                            working_dir='source')
 
+    def test_push_suggests_parent_alias(self):
+        """Push suggests using :parent if there is a known parent branch."""
+        tree_a = self.make_branch_and_tree('a')
+        tree_a.commit('this is a commit')
+        tree_b = self.make_branch_and_tree('b')
+
+        # If there is no parent location set, :parent isn't mentioned.
+        out = self.run_bzr('push', working_dir='a', retcode=3)
+        self.assertEquals(out,
+                ('','bzr: ERROR: No push location known or specified.\n'))
+
+        # If there is a parent location set, the error suggests :parent.
+        tree_a.branch.set_parent(tree_b.branch.base)
+        out = self.run_bzr('push', working_dir='a', retcode=3)
+        self.assertEquals(out,
+            ('','bzr: ERROR: No push location known or specified. '
+                'To push to the parent branch '
+                '(at %s), use \'bzr push :parent\'.\n' %
+                urlutils.unescape_for_display(tree_b.branch.base, 'utf-8')))
+
     def test_push_remember(self):
         """Push changes from one branch to another and test push location."""
         transport = self.get_transport()

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-12-21 17:42:34 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2011-12-21 17:57:40 +0000
@@ -49,6 +49,9 @@
 * ``bzr branches`` now indicates the active colocated branch.
   (Jelmer Vernooij, #891667)
 
+* ``bzr push`` now suggests using :parent if there is a parent location
+  set. (Jelmer Vernooij)
+
 * ``bzr send`` now only opens a single connection, rather than two,
   to the target branch.  (Jelmer Vernooij)