Merge lp:~jelmer/brz/3.2 into lp:brz/3.2

[Jelmer Vernooij]

Merge 3.2.0.

Merge 3.2.0.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.2/job/brz-3.2-land/3/

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2020-06-19 21:26:53 +0000
+++ breezy/__init__.py	2021-05-03 13:59:16 +0000
@@ -51,7 +51,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (3, 2, 0, 'dev', 0)
+version_info = (3, 2, 0, 'final', 0)
 
 
 def _format_version_tuple(version_info):

=== modified file 'doc/en/_templates/index.html'
--- doc/en/_templates/index.html	2018-11-21 00:43:20 +0000
+++ doc/en/_templates/index.html	2021-05-03 13:59:16 +0000
@@ -7,7 +7,7 @@
 
   <table class="contentstable" align="center" style="margin-left: 30px"><tr>
     <td width="50%">
-        <p class="biglink"><a class="biglink" href="{{ pathto("whats-new/whats-new-in-3.0") }}">What's New in Breezy 3.0?</a><br/>
+        <p class="biglink"><a class="biglink" href="{{ pathto("whats-new/whats-new-in-3.2") }}">What's New in Breezy 3.2?</a><br/>
         <span class="linkdescr">what's new in this release</span>
       </p>
         <p class="biglink"><a class="biglink" href="{{ pathto("user-guide/index") }}">User Guide</a><br/>

=== modified file 'po/brz.pot'
--- po/brz.pot	2020-05-21 19:02:12 +0000
+++ po/brz.pot	2021-05-03 13:59:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: brz\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2020-05-21 19:00+0000\n"
+"POT-Creation-Date: 2021-05-03 13:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,16 +18,16 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: breezy/add.py:95
+#: breezy/add.py:93
 #, python-brace-format
 msgid "skipping {0} (larger than {1} of {2} bytes)"
 msgstr ""
 
-#: breezy/bisect.py:266
+#: breezy/bisect.py:261
 msgid "Find an interesting commit using a binary search."
 msgstr ""
 
-#: breezy/bisect.py:268
+#: breezy/bisect.py:263
 msgid ""
 "Bisecting, in a nutshell, is a way to find the commit at which\n"
 "some testable change was made, such as the introduction of a bug\n"
@@ -38,34 +38,34 @@
 "the change was first introduced."
 msgstr ""
 
-#: breezy/bisect.py:276
+#: breezy/bisect.py:271
 msgid ""
 "This command uses subcommands to implement the search, each\n"
 "of which changes the state of the bisection.  The\n"
 "subcommands are:"
 msgstr ""
 
-#: breezy/bisect.py:280
+#: breezy/bisect.py:275
 msgid ""
 "brz bisect start\n"
 "    Start a bisect, possibly clearing out a previous bisect."
 msgstr ""
 
-#: breezy/bisect.py:283
+#: breezy/bisect.py:278
 msgid ""
 "brz bisect yes [-r rev]\n"
 "    The specified revision (or the current revision, if not given)\n"
 "    has the characteristic we're looking for,"
 msgstr ""
 
-#: breezy/bisect.py:287
+#: breezy/bisect.py:282
 msgid ""
 "brz bisect no [-r rev]\n"
 "    The specified revision (or the current revision, if not given)\n"
 "    does not have the characteristic we're looking for,"
 msgstr ""
 
-#: breezy/bisect.py:291
+#: breezy/bisect.py:286
 msgid ""
 "brz bisect move -r rev\n"
 "    Switch to a different revision manually.  Use if the bisect\n"
@@ -73,27 +73,27 @@
 "    move as little as possible."
 msgstr ""
 
-#: breezy/bisect.py:296
+#: breezy/bisect.py:291
 msgid ""
 "brz bisect reset\n"
 "    Clear out a bisection in progress."
 msgstr ""
 
-#: breezy/bisect.py:299
+#: breezy/bisect.py:294
 msgid ""
 "brz bisect log [-o file]\n"
 "    Output a log of the current bisection to standard output, or\n"
 "    to the specified file."
 msgstr ""
 
-#: breezy/bisect.py:303
+#: breezy/bisect.py:298
 msgid ""
 "brz bisect replay <logfile>\n"
 "    Replay a previously-saved bisect log, forgetting any bisection\n"
 "    that might be in progress."
 msgstr ""
 
-#: breezy/bisect.py:307
+#: breezy/bisect.py:302
 msgid ""
 "brz bisect run <script>\n"
 "    Bisect automatically using <script> to determine 'yes' or 'no'.\n"
@@ -104,83 +104,83 @@
 msgstr ""
 
 # help of 'output' option of 'bisect' command
-#: breezy/bisect.py:317
+#: breezy/bisect.py:312
 msgid "Write log to this file."
 msgstr ""
 
-#: breezy/branch.py:828
+#: breezy/branch.py:822
 msgid "Unstacking"
 msgstr ""
 
-#: breezy/branch.py:2009
+#: breezy/branch.py:2003
 #, python-format
 msgid "Pushed up to revision %d."
 msgstr ""
 
-#: breezy/branch.py:2012
+#: breezy/branch.py:2006
 #, python-format
 msgid "Pushed up to revision id %s."
 msgstr ""
 
-#: breezy/branch.py:2015
+#: breezy/branch.py:2009
 #, python-format
 msgid "%d tag updated."
 msgid_plural "%d tags updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/branch.py:2019
+#: breezy/branch.py:2013
 msgid "No new revisions or tags to push."
 msgstr ""
 
-#: breezy/branch.py:2021
+#: breezy/branch.py:2015
 msgid "No new revisions to push."
 msgstr ""
 
-#: breezy/branch.py:2041
+#: breezy/branch.py:2035
 #, python-brace-format
 msgid "checked branch {0} format {1}"
 msgstr ""
 
-#: breezy/branch.py:2044
+#: breezy/branch.py:2038
 #, python-format
 msgid "found error:%s"
 msgstr ""
 
-#: breezy/builtins.py:262 breezy/builtins.py:3094 breezy/workingtree.py:251
+#: breezy/builtins.py:253 breezy/builtins.py:3084 breezy/workingtree.py:249
 #, python-format
 msgid "Ignoring files outside view. View is %s"
 msgstr ""
 
-#: breezy/builtins.py:272
+#: breezy/builtins.py:263
 #, python-format
 msgid "brz %s --revision takes exactly one revision identifier"
 msgstr ""
 
-#: breezy/builtins.py:327
+#: breezy/builtins.py:318
 msgid "Display status summary."
 msgstr ""
 
-#: breezy/builtins.py:329
+#: breezy/builtins.py:320
 msgid ""
 "This reports on versioned and unknown files, reporting them\n"
 "grouped by state.  Possible states are:"
 msgstr ""
 
-#: breezy/builtins.py:332
+#: breezy/builtins.py:323
 msgid ""
 "added\n"
 "    Versioned in the working copy but not in the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:335
+#: breezy/builtins.py:326
 msgid ""
 "removed\n"
 "    Versioned in the previous revision but removed or deleted\n"
 "    in the working copy."
 msgstr ""
 
-#: breezy/builtins.py:339
+#: breezy/builtins.py:330
 msgid ""
 "renamed\n"
 "    Path of this file changed from the previous revision;\n"
@@ -188,25 +188,25 @@
 "    parent directory was renamed."
 msgstr ""
 
-#: breezy/builtins.py:344
+#: breezy/builtins.py:335
 msgid ""
 "modified\n"
 "    Text has changed since the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:347
+#: breezy/builtins.py:338
 msgid ""
 "kind changed\n"
 "    File kind has been changed (e.g. from file to directory)."
 msgstr ""
 
-#: breezy/builtins.py:350
+#: breezy/builtins.py:341
 msgid ""
 "unknown\n"
 "    Not versioned and not matching an ignore pattern."
 msgstr ""
 
-#: breezy/builtins.py:353
+#: breezy/builtins.py:344
 msgid ""
 "Additionally for directories, symlinks and files with a changed\n"
 "executable bit, Breezy indicates their type using a trailing\n"
@@ -214,20 +214,20 @@
 "disabled using the '--no-classify' option."
 msgstr ""
 
-#: breezy/builtins.py:358
+#: breezy/builtins.py:349
 msgid ""
 "To see ignored files use 'brz ignored'.  For details on the\n"
 "changes to file texts, use 'brz diff'."
 msgstr ""
 
-#: breezy/builtins.py:361
+#: breezy/builtins.py:352
 msgid ""
 "Note that --short or -S gives status flags for each item, similar\n"
 "to Subversion's status command. To get output similar to svn -q,\n"
 "use brz status -SV."
 msgstr ""
 
-#: breezy/builtins.py:365
+#: breezy/builtins.py:356
 msgid ""
 "If no arguments are specified, the status of the entire working\n"
 "directory is shown.  Otherwise, only the status of the specified\n"
@@ -235,7 +235,7 @@
 "is reported for everything inside that directory."
 msgstr ""
 
-#: breezy/builtins.py:370
+#: breezy/builtins.py:361
 msgid ""
 "Before merges are committed, the pending merge tip revisions are\n"
 "shown. To see all pending merge revisions, use the -v option.\n"
@@ -243,13 +243,13 @@
 "the no-pending option or specify a file/directory."
 msgstr ""
 
-#: breezy/builtins.py:375
+#: breezy/builtins.py:366
 msgid ""
 "To compare the working directory to a specific revision, pass a\n"
 "single revision to the revision argument."
 msgstr ""
 
-#: breezy/builtins.py:378
+#: breezy/builtins.py:369
 msgid ""
 "To see which files have changed in a specific revision, or between\n"
 "two revisions, pass a revision range to the revision argument.\n"
@@ -257,132 +257,132 @@
 msgstr ""
 
 # help of 'short' option of 'status' command
-#: breezy/builtins.py:387
+#: breezy/builtins.py:378
 msgid "Use short status indicators."
 msgstr ""
 
 # help of 'versioned' option of 'status' command
-#: breezy/builtins.py:389
+#: breezy/builtins.py:380
 msgid "Only show versioned files."
 msgstr ""
 
 # help of 'no-pending' option of 'status' command
-#: breezy/builtins.py:391
+#: breezy/builtins.py:382
 msgid "Don't show pending merges."
 msgstr ""
 
 # help of 'no-classify' option of 'status' command
-#: breezy/builtins.py:393
+#: breezy/builtins.py:384
 msgid "Do not mark object type using indicator."
 msgstr ""
 
-#: breezy/builtins.py:408
+#: breezy/builtins.py:399
 msgid "brz status --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:452 breezy/builtins.py:5331
+#: breezy/builtins.py:443 breezy/builtins.py:5321
 msgid "You can only supply one of revision_id or --revision"
 msgstr ""
 
-#: breezy/builtins.py:456 breezy/builtins.py:5334
+#: breezy/builtins.py:447 breezy/builtins.py:5324
 msgid "You must supply either --revision or a revision_id"
 msgstr ""
 
-#: breezy/builtins.py:463
+#: breezy/builtins.py:454
 #, python-format
 msgid "Repository %r does not support access to raw revision texts"
 msgstr ""
 
-#: breezy/builtins.py:474
+#: breezy/builtins.py:465
 #, python-brace-format
 msgid "The repository {0} contains no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:481
+#: breezy/builtins.py:472
 msgid "You cannot specify a NULL revision."
 msgstr ""
 
-#: breezy/builtins.py:487
+#: breezy/builtins.py:478
 msgid "Remove the working tree from a given branch/checkout."
 msgstr ""
 
-#: breezy/builtins.py:489
+#: breezy/builtins.py:480
 msgid ""
 "Since a lightweight checkout is little more than a working tree\n"
 "this will refuse to run against one."
 msgstr ""
 
-#: breezy/builtins.py:492
+#: breezy/builtins.py:483
 msgid "To re-create the working tree, use \"brz checkout\"."
 msgstr ""
 
 # help of 'force' option of 'remove-tree' command
-#: breezy/builtins.py:498
+#: breezy/builtins.py:489
 msgid "Remove the working tree even if it has uncommitted or shelved changes."
 msgstr ""
 
-#: breezy/builtins.py:513
+#: breezy/builtins.py:504
 msgid "No working tree to remove"
 msgstr ""
 
-#: breezy/builtins.py:516
+#: breezy/builtins.py:507
 msgid "You cannot remove the working tree of a remote path"
 msgstr ""
 
-#: breezy/builtins.py:526
+#: breezy/builtins.py:517
 msgid "You cannot remove the working tree from a lightweight checkout"
 msgstr ""
 
-#: breezy/builtins.py:567
+#: breezy/builtins.py:558
 msgid ""
 "The tree does not appear to be corrupt. You probably want \"brz revert\" "
 "instead. Use \"--force\" if you are sure you want to reset the working tree."
 msgstr ""
 
-#: breezy/builtins.py:578
+#: breezy/builtins.py:569
 msgid ""
 ", the header appears corrupt, try passing -r -1 to set the state to the last "
 "commit"
 msgstr ""
 
-#: breezy/builtins.py:583
+#: breezy/builtins.py:574
 #, python-brace-format
 msgid "failed to reset the tree state{0}"
 msgstr ""
 
-#: breezy/builtins.py:587
+#: breezy/builtins.py:578
 msgid "Show current revision number."
 msgstr ""
 
-#: breezy/builtins.py:589
+#: breezy/builtins.py:580
 msgid "This is equal to the number of revisions on this branch."
 msgstr ""
 
-#: breezy/builtins.py:603
+#: breezy/builtins.py:594
 msgid "--tree and --revision can not be used together"
 msgstr ""
 
-#: breezy/builtins.py:619
+#: breezy/builtins.py:610
 msgid "Revision numbers only make sense for single revisions, not ranges"
 msgstr ""
 
 # help of 'tree' option of 'revno' command
-#: breezy/builtins.py:642
+#: breezy/builtins.py:633
 msgid "Show revno of working tree."
 msgstr ""
 
-#: breezy/builtins.py:691
+#: breezy/builtins.py:682
 msgid "Add specified files or directories."
 msgstr ""
 
-#: breezy/builtins.py:693
+#: breezy/builtins.py:684
 msgid ""
 "In non-recursive mode, all the named items are added, regardless\n"
 "of whether they were previously ignored.  A warning is given if\n"
 "any of the named files are already versioned."
 msgstr ""
 
-#: breezy/builtins.py:697
+#: breezy/builtins.py:688
 msgid ""
 "In recursive mode (the default), files are treated the same way\n"
 "but the behaviour for directories is different.  Directories that\n"
@@ -393,19 +393,19 @@
 "directories.  If no names are given '.' is assumed."
 msgstr ""
 
-#: breezy/builtins.py:705
+#: breezy/builtins.py:696
 msgid ""
 "A warning will be printed when nested trees are encountered,\n"
 "unless they are explicitly ignored."
 msgstr ""
 
-#: breezy/builtins.py:708
+#: breezy/builtins.py:699
 msgid ""
 "Therefore simply saying 'brz add' will version all files that\n"
 "are currently unknown."
 msgstr ""
 
-#: breezy/builtins.py:711
+#: breezy/builtins.py:702
 msgid ""
 "Adding a file whose parent directory is not versioned will\n"
 "implicitly add the parent, and so on up to the root. This means\n"
@@ -413,13 +413,13 @@
 "get added when you add a file in the directory."
 msgstr ""
 
-#: breezy/builtins.py:716
+#: breezy/builtins.py:707
 msgid ""
 "--dry-run will show which files would be added, but not actually\n"
 "add them."
 msgstr ""
 
-#: breezy/builtins.py:719
+#: breezy/builtins.py:710
 msgid ""
 "--file-ids-from will try to use the file ids from the supplied path.\n"
 "It looks up ids trying to find a matching parent directory with the\n"
@@ -430,13 +430,13 @@
 "into a subdirectory of this one."
 msgstr ""
 
-#: breezy/builtins.py:727
+#: breezy/builtins.py:718
 msgid ""
 "Any files matching patterns in the ignore list will not be added\n"
 "unless they are explicitly mentioned."
 msgstr ""
 
-#: breezy/builtins.py:730
+#: breezy/builtins.py:721
 msgid ""
 "In recursive mode, files larger than the configuration option\n"
 "add.maximum_file_size will be skipped. Named items are never skipped due\n"
@@ -444,117 +444,117 @@
 msgstr ""
 
 # help of 'no-recurse' option of 'add' command
-#: breezy/builtins.py:737
+#: breezy/builtins.py:728
 msgid "Don't recursively add the contents of directories."
 msgstr ""
 
 # help of 'file-ids-from' option of 'add' command
-#: breezy/builtins.py:745
+#: breezy/builtins.py:736
 msgid "Lookup file ids from this tree."
 msgstr ""
 
-#: breezy/builtins.py:757
+#: breezy/builtins.py:748
 msgid ""
 "Ignoring --file-ids-from, since the tree does not support setting file ids."
 msgstr ""
 
-#: breezy/builtins.py:788
+#: breezy/builtins.py:779
 #, python-brace-format
 msgid "ignored {0} matching \"{1}\"\n"
 msgstr ""
 
-#: breezy/builtins.py:793
+#: breezy/builtins.py:784
 msgid "Create a new versioned directory."
 msgstr ""
 
-#: breezy/builtins.py:795
+#: breezy/builtins.py:786
 msgid "This is equivalent to creating the directory and then adding it."
 msgstr ""
 
 # help of 'parents' option of 'mkdir' command
-#: breezy/builtins.py:802
+#: breezy/builtins.py:793
 msgid "No error if existing, make parent directories as needed."
 msgstr ""
 
-#: breezy/builtins.py:836
+#: breezy/builtins.py:827
 #, python-format
 msgid "added %s\n"
 msgstr ""
 
