Merge lp:~jelmer/brz/uncommit-url into lp:brz/3.0

[Jelmer Vernooij]

Display "-d $LOCATION" in example bzr pull command output by 'brz uncommit'

Display "-d $LOCATION" in example bzr pull command output by 'brz uncommit'

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-02-09 03:23:20 +0000
+++ breezy/builtins.py	2019-02-27 01:45:01 +0000
@@ -5420,10 +5420,10 @@
         else:
             self.add_cleanup(b.lock_write().unlock)
         return self._run(b, tree, dry_run, verbose, revision, force,
-                         local, keep_tags)
+                         local, keep_tags, location)
 
     def _run(self, b, tree, dry_run, verbose, revision, force, local,
-             keep_tags):
+             keep_tags, location):
         from .log import log_formatter, show_log
         from .uncommit import uncommit
 
@@ -5477,10 +5477,16 @@
                last_rev_id, rev_id)
         uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
                  revno=revno, local=local, keep_tags=keep_tags)
-        self.outf.write(
-            gettext('You can restore the old tip by running:\n'
-                    '  brz pull . -r revid:%s\n')
-            % last_rev_id.decode('utf-8'))
+        if location != '.':
+            self.outf.write(
+                gettext('You can restore the old tip by running:\n'
+                        '  brz pull -d %s %s -r revid:%s\n')
+                % (location, location, last_rev_id.decode('utf-8')))
+        else:
+            self.outf.write(
+                gettext('You can restore the old tip by running:\n'
+                        '  brz pull . -r revid:%s\n')
+                % last_rev_id.decode('utf-8'))
 
 
 class cmd_break_lock(Command):

=== modified file 'breezy/tests/blackbox/test_uncommit.py'
--- breezy/tests/blackbox/test_uncommit.py	2018-11-18 19:48:57 +0000
+++ breezy/tests/blackbox/test_uncommit.py	2019-02-27 01:45:01 +0000
@@ -246,6 +246,20 @@
   brz pull . -r revid:a2
 """)
 
+    def test_uncommit_shows_pull_with_location(self):
+        wt = self.create_simple_tree()
+
+        script = ScriptRunner()
+        script.run_script(self, """
+$ brz uncommit --force tree
+    2 ...
+      second commit
+...
+The above revision(s) will be removed.
+You can restore the old tip by running:
+  brz pull -d tree tree -r revid:a2
+""")
+
     def test_uncommit_octopus_merge(self):
         # Check that uncommit keeps the pending merges in the same order
         # though it will also filter out ones in the ancestry

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-02-14 06:21:45 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-02-27 01:45:01 +0000
@@ -230,6 +230,10 @@
 * Don't report .git files as unknown files.
   (Jelmer Vernooij, Debian Bug #921240)
 
+* Display correct pull location argument in
+  output of ``brz uncommit``.
+  (Jelmer Vernooij, #386577)
+
 Documentation
 *************