-#: breezy/builtins.py:883
+#: breezy/builtins.py:874
 #, python-format
 msgid "invalid kind %r specified"
 msgstr ""
 
-#: breezy/builtins.py:921
+#: breezy/builtins.py:912
 msgid "Copy a file."
 msgstr ""
 
-#: breezy/builtins.py:923
+#: breezy/builtins.py:914
 msgid "    brz cp SOURCE... DESTINATION"
 msgstr ""
 
-#: breezy/builtins.py:925
+#: breezy/builtins.py:916
 msgid ""
 "If the last argument is a versioned directory, all the other names\n"
 "are copied into it.  Otherwise, there must be exactly two arguments\n"
 "and the file is copied to a new name."
 msgstr ""
 
-#: breezy/builtins.py:929
+#: breezy/builtins.py:920
 msgid ""
 "Files cannot be copied between branches. Only files can be copied\n"
 "at the moment."
 msgstr ""
 
-#: breezy/builtins.py:945 breezy/builtins.py:1038
+#: breezy/builtins.py:936 breezy/builtins.py:1029
 msgid "missing file argument"
 msgstr ""
 
-#: breezy/builtins.py:951
+#: breezy/builtins.py:942
 msgid "can not copy root of branch"
 msgstr ""
 
-#: breezy/builtins.py:959
+#: breezy/builtins.py:950
 msgid "to copy multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: breezy/builtins.py:973 breezy/builtins.py:989
+#: breezy/builtins.py:964 breezy/builtins.py:980
 #, python-format
 msgid "Could not copy %s => %s: %s is not versioned."
 msgstr ""
 
-#: breezy/builtins.py:977
+#: breezy/builtins.py:968
 #, python-format
 msgid "Could not copy %s => %s . %s is not versioned\\."
 msgstr ""
 
-#: breezy/builtins.py:981
+#: breezy/builtins.py:972
 #, python-format
 msgid "Could not copy %s => %s . %s is a directory."
 msgstr ""
 
-#: breezy/builtins.py:993
+#: breezy/builtins.py:984
 #, python-format
 msgid "Could not copy to %s: %s is not a directory."
 msgstr ""
 
-#: breezy/builtins.py:1000
+#: breezy/builtins.py:991
 msgid "Move or rename a file."
 msgstr ""
 
-#: breezy/builtins.py:1002
+#: breezy/builtins.py:993
 msgid "    brz mv SOURCE... DESTINATION"
 msgstr ""
 
-#: breezy/builtins.py:1004
+#: breezy/builtins.py:995
 msgid ""
 "If the last argument is a versioned directory, all the other names\n"
 "are moved into it.  Otherwise, there must be exactly two arguments\n"
 "and the file is changed to a new name."
 msgstr ""
 
-#: breezy/builtins.py:1008
+#: breezy/builtins.py:999
 msgid ""
 "If OLDNAME does not exist on the filesystem but is versioned and\n"
 "NEWNAME does exist on the filesystem but is not versioned, mv\n"
@@ -563,52 +563,52 @@
 "The same is valid when moving many SOURCE files to a DESTINATION."
 msgstr ""
 
-#: breezy/builtins.py:1014
+#: breezy/builtins.py:1005
 msgid "Files cannot be moved between branches."
 msgstr ""
 
 # help of 'after' option of 'mv' command
-#: breezy/builtins.py:1021
+#: breezy/builtins.py:1012
 msgid ""
 "Move only the brz identifier of the file, because the file has already been "
 "moved."
 msgstr ""
 
 # help of 'auto' option of 'mv' command
-#: breezy/builtins.py:1023
+#: breezy/builtins.py:1014
 msgid "Automatically guess renames."
 msgstr ""
 
 # help of 'dry-run' option of 'mv' command
+#: breezy/builtins.py:1016
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
 #: breezy/builtins.py:1025
-msgid "Avoid making changes when guessing renames."
-msgstr ""
-
-#: breezy/builtins.py:1034
 msgid "--dry-run requires --auto."
 msgstr ""
 
-#: breezy/builtins.py:1044
+#: breezy/builtins.py:1035
 msgid "can not move root of branch"
 msgstr ""
 
-#: breezy/builtins.py:1051
+#: breezy/builtins.py:1042
 msgid "Only one path may be specified to --auto."
 msgstr ""
 
-#: breezy/builtins.py:1054
+#: breezy/builtins.py:1045
 msgid "--after cannot be specified with --auto."
 msgstr ""
 
-#: breezy/builtins.py:1090
+#: breezy/builtins.py:1081
 msgid "to mv multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: breezy/builtins.py:1143
+#: breezy/builtins.py:1134
 msgid "Turn this branch into a mirror of another branch."
 msgstr ""
 
-#: breezy/builtins.py:1145
+#: breezy/builtins.py:1136
 msgid ""
 "By default, this command only works on branches that have not diverged.\n"
 "Branches are considered diverged if the destination branch's most recent\n"
@@ -616,21 +616,21 @@
 "parent."
 msgstr ""
 
-#: breezy/builtins.py:1150
+#: breezy/builtins.py:1141
 msgid ""
 "If branches have diverged, you can use 'brz merge' to integrate the changes\n"
 "from one into the other.  Once one branch has merged, the other should\n"
 "be able to pull it again."
 msgstr ""
 
-#: breezy/builtins.py:1154
+#: breezy/builtins.py:1145
 msgid ""
 "If you want to replace your local changes and just want your branch to\n"
 "match the remote one, use pull --overwrite. This will work even if the two\n"
 "branches have diverged."
 msgstr ""
 
-#: breezy/builtins.py:1158
+#: breezy/builtins.py:1149
 msgid ""
 "If there is no default location set, the first pull will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the\n"
@@ -638,14 +638,14 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1163
+#: breezy/builtins.py:1154
 msgid ""
 "The --verbose option will display the revisions pulled using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
 "-Olog_format=<other_format>."
 msgstr ""
 
-#: breezy/builtins.py:1167
+#: breezy/builtins.py:1158
 msgid ""
 "Note: The location can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
@@ -653,77 +653,77 @@
 msgstr ""
 
 # help of 'verbose' option of 'pull' command
-#: breezy/builtins.py:1175
+#: breezy/builtins.py:1166
 msgid "Show logs of pulled revisions."
 msgstr ""
 
 # help of 'directory' option of 'pull' command
-#: breezy/builtins.py:1177
+#: breezy/builtins.py:1168
 msgid ""
 "Branch to pull into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'local' option of 'pull' command
-#: breezy/builtins.py:1180
+#: breezy/builtins.py:1171
 msgid ""
 "Perform a local pull in a bound branch.  Local pulls are not applied to the "
 "master branch."
 msgstr ""
 
-#: breezy/builtins.py:1217
+#: breezy/builtins.py:1208
 msgid "No working tree, ignoring --show-base"
 msgstr ""
 
-#: breezy/builtins.py:1233 breezy/plugins/rewrite/commands.py:479
+#: breezy/builtins.py:1224 breezy/plugins/rewrite/commands.py:477
 msgid "No pull location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1240
+#: breezy/builtins.py:1231
 #, python-format
 msgid "Using saved parent location: %s\n"
 msgstr ""
 
-#: breezy/builtins.py:1247 breezy/builtins.py:4529
+#: breezy/builtins.py:1238 breezy/builtins.py:4519
 msgid "Cannot use -r with merge directives or bundles"
 msgstr ""
 
-#: breezy/builtins.py:1290
+#: breezy/builtins.py:1281
 msgid "Update a mirror of this branch."
 msgstr ""
 
-#: breezy/builtins.py:1292
+#: breezy/builtins.py:1283
 msgid ""
 "The target branch will not have its working tree populated because this\n"
 "is both expensive, and is not supported on remote file systems."
 msgstr ""
 
-#: breezy/builtins.py:1295
+#: breezy/builtins.py:1286
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: breezy/builtins.py:1298
+#: breezy/builtins.py:1289
 msgid ""
 "This command only works on branches that have not diverged.  Branches are\n"
 "considered diverged if the destination branch's most recent commit is one\n"
 "that has not been merged (directly or indirectly) by the source branch."
 msgstr ""
 
-#: breezy/builtins.py:1302
+#: breezy/builtins.py:1293
 msgid ""
 "If branches have diverged, you can use 'brz push --overwrite' to replace\n"
 "the other branch completely, discarding its unmerged changes."
 msgstr ""
 
-#: breezy/builtins.py:1305
+#: breezy/builtins.py:1296
 msgid ""
 "If you want to ensure you have the different changes in the other branch,\n"
 "do a merge (see brz help merge) from the other branch, and commit that.\n"
 "After that you will be able to do a push without '--overwrite'."
 msgstr ""
 
-#: breezy/builtins.py:1309
+#: breezy/builtins.py:1300
 msgid ""
 "If there is no default push location set, the first push will set it (use\n"
 "--no-remember to avoid setting it).  After that, you can omit the\n"
@@ -731,7 +731,7 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1314
+#: breezy/builtins.py:1305
 msgid ""
 "The --verbose option will display the revisions pushed using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
@@ -739,27 +739,27 @@
 msgstr ""
 
 # help of 'directory' option of 'push' command
-#: breezy/builtins.py:1325
+#: breezy/builtins.py:1316
 msgid ""
 "Branch to push from, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'push' command
-#: breezy/builtins.py:1328
+#: breezy/builtins.py:1319
 msgid ""
 "By default push will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow push to proceed."
 msgstr ""
 
 # help of 'stacked' option of 'push' command
-#: breezy/builtins.py:1333
+#: breezy/builtins.py:1324
 msgid ""
 "Create a stacked branch that references the public location of the parent "
 "branch."
 msgstr ""
 
 # help of 'stacked-on' option of 'push' command
-#: breezy/builtins.py:1336
+#: breezy/builtins.py:1327
 msgid ""
 "Create a stacked branch that refers to another branch for the commit "
 "history. Only the work not present in the referenced branch is included in "
@@ -767,55 +767,55 @@
 msgstr ""
 
 # help of 'strict' option of 'push' command
-#: breezy/builtins.py:1341
+#: breezy/builtins.py:1332
 msgid ""
 "Refuse to push if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
 # help of 'no-tree' option of 'push' command
-#: breezy/builtins.py:1344
+#: breezy/builtins.py:1335
 msgid "Don't populate the working tree, even for protocols that support it."
 msgstr ""
 
 # help of 'overwrite-tags' option of 'pull' command
 # help of 'overwrite-tags' option of 'push' command
-#: breezy/builtins.py:1347
+#: breezy/builtins.py:1338
 msgid "Overwrite tags only."
 msgstr ""
 
 # help of 'lossy' option of 'push' command
-#: breezy/builtins.py:1348
+#: breezy/builtins.py:1339
 msgid ""
 "Allow lossy push, i.e. dropping metadata that can't be represented in the "
 "target."
 msgstr ""
 
+#: breezy/builtins.py:1393
+msgid "Could not determine branch to refer to."
+msgstr ""
+
 #: breezy/builtins.py:1402
-msgid "Could not determine branch to refer to."
-msgstr ""
-
-#: breezy/builtins.py:1411
 #, python-format
 msgid ""
 "No push location known or specified. To push to the parent branch (at %s), "
 "use 'brz push :parent'."
 msgstr ""
 
-#: breezy/builtins.py:1417
+#: breezy/builtins.py:1408
 msgid "No push location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1421
+#: breezy/builtins.py:1412
 #, python-format
 msgid "Using saved push location: %s"
 msgstr ""
 
-#: breezy/builtins.py:1432
+#: breezy/builtins.py:1423
 msgid "Create a new branch that is a copy of an existing branch."
 msgstr ""
 
-#: breezy/builtins.py:1434
+#: breezy/builtins.py:1425
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
 "be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
@@ -826,118 +826,118 @@
 "create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1441
+#: breezy/builtins.py:1432
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"branch foo/bar -r 5\"."
 msgstr ""
 
 # help of 'no-tree' option of 'branch' command
-#: breezy/builtins.py:1454
+#: breezy/builtins.py:1445
 msgid "Create a branch without a working-tree."
 msgstr ""
 
 # help of 'switch' option of 'branch' command
-#: breezy/builtins.py:1456
+#: breezy/builtins.py:1447
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
 # help of 'stacked' option of 'branch' command
-#: breezy/builtins.py:1459
+#: breezy/builtins.py:1450
 msgid ""
 "Create a stacked branch referring to the source branch. The new branch will "
 "depend on the availability of the source branch for all operations."
 msgstr ""
 
 # help of 'standalone' option of 'branch' command
-#: breezy/builtins.py:1463
+#: breezy/builtins.py:1454
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'branch' command
-#: breezy/builtins.py:1465
+#: breezy/builtins.py:1456
 msgid ""
 "By default branch will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow branch to proceed."
 msgstr ""
 
 # help of 'bind' option of 'branch' command
-#: breezy/builtins.py:1470
+#: breezy/builtins.py:1461
 msgid "Bind new branch to from location."
 msgstr ""
 
 # help of 'colocated-branch' option of 'branch' command
-#: breezy/builtins.py:1474
+#: breezy/builtins.py:1465
 msgid "Name of colocated branch to sprout."
 msgstr ""
 
-#: breezy/builtins.py:1515
+#: breezy/builtins.py:1506
 #, python-format
 msgid "Target directory \"%s\" already exists."
 msgstr ""
 
-#: breezy/builtins.py:1527
+#: breezy/builtins.py:1518
 #, python-format
 msgid "Parent of \"%s\" does not exist."
 msgstr ""
 
-#: breezy/builtins.py:1546
+#: breezy/builtins.py:1537
 #, python-brace-format
 msgid "The branch {0} has no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:1563 breezy/push.py:54
+#: breezy/builtins.py:1554 breezy/push.py:52
 #, python-format
 msgid "Created new stacked branch referring to %s."
 msgstr ""
 
-#: breezy/builtins.py:1569
+#: breezy/builtins.py:1560
 #, python-format
 msgid "Branched %d revision."
 msgid_plural "Branched %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:1573 breezy/push.py:57
+#: breezy/builtins.py:1564 breezy/push.py:55
 msgid "Created new branch."
 msgstr ""
 
-#: breezy/builtins.py:1578
+#: breezy/builtins.py:1569
 #, python-format
 msgid "New branch bound to %s"
 msgstr ""
 
-#: breezy/builtins.py:1583
+#: breezy/builtins.py:1574
 #, python-format
 msgid "Switched to branch: %s"
 msgstr ""
 
-#: breezy/builtins.py:1588
+#: breezy/builtins.py:1579
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: breezy/builtins.py:1590
+#: breezy/builtins.py:1581
 msgid ""
 "This command will print the names of all the branches at the current\n"
 "location."
 msgstr ""
 
 # help of 'recursive' option of 'branches' command
-#: breezy/builtins.py:1597
+#: breezy/builtins.py:1588
 msgid ""
 "Recursively scan for branches rather than just looking in the specified "
 "location."
 msgstr ""
 
-#: breezy/builtins.py:1626
+#: breezy/builtins.py:1617
 msgid "(default)"
 msgstr ""
 
-#: breezy/builtins.py:1638
+#: breezy/builtins.py:1628
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: breezy/builtins.py:1640
+#: breezy/builtins.py:1630
 msgid ""
 "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree\n"
 "for the branch found in '.'. This is useful if you have removed the working\n"
@@ -945,7 +945,7 @@
 "current location using SFTP."
 msgstr ""
 
-#: breezy/builtins.py:1645
+#: breezy/builtins.py:1635
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION\n"
 "will be used.  In other words, \"checkout ../foo/bar\" will attempt to "
@@ -957,7 +957,7 @@
 "attempt to create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1652
+#: breezy/builtins.py:1642
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"checkout foo/bar -r 5\". Note that this will be\n"
@@ -966,7 +966,7 @@
 msgstr ""
 
 # help of 'lightweight' option of 'checkout' command
-#: breezy/builtins.py:1662
+#: breezy/builtins.py:1652
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -976,17 +976,17 @@
 
 # help of 'files-from' option of 'branch' command
 # help of 'files-from' option of 'checkout' command
-#: breezy/builtins.py:1669
+#: breezy/builtins.py:1659
 msgid "Get file contents from this tree."
 msgstr ""
 
 # help of 'hardlink' option of 'branch' command
 # help of 'hardlink' option of 'checkout' command
-#: breezy/builtins.py:1671
+#: breezy/builtins.py:1661
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: breezy/builtins.py:1711
+#: breezy/builtins.py:1701
 msgid ""
 "Clone a control directory.\n"
 "    "
@@ -994,38 +994,38 @@
 
 # help of 'no-recurse-nested' option of 'branch' command
 # help of 'no-recurse-nested' option of 'clone' command
-#: breezy/builtins.py:1717
+#: breezy/builtins.py:1707
 msgid "Do not recursively check out nested trees."
 msgstr ""
 
-#: breezy/builtins.py:1739
+#: breezy/builtins.py:1729
 msgid "Created new control directory."
 msgstr ""
 
-#: breezy/builtins.py:1743
+#: breezy/builtins.py:1733
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: breezy/builtins.py:1771
+#: breezy/builtins.py:1761
 msgid "Update a working tree to a new revision."
 msgstr ""
 
-#: breezy/builtins.py:1773
+#: breezy/builtins.py:1763
 msgid ""
 "This will perform a merge of the destination revision (the tip of the\n"
 "branch, or the specified revision) into the working tree, and then make\n"
 "that revision the basis revision for the working tree."
 msgstr ""
 
-#: breezy/builtins.py:1777
+#: breezy/builtins.py:1767
 msgid ""
 "You can use this to visit an older revision, or to update a working tree\n"
 "that is out of date from its branch."
 msgstr ""
 
-#: breezy/builtins.py:1780
+#: breezy/builtins.py:1770
 msgid ""
 "If there are any uncommitted changes in the tree, they will be carried\n"
 "across and remain as uncommitted changes after the update.  To discard\n"
@@ -1033,13 +1033,13 @@
 "with the changes brought in by the change in basis revision."
 msgstr ""
 
-#: breezy/builtins.py:1785
+#: breezy/builtins.py:1775
 msgid ""
 "If the tree's branch is bound to a master branch, brz will also update\n"
 "the branch from the master."
 msgstr ""
 
-#: breezy/builtins.py:1788
+#: breezy/builtins.py:1778
 msgid ""
 "You cannot update just a single file or directory, because each Breezy\n"
 "working tree has just a single basis revision.  If you want to restore a\n"
@@ -1049,103 +1049,103 @@
 "out the old content of that file to a new location."
 msgstr ""
 
-#: breezy/builtins.py:1795
+#: breezy/builtins.py:1785
 msgid ""
 "The 'dir' argument, if given, must be the location of the root of a\n"
 "working tree to update.  By default, the working tree that contains the\n"
 "current working directory is used."
 msgstr ""
 
-#: breezy/builtins.py:1811
+#: breezy/builtins.py:1801
 msgid "brz update --revision takes exactly one revision"
 msgstr ""
 
-#: breezy/builtins.py:1819
+#: breezy/builtins.py:1809
 msgid "brz update can only update a whole tree, not a file or subdirectory"
 msgstr ""
 
-#: breezy/builtins.py:1849
+#: breezy/builtins.py:1839
 #, python-brace-format
 msgid "Tree is up to date at revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1865
+#: breezy/builtins.py:1855
 #, python-format
 msgid ""
 "branch has no revision %s\n"
 "brz update --revision only works for a revision in the branch history"
 msgstr ""
 
-#: breezy/builtins.py:1871
+#: breezy/builtins.py:1861
 #, python-brace-format
 msgid "Updated to revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1875
+#: breezy/builtins.py:1865
 msgid ""
 "Your local commits will now show as pending merges with 'brz status', and "
 "can be committed with 'brz commit'."
 msgstr ""
 
-#: breezy/builtins.py:1884
+#: breezy/builtins.py:1874
 msgid "Show information about a working tree, branch or repository."
 msgstr ""
 
-#: breezy/builtins.py:1886
+#: breezy/builtins.py:1876
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: breezy/builtins.py:1889
+#: breezy/builtins.py:1879
 msgid ""
 "In verbose mode, statistical information is included with each report.\n"
 "To see extended statistic information, use a verbosity level of 2 or\n"
 "higher by specifying the verbose option multiple times, e.g. -vv."
 msgstr ""
 
-#: breezy/builtins.py:1893
+#: breezy/builtins.py:1883
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: breezy/builtins.py:1895 breezy/builtins.py:3830 breezy/builtins.py:4997
-#: breezy/builtins.py:6591 breezy/plugins/fastimport/cmds.py:211
-#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:285
+#: breezy/builtins.py:1885 breezy/builtins.py:3820 breezy/builtins.py:4987
+#: breezy/builtins.py:6581 breezy/plugins/fastimport/cmds.py:206
+#: breezy/plugins/fastimport/cmds.py:412 breezy/plugins/gitlab/cmds.py:39
 msgid ":Examples:"
 msgstr ""
 
-#: breezy/builtins.py:1897
+#: breezy/builtins.py:1887
 msgid "  Display information on the format and related locations:"
 msgstr ""
 
-#: breezy/builtins.py:1899
+#: breezy/builtins.py:1889
 msgid "    brz info"
 msgstr ""
 
-#: breezy/builtins.py:1901
+#: breezy/builtins.py:1891
 msgid ""
 "  Display the above together with extended format information and\n"
 "  basic statistics (like the number of files in the working tree and\n"
 "  number of revisions in the branch and repository):"
 msgstr ""
 
-#: breezy/builtins.py:1905
+#: breezy/builtins.py:1895
 msgid "    brz info -v"
 msgstr ""
 
-#: breezy/builtins.py:1907
+#: breezy/builtins.py:1897
 msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
-#: breezy/builtins.py:1909
+#: breezy/builtins.py:1899
 msgid "    brz info -vv"
 msgstr ""
 
-#: breezy/builtins.py:1928
+#: breezy/builtins.py:1918
 msgid "Remove files or directories."
 msgstr ""
 
-#: breezy/builtins.py:1930
+#: breezy/builtins.py:1920
 msgid ""
 "This makes Breezy stop tracking changes to the specified files. Breezy will\n"
 "delete them if they can easily be recovered using revert otherwise they\n"
@@ -1155,44 +1155,44 @@
 msgstr ""
 
 # help of 'new' option of 'remove' command
-#: breezy/builtins.py:1939
+#: breezy/builtins.py:1929
 msgid "Only remove files that have never been committed."
 msgstr ""
 
 # help of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1941
+#: breezy/builtins.py:1931
 msgid "The file deletion mode to be used."
 msgstr ""
 
 # title of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1942
+#: breezy/builtins.py:1932
 msgid "Deletion Strategy"
 msgstr ""
 
 # help of 'file-deletion-strategy=safe' option of 'remove' command
-#: breezy/builtins.py:1943
+#: breezy/builtins.py:1933
 msgid "Backup changed files (default)."
 msgstr ""
 
 # help of 'file-deletion-strategy=keep' option of 'remove' command
-#: breezy/builtins.py:1944
+#: breezy/builtins.py:1934
 msgid "Delete from brz but leave the working copy."
 msgstr ""
 
 # help of 'file-deletion-strategy=no-backup' option of 'remove' command
-#: breezy/builtins.py:1945
+#: breezy/builtins.py:1935
 msgid "Don't backup changed files."
 msgstr ""
 
-#: breezy/builtins.py:1966
+#: breezy/builtins.py:1956
 msgid "No matching files."
 msgstr ""
 
-#: breezy/builtins.py:1983
+#: breezy/builtins.py:1973
 msgid "Reconcile brz metadata in a branch."
 msgstr ""
 
-#: breezy/builtins.py:1985
+#: breezy/builtins.py:1975
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or brz upgrades. You should only\n"
@@ -1200,7 +1200,7 @@
 "advises you to run it."
 msgstr ""
 
-#: breezy/builtins.py:1990
+#: breezy/builtins.py:1980
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -1208,20 +1208,20 @@
 "correctly in both branches."
 msgstr ""
 
-#: breezy/builtins.py:1995
+#: breezy/builtins.py:1985
 msgid ""
 "At the same time it is run it may recompress data resulting in\n"
 "a potential saving in disk space or performance gain."
 msgstr ""
 
-#: breezy/builtins.py:1998
+#: breezy/builtins.py:1988
 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
 msgstr ""
 
 # help of 'format=git-bare' option of 'init' command
 # help of 'format=git-bare' option of 'init-shared-repository' command
 # help of 'format=git-bare' option of 'upgrade' command
-#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
+#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
 msgid "Bare GIT repository (no working tree)."
 msgstr ""
 
@@ -1234,28 +1234,28 @@
 # help of 'format=2a' option of 'upgrade' command
 # help of 'format=bzr' option of 'upgrade' command
 # help of 'format=default' option of 'upgrade' command
-#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
+#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
 msgid "Format for the bzr 2.0 series.\n"
 msgstr ""
 
 # help of 'format=git' option of 'init' command
 # help of 'format=git' option of 'init-shared-repository' command
 # help of 'format=git' option of 'upgrade' command
-#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
+#: breezy/builtins.py:2055 breezy/builtins.py:2176 breezy/builtins.py:3855
 msgid "GIT repository."
 msgstr ""
 
-#: breezy/builtins.py:2066
+#: breezy/builtins.py:2056
 msgid "Make a directory into a versioned branch."
 msgstr ""
 
-#: breezy/builtins.py:2068
+#: breezy/builtins.py:2058
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: breezy/builtins.py:2071
+#: breezy/builtins.py:2061
 msgid ""
 "If there is a repository in a parent directory of the location, then\n"
 "the history of the branch will be stored in the repository.  Otherwise\n"
@@ -1263,17 +1263,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: breezy/builtins.py:2076
+#: breezy/builtins.py:2066
 msgid ""
 "If there is already a branch at the location but it has no working tree,\n"
 "the tree can be populated with 'brz checkout'."
 msgstr ""
 
-#: breezy/builtins.py:2079
+#: breezy/builtins.py:2069
 msgid "Recipe for importing a tree of files::"
 msgstr ""
 
-#: breezy/builtins.py:2081
+#: breezy/builtins.py:2071
 msgid ""
 "    cd ~/project\n"
 "    brz init\n"
@@ -1284,52 +1284,52 @@
 
 # help of 'create-prefix' option of 'init' command
 # help of 'create-prefix' option of 'push' command
-#: breezy/builtins.py:2092
+#: breezy/builtins.py:2082
 msgid "Create the path leading up to the branch if it does not already exist."
 msgstr ""
 
 # help of 'format' option of 'init' command
-#: breezy/builtins.py:2095
+#: breezy/builtins.py:2085
 msgid "Specify a format for this branch. See \"help formats\" for a full list."
 msgstr ""
 
 # help of 'append-revisions-only' option of 'init' command
-#: breezy/builtins.py:2104
+#: breezy/builtins.py:2094
 msgid "Never change revnos or the existing log.  Append revisions to it only."
 msgstr ""
 
 # help of 'no-tree' option of 'init' command
-#: breezy/builtins.py:2107
+#: breezy/builtins.py:2097
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: breezy/builtins.py:2128 breezy/push.py:112
+#: breezy/builtins.py:2118 breezy/push.py:110
 #, python-format
 msgid ""
 "Parent directory of %s does not exist.\n"
 "You may supply --create-prefix to create all leading parent directories."
 msgstr ""
 
-#: breezy/builtins.py:2163
+#: breezy/builtins.py:2153
 msgid ""
 "This branch format cannot be set to append-revisions-only.  Try --default."
 msgstr ""
 
-#: breezy/builtins.py:2174
+#: breezy/builtins.py:2164
 #, python-brace-format
 msgid "Created a {0} (format: {1})\n"
 msgstr ""
 
-#: breezy/builtins.py:2183
+#: breezy/builtins.py:2173
 #, python-format
 msgid "Using shared repository: %s\n"
 msgstr ""
 
-#: breezy/builtins.py:2187
+#: breezy/builtins.py:2177
 msgid "Create a shared repository for branches to share storage space."
 msgstr ""
 
-#: breezy/builtins.py:2189
+#: breezy/builtins.py:2179
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -1337,7 +1337,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: breezy/builtins.py:2194
+#: breezy/builtins.py:2184
 msgid ""
 "If the --no-trees option is given then the branches in the repository\n"
 "will not have working trees by default.  They will still exist as\n"
@@ -1347,23 +1347,23 @@
 "branches, such as on a server."
 msgstr ""
 
-#: breezy/builtins.py:2201
+#: breezy/builtins.py:2191
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: breezy/builtins.py:2204
+#: breezy/builtins.py:2194
 msgid ""
 "        brz init-shared-repo --no-trees repo\n"
 "        brz init repo/trunk"
 msgstr ""
 
-#: breezy/builtins.py:2207
+#: breezy/builtins.py:2197
 msgid "    Make a lightweight checkout elsewhere::"
 msgstr ""
 
-#: breezy/builtins.py:2209
+#: breezy/builtins.py:2199
 msgid ""
 "        brz checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
@@ -1371,35 +1371,35 @@
 msgstr ""
 
 # help of 'format' option of 'init-shared-repository' command
-#: breezy/builtins.py:2217
+#: breezy/builtins.py:2207
 msgid ""
 "Specify a format for this repository. See \"brz help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init-shared-repository' command
 # title of 'format' option of 'fast-import' command
-#: breezy/builtins.py:2223 breezy/plugins/fastimport/cmds.py:287
+#: breezy/builtins.py:2213 breezy/plugins/fastimport/cmds.py:282
 msgid "Repository format"
 msgstr ""
 
 # help of 'no-trees' option of 'init-shared-repository' command
-#: breezy/builtins.py:2225
+#: breezy/builtins.py:2215
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
 # help of 'color' option of 'diff' command
-#: breezy/builtins.py:2255
+#: breezy/builtins.py:2245
 msgid ""
 "Color mode to use.  \"always\": Always colorize output (default).  \"auto\": "
 "Only colorize output if terminal supports it and STDOUT is a TTY.  \"never"
 "\": Never colorize output."
 msgstr ""
 
-#: breezy/builtins.py:2256
+#: breezy/builtins.py:2246
 msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
-#: breezy/builtins.py:2258
+#: breezy/builtins.py:2248
 msgid ""
 "If no arguments are given, all changes for the current tree are listed.\n"
 "If files are given, only the changes in those files are listed.\n"
@@ -1409,13 +1409,13 @@
 "given."
 msgstr ""
 
-#: breezy/builtins.py:2265
+#: breezy/builtins.py:2255
 msgid ""
 "\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: breezy/builtins.py:2268
+#: breezy/builtins.py:2258
 msgid ""
 "Note that when using the -r argument with a range of revisions, the\n"
 "differences are computed between the two specified revisions.  That\n"
@@ -1425,7 +1425,7 @@
 "in the range."
 msgstr ""
 
-#: breezy/builtins.py:2275
+#: breezy/builtins.py:2265
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -1434,219 +1434,219 @@
 "    0 - no change"
 msgstr ""
 
-#: breezy/builtins.py:2281
+#: breezy/builtins.py:2271
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
-#: breezy/builtins.py:2284
+#: breezy/builtins.py:2274
 msgid "        brz diff"
 msgstr ""
 
-#: breezy/builtins.py:2286
+#: breezy/builtins.py:2276
 msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
-#: breezy/builtins.py:2288
+#: breezy/builtins.py:2278
 msgid "        brz diff -r1"
 msgstr ""
 
-#: breezy/builtins.py:2290
+#: breezy/builtins.py:2280
 msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
-#: breezy/builtins.py:2292
+#: breezy/builtins.py:2282
 msgid "        brz diff -r1..3"
 msgstr ""
 
-#: breezy/builtins.py:2294
+#: breezy/builtins.py:2284
 msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
-#: breezy/builtins.py:2296
+#: breezy/builtins.py:2286
 msgid "        brz diff -r1..3 xxx"
 msgstr ""
 
-#: breezy/builtins.py:2298
+#: breezy/builtins.py:2288
 msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
-#: breezy/builtins.py:2300
+#: breezy/builtins.py:2290
 msgid "        brz diff -c2"
 msgstr ""
 
-#: breezy/builtins.py:2302
+#: breezy/builtins.py:2292
 msgid "    To see the changes introduced by revision X::"
 msgstr ""
 
-#: breezy/builtins.py:2304
+#: breezy/builtins.py:2294
 msgid "        brz diff -cX"
 msgstr ""
 
-#: breezy/builtins.py:2306
+#: breezy/builtins.py:2296
 msgid ""
 "    Note that in the case of a merge, the -c option shows the changes\n"
 "    compared to the left hand parent. To see the changes against\n"
 "    another parent, use::"
 msgstr ""
 
-#: breezy/builtins.py:2310
+#: breezy/builtins.py:2300
 msgid "        brz diff -r<chosen_parent>..X"
 msgstr ""
 
-#: breezy/builtins.py:2312
+#: breezy/builtins.py:2302
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
-#: breezy/builtins.py:2315
+#: breezy/builtins.py:2305
 msgid "        brz diff -r-2.."
 msgstr ""
 
-#: breezy/builtins.py:2317
+#: breezy/builtins.py:2307
 msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2319
+#: breezy/builtins.py:2309
 msgid "        brz diff NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2321
+#: breezy/builtins.py:2311
 msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2323
+#: breezy/builtins.py:2313
 msgid "        brz diff xxx/NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2325
+#: breezy/builtins.py:2315
 msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
-#: breezy/builtins.py:2327
+#: breezy/builtins.py:2317
 msgid "        brz diff --old xxx"
 msgstr ""
 
-#: breezy/builtins.py:2329
+#: breezy/builtins.py:2319
 msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2331
+#: breezy/builtins.py:2321
 msgid "        brz diff --old xxx --new yyy NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2333
+#: breezy/builtins.py:2323
 msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
 msgstr ""
 
-#: breezy/builtins.py:2335
+#: breezy/builtins.py:2325
 msgid "        brz diff --prefix old/:new/"
 msgstr ""
 
-#: breezy/builtins.py:2337
+#: breezy/builtins.py:2327
 msgid "    Show the differences using a custom diff program with options::"
 msgstr ""
 
-#: breezy/builtins.py:2339
+#: breezy/builtins.py:2329
 msgid "        brz diff --using /usr/bin/diff --diff-options -wu"
 msgstr ""
 
 # help of 'diff-options' option of 'diff' command
-#: breezy/builtins.py:2345
+#: breezy/builtins.py:2335
 msgid "Pass these options to the external diff program."
 msgstr ""
 
 # help of 'prefix' option of 'diff' command
-#: breezy/builtins.py:2348
+#: breezy/builtins.py:2338
 msgid ""
 "Set prefixes added to old and new filenames, as two values separated by a "
 "colon. (eg \"old/:new/\")."
 msgstr ""
 
 # help of 'old' option of 'diff' command
-#: breezy/builtins.py:2351
+#: breezy/builtins.py:2341
 msgid "Branch/tree to compare from."
 msgstr ""
 
 # help of 'new' option of 'diff' command
-#: breezy/builtins.py:2355
+#: breezy/builtins.py:2345
 msgid "Branch/tree to compare to."
 msgstr ""
 
 # help of 'using' option of 'diff' command
-#: breezy/builtins.py:2361
+#: breezy/builtins.py:2351
 msgid "Use this command to compare files."
 msgstr ""
 
 # help of 'format' option of 'diff' command
-#: breezy/builtins.py:2366
+#: breezy/builtins.py:2356
 msgid "Diff format to use."
 msgstr ""
 
 # title of 'format' option of 'diff' command
-#: breezy/builtins.py:2368
+#: breezy/builtins.py:2358
 msgid "Diff format"
 msgstr ""
 
 # help of 'context' option of 'diff' command
-#: breezy/builtins.py:2370
+#: breezy/builtins.py:2360
 msgid "How many lines of context to show."
 msgstr ""
 
 # title of 'color' option of 'diff' command
-#: breezy/builtins.py:2376
+#: breezy/builtins.py:2366
 msgid "Color Mode"
 msgstr ""
 
 # help of 'check-style' option of 'diff' command
-#: breezy/builtins.py:2383
+#: breezy/builtins.py:2373
 msgid "Warn if trailing whitespace or spurious changes have been  added."
 msgstr ""
 
-#: breezy/builtins.py:2408
+#: breezy/builtins.py:2398
 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
 msgstr ""
 
-#: breezy/builtins.py:2412
+#: breezy/builtins.py:2402
 msgid "brz diff --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:2417 breezy/builtins.py:2823 breezy/builtins.py:2831
+#: breezy/builtins.py:2407 breezy/builtins.py:2813 breezy/builtins.py:2821
 #, python-brace-format
 msgid "{0} and {1} are mutually exclusive"
 msgstr ""
 
-#: breezy/builtins.py:2447
+#: breezy/builtins.py:2437
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
-#: breezy/builtins.py:2522
+#: breezy/builtins.py:2512
 msgid "Show the tree root directory."
 msgstr ""
 
-#: breezy/builtins.py:2524
+#: breezy/builtins.py:2514
 msgid ""
 "The root is the nearest enclosing directory with a control\n"
 "directory."
 msgstr ""
 
-#: breezy/builtins.py:2540
+#: breezy/builtins.py:2530
 msgid "The limit argument must be an integer."
 msgstr ""
 
-#: breezy/builtins.py:2548
+#: breezy/builtins.py:2538
 msgid "The levels argument must be an integer."
 msgstr ""
 
-#: breezy/builtins.py:2553
+#: breezy/builtins.py:2543
 msgid "Show historical log for a branch or subset of a branch."
 msgstr ""
 
-#: breezy/builtins.py:2555
+#: breezy/builtins.py:2545
 msgid ""
 "log is brz's default tool for exploring the history of a branch.\n"
 "The branch to use is taken from the first parameter. If no parameters\n"
@@ -1654,14 +1654,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: breezy/builtins.py:2560
+#: breezy/builtins.py:2550
 msgid ""
 "  brz log                       log the current branch\n"
 "  brz log foo.py                log a file in its branch\n"
 "  brz log http://server/branch  log a branch on a server"
 msgstr ""
 
-#: breezy/builtins.py:2564
+#: breezy/builtins.py:2554
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1671,11 +1671,11 @@
 "were merged."
 msgstr ""
 
-#: breezy/builtins.py:2571
+#: breezy/builtins.py:2561
 msgid ":Output control:"
 msgstr ""
 
-#: breezy/builtins.py:2573
+#: breezy/builtins.py:2563
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1683,13 +1683,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: breezy/builtins.py:2578
+#: breezy/builtins.py:2568
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: breezy/builtins.py:2581
+#: breezy/builtins.py:2571
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1698,25 +1698,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: breezy/builtins.py:2587
+#: breezy/builtins.py:2577
 msgid ""
 "  Note that the default number of levels to display is a function of the\n"
 "  log format. If the -n option is not used, the standard log formats show\n"
 "  just the top level (mainline)."
 msgstr ""
 
-#: breezy/builtins.py:2591
+#: breezy/builtins.py:2581
 msgid ""
 "  Status summaries are shown using status flags like A, M, etc. To see\n"
 "  the changes explained using words like ``added`` and ``modified``\n"
 "  instead, use the -vv option."
 msgstr ""
 
-#: breezy/builtins.py:2595
+#: breezy/builtins.py:2585
 msgid ":Ordering control:"
 msgstr ""
 
-#: breezy/builtins.py:2597
+#: breezy/builtins.py:2587
 msgid ""
 "  To display revisions from oldest to newest, use the --forward option.\n"
 "  In most cases, using this option will have little impact on the total\n"
@@ -1724,17 +1724,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
-#: breezy/builtins.py:2602
+#: breezy/builtins.py:2592
 msgid ":Revision filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2604
+#: breezy/builtins.py:2594
 msgid ""
 "  The -r option can be used to specify what revision or range of revisions\n"
 "  to filter against. The various forms are shown below::"
 msgstr ""
 
-#: breezy/builtins.py:2607
+#: breezy/builtins.py:2597
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1742,13 +1742,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: breezy/builtins.py:2612
+#: breezy/builtins.py:2602
 msgid ""
 "  See ``brz help revisionspec`` for details on how to specify X and Y.\n"
 "  Some common examples are given below::"
 msgstr ""
 
-#: breezy/builtins.py:2615
+#: breezy/builtins.py:2605
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1758,7 +1758,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: breezy/builtins.py:2622
+#: breezy/builtins.py:2612
 msgid ""
 "  When logging a range of revisions using -rX..Y, log starts at\n"
 "  revision Y and searches back in history through the primary\n"
@@ -1768,73 +1768,73 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
-#: breezy/builtins.py:2629
+#: breezy/builtins.py:2619
 msgid ":Path filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2631
+#: breezy/builtins.py:2621
 msgid ""
 "  If parameters are given and the first one is not a branch, the log\n"
 "  will be filtered to show only those revisions that changed the\n"
 "  nominated files or directories."
 msgstr ""
 
-#: breezy/builtins.py:2635
+#: breezy/builtins.py:2625
 msgid ""
 "  Filenames are interpreted within their historical context. To log a\n"
 "  deleted file, specify a revision range so that the file existed at\n"
 "  the end or start of the range."
 msgstr ""
 
-#: breezy/builtins.py:2639
+#: breezy/builtins.py:2629
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: breezy/builtins.py:2642
+#: breezy/builtins.py:2632
 msgid ""
 "  * revision 1: add tutorial.txt\n"
 "  * revision 2: modify tutorial.txt\n"
 "  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
 msgstr ""
 
-#: breezy/builtins.py:2646
+#: breezy/builtins.py:2636
 msgid "  In this case:"
 msgstr ""
 
-#: breezy/builtins.py:2648
+#: breezy/builtins.py:2638
 msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
-#: breezy/builtins.py:2650
+#: breezy/builtins.py:2640
 msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
-#: breezy/builtins.py:2652
+#: breezy/builtins.py:2642
 msgid ""
 "  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: breezy/builtins.py:2655
+#: breezy/builtins.py:2645
 msgid ""
 "  * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
 "    was no file called guide.txt in revision 2."
 msgstr ""
 
-#: breezy/builtins.py:2658
+#: breezy/builtins.py:2648
 msgid ""
 "  Renames are always followed by log. By design, there is no need to\n"
 "  explicitly ask for this (and no way to stop logging a file back\n"
 "  until it was last renamed)."
 msgstr ""
 
-#: breezy/builtins.py:2662
+#: breezy/builtins.py:2652
 msgid ":Other filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2664
+#: breezy/builtins.py:2654
 msgid ""
 "  The --match option can be used for finding revisions that match a\n"
 "  regular expression in a commit message, committer, author or bug.\n"
@@ -1843,11 +1843,11 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
-#: breezy/builtins.py:2670
+#: breezy/builtins.py:2660
 msgid ":Tips & tricks:"
 msgstr ""
 
-#: breezy/builtins.py:2672
+#: breezy/builtins.py:2662
 msgid ""
 "  GUI tools and IDEs are often better at exploring history than command\n"
 "  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
@@ -1856,11 +1856,11 @@
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>."
 msgstr ""
 
-#: breezy/builtins.py:2678
+#: breezy/builtins.py:2668
 msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
 msgstr ""
 
-#: breezy/builtins.py:2680
+#: breezy/builtins.py:2670
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1868,20 +1868,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: breezy/builtins.py:2685
+#: breezy/builtins.py:2675
 msgid ""
 "  ``brz tip`` will then show the latest revision while ``brz top``\n"
 "  will show the last 10 mainline revisions. To see the details of a\n"
 "  particular revision X,  ``brz show -rX``."
 msgstr ""
 
-#: breezy/builtins.py:2689
+#: breezy/builtins.py:2679
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``brz log -n0 -rX``."
 msgstr ""
 
-#: breezy/builtins.py:2692
+#: breezy/builtins.py:2682
 msgid ""
 "  ``brz log -v`` on a branch with lots of history is currently\n"
 "  very slow. A fix for this issue is currently under development.\n"
@@ -1889,7 +1889,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: breezy/builtins.py:2697
+#: breezy/builtins.py:2687
 msgid ""
 "  brz has a generic full-text matching plugin, brz-search, that can be\n"
 "  used to find revisions matching user names, commit messages, etc.\n"
@@ -1897,7 +1897,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: breezy/builtins.py:2702
+#: breezy/builtins.py:2692
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1906,169 +1906,169 @@
 msgstr ""
 
 # help of 'forward' option of 'log' command
-#: breezy/builtins.py:2711
+#: breezy/builtins.py:2701
 msgid "Show from oldest to newest."
 msgstr ""
 
 # help of 'verbose' option of 'log' command
-#: breezy/builtins.py:2714
+#: breezy/builtins.py:2704
 msgid "Show files changed in each revision."
 msgstr ""
 
 # help of 'change' option of 'log' command
-#: breezy/builtins.py:2720
+#: breezy/builtins.py:2710
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
 # help of 'authors' option of 'log' command
-#: breezy/builtins.py:2724
+#: breezy/builtins.py:2714
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
 # title of 'authors' option of 'log' command
-#: breezy/builtins.py:2725
+#: breezy/builtins.py:2715
 msgid "Authors"
 msgstr ""
 
 # help of 'levels' option of 'log' command
-#: breezy/builtins.py:2731
+#: breezy/builtins.py:2721
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
 # help of 'limit' option of 'log' command
-#: breezy/builtins.py:2741
+#: breezy/builtins.py:2731
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
 # help of 'show-diff' option of 'log' command
-#: breezy/builtins.py:2746
+#: breezy/builtins.py:2736
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
 # help of 'include-merged' option of 'log' command
-#: breezy/builtins.py:2748
+#: breezy/builtins.py:2738
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
 # help of 'omit-merges' option of 'log' command
-#: breezy/builtins.py:2752
+#: breezy/builtins.py:2742
 msgid "Do not report commits with more than one parent."
 msgstr ""
 
 # help of 'exclude-common-ancestry' option of 'log' command
-#: breezy/builtins.py:2754
+#: breezy/builtins.py:2744
 msgid ""
 "Display only the revisions that are not part of both ancestries (require -"
 "rX..Y)."
 msgstr ""
 
 # help of 'signatures' option of 'log' command
-#: breezy/builtins.py:2758
+#: breezy/builtins.py:2748
 msgid "Show digital signature validity."
 msgstr ""
 
 # help of 'match' option of 'log' command
-#: breezy/builtins.py:2761
+#: breezy/builtins.py:2751
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
 # help of 'match-message' option of 'log' command
-#: breezy/builtins.py:2765
+#: breezy/builtins.py:2755
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
 # help of 'match-committer' option of 'log' command
-#: breezy/builtins.py:2769
+#: breezy/builtins.py:2759
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
 # help of 'match-author' option of 'log' command
-#: breezy/builtins.py:2773
+#: breezy/builtins.py:2763
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
 # help of 'match-bugs' option of 'log' command
-#: breezy/builtins.py:2777
+#: breezy/builtins.py:2767
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: breezy/builtins.py:2817
+#: breezy/builtins.py:2807
 msgid "--exclude-common-ancestry requires -r with two revisions"
 msgstr ""
 
-#: breezy/builtins.py:2845
+#: breezy/builtins.py:2835
 #, python-format
 msgid "Path unknown at end or start of revision range: %s"
 msgstr ""
 
-#: breezy/builtins.py:2963
+#: breezy/builtins.py:2953
 #, python-format
 msgid "brz %s doesn't accept two revisions in different branches."
 msgstr ""
 
-#: breezy/builtins.py:2979
+#: breezy/builtins.py:2969
 #, python-format
 msgid "brz %s --revision takes one or two values."
 msgstr ""
 
-#: breezy/builtins.py:3024
+#: breezy/builtins.py:3014
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
 # help of 'recursive' option of 'ls' command
-#: breezy/builtins.py:3033
+#: breezy/builtins.py:3023
 msgid "Recurse into subdirectories."
 msgstr ""
 
 # help of 'from-root' option of 'ls' command
-#: breezy/builtins.py:3035
+#: breezy/builtins.py:3025
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
 # help of 'unknown' option of 'ls' command
-#: breezy/builtins.py:3037
+#: breezy/builtins.py:3027
 msgid "Print unknown files."
 msgstr ""
 
 # help of 'versioned' option of 'ls' command
-#: breezy/builtins.py:3038
+#: breezy/builtins.py:3028
 msgid "Print versioned files."
 msgstr ""
 
 # help of 'ignored' option of 'ls' command
-#: breezy/builtins.py:3041
+#: breezy/builtins.py:3031
 msgid "Print ignored files."
 msgstr ""
 
 # help of 'kind' option of 'ls' command
-#: breezy/builtins.py:3043
+#: breezy/builtins.py:3033
 msgid ""
 "List entries of a particular kind: file, directory, symlink, tree-reference."
 msgstr ""
 
-#: breezy/builtins.py:3058
+#: breezy/builtins.py:3048
 msgid "invalid kind specified"
 msgstr ""
 
-#: breezy/builtins.py:3062
+#: breezy/builtins.py:3052
 msgid "Cannot set both --verbose and --null"
 msgstr ""
 
-#: breezy/builtins.py:3071
+#: breezy/builtins.py:3061
 msgid "cannot specify both --from-root and PATH"
 msgstr ""
 
-#: breezy/builtins.py:3158
+#: breezy/builtins.py:3148
 msgid "Ignore specified files or patterns."
 msgstr ""
 
-#: breezy/builtins.py:3160
+#: breezy/builtins.py:3150
 msgid "See ``brz help patterns`` for details on the syntax of patterns."
 msgstr ""
 
-#: breezy/builtins.py:3162
+#: breezy/builtins.py:3152
 msgid ""
 "If a .bzrignore file does not exist, the ignore command\n"
 "will create one and add the specified files or patterns to the newly\n"
@@ -2077,7 +2077,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: breezy/builtins.py:3168
+#: breezy/builtins.py:3158
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -2085,7 +2085,7 @@
 "it."
 msgstr ""
 
-#: breezy/builtins.py:3173
+#: breezy/builtins.py:3163
 msgid ""
 "Breezy also supports a global ignore file ~/.config/breezy/ignore. On\n"
 "Windows the global ignore file can be found in the application data\n"
@@ -2095,96 +2095,96 @@
 "can be edited directly using an editor."
 msgstr ""
 
-#: breezy/builtins.py:3180
+#: breezy/builtins.py:3170
 msgid ""
 "Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
 "precedence over regular ignores.  Such exceptions are used to specify\n"
 "files that should be versioned which would otherwise be ignored."
 msgstr ""
 
-#: breezy/builtins.py:3184
+#: breezy/builtins.py:3174
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
-#: breezy/builtins.py:3187
+#: breezy/builtins.py:3177
 msgid ":Notes:"
 msgstr ""
 
-#: breezy/builtins.py:3189
+#: breezy/builtins.py:3179
 msgid ""
 "* Ignore patterns containing shell wildcards must be quoted from\n"
 "  the shell on Unix."
 msgstr ""
 
-#: breezy/builtins.py:3192
+#: breezy/builtins.py:3182
 msgid ""
 "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
 "  To ignore patterns that begin with that character, use the \"RE:\" prefix."
 msgstr ""
 
-#: breezy/builtins.py:3195
+#: breezy/builtins.py:3185
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
-#: breezy/builtins.py:3198
+#: breezy/builtins.py:3188
 msgid "        brz ignore ./Makefile"
 msgstr ""
 
-#: breezy/builtins.py:3200
+#: breezy/builtins.py:3190
 msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
-#: breezy/builtins.py:3202
+#: breezy/builtins.py:3192
 msgid "        brz ignore \"*.class\""
 msgstr ""
 
-#: breezy/builtins.py:3204
+#: breezy/builtins.py:3194
 msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
-#: breezy/builtins.py:3206
+#: breezy/builtins.py:3196
 msgid "        brz ignore \"!special.class\""
 msgstr ""
 
-#: breezy/builtins.py:3208
+#: breezy/builtins.py:3198
 msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
-#: breezy/builtins.py:3210
+#: breezy/builtins.py:3200
 msgid "        brz ignore \"RE:^#\""
 msgstr ""
 
-#: breezy/builtins.py:3212 breezy/builtins.py:3216
+#: breezy/builtins.py:3202 breezy/builtins.py:3206
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: breezy/builtins.py:3214
+#: breezy/builtins.py:3204
 msgid "        brz ignore \"lib/**/*.o\""
 msgstr ""
 
-#: breezy/builtins.py:3218
+#: breezy/builtins.py:3208
 msgid "        brz ignore \"RE:lib/.*\\.o\""
 msgstr ""
 
-#: breezy/builtins.py:3220
+#: breezy/builtins.py:3210
 msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
-#: breezy/builtins.py:3222
+#: breezy/builtins.py:3212
 msgid "        brz ignore \"RE:(?!debian/).*\""
 msgstr ""
 
-#: breezy/builtins.py:3224
+#: breezy/builtins.py:3214
 msgid ""
 "    Ignore everything except the \"local\" toplevel directory,\n"
 "    but always ignore autosave files ending in ~, even under local/::"
 msgstr ""
 
-#: breezy/builtins.py:3227
+#: breezy/builtins.py:3217
 msgid ""
 "        brz ignore \"*\"\n"
 "        brz ignore \"!./local\"\n"
@@ -2192,26 +2192,26 @@
 msgstr ""
 
 # help of 'default-rules' option of 'ignore' command
-#: breezy/builtins.py:3236
+#: breezy/builtins.py:3226
 msgid "Display the default ignore rules that brz uses."
 msgstr ""
 
-#: breezy/builtins.py:3248
+#: breezy/builtins.py:3238
 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
 msgstr ""
 
-#: breezy/builtins.py:3259
+#: breezy/builtins.py:3249
 #, python-format
 msgid "Invalid ignore pattern found. %s"
 msgid_plural "Invalid ignore patterns found. %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:3268
+#: breezy/builtins.py:3258
 msgid "NAME_PATTERN should not be an absolute path"
 msgstr ""
 
-#: breezy/builtins.py:3280
+#: breezy/builtins.py:3270
 #, python-format
 msgid ""
 "Warning: the following files are version controlled and match your ignore "
@@ -2221,62 +2221,62 @@
 "them.\n"
 msgstr ""
 
-#: breezy/builtins.py:3287
+#: breezy/builtins.py:3277
 msgid "List ignored files and the patterns that matched them."
 msgstr ""
 
-#: breezy/builtins.py:3289
+#: breezy/builtins.py:3279
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
-#: breezy/builtins.py:3292
+#: breezy/builtins.py:3282
 msgid "Alternatively, to list just the files::"
 msgstr ""
 
-#: breezy/builtins.py:3294
+#: breezy/builtins.py:3284
 msgid "    brz ls --ignored"
 msgstr ""
 
-#: breezy/builtins.py:3328
+#: breezy/builtins.py:3318
 #, python-format
 msgid "not a valid revision-number: %r"
 msgstr ""
 
-#: breezy/builtins.py:3336
+#: breezy/builtins.py:3326
 msgid "Export current or past revision to a destination directory or archive."
 msgstr ""
 
-#: breezy/builtins.py:3338
+#: breezy/builtins.py:3328
 msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
-#: breezy/builtins.py:3340
+#: breezy/builtins.py:3330
 msgid ""
 "Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
 "given, try to find the format with the extension. If no extension\n"
 "is found exports to a directory (equivalent to --format=dir)."
 msgstr ""
 
-#: breezy/builtins.py:3344
+#: breezy/builtins.py:3334
 msgid ""
 "If root is supplied, it will be used as the root directory inside\n"
 "container formats (tar, zip, etc). If it is not supplied it will default\n"
 "to the exported filename. The root option has no effect for 'dir' format."
 msgstr ""
 
-#: breezy/builtins.py:3348
+#: breezy/builtins.py:3338
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
-#: breezy/builtins.py:3351
+#: breezy/builtins.py:3341
 msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
 msgstr ""
 
-#: breezy/builtins.py:3353
+#: breezy/builtins.py:3343
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -2290,78 +2290,78 @@
 msgstr ""
 
 # help of 'format' option of 'export' command
-#: breezy/builtins.py:3368
+#: breezy/builtins.py:3358
 msgid "Type of file to export to."
 msgstr ""
 
 # help of 'filters' option of 'export' command
-#: breezy/builtins.py:3371
+#: breezy/builtins.py:3361
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
 # help of 'root' option of 'export' command
-#: breezy/builtins.py:3375
+#: breezy/builtins.py:3365
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
 # help of 'per-file-timestamps' option of 'export' command
-#: breezy/builtins.py:3377
+#: breezy/builtins.py:3367
 msgid ""
 "Set modification time of files to that of the last revision in which it was "
 "changed."
 msgstr ""
 
 # help of 'uncommitted' option of 'export' command
-#: breezy/builtins.py:3380
+#: breezy/builtins.py:3370
 msgid "Export the working tree contents rather than that of the last revision."
 msgstr ""
 
-#: breezy/builtins.py:3400
+#: breezy/builtins.py:3390
 msgid "--uncommitted requires a working tree"
 msgstr ""
 
-#: breezy/builtins.py:3428
+#: breezy/builtins.py:3418
 #, python-format
 msgid "Unsupported export format: %s"
 msgstr ""
 
-#: breezy/builtins.py:3432
+#: breezy/builtins.py:3422
 msgid "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: breezy/builtins.py:3434
+#: breezy/builtins.py:3424
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: breezy/builtins.py:3436
+#: breezy/builtins.py:3426
 msgid ""
 "Note: Take care to redirect standard output when using this command on a\n"
 "binary file."
 msgstr ""
 
 # help of 'name-from-revision' option of 'cat' command
-#: breezy/builtins.py:3443
+#: breezy/builtins.py:3433
 msgid "The path name in the old tree."
 msgstr ""
 
 # help of 'filters' option of 'cat' command
-#: breezy/builtins.py:3444
+#: breezy/builtins.py:3434
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: breezy/builtins.py:3455
+#: breezy/builtins.py:3445
 msgid "brz cat --revision takes exactly one revision specifier"
 msgstr ""
 
-#: breezy/builtins.py:3475 breezy/builtins.py:3489
+#: breezy/builtins.py:3465 breezy/builtins.py:3479
 msgid "{0!r} is not present in revision {1}"
 msgstr ""
 
-#: breezy/builtins.py:3516
+#: breezy/builtins.py:3506
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: breezy/builtins.py:3518
+#: breezy/builtins.py:3508
 msgid ""
 "An explanatory message needs to be given for each commit. This is\n"
 "often done by using the --message option (getting the message from the\n"
@@ -2371,44 +2371,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: breezy/builtins.py:3525
+#: breezy/builtins.py:3515
 msgid ""
 "By default, the entire tree is committed and the person doing the\n"
 "commit is assumed to be the author. These defaults can be overridden\n"
 "as explained below."
 msgstr ""
 
-#: breezy/builtins.py:3529
+#: breezy/builtins.py:3519
 msgid ":Selective commits:"
 msgstr ""
 
-#: breezy/builtins.py:3531
+#: breezy/builtins.py:3521
 msgid ""
 "  If selected files are specified, only changes to those files are\n"
 "  committed.  If a directory is specified then the directory and\n"
 "  everything within it is committed."
 msgstr ""
 
-#: breezy/builtins.py:3535
+#: breezy/builtins.py:3525
 msgid ""
 "  When excludes are given, they take precedence over selected files.\n"
 "  For example, to commit only changes within foo, but not changes\n"
 "  within foo/bar::"
 msgstr ""
 
-#: breezy/builtins.py:3539
+#: breezy/builtins.py:3529
 msgid "    brz commit foo -x foo/bar"
 msgstr ""
 
-#: breezy/builtins.py:3541
+#: breezy/builtins.py:3531
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: breezy/builtins.py:3543
+#: breezy/builtins.py:3533
 msgid ":Custom authors:"
 msgstr ""
 
-#: breezy/builtins.py:3545
+#: breezy/builtins.py:3535
 msgid ""
 "  If the author of the change is not the same person as the committer,\n"
 "  you can specify the author's name using the --author option. The\n"
@@ -2418,11 +2418,11 @@
 "  author."
 msgstr ""
 
-#: breezy/builtins.py:3552
+#: breezy/builtins.py:3542
 msgid ":Checks:"
 msgstr ""
 
-#: breezy/builtins.py:3554
+#: breezy/builtins.py:3544
 msgid ""
 "  A common mistake is to forget to add a new file or directory before\n"
 "  running the commit command. The --strict option checks for unknown\n"
@@ -2431,18 +2431,18 @@
 "  for details."
 msgstr ""
 
-#: breezy/builtins.py:3560
+#: breezy/builtins.py:3550
 msgid ":Things to note:"
 msgstr ""
 
-#: breezy/builtins.py:3562
+#: breezy/builtins.py:3552
 msgid ""
 "  If you accidentally commit the wrong changes or make a spelling\n"
 "  mistake in the commit message say, you can use the uncommit command\n"
 "  to undo it. See ``brz help uncommit`` for details."
 msgstr ""
 
-#: breezy/builtins.py:3566
+#: breezy/builtins.py:3556
 msgid ""
 "  Hooks can also be configured to run after a commit. This allows you\n"
 "  to trigger updates to external systems like bug trackers. The --fixes\n"
@@ -2451,74 +2451,74 @@
 msgstr ""
 
 # help of 'exclude' option of 'commit' command
-#: breezy/builtins.py:3577
+#: breezy/builtins.py:3567
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
 # help of 'message' option of 'commit' command
-#: breezy/builtins.py:3580
+#: breezy/builtins.py:3570
 msgid "Description of the new revision."
 msgstr ""
 
 # help of 'unchanged' option of 'commit' command
-#: breezy/builtins.py:3583
+#: breezy/builtins.py:3573
 msgid "Commit even if nothing has changed."
 msgstr ""
 
 # help of 'file' option of 'commit' command
-#: breezy/builtins.py:3587
+#: breezy/builtins.py:3577
 msgid "Take commit message from this file."
 msgstr ""
 
 # help of 'strict' option of 'commit' command
-#: breezy/builtins.py:3589
+#: breezy/builtins.py:3579
 msgid "Refuse to commit if there are unknown files in the working tree."
 msgstr ""
 
 # help of 'commit-time' option of 'commit' command
-#: breezy/builtins.py:3592
+#: breezy/builtins.py:3582
 msgid ""
 "Manually set a commit time using commit date format, e.g. '2009-10-10 "
 "08:00:00 +0100'."
 msgstr ""
 
 # help of 'bugs' option of 'commit' command
-#: breezy/builtins.py:3596
+#: breezy/builtins.py:3586
 msgid "Link to a related bug. (see \"brz help bugs\")."
 msgstr ""
 
 # help of 'fixes' option of 'commit' command
-#: breezy/builtins.py:3599
+#: breezy/builtins.py:3589
 msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
 msgstr ""
 
 # help of 'author' option of 'commit' command
-#: breezy/builtins.py:3603
+#: breezy/builtins.py:3593
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
 # help of 'local' option of 'commit' command
-#: breezy/builtins.py:3606
+#: breezy/builtins.py:3596
 msgid ""
 "Perform a local commit in a bound branch.  Local commits are not pushed to "
 "the master branch until a normal commit is performed."
 msgstr ""
 
 # help of 'show-diff' option of 'commit' command
-#: breezy/builtins.py:3612
+#: breezy/builtins.py:3602
 msgid ""
 "When no message is supplied, show the diff along with the status summary in "
 "the message editor."
 msgstr ""
 
 # help of 'lossy' option of 'commit' command
-#: breezy/builtins.py:3615
+#: breezy/builtins.py:3605
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: breezy/builtins.py:3632
+#: breezy/builtins.py:3622
 #, python-format
 msgid ""
 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
@@ -2526,7 +2526,7 @@
 "See \"brz help bugs\" for more information on this feature. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3641
+#: breezy/builtins.py:3631
 #, python-format
 msgid ""
 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
@@ -2534,91 +2534,91 @@
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3650
+#: breezy/builtins.py:3640
 #, python-format
 msgid "Unrecognized bug %s. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3653
+#: breezy/builtins.py:3643
 #, python-format
 msgid ""
 "%s\n"
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3680
+#: breezy/builtins.py:3670
 msgid "Could not parse --commit-time: "
 msgstr ""
 
-#: breezy/builtins.py:3724
+#: breezy/builtins.py:3714
 msgid "please specify either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3754
+#: breezy/builtins.py:3744
 msgid "please specify a commit message with either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3757
+#: breezy/builtins.py:3747
 msgid ""
 "Empty commit message specified. Please specify a commit message with either "
 "--message or --file or leave a blank message with --message \"\"."
 msgstr ""
 
-#: breezy/builtins.py:3777
+#: breezy/builtins.py:3767
 msgid ""
 "No changes to commit. Please 'brz add' the files you want to commit, or use "
 "--unchanged to force an empty commit."
 msgstr ""
 
-#: breezy/builtins.py:3781
+#: breezy/builtins.py:3771
 msgid ""
 "Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
 "resolve FILE\" to resolve."
 msgstr ""
 
-#: breezy/builtins.py:3785
+#: breezy/builtins.py:3775
 msgid "Commit refused because there are unknown files in the working tree."
 msgstr ""
 
-#: breezy/builtins.py:3788
+#: breezy/builtins.py:3778
 msgid ""
 "\n"
 "To commit to master branch, run update and then commit.\n"
 "You can also pass --local to commit to continue working disconnected."
 msgstr ""
 
-#: breezy/builtins.py:3796
+#: breezy/builtins.py:3786
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: breezy/builtins.py:3798
+#: breezy/builtins.py:3788
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or brz bugs."
 msgstr ""
 
-#: breezy/builtins.py:3801
+#: breezy/builtins.py:3791
 msgid ""
 "The working tree and branch checks will only give output if a problem is\n"
 "detected. The output fields of the repository check are:"
 msgstr ""
 
-#: breezy/builtins.py:3804
+#: breezy/builtins.py:3794
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3808
+#: breezy/builtins.py:3798
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3812
+#: breezy/builtins.py:3802
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
@@ -2626,14 +2626,14 @@
 "    subtle problem that Breezy can work around."
 msgstr ""
 
-#: breezy/builtins.py:3817
+#: breezy/builtins.py:3807
 msgid ""
 "unique file texts\n"
 "    This is the total number of unique file contents\n"
 "    seen in the checked revisions.  It does not indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3821
+#: breezy/builtins.py:3811
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -2642,56 +2642,56 @@
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3827
+#: breezy/builtins.py:3817
 msgid ""
 "If no restrictions are specified, all data that is found at the given\n"
 "location will be checked."
 msgstr ""
 
-#: breezy/builtins.py:3832
+#: breezy/builtins.py:3822
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: breezy/builtins.py:3834
+#: breezy/builtins.py:3824
 msgid "        brz check --tree --branch foo"
 msgstr ""
 
-#: breezy/builtins.py:3836
+#: breezy/builtins.py:3826
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: breezy/builtins.py:3838
+#: breezy/builtins.py:3828
 msgid "        brz check --repo bar"
 msgstr ""
 
-#: breezy/builtins.py:3840
+#: breezy/builtins.py:3830
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: breezy/builtins.py:3842
+#: breezy/builtins.py:3832
 msgid "        brz check baz"
 msgstr ""
 
 # help of 'branch' option of 'check' command
-#: breezy/builtins.py:3848
+#: breezy/builtins.py:3838
 msgid "Check the branch related to the current directory."
 msgstr ""
 
 # help of 'repo' option of 'check' command
-#: breezy/builtins.py:3850
+#: breezy/builtins.py:3840
 msgid "Check the repository related to the current directory."
 msgstr ""
 
 # help of 'tree' option of 'check' command
-#: breezy/builtins.py:3852
+#: breezy/builtins.py:3842
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: breezy/builtins.py:3866
+#: breezy/builtins.py:3856
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: breezy/builtins.py:3868
+#: breezy/builtins.py:3858
 msgid ""
 "When the default format has changed after a major new release of\n"
 "Bazaar/Breezy, you may be informed during certain operations that you\n"
@@ -2700,7 +2700,7 @@
 "with older repositories or with older versions of Bazaar or Breezy."
 msgstr ""
 
-#: breezy/builtins.py:3874
+#: breezy/builtins.py:3864
 msgid ""
 "If you wish to upgrade to a particular format rather than the\n"
 "current default, that can be specified using the --format option.\n"
@@ -2710,7 +2710,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: breezy/builtins.py:3881
+#: breezy/builtins.py:3871
 msgid ""
 "A backup.bzr.~#~ directory is created at the start of the conversion\n"
 "process (where # is a number). By default, this is left there on\n"
@@ -2721,7 +2721,7 @@
 "afterwards."
 msgstr ""
 
-#: breezy/builtins.py:3889
+#: breezy/builtins.py:3879
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -2729,171 +2729,171 @@
 "tried."
 msgstr ""
 
-#: breezy/builtins.py:3894
+#: breezy/builtins.py:3884
 msgid ""
 "For more information on upgrades, see the Breezy Upgrade Guide,\n"
 "https://www.breezy-vcs.org/doc/en/upgrade-guide/."
 msgstr ""
 
 # help of 'format' option of 'upgrade' command
-#: breezy/builtins.py:3902
+#: breezy/builtins.py:3892
 msgid "Upgrade to a specific format.  See \"brz help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init' command
 # title of 'format' option of 'upgrade' command
-#: breezy/builtins.py:3907
+#: breezy/builtins.py:3897
 msgid "Branch format"
 msgstr ""
 
 # help of 'clean' option of 'upgrade' command
-#: breezy/builtins.py:3909
+#: breezy/builtins.py:3899
 msgid "Remove the backup.bzr directory if successful."
 msgstr ""
 
 # help of 'dry-run' option of 'add' command
 # help of 'dry-run' option of 'upgrade' command
 # help of 'dry-run' option of 'rebase' command
-#: breezy/builtins.py:3911 breezy/plugins/rewrite/commands.py:97
+#: breezy/builtins.py:3901 breezy/plugins/rewrite/commands.py:95
 msgid "Show what would be done, but don't actually do anything."
 msgstr ""
 
-#: breezy/builtins.py:3926
+#: breezy/builtins.py:3916
 msgid "Show or set brz user id."
 msgstr ""
 
-#: breezy/builtins.py:3928
+#: breezy/builtins.py:3918
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3931
+#: breezy/builtins.py:3921
 msgid "        brz whoami --email"
 msgstr ""
 
-#: breezy/builtins.py:3933
+#: breezy/builtins.py:3923
 msgid "    Set the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3935
+#: breezy/builtins.py:3925
 msgid "        brz whoami \"Frank Chu <[e-mail]>\""
 msgstr ""
 
 # help of 'email' option of 'whoami' command
-#: breezy/builtins.py:3939
+#: breezy/builtins.py:3929
 msgid "Display email address only."
 msgstr ""
 
 # help of 'branch' option of 'whoami' command
-#: breezy/builtins.py:3941
+#: breezy/builtins.py:3931
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: breezy/builtins.py:3967
+#: breezy/builtins.py:3957
 msgid "--email can only be used to display existing identity"
 msgstr ""
 
-#: breezy/builtins.py:3991
+#: breezy/builtins.py:3981
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: breezy/builtins.py:3993
+#: breezy/builtins.py:3983
 msgid ""
 "If unset, the colocated branch name is used for colocated branches, and\n"
 "the branch directory name is used for other branches.  To print the\n"
 "current nickname, execute with no argument."
 msgstr ""
 
-#: breezy/builtins.py:3997
+#: breezy/builtins.py:3987
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: breezy/builtins.py:4018
+#: breezy/builtins.py:4008
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: breezy/builtins.py:4020
+#: breezy/builtins.py:4010
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: breezy/builtins.py:4023
+#: breezy/builtins.py:4013
 msgid "        brz alias"
 msgstr ""
 
-#: breezy/builtins.py:4025
+#: breezy/builtins.py:4015
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4027
+#: breezy/builtins.py:4017
 msgid "        brz alias ll"
 msgstr ""
 
-#: breezy/builtins.py:4029
+#: breezy/builtins.py:4019
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4031
+#: breezy/builtins.py:4021
 msgid "        brz alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: breezy/builtins.py:4033
+#: breezy/builtins.py:4023
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:4035
+#: breezy/builtins.py:4025
 msgid "        brz alias --remove ll"
 msgstr ""
 
 # help of 'remove' option of 'alias' command
-#: breezy/builtins.py:4040
+#: breezy/builtins.py:4030
 msgid "Remove the alias."
 msgstr ""
 
-#: breezy/builtins.py:4058
+#: breezy/builtins.py:4048
 msgid "brz alias --remove expects an alias to remove."
 msgstr ""
 
-#: breezy/builtins.py:4249
+#: breezy/builtins.py:4239
 msgid "subunit not available. subunit needs to be installed to use --subunit."
 msgstr ""
 
-#: breezy/builtins.py:4266
+#: breezy/builtins.py:4256
 msgid "subunit not available. subunit needs to be installed to use --subunit2."
 msgstr ""
 
-#: breezy/builtins.py:4275
+#: breezy/builtins.py:4265
 msgid ""
 "--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
 msgstr ""
 
-#: breezy/builtins.py:4322
+#: breezy/builtins.py:4312
 msgid "Show version of brz."
 msgstr ""
 
 # help of 'short' option of 'version' command
-#: breezy/builtins.py:4326
+#: breezy/builtins.py:4316
 msgid "Print just the version number."
 msgstr ""
 
-#: breezy/builtins.py:4345
+#: breezy/builtins.py:4335
 msgid "It sure does!\n"
 msgstr ""
 
-#: breezy/builtins.py:4369
+#: breezy/builtins.py:4359
 #, python-format
 msgid "merge base is revision %s\n"
 msgstr ""
 
-#: breezy/builtins.py:4374
+#: breezy/builtins.py:4364
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: breezy/builtins.py:4376
+#: breezy/builtins.py:4366
 msgid ""
 "The source of the merge can be specified either in the form of a branch,\n"
 "or in the form of a path to a file containing a merge directive generated\n"
@@ -2904,20 +2904,20 @@
 "the current working tree."
 msgstr ""
 
-#: breezy/builtins.py:4384
+#: breezy/builtins.py:4374
 msgid ""
 "When merging from a branch, by default brz will try to merge in all new\n"
 "work from the other branch, automatically determining an appropriate base\n"
 "revision.  If this fails, you may need to give an explicit base."
 msgstr ""
 
-#: breezy/builtins.py:4388
+#: breezy/builtins.py:4378
 msgid ""
 "To pick a different ending revision, pass \"--revision OTHER\".  brz will\n"
 "try to merge in all new work up to and including revision OTHER."
 msgstr ""
 
-#: breezy/builtins.py:4391
+#: breezy/builtins.py:4381
 msgid ""
 "If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
 "through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
@@ -2928,11 +2928,11 @@
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: breezy/builtins.py:4399
+#: breezy/builtins.py:4389
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: breezy/builtins.py:4401 breezy/conflicts.py:54 breezy/conflicts.py:111
+#: breezy/builtins.py:4391 breezy/conflicts.py:46 breezy/conflicts.py:103
 msgid ""
 "Merge will do its best to combine the changes in two branches, but there\n"
 "are some kinds of problems only a human can fix.  When it encounters those,\n"
@@ -2940,11 +2940,11 @@
 "before you can commit."
 msgstr ""
 
-#: breezy/builtins.py:4406
+#: breezy/builtins.py:4396
 msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4408
+#: breezy/builtins.py:4398
 msgid ""
 "If there is no default branch set, the first merge will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the branch\n"
@@ -2952,14 +2952,14 @@
 "only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:4413
+#: breezy/builtins.py:4403
 msgid ""
 "The results of the merge are placed into the destination working\n"
 "directory, where they can be reviewed (with brz diff), tested, and then\n"
 "committed to record the result of the merge."
 msgstr ""
 
-#: breezy/builtins.py:4417
+#: breezy/builtins.py:4407
 msgid ""
 "merge refuses to run if there are any uncommitted changes, unless\n"
 "--force is given.  If --force is given, then the changes from the source\n"
@@ -2968,60 +2968,60 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: breezy/builtins.py:4423
+#: breezy/builtins.py:4413
 msgid ""
 "If one would like to merge changes from the working tree of the other\n"
 "branch without merging any committed revisions, the --uncommitted option\n"
 "can be given."
 msgstr ""
 
-#: breezy/builtins.py:4427
+#: breezy/builtins.py:4417
 msgid ""
 "To select only some changes to merge, use \"merge -i\", which will prompt\n"
 "you to apply each diff hunk and file change, similar to \"shelve\"."
 msgstr ""
 
-#: breezy/builtins.py:4430
+#: breezy/builtins.py:4420
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4433
+#: breezy/builtins.py:4423
 msgid "        brz merge ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4435
+#: breezy/builtins.py:4425
 msgid "    To merge changes up to and including revision 82 from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4437
+#: breezy/builtins.py:4427
 msgid "        brz merge -r 82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4439
+#: breezy/builtins.py:4429
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: breezy/builtins.py:4441
+#: breezy/builtins.py:4431
 msgid "        brz merge -r 81..82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4443
+#: breezy/builtins.py:4433
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: breezy/builtins.py:4445
+#: breezy/builtins.py:4435
 msgid "        brz merge /tmp/merge"
 msgstr ""
 
-#: breezy/builtins.py:4447
+#: breezy/builtins.py:4437
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: breezy/builtins.py:4450
+#: breezy/builtins.py:4440
 msgid ""
 "        brz merge ../feature1a\n"
 "        brz merge ../feature1b --force\n"
@@ -3029,18 +3029,18 @@
 msgstr ""
 
 # help of 'force' option of 'merge' command
-#: breezy/builtins.py:4462
+#: breezy/builtins.py:4452
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
 # help of 'uncommitted' option of 'merge' command
-#: breezy/builtins.py:4468
+#: breezy/builtins.py:4458
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
 # help of 'pull' option of 'merge' command
-#: breezy/builtins.py:4470
+#: breezy/builtins.py:4460
 msgid ""
 "If the destination is already completely merged into the source, pull from "
 "the source rather than merging.  When this happens, you do not need to "
@@ -3048,115 +3048,115 @@
 msgstr ""
 
 # help of 'directory' option of 'merge' command
-#: breezy/builtins.py:4475
+#: breezy/builtins.py:4465
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'preview' option of 'merge' command
-#: breezy/builtins.py:4477
+#: breezy/builtins.py:4467
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
 # help of 'interactive' option of 'merge' command
-#: breezy/builtins.py:4479
+#: breezy/builtins.py:4469
 msgid "Select changes interactively."
 msgstr ""
 
-#: breezy/builtins.py:4502
+#: breezy/builtins.py:4492
 msgid ""
 "Merging into empty branches not currently supported, https://bugs.launchpad."
 "net/bzr/+bug/308562"
 msgstr ""
 
-#: breezy/builtins.py:4524
+#: breezy/builtins.py:4514
 msgid "Cannot use --uncommitted with bundles or merge directives."
 msgstr ""
 
-#: breezy/builtins.py:4535
+#: breezy/builtins.py:4525
 msgid "Cannot use --uncommitted and --revision at the same time."
 msgstr ""
 
-#: breezy/builtins.py:4555
+#: breezy/builtins.py:4545
 msgid "merger: "
 msgstr ""
 
-#: breezy/builtins.py:4557 breezy/bzr/bundle/apply_bundle.py:65
-#: breezy/plugins/rewrite/commands.py:518
+#: breezy/builtins.py:4547 breezy/bzr/bundle/apply_bundle.py:63
+#: breezy/plugins/rewrite/commands.py:516
 msgid "Nothing to do."
 msgstr ""
 
-#: breezy/builtins.py:4562
+#: breezy/builtins.py:4552
 msgid "Cannot pull individual files"
 msgstr ""
 
-#: breezy/builtins.py:4570
+#: breezy/builtins.py:4560
 msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
 msgstr ""
 
-#: breezy/builtins.py:4628
+#: breezy/builtins.py:4618
 #, python-format
 msgid "Show-base is not supported for this merge type. %s"
 msgstr ""
 
-#: breezy/builtins.py:4637
+#: breezy/builtins.py:4627
 #, python-format
 msgid "Conflict reduction is not supported for merge type %s."
 msgstr ""
 
-#: breezy/builtins.py:4641
+#: breezy/builtins.py:4631
 msgid "Cannot do conflict reduction and show base."
 msgstr ""
 
-#: breezy/builtins.py:4650
+#: breezy/builtins.py:4640
 msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
 msgstr ""
 
-#: breezy/builtins.py:4761
+#: breezy/builtins.py:4751
 msgid "No location specified or remembered"
 msgstr ""
 
-#: breezy/builtins.py:4763
+#: breezy/builtins.py:4753
 #, python-brace-format
 msgid "{0} remembered {1} location {2}"
 msgstr ""
 
-#: breezy/builtins.py:4769
+#: breezy/builtins.py:4759
 msgid "Redo a merge."
 msgstr ""
 
-#: breezy/builtins.py:4771
+#: breezy/builtins.py:4761
 msgid ""
 "Use this if you want to try a different merge technique while resolving\n"
 "conflicts.  Some merge techniques are better than others, and remerge\n"
 "lets you try different ones on different files."
 msgstr ""
 
-#: breezy/builtins.py:4775
+#: breezy/builtins.py:4765
 msgid ""
 "The options for remerge have the same meaning and defaults as the ones for\n"
 "merge.  The difference is that remerge can (only) be run when there is a\n"
 "pending merge, and it lets you specify particular files."
 msgstr ""
 
-#: breezy/builtins.py:4779
+#: breezy/builtins.py:4769
 msgid ""
 ":Examples:\n"
 "    Re-do the merge of all conflicted files, and show the base text in\n"
 "    conflict regions, in addition to the usual THIS and OTHER texts::"
 msgstr ""
 
-#: breezy/builtins.py:4783
+#: breezy/builtins.py:4773
 msgid "        brz remerge --show-base"
 msgstr ""
 
-#: breezy/builtins.py:4785
+#: breezy/builtins.py:4775
 msgid ""
 "    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
 "    additional processing to reduce the size of conflict regions::"
 msgstr ""
 
-#: breezy/builtins.py:4788
+#: breezy/builtins.py:4778
 msgid "        brz remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
@@ -3164,22 +3164,22 @@
 # help of 'show-base' option of 'pull' command
 # help of 'show-base' option of 'remerge' command
 # help of 'show-base' option of 'update' command
-#: breezy/builtins.py:4795
+#: breezy/builtins.py:4785
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4808
+#: breezy/builtins.py:4798
 msgid ""
 "Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
 "merges."
 msgstr ""
 
-#: breezy/builtins.py:4862
+#: breezy/builtins.py:4852
 msgid ""
 "Set files in the working tree back to the contents of a previous revision."
 msgstr ""
 
-#: breezy/builtins.py:4864
+#: breezy/builtins.py:4854
 msgid ""
 "Giving a list of files will revert only those files.  Otherwise, all files\n"
 "will be reverted.  If the revision is not specified with '--revision', the\n"
@@ -3188,7 +3188,7 @@
 "the working tree basis revision."
 msgstr ""
 
-#: breezy/builtins.py:4870
+#: breezy/builtins.py:4860
 msgid ""
 "To remove only some changes, without reverting to a prior version, use\n"
 "merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
@@ -3200,7 +3200,7 @@
 "update command."
 msgstr ""
 
-#: breezy/builtins.py:4879
+#: breezy/builtins.py:4869
 msgid ""
 "Uncommitted changes to files that are reverted will be discarded.\n"
 "However, by default, any files that have been manually changed will be\n"
@@ -3208,7 +3208,7 @@
 "files have '.~#~' appended to their name, where # is a number."
 msgstr ""
 
-#: breezy/builtins.py:4884
+#: breezy/builtins.py:4874
 msgid ""
 "When you provide files, you can use their current pathname or the pathname\n"
 "from the target revision.  So you can use revert to \"undelete\" a file by\n"
@@ -3216,7 +3216,7 @@
 "reverted."
 msgstr ""
 
-#: breezy/builtins.py:4889
+#: breezy/builtins.py:4879
 msgid ""
 "If you have newly added files since the target revision, they will be\n"
 "removed.  If the files to be removed have been changed, backups will be\n"
@@ -3224,7 +3224,7 @@
 "deleted."
 msgstr ""
 
-#: breezy/builtins.py:4894
+#: breezy/builtins.py:4884
 msgid ""
 "The working tree contains a list of revisions that have been merged but\n"
 "not yet committed. These revisions will be included as additional parents\n"
@@ -3236,7 +3236,7 @@
 "reverting any files."
 msgstr ""
 
-#: breezy/builtins.py:4903
+#: breezy/builtins.py:4893
 msgid ""
 "Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
 "changes from a branch in a single revision.  To do this, perform the merge\n"
@@ -3251,177 +3251,177 @@
 msgstr ""
 
 # help of 'no-backup' option of 'revert' command
-#: breezy/builtins.py:4918
+#: breezy/builtins.py:4908
 msgid "Do not save backups of reverted files."
 msgstr ""
 
 # help of 'forget-merges' option of 'revert' command
-#: breezy/builtins.py:4920
+#: breezy/builtins.py:4910
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: breezy/builtins.py:4951
+#: breezy/builtins.py:4941
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
 # help of 'long' option of 'help' command
-#: breezy/builtins.py:4956
+#: breezy/builtins.py:4946
 msgid "Show help on all commands."
 msgstr ""
 
-#: breezy/builtins.py:4985
+#: breezy/builtins.py:4975
 msgid "Show unmerged/unpulled revisions between two branches."
 msgstr ""
 
-#: breezy/builtins.py:4987
+#: breezy/builtins.py:4977
 msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
-#: breezy/builtins.py:4989
+#: breezy/builtins.py:4979
 msgid ""
 "To filter on a range of revisions, you can use the command -r begin..end\n"
 "-r revision requests a specific revision, -r ..end or -r begin.. are\n"
 "also valid."
 msgstr ""
 
-#: breezy/builtins.py:4993
+#: breezy/builtins.py:4983
 msgid ""
 ":Exit values:\n"
 "    1 - some missing revisions\n"
 "    0 - no missing revisions"
 msgstr ""
 
-#: breezy/builtins.py:4999
+#: breezy/builtins.py:4989
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
-#: breezy/builtins.py:5002
+#: breezy/builtins.py:4992
 msgid "        brz missing"
 msgstr ""
 
-#: breezy/builtins.py:5004
+#: breezy/builtins.py:4994
 msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
-#: breezy/builtins.py:5006
+#: breezy/builtins.py:4996
 msgid "        brz missing http://server/branch"
 msgstr ""
 
-#: breezy/builtins.py:5008
+#: breezy/builtins.py:4998
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
-#: breezy/builtins.py:5011
+#: breezy/builtins.py:5001
 msgid "        brz missing -r ..-10"
 msgstr ""
 
-#: breezy/builtins.py:5013
+#: breezy/builtins.py:5003
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: breezy/builtins.py:5016
+#: breezy/builtins.py:5006
 msgid "        brz missing --my-revision ..-10"
 msgstr ""
 
 # help of 'reverse' option of 'missing' command
-#: breezy/builtins.py:5023
+#: breezy/builtins.py:5013
 msgid "Reverse the order of revisions."
 msgstr ""
 
 # help of 'mine-only' option of 'missing' command
-#: breezy/builtins.py:5025
+#: breezy/builtins.py:5015
 msgid "Display changes in the local branch only."
 msgstr ""
 
 # help of 'this' option of 'missing' command
-#: breezy/builtins.py:5026
+#: breezy/builtins.py:5016
 msgid "Same as --mine-only."
 msgstr ""
 
 # help of 'theirs-only' option of 'missing' command
-#: breezy/builtins.py:5028
+#: breezy/builtins.py:5018
 msgid "Display changes in the remote branch only."
 msgstr ""
 
 # help of 'other' option of 'missing' command
-#: breezy/builtins.py:5029
+#: breezy/builtins.py:5019
 msgid "Same as --theirs-only."
 msgstr ""
 
 # help of 'revision' option of 'missing' command
-#: breezy/builtins.py:5034
+#: breezy/builtins.py:5024
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'my-revision' option of 'missing' command
-#: breezy/builtins.py:5038
+#: breezy/builtins.py:5028
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'include-merged' option of 'missing' command
-#: breezy/builtins.py:5041
+#: breezy/builtins.py:5031
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: breezy/builtins.py:5082
+#: breezy/builtins.py:5072
 msgid "No peer location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:5086
+#: breezy/builtins.py:5076
 #, python-brace-format
 msgid "Using saved parent location: {0}\n"
 msgstr ""
 
-#: breezy/builtins.py:5119
+#: breezy/builtins.py:5109
 #, python-format
 msgid "You have %d extra revision:\n"
 msgid_plural "You have %d extra revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5139
+#: breezy/builtins.py:5129
 #, python-format
 msgid "You are missing %d revision:\n"
 msgid_plural "You are missing %d revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5154
+#: breezy/builtins.py:5144
 msgid "This branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5157
+#: breezy/builtins.py:5147
 msgid "Other branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5162
+#: breezy/builtins.py:5152
 msgid "Branches are up to date.\n"
 msgstr ""
 
-#: breezy/builtins.py:5173
+#: breezy/builtins.py:5163
 msgid "Compress the data within a repository."
 msgstr ""
 
-#: breezy/builtins.py:5175
+#: breezy/builtins.py:5165
 msgid ""
 "This operation compresses the data within a bazaar repository. As\n"
 "bazaar supports automatic packing of repository, this operation is\n"
 "normally not required to be done manually."
 msgstr ""
 
-#: breezy/builtins.py:5179
+#: breezy/builtins.py:5169
 msgid ""
 "During the pack operation, bazaar takes a backup of existing repository\n"
 "data, i.e. pack files. This backup is eventually removed by bazaar\n"
@@ -3430,7 +3430,7 @@
 "used."
 msgstr ""
 
-#: breezy/builtins.py:5185
+#: breezy/builtins.py:5175
 msgid ""
 "Warning: If you use --clean-obsolete-packs and your machine crashes\n"
 "during or immediately after repacking, you may be left with a state\n"
@@ -3439,25 +3439,25 @@
 msgstr ""
 
 # help of 'clean-obsolete-packs' option of 'pack' command
-#: breezy/builtins.py:5195
+#: breezy/builtins.py:5185
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
-#: breezy/builtins.py:5209
+#: breezy/builtins.py:5199
 msgid "List the installed plugins."
 msgstr ""
 
-#: breezy/builtins.py:5211
+#: breezy/builtins.py:5201
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
-#: breezy/builtins.py:5214
+#: breezy/builtins.py:5204
 msgid "--verbose shows the path where each plugin is located."
 msgstr ""
 
-#: breezy/builtins.py:5216
+#: breezy/builtins.py:5206
 msgid ""
 "A plugin is an external component for Breezy that extends the\n"
 "revision control system, by adding or replacing code in Breezy.\n"
@@ -3466,7 +3466,7 @@
 "customizing log output."
 msgstr ""
 
-#: breezy/builtins.py:5222
+#: breezy/builtins.py:5212
 msgid ""
 "See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
 "for further information on plugins including where to find them and how to\n"
@@ -3474,122 +3474,122 @@
 "plugins using the Python programming language."
 msgstr ""
 
-#: breezy/builtins.py:5238
+#: breezy/builtins.py:5228
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
 # help of 'long' option of 'testament' command
-#: breezy/builtins.py:5241
+#: breezy/builtins.py:5231
 msgid "Produce long-format testament."
 msgstr ""
 
 # help of 'strict' option of 'testament' command
-#: breezy/builtins.py:5243
+#: breezy/builtins.py:5233
 msgid "Produce a strict-format testament."
 msgstr ""
 
-#: breezy/builtins.py:5271
+#: breezy/builtins.py:5261
 msgid "Show the origin of each line in a file."
 msgstr ""
 
-#: breezy/builtins.py:5273
+#: breezy/builtins.py:5263
 msgid ""
 "This prints out the given file with an annotation on the left side\n"
 "indicating which revision, author and date introduced the change."
 msgstr ""
 
-#: breezy/builtins.py:5276
+#: breezy/builtins.py:5266
 msgid ""
 "If the origin is the same for a run of consecutive lines, it is\n"
 "shown only at the top, unless the --all option is given."
 msgstr ""
 
 # help of 'all' option of 'annotate' command
-#: breezy/builtins.py:5284
+#: breezy/builtins.py:5274
 msgid "Show annotations on all lines."
 msgstr ""
 
 # help of 'long' option of 'annotate' command
-#: breezy/builtins.py:5285
+#: breezy/builtins.py:5275
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: breezy/builtins.py:5362
+#: breezy/builtins.py:5352
 msgid "Cannot sign a range of non-revision-history revisions"
 msgstr ""
 
-#: breezy/builtins.py:5369
+#: breezy/builtins.py:5359
 msgid "Please supply either one revision, or a range."
 msgstr ""
 
-#: breezy/builtins.py:5373
+#: breezy/builtins.py:5363
 msgid ""
 "Convert the current branch into a checkout of the supplied branch.\n"
 "If no branch is supplied, rebind to the last bound location."
 msgstr ""
 
-#: breezy/builtins.py:5376
+#: breezy/builtins.py:5366
 msgid ""
 "Once converted into a checkout, commits must succeed on the master branch\n"
 "before they will be applied to the local branch."
 msgstr ""
 
-#: breezy/builtins.py:5379
+#: breezy/builtins.py:5369
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case binding will update the local nickname to be\n"
 "that of the master."
 msgstr ""
 
-#: breezy/builtins.py:5395
+#: breezy/builtins.py:5385
 msgid "No location supplied.  This format does not remember old locations."
 msgstr ""
 
-#: breezy/builtins.py:5401
+#: breezy/builtins.py:5391
 msgid "Branch is already bound"
 msgstr ""
 
-#: breezy/builtins.py:5404
+#: breezy/builtins.py:5394
 msgid "No location supplied and no previous location known"
 msgstr ""
 
-#: breezy/builtins.py:5411
+#: breezy/builtins.py:5401
 msgid "These branches have diverged. Try merging, and then bind again."
 msgstr ""
 
-#: breezy/builtins.py:5418
+#: breezy/builtins.py:5408
 msgid "Convert the current checkout into a regular branch."
 msgstr ""
 
-#: breezy/builtins.py:5420
+#: breezy/builtins.py:5410
 msgid ""
 "After unbinding, the local branch is considered independent and subsequent\n"
 "commits will be local only."
 msgstr ""
 
-#: breezy/builtins.py:5431
+#: breezy/builtins.py:5421
 msgid "Local branch is not bound"
 msgstr ""
 
-#: breezy/builtins.py:5435
+#: breezy/builtins.py:5425
 msgid "Remove the last committed revision."
 msgstr ""
 
-#: breezy/builtins.py:5437
+#: breezy/builtins.py:5427
 msgid ""
 "--verbose will print out what is being removed.\n"
 "--dry-run will go through all the motions, but not actually\n"
 "remove anything."
 msgstr ""
 
-#: breezy/builtins.py:5441
+#: breezy/builtins.py:5431
 msgid ""
 "If --revision is specified, uncommit revisions to leave the branch at the\n"
 "specified revision.  For example, \"brz uncommit -r 15\" will leave the\n"
 "branch at revision 15."
 msgstr ""
 
-#: breezy/builtins.py:5445
+#: breezy/builtins.py:5435
 msgid ""
 "Uncommit leaves the working tree ready for a new commit.  The only change\n"
 "it may make is to restore any pending merges that were present before\n"
@@ -3597,82 +3597,82 @@
 msgstr ""
 
 # help of 'dry-run' option of 'uncommit' command
-#: breezy/builtins.py:5456
+#: breezy/builtins.py:5446
 msgid "Don't actually make changes."
 msgstr ""
 
 # help of 'force' option of 'uncommit' command
-#: breezy/builtins.py:5457
+#: breezy/builtins.py:5447
 msgid "Say yes to all questions."
 msgstr ""
 
 # help of 'keep-tags' option of 'uncommit' command
-#: breezy/builtins.py:5459
+#: breezy/builtins.py:5449
 msgid "Keep tags that point to removed revisions."
 msgstr ""
 
 # help of 'local' option of 'uncommit' command
-#: breezy/builtins.py:5461
+#: breezy/builtins.py:5451
 msgid "Only remove the commits from the local branch when in a checkout."
 msgstr ""
 
-#: breezy/builtins.py:5510
+#: breezy/builtins.py:5500
 msgid "No revisions to uncommit.\n"
 msgstr ""
 
-#: breezy/builtins.py:5525
+#: breezy/builtins.py:5515
 msgid "Dry-run, pretending to remove the above revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5529
+#: breezy/builtins.py:5519
 msgid "The above revision(s) will be removed.\n"
 msgstr ""
 
-#: breezy/builtins.py:5533
+#: breezy/builtins.py:5523
 msgid "Uncommit these revisions"
 msgstr ""
 
-#: breezy/builtins.py:5536
+#: breezy/builtins.py:5526
 msgid "Canceled\n"
 msgstr ""
 
-#: breezy/builtins.py:5545
+#: breezy/builtins.py:5535
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  brz pull -d %s %s -r revid:%s\n"
 msgstr ""
 
-#: breezy/builtins.py:5550
+#: breezy/builtins.py:5540
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  brz pull . -r revid:%s\n"
 msgstr ""
 
-#: breezy/builtins.py:5556
+#: breezy/builtins.py:5546
 msgid "Break a dead lock."
 msgstr ""
 
-#: breezy/builtins.py:5558
+#: breezy/builtins.py:5548
 msgid ""
 "This command breaks a lock on a repository, branch, working directory or\n"
 "config file."
 msgstr ""
 
-#: breezy/builtins.py:5561
+#: breezy/builtins.py:5551
 msgid ""
 "CAUTION: Locks should only be broken when you are sure that the process\n"
 "holding the lock has been stopped."
 msgstr ""
 
-#: breezy/builtins.py:5564
+#: breezy/builtins.py:5554
 msgid ""
 "You can get information on what locks are open via the 'brz info\n"
 "[location]' command."
 msgstr ""
 
-#: breezy/builtins.py:5567
+#: breezy/builtins.py:5557
 msgid ""
 ":Examples:\n"
 "    brz break-lock\n"
@@ -3681,61 +3681,61 @@
 msgstr ""
 
 # help of 'config' option of 'break-lock' command
-#: breezy/builtins.py:5576
+#: breezy/builtins.py:5566
 msgid "LOCATION is the directory where the config lock is."
 msgstr ""
 
 # help of 'force' option of 'break-lock' command
-#: breezy/builtins.py:5578
+#: breezy/builtins.py:5568
 msgid "Do not ask for confirmation before breaking the lock."
 msgstr ""
 
 # help of 'protocol=git' option of 'serve' command
-#: breezy/builtins.py:5613
+#: breezy/builtins.py:5603
 msgid "Git Smart server protocol over TCP. (default port: 9418)"
 msgstr ""
 
 # help of 'protocol=git-receive-pack' option of 'serve' command
-#: breezy/builtins.py:5613
+#: breezy/builtins.py:5603
 msgid "Git Smart server receive pack command. (inetd mode only)"
 msgstr ""
 
 # help of 'protocol=git-upload-pack' option of 'serve' command
-#: breezy/builtins.py:5613
+#: breezy/builtins.py:5603
 msgid "Git Smart server upload pack command. (inetd mode only)"
 msgstr ""
 
 # help of 'protocol=bzr' option of 'serve' command
-#: breezy/builtins.py:5613
+#: breezy/builtins.py:5603
 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
 msgstr ""
 
-#: breezy/builtins.py:5614
+#: breezy/builtins.py:5604
 msgid "Run the brz server."
 msgstr ""
 
 # help of 'inet' option of 'serve' command
-#: breezy/builtins.py:5620
+#: breezy/builtins.py:5610
 msgid "Serve on stdin/out for use from inetd or sshd."
 msgstr ""
 
 # title of 'protocol' option of 'serve' command
-#: breezy/builtins.py:5621
+#: breezy/builtins.py:5611
 msgid "protocol"
 msgstr ""
 
 # help of 'protocol' option of 'serve' command
-#: breezy/builtins.py:5622
+#: breezy/builtins.py:5612
 msgid "Protocol to serve."
 msgstr ""
 
 # help of 'listen' option of 'serve' command
-#: breezy/builtins.py:5627
+#: breezy/builtins.py:5617
 msgid "Listen for connections on nominated address."
 msgstr ""
 
 # help of 'port' option of 'serve' command
-#: breezy/builtins.py:5630
+#: breezy/builtins.py:5620
 msgid ""
 "Listen for connections on nominated port.  Passing 0 as the port number will "
 "result in a dynamically allocated port.  The default port depends on the "
@@ -3743,12 +3743,12 @@
 msgstr ""
 
 # help of 'directory' option of 'serve' command
-#: breezy/builtins.py:5635
+#: breezy/builtins.py:5625
 msgid "Serve contents of this directory."
 msgstr ""
 
 # help of 'allow-writes' option of 'serve' command
-#: breezy/builtins.py:5637
+#: breezy/builtins.py:5627
 msgid ""
 "By default the server is a readonly server.  Supplying --allow-writes "
 "enables write access to the contents of the served directory and below.  "
@@ -3758,115 +3758,115 @@
 msgstr ""
 
 # help of 'client-timeout' option of 'serve' command
-#: breezy/builtins.py:5646
+#: breezy/builtins.py:5636
 msgid "Override the default idle client timeout (5min)."
 msgstr ""
 
-#: breezy/builtins.py:5664
+#: breezy/builtins.py:5654
 msgid "Combine a tree into its containing tree."
 msgstr ""
 
-#: breezy/builtins.py:5666
+#: breezy/builtins.py:5656
 msgid "This command requires the target tree to be in a rich-root format."
 msgstr ""
 
-#: breezy/builtins.py:5668
+#: breezy/builtins.py:5658
 msgid ""
 "The TREE argument should be an independent tree, inside another tree, but\n"
 "not part of it.  (Such trees can be produced by \"brz split\", but also by\n"
 "running \"brz branch\" with the target inside a tree.)"
 msgstr ""
 
-#: breezy/builtins.py:5672
+#: breezy/builtins.py:5662
 msgid ""
 "The result is a combined tree, with the subtree no longer an independent\n"
 "part.  This is marked as a merge of the subtree into the containing tree,\n"
 "and all history is preserved."
 msgstr ""
 
-#: breezy/builtins.py:5691
+#: breezy/builtins.py:5681
 #, python-format
 msgid ""
 "Can't join trees because %s doesn't support rich root data.\n"
 "You can use brz upgrade on the repository."
 msgstr ""
 
-#: breezy/builtins.py:5701 breezy/builtins.py:5707
+#: breezy/builtins.py:5691 breezy/builtins.py:5697
 #, python-brace-format
 msgid "Cannot join {0}.  {1}"
 msgstr ""
 
-#: breezy/builtins.py:5711
+#: breezy/builtins.py:5701
 msgid "Split a subdirectory of a tree into a separate tree."
 msgstr ""
 
-#: breezy/builtins.py:5713
+#: breezy/builtins.py:5703
 msgid ""
 "This command will produce a target tree in a format that supports\n"
 "rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
 "converted into earlier formats like 'dirstate-tags'."
 msgstr ""
 
-#: breezy/builtins.py:5717
+#: breezy/builtins.py:5707
 msgid ""
 "The TREE argument should be a subdirectory of a working tree.  That\n"
 "subdirectory will be converted into an independent tree, with its own\n"
 "branch.  Commits in the top-level tree will not apply to the new subtree."
 msgstr ""
 
-#: breezy/builtins.py:5799
+#: breezy/builtins.py:5789
 msgid "No submit branch specified or known"
 msgstr ""
 
-#: breezy/builtins.py:5809 breezy/send.py:108
+#: breezy/builtins.py:5799 breezy/send.py:106
 msgid "No public branch specified or known"
 msgstr ""
 
-#: breezy/builtins.py:5814
+#: breezy/builtins.py:5804
 msgid "brz merge-directive takes at most two one revision identifiers"
 msgstr ""
 
-#: breezy/builtins.py:5823
+#: breezy/builtins.py:5813
 msgid "No revisions to bundle."
 msgstr ""
 
-#: breezy/builtins.py:5842
+#: breezy/builtins.py:5832
 msgid "Mail or create a merge-directive for submitting changes."
 msgstr ""
 
-#: breezy/builtins.py:5844
+#: breezy/builtins.py:5834
 msgid "A merge directive provides many things needed for requesting merges:"
 msgstr ""
 
-#: breezy/builtins.py:5846
+#: breezy/builtins.py:5836
 msgid "* A machine-readable description of the merge to perform"
 msgstr ""
 
-#: breezy/builtins.py:5848
+#: breezy/builtins.py:5838
 msgid "* An optional patch that is a preview of the changes requested"
 msgstr ""
 
-#: breezy/builtins.py:5850
+#: breezy/builtins.py:5840
 msgid ""
 "* An optional bundle of revision data, so that the changes can be applied\n"
 "  directly from the merge directive, without retrieving data from a\n"
 "  branch."
 msgstr ""
 
-#: breezy/builtins.py:5854
+#: breezy/builtins.py:5844
 msgid ""
 "`brz send` creates a compact data set that, when applied using brz\n"
 "merge, has the same effect as merging from the source branch."
 msgstr ""
 
-#: breezy/builtins.py:5857
+#: breezy/builtins.py:5847
 msgid ""
 "By default the merge directive is self-contained and can be applied to any\n"
 "branch containing submit_branch in its ancestory without needing access to\n"
 "the source branch."
 msgstr ""
 
-#: breezy/builtins.py:5861
+#: breezy/builtins.py:5851
 msgid ""
 "If --no-bundle is specified, then Breezy doesn't send the contents of the\n"
 "revisions, but only a structured request to merge from the\n"
@@ -3875,7 +3875,7 @@
 "included if known, so that people can check it later."
 msgstr ""
 
-#: breezy/builtins.py:5867
+#: breezy/builtins.py:5857
 msgid ""
 "The submit branch defaults to the parent of the source branch, but can be\n"
 "overridden.  Both submit branch and public branch will be remembered in\n"
@@ -3884,7 +3884,7 @@
 "be changed using --from."
 msgstr ""
 
-#: breezy/builtins.py:5873
+#: breezy/builtins.py:5863
 msgid ""
 "Both the submit branch and the public branch follow the usual behavior with\n"
 "respect to --remember: If there is no default location set, the first send\n"
@@ -3893,7 +3893,7 @@
 "--remember. The value will only be saved if the location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:5879
+#: breezy/builtins.py:5869
 msgid ""
 "In order to calculate those changes, brz must analyse the submit branch.\n"
 "Therefore it is most efficient for the submit branch to be a local mirror.\n"
@@ -3901,20 +3901,20 @@
 "in the merge directive."
 msgstr ""
 
-#: breezy/builtins.py:5884
+#: breezy/builtins.py:5874
 msgid ""
 "The default behaviour is to send the merge directive by mail, unless -o is\n"
 "given, in which case it is sent to a file."
 msgstr ""
 
-#: breezy/builtins.py:5887
+#: breezy/builtins.py:5877
 msgid ""
 "Mail is sent using your preferred mail program.  This should be transparent\n"
 "on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
 "If the preferred client can't be found (or used), your editor will be used."
 msgstr ""
 
-#: breezy/builtins.py:5891
+#: breezy/builtins.py:5881
 msgid ""
 "To use a specific mail program, set the mail_client configuration option.\n"
 "Supported values for specific clients are \"claws\", \"evolution\", \"kmail"
@@ -3926,7 +3926,7 @@
 "may also add supported clients."
 msgstr ""
 
-#: breezy/builtins.py:5897
+#: breezy/builtins.py:5887
 msgid ""
 "If mail is being sent, a to address is required.  This can be supplied\n"
 "either on the commandline, by setting the submit_to configuration\n"
@@ -3934,13 +3934,13 @@
 "in the submit branch."
 msgstr ""
 
-#: breezy/builtins.py:5902
+#: breezy/builtins.py:5892
 msgid ""
 "The merge directives created by brz send may be applied using brz merge or\n"
 "brz pull by specifying a file containing a merge directive as the location."
 msgstr ""
 
-#: breezy/builtins.py:5905
+#: breezy/builtins.py:5895
 msgid ""
 "brz send makes extensive use of public locations to map local locations "
 "into\n"
@@ -3949,44 +3949,44 @@
 msgstr ""
 
 # help of 'output' option of 'send' command
-#: breezy/builtins.py:5929
+#: breezy/builtins.py:5919
 msgid "Write merge directive to this file or directory; use - for stdout."
 msgstr ""
 
 # help of 'strict' option of 'send' command
-#: breezy/builtins.py:5933
+#: breezy/builtins.py:5923
 msgid ""
 "Refuse to send if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
 # help of 'mail-to' option of 'send' command
-#: breezy/builtins.py:5935
+#: breezy/builtins.py:5925
 msgid "Mail the request to this address."
 msgstr ""
 
 # help of 'body' option of 'send' command
-#: breezy/builtins.py:5939
+#: breezy/builtins.py:5929
 msgid "Body for the email."
 msgstr ""
 
 # help of 'no-bundle' option of 'send' command
-#: breezy/builtins.py:5986
+#: breezy/builtins.py:5976
 msgid "Do not include a bundle in the merge directive."
 msgstr ""
 
 # help of 'no-patch' option of 'send' command
-#: breezy/builtins.py:5987
+#: breezy/builtins.py:5977
 msgid "Do not include a preview patch in the merge directive."
 msgstr ""
 
 # help of 'remember' option of 'send' command
-#: breezy/builtins.py:5990
+#: breezy/builtins.py:5980
 msgid "Remember submit and public branch."
 msgstr ""
 
 # help of 'from' option of 'send' command
-#: breezy/builtins.py:5992
+#: breezy/builtins.py:5982
 msgid ""
 "Branch to generate the submission from, rather than the one containing the "
 "working directory."
@@ -3994,46 +3994,46 @@
 
 # title of 'format' option of 'send' command
 # title of 'format' option of 'version-info' command
-#: breezy/builtins.py:6002 breezy/cmd_version_info.py:79
+#: breezy/builtins.py:5992 breezy/cmd_version_info.py:76
 msgid "format"
 msgstr ""
 
 # help of 'format' option of 'send' command
-#: breezy/builtins.py:6003
+#: breezy/builtins.py:5993
 msgid "Use the specified output format."
 msgstr ""
 
-#: breezy/builtins.py:6025
+#: breezy/builtins.py:6015
 msgid "Create, remove or modify a tag naming a revision."
 msgstr ""
 
-#: breezy/builtins.py:6027
+#: breezy/builtins.py:6017
 msgid ""
 "Tags give human-meaningful names to revisions.  Commands that take a -r\n"
 "(--revision) option can be given -rtag:X, where X is any previously\n"
 "created tag."
 msgstr ""
 
-#: breezy/builtins.py:6031
+#: breezy/builtins.py:6021
 msgid ""
 "Tags are stored in the branch.  Tags are copied from one branch to another\n"
 "along when you branch, push, pull or merge."
 msgstr ""
 
-#: breezy/builtins.py:6034
+#: breezy/builtins.py:6024
 msgid ""
 "It is an error to give a tag name that already exists unless you pass\n"
 "--force, in which case the tag is moved to point to the new revision."
 msgstr ""
 
-#: breezy/builtins.py:6037
+#: breezy/builtins.py:6027
 msgid ""
 "To rename a tag (change the name but keep it on the same revsion), run "
 "``brz\n"
 "tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
 msgstr ""
 
-#: breezy/builtins.py:6040
+#: breezy/builtins.py:6030
 msgid ""
 "If no tag name is specified it will be determined through the\n"
 "'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
@@ -4042,85 +4042,85 @@
 msgstr ""
 
 # help of 'delete' option of 'tag' command
-#: breezy/builtins.py:6050
+#: breezy/builtins.py:6040
 msgid "Delete this tag rather than placing it."
 msgstr ""
 
 # help of 'directory' option of 'tag' command
-#: breezy/builtins.py:6053
+#: breezy/builtins.py:6043
 msgid "Branch in which to place the tag."
 msgstr ""
 
 # help of 'force' option of 'tag' command
-#: breezy/builtins.py:6055
+#: breezy/builtins.py:6045
 msgid "Replace existing tags."
 msgstr ""
 
-#: breezy/builtins.py:6071
+#: breezy/builtins.py:6061
 msgid "No tag specified to delete."
 msgstr ""
 
-#: breezy/builtins.py:6073
+#: breezy/builtins.py:6063
 #, python-format
 msgid "Deleted tag %s."
 msgstr ""
 
-#: breezy/builtins.py:6078
+#: breezy/builtins.py:6068
 msgid "Tags can only be placed on a single revision, not on a range"
 msgstr ""
 
-#: breezy/builtins.py:6087
+#: breezy/builtins.py:6077
 msgid "Please specify a tag name."
 msgstr ""
 
-#: breezy/builtins.py:6095
+#: breezy/builtins.py:6085
 #, python-format
 msgid "Tag %s already exists for that revision."
 msgstr ""
 
-#: breezy/builtins.py:6099
+#: breezy/builtins.py:6089
 #, python-format
 msgid "Created tag %s."
 msgstr ""
 
-#: breezy/builtins.py:6101
+#: breezy/builtins.py:6091
 #, python-format
 msgid "Updated tag %s."
 msgstr ""
 
-#: breezy/builtins.py:6105
+#: breezy/builtins.py:6095
 msgid "List tags."
 msgstr ""
 
-#: breezy/builtins.py:6107
+#: breezy/builtins.py:6097
 msgid ""
 "This command shows a table of tag names and the revisions they reference."
 msgstr ""
 
 # help of 'directory' option of 'tags' command
-#: breezy/builtins.py:6113
+#: breezy/builtins.py:6103
 msgid "Branch whose tags should be displayed."
 msgstr ""
 
 # help of 'sort' option of 'tags' command
-#: breezy/builtins.py:6115
+#: breezy/builtins.py:6105
 msgid "Sort tags by different criteria."
 msgstr ""
 
 # title of 'sort' option of 'tags' command
-#: breezy/builtins.py:6115
+#: breezy/builtins.py:6105
 msgid "Sorting"
 msgstr ""
 
-#: breezy/builtins.py:6185
+#: breezy/builtins.py:6175
 msgid "Reconfigure the type of a brz directory."
 msgstr ""
 
-#: breezy/builtins.py:6187
+#: breezy/builtins.py:6177
 msgid "A target configuration must be specified."
 msgstr ""
 
-#: breezy/builtins.py:6189
+#: breezy/builtins.py:6179
 msgid ""
 "For checkouts, the bind-to location will be auto-detected if not specified.\n"
 "The order of preference is\n"
@@ -4132,112 +4132,112 @@
 msgstr ""
 
 # title of 'tree_type' option of 'reconfigure' command
-#: breezy/builtins.py:6203
+#: breezy/builtins.py:6193
 msgid "Tree type"
 msgstr ""
 
 # help of 'tree_type' option of 'reconfigure' command
-#: breezy/builtins.py:6204
+#: breezy/builtins.py:6194
 msgid "The relation between branch and tree."
 msgstr ""
 
 # help of 'tree_type=branch' option of 'reconfigure' command
-#: breezy/builtins.py:6206
+#: breezy/builtins.py:6196
 msgid "Reconfigure to be an unbound branch with no working tree."
 msgstr ""
 
 # help of 'tree_type=tree' option of 'reconfigure' command
-#: breezy/builtins.py:6207
+#: breezy/builtins.py:6197
 msgid "Reconfigure to be an unbound branch with a working tree."
 msgstr ""
 
 # help of 'tree_type=checkout' option of 'reconfigure' command
-#: breezy/builtins.py:6208
+#: breezy/builtins.py:6198
 msgid "Reconfigure to be a bound branch with a working tree."
 msgstr ""
 
 # help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
-#: breezy/builtins.py:6209
+#: breezy/builtins.py:6199
 msgid "Reconfigure to be a lightweight checkout (with no local history)."
 msgstr ""
 
 # title of 'repository_type' option of 'reconfigure' command
-#: breezy/builtins.py:6214
+#: breezy/builtins.py:6204
 msgid "Repository type"
 msgstr ""
 
 # help of 'repository_type' option of 'reconfigure' command
-#: breezy/builtins.py:6215
+#: breezy/builtins.py:6205
 msgid "Location fo the repository."
 msgstr ""
 
 # help of 'repository_type=standalone' option of 'reconfigure' command
-#: breezy/builtins.py:6217
+#: breezy/builtins.py:6207
 msgid ""
 "Reconfigure to be a standalone branch (i.e. stop using shared repository)."
 msgstr ""
 
 # help of 'repository_type=use-shared' option of 'reconfigure' command
-#: breezy/builtins.py:6219
+#: breezy/builtins.py:6209
 msgid "Reconfigure to use a shared repository."
 msgstr ""
 
 # title of 'repository_trees' option of 'reconfigure' command
-#: breezy/builtins.py:6223
+#: breezy/builtins.py:6213
 msgid "Trees in Repository"
 msgstr ""
 
 # help of 'repository_trees' option of 'reconfigure' command
-#: breezy/builtins.py:6224
+#: breezy/builtins.py:6214
 msgid "Whether new branches in the repository have trees."
 msgstr ""
 
 # help of 'repository_trees=with-trees' option of 'reconfigure' command
-#: breezy/builtins.py:6226
+#: breezy/builtins.py:6216
 msgid "Reconfigure repository to create working trees on branches by default."
 msgstr ""
 
 # help of 'repository_trees=with-no-trees' option of 'reconfigure' command
-#: breezy/builtins.py:6228
+#: breezy/builtins.py:6218
 msgid ""
 "Reconfigure repository to not create working trees on branches by default."
 msgstr ""
 
 # help of 'bind-to' option of 'reconfigure' command
-#: breezy/builtins.py:6231
+#: breezy/builtins.py:6221
 msgid "Branch to bind checkout to."
 msgstr ""
 
 # help of 'force' option of 'reconfigure' command
-#: breezy/builtins.py:6233
+#: breezy/builtins.py:6223
 msgid "Perform reconfiguration even if local changes will be lost."
 msgstr ""
 
 # help of 'stacked-on' option of 'reconfigure' command
-#: breezy/builtins.py:6236
+#: breezy/builtins.py:6226
 msgid "Reconfigure a branch to be stacked on another branch."
 msgstr ""
 
 # help of 'unstacked' option of 'reconfigure' command
-#: breezy/builtins.py:6240
+#: breezy/builtins.py:6230
 msgid ""
 "Reconfigure a branch to be unstacked.  This may require copying substantial "
 "data into it."
 msgstr ""
 
-#: breezy/builtins.py:6251
+#: breezy/builtins.py:6241
 msgid "Can't use both --stacked-on and --unstacked"
 msgstr ""
 
-#: breezy/builtins.py:6265
+#: breezy/builtins.py:6255
 msgid "No target configuration specified"
 msgstr ""
 
-#: breezy/builtins.py:6300
+#: breezy/builtins.py:6290
 msgid "Set the branch of a checkout and update."
 msgstr ""
 
-#: breezy/builtins.py:6302
+#: breezy/builtins.py:6292
 msgid ""
 "For lightweight checkouts, this changes the branch being referenced.\n"
 "For heavyweight checkouts, this checks that there are no local commits\n"
@@ -4245,17 +4245,17 @@
 "of the new location and binds to it."
 msgstr ""
 
-#: breezy/builtins.py:6307
+#: breezy/builtins.py:6297
 msgid ""
 "In both cases, the working tree is updated and uncommitted changes\n"
 "are merged. The user can commit or revert these as they desire."
 msgstr ""
 
-#: breezy/builtins.py:6310
+#: breezy/builtins.py:6300
 msgid "Pending merges need to be committed or reverted before using switch."
 msgstr ""
 
-#: breezy/builtins.py:6312
+#: breezy/builtins.py:6302
 msgid ""
 "The path to the branch to switch to can be specified relative to the parent\n"
 "directory of the current branch. For example, if you are currently in a\n"
@@ -4263,7 +4263,7 @@
 "/path/to/newbranch."
 msgstr ""
 
-#: breezy/builtins.py:6317
+#: breezy/builtins.py:6307
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case switching will update the local nickname to be\n"
@@ -4271,54 +4271,54 @@
 msgstr ""
 
 # help of 'force' option of 'switch' command
-#: breezy/builtins.py:6325
+#: breezy/builtins.py:6315
 msgid "Switch even if local commits will be lost."
 msgstr ""
 
 # help of 'create-branch' option of 'switch' command
-#: breezy/builtins.py:6328
+#: breezy/builtins.py:6318
 msgid "Create the target branch from this one before switching to it."
 msgstr ""
 
 # help of 'store' option of 'switch' command
-#: breezy/builtins.py:6331
+#: breezy/builtins.py:6321
 msgid "Store and restore uncommitted changes in the branch."
 msgstr ""
 
-#: breezy/builtins.py:6344
+#: breezy/builtins.py:6334
 msgid "You must supply either a revision or a location"
 msgstr ""
 
-#: breezy/builtins.py:6359
+#: breezy/builtins.py:6349
 msgid "cannot create branch without source branch"
 msgstr ""
 
-#: breezy/builtins.py:6387
+#: breezy/builtins.py:6377
 msgid ""
 "switching would create a branch reference loop. Use the \"bzr up\" command "
 "to switch to a different revision."
 msgstr ""
 
-#: breezy/builtins.py:6395
+#: breezy/builtins.py:6385
 #, python-format
 msgid "Switched to branch %s at %s"
 msgstr ""
 
-#: breezy/builtins.py:6398
+#: breezy/builtins.py:6388
 #, python-format
 msgid "Switched to branch %s"
 msgstr ""
 
-#: breezy/builtins.py:6400
+#: breezy/builtins.py:6390
 #, python-format
 msgid "Switched to branch at %s"
 msgstr ""
 
-#: breezy/builtins.py:6405
+#: breezy/builtins.py:6395
 msgid "Manage filtered views."
 msgstr ""
 
-#: breezy/builtins.py:6407