Merge lp:~jelmer/brz/merge-3.1 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.1.

Merge lp:brz/3.1.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bedding.py'
--- breezy/bedding.py	2020-05-24 00:42:36 +0000
+++ breezy/bedding.py	2020-06-01 19:36:54 +0000
@@ -43,12 +43,12 @@
     if path is None:
         path = config_dir()
     if not os.path.isdir(path):
-        if sys.platform == 'win32':
-            parent_dir = os.path.dirname(path)
-            if not os.path.isdir(parent_dir):
-                trace.mutter(
-                    'creating config parent directory: %r', parent_dir)
-                os.mkdir(parent_dir)
+        parent_dir = os.path.dirname(path)
+        if not os.path.isdir(parent_dir):
+            trace.mutter(
+                'creating config parent directory: %r', parent_dir)
+            os.mkdir(parent_dir)
+            osutils.copy_ownership_from_path(parent_dir)
         trace.mutter('creating config directory: %r', path)
         os.mkdir(path)
         osutils.copy_ownership_from_path(path)

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2020-02-18 01:57:45 +0000
+++ breezy/diff.py	2020-06-01 19:36:54 +0000
@@ -731,10 +731,10 @@
             new_date = self.EPOCH_DATE
         else:
             return self.CANNOT_DIFF
-        from_label = '%s%s\t%s' % (self.old_label, old_path,
-                                   old_date)
-        to_label = '%s%s\t%s' % (self.new_label, new_path,
-                                 new_date)
+        from_label = '%s%s\t%s' % (
+            self.old_label, old_path or new_path, old_date)
+        to_label = '%s%s\t%s' % (
+            self.new_label, new_path or old_path, new_date)
         return self.diff_text(old_path, new_path, from_label, to_label)
 
     def diff_text(self, from_path, to_path, from_label, to_label):
@@ -762,7 +762,9 @@
         except errors.BinaryFile:
             self.to_file.write(
                 ("Binary files %s%s and %s%s differ\n" %
-                 (self.old_label, from_path, self.new_label, to_path)).encode(self.path_encoding, 'replace'))
+                 (self.old_label, from_path or to_path,
+                  self.new_label, to_path or from_path)
+                 ).encode(self.path_encoding, 'replace'))
         return self.CHANGED
 
 
@@ -1052,8 +1054,8 @@
                     'supported on this filesystem.' % (change.path[0],))
                 continue
             oldpath, newpath = change.path
-            oldpath_encoded = get_encoded_path(change.path[0])
-            newpath_encoded = get_encoded_path(change.path[1])
+            oldpath_encoded = get_encoded_path(oldpath)
+            newpath_encoded = get_encoded_path(newpath)
             old_present = (change.kind[0] is not None and change.versioned[0])
             new_present = (change.kind[1] is not None and change.versioned[1])
             executable = change.executable
@@ -1073,11 +1075,9 @@
             if (old_present, new_present) == (True, False):
                 self.to_file.write(b"=== removed %s '%s'\n" %
                                    (kind[0].encode('ascii'), oldpath_encoded))
-                newpath = oldpath
             elif (old_present, new_present) == (False, True):
                 self.to_file.write(b"=== added %s '%s'\n" %
                                    (kind[1].encode('ascii'), newpath_encoded))
-                oldpath = newpath
             elif renamed:
                 self.to_file.write(b"=== renamed %s '%s' => '%s'%s\n" %
                                    (kind[0].encode('ascii'), oldpath_encoded, newpath_encoded, prop_str))

=== modified file 'breezy/git/server.py'
--- breezy/git/server.py	2020-05-06 02:13:25 +0000
+++ breezy/git/server.py	2020-06-01 19:36:54 +0000
@@ -104,7 +104,6 @@
                         have, wants, progress=progress)
 
 
-
 class BzrTCPGitServer(TCPGitServer):
 
     def handle_error(self, request, client_address):

=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py	2019-09-01 15:33:59 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py	2020-06-01 19:36:54 +0000
@@ -85,7 +85,7 @@
         surplus = set(words) & self.completion_result
         if surplus:
             raise AssertionError('Completion should omit %r but it has %r'
-                                 % (surplus, res, self.completion_result))
+                                 % (surplus, self.completion_result))
 
     def get_script(self):
         commands.install_bzr_command_hooks()

=== added directory 'breezy/plugins/github'
=== added file 'breezy/plugins/github/__init__.py'
--- breezy/plugins/github/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/github/__init__.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) 2020 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Support for GitHub."""
+
+from __future__ import absolute_import
+
+from ... import version_info  # noqa: F401
+from ...commands import plugin_cmds
+
+plugin_cmds.register_lazy("cmd_github_login", ["gh-login"], __name__ + ".cmds")
+
+
+from ...propose import hosters
+hosters.register_lazy("github", __name__ + '.hoster', "GitHub")
+
+
+def test_suite():
+    from unittest import TestSuite
+    from .tests import test_suite
+    result = TestSuite()
+    result.addTest(test_suite())
+    return result

=== added file 'breezy/plugins/github/cmds.py'
--- breezy/plugins/github/cmds.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/github/cmds.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,61 @@
+# Copyright (C) 2018 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""GitHub command implementations."""
+
+from __future__ import absolute_import
+
+from ... import (
+    errors,
+    )
+from ...commands import Command
+
+
+class cmd_github_login(Command):
+    __doc__ = """Log into GitHub.
+
+    When communicating with GitHub, some commands need to authenticate to
+    GitHub.
+    """
+
+    takes_args = ['username?']
+
+    def run(self, username=None):
+        from github import Github, GithubException
+        from breezy.config import AuthenticationConfig
+        authconfig = AuthenticationConfig()
+        if username is None:
+            username = authconfig.get_user(
+                'https', 'github.com', prompt=u'GitHub username', ask=True)
+        password = authconfig.get_password('https', 'github.com', username)
+        client = Github(username, password)
+        user = client.get_user()
+        try:
+            authorization = user.create_authorization(
+                scopes=['user', 'repo', 'delete_repo'], note='Breezy',
+                note_url='https://github.com/breezy-team/breezy')
+        except GithubException as e:
+            errs = e.data.get('errors', [])
+            if errs:
+                err_code = errs[0].get('code')
+                if err_code == u'already_exists':
+                    raise errors.BzrCommandError('token already exists')
+            raise errors.BzrCommandError(e.data['message'])
+        # TODO(jelmer): This should really use something in
+        # AuthenticationConfig
+        from .github import store_github_token
+        store_github_token(scheme='https', host='github.com',
+                           token=authorization.token)

=== renamed file 'breezy/plugins/propose/github.py' => 'breezy/plugins/github/hoster.py'
=== added directory 'breezy/plugins/github/tests'
=== added file 'breezy/plugins/github/tests/__init__.py'
--- breezy/plugins/github/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/github/tests/__init__.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,24 @@
+# Copyright (C) 2020 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from unittest import TestLoader, TestSuite
+
+
+def test_suite():
+    result = TestSuite()
+
+    loader = TestLoader()
+    return result

=== added directory 'breezy/plugins/gitlab'
=== added file 'breezy/plugins/gitlab/__init__.py'
--- breezy/plugins/gitlab/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/gitlab/__init__.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) 2020 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Management of hosted branches."""
+
+from __future__ import absolute_import
+
+from ... import version_info  # noqa: F401
+from ...commands import plugin_cmds
+
+plugin_cmds.register_lazy("cmd_gitlab_login", ["gl-login"], __name__ + ".cmds")
+
+
+from ...propose import hosters
+hosters.register_lazy("gitlab", __name__ + '.hoster', "GitLab")
+
+
+def test_suite():
+    from unittest import TestSuite
+    from .tests import test_suite
+    result = TestSuite()
+    result.addTest(test_suite())
+    return result

=== added file 'breezy/plugins/gitlab/cmds.py'
--- breezy/plugins/gitlab/cmds.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/gitlab/cmds.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,76 @@
+# Copyright (C) 2020 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""GitLab command implementations."""
+
+from __future__ import absolute_import
+
+from ... import (
+    errors,
+    urlutils,
+    )
+from ...commands import Command
+from ...option import (
+    Option,
+    )
+from ...trace import note
+
+
+class cmd_gitlab_login(Command):
+    __doc__ = """Log into a GitLab instance.
+
+    This command takes a GitLab instance URL (e.g. https://gitlab.com)
+    as well as an optional private token. Private tokens can be created via the
+    web UI.
+
+    :Examples:
+
+      Log into GNOME's GitLab (prompts for a token):
+
+         brz gitlab-login https://gitlab.gnome.org/
+
+      Log into Debian's salsa, using a token created earlier:
+
+         brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo
+    """
+
+    takes_args = ['url', 'private_token?']
+
+    takes_options = [
+        Option('name', help='Name for GitLab site in configuration.',
+               type=str),
+        Option('no-check',
+               "Don't check that the token is valid."),
+        ]
+
+    def run(self, url, private_token=None, name=None, no_check=False):
+        from breezy import ui
+        from .hoster import store_gitlab_token
+        if name is None:
+            try:
+                name = urlutils.parse_url(url)[3].split('.')[-2]
+            except (ValueError, IndexError):
+                raise errors.BzrCommandError(
+                    'please specify a site name with --name')
+        if private_token is None:
+            note("Please visit %s to obtain a private token.",
+                 urlutils.join(url, "profile/personal_access_tokens"))
+            private_token = ui.ui_factory.get_password(u'Private token')
+        if not no_check:
+            from breezy.transport import get_transport
+            from .hoster import GitLab
+            GitLab(get_transport(url), private_token=private_token)
+        store_gitlab_token(name=name, url=url, private_token=private_token)

=== renamed file 'breezy/plugins/propose/gitlabs.py' => 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/propose/gitlabs.py	2020-05-06 02:13:25 +0000
+++ breezy/plugins/gitlab/hoster.py	2020-06-01 19:36:54 +0000
@@ -250,6 +250,12 @@
             return False
         elif self._mr['merge_status'] == 'can_be_merged':
             return True
+        elif self._mr['merge_status'] in (
+                'unchecked', 'cannot_be_merged_recheck'):
+            # See https://gitlab.com/gitlab-org/gitlab/-/commit/7517105303c for
+            # an explanation of the distinction between unchecked and
+            # cannot_be_merged_recheck
+            return None
         else:
             raise ValueError(self._mr['merge_status'])
 

=== added directory 'breezy/plugins/gitlab/tests'
=== added file 'breezy/plugins/gitlab/tests/__init__.py'
--- breezy/plugins/gitlab/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/gitlab/tests/__init__.py	2020-06-01 19:36:54 +0000
@@ -0,0 +1,26 @@
+# Copyright (C) 2020 Jelmer Vernooij <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from unittest import TestLoader, TestSuite
+
+
+def test_suite():
+    result = TestSuite()
+    from . import test_hoster
+
+    loader = TestLoader()
+    result.addTests(loader.loadTestsFromModule(test_hoster))
+    return result

=== renamed file 'breezy/plugins/propose/tests/test_gitlab.py' => 'breezy/plugins/gitlab/tests/test_hoster.py'
--- breezy/plugins/propose/tests/test_gitlab.py	2020-04-13 01:55:32 +0000
+++ breezy/plugins/gitlab/tests/test_hoster.py	2020-06-01 19:36:54 +0000
@@ -16,7 +16,7 @@
 
 from breezy.tests import TestCase
 
-from breezy.plugins.propose.gitlabs import (
+from breezy.plugins.gitlab.hoster import (
     parse_gitlab_merge_request_url,
     NotMergeRequestUrl,
     NotGitLabUrl,

=== modified file 'breezy/plugins/propose/__init__.py'
--- breezy/plugins/propose/__init__.py	2020-05-06 02:13:25 +0000
+++ breezy/plugins/propose/__init__.py	2020-06-01 19:36:54 +0000
@@ -23,8 +23,6 @@
 plugin_cmds.register_lazy("cmd_land_merge_proposal", ["land"], __name__ + ".cmds")
 plugin_cmds.register_lazy("cmd_publish_derived", ['publish'], __name__ + ".cmds")
 plugin_cmds.register_lazy("cmd_find_merge_proposal", ['find-proposal'], __name__ + ".cmds")
-plugin_cmds.register_lazy("cmd_github_login", ["gh-login"], __name__ + ".cmds")
-plugin_cmds.register_lazy("cmd_gitlab_login", ["gl-login"], __name__ + ".cmds")
 plugin_cmds.register_lazy(
     "cmd_my_merge_proposals", ["my-proposals"],
     __name__ + ".cmds")
@@ -35,11 +33,6 @@
     "launchpad", "breezy.plugins.propose.launchpad",
     "Launchpad")
 hosters.register_lazy(
-    "github", "breezy.plugins.propose.github",
-    "GitHub")
-hosters.register_lazy(
-    "gitlab", "breezy.plugins.propose.gitlabs",
-    "GitLab")
 
 
 def test_suite():

=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-03-07 14:46:08 +0000
+++ breezy/plugins/propose/cmds.py	2020-06-01 19:36:54 +0000
@@ -235,90 +235,6 @@
             self.outf.write(gettext('Merge proposal: %s\n') % mp.url)
 
 
-class cmd_github_login(Command):
-    __doc__ = """Log into GitHub.
-
-    When communicating with GitHub, some commands need to authenticate to
-    GitHub.
-    """
-
-    takes_args = ['username?']
-
-    def run(self, username=None):
-        from github import Github, GithubException
-        from breezy.config import AuthenticationConfig
-        authconfig = AuthenticationConfig()
-        if username is None:
-            username = authconfig.get_user(
-                'https', 'github.com', prompt=u'GitHub username', ask=True)
-        password = authconfig.get_password('https', 'github.com', username)
-        client = Github(username, password)
-        user = client.get_user()
-        try:
-            authorization = user.create_authorization(
-                scopes=['user', 'repo', 'delete_repo'], note='Breezy',
-                note_url='https://github.com/breezy-team/breezy')
-        except GithubException as e:
-            errs = e.data.get('errors', [])
-            if errs:
-                err_code = errs[0].get('code')
-                if err_code == u'already_exists':
-                    raise errors.BzrCommandError('token already exists')
-            raise errors.BzrCommandError(e.data['message'])
-        # TODO(jelmer): This should really use something in
-        # AuthenticationConfig
-        from .github import store_github_token
-        store_github_token(scheme='https', host='github.com',
-                           token=authorization.token)
-
-
-class cmd_gitlab_login(Command):
-    __doc__ = """Log into a GitLab instance.
-
-    This command takes a GitLab instance URL (e.g. https://gitlab.com)
-    as well as an optional private token. Private tokens can be created via the
-    web UI.
-
-    :Examples:
-
-      Log into GNOME's GitLab (prompts for a token):
-
-         brz gitlab-login https://gitlab.gnome.org/
-
-      Log into Debian's salsa, using a token created earlier:
-
-         brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo
-    """
-
-    takes_args = ['url', 'private_token?']
-
-    takes_options = [
-        Option('name', help='Name for GitLab site in configuration.',
-               type=str),
-        Option('no-check',
-               "Don't check that the token is valid."),
-        ]
-
-    def run(self, url, private_token=None, name=None, no_check=False):
-        from breezy import ui
-        from .gitlabs import store_gitlab_token
-        if name is None:
-            try:
-                name = urlutils.parse_url(url)[3].split('.')[-2]
-            except (ValueError, IndexError):
-                raise errors.BzrCommandError(
-                    'please specify a site name with --name')
-        if private_token is None:
-            note("Please visit %s to obtain a private token.",
-                 urlutils.join(url, "profile/personal_access_tokens"))
-            private_token = ui.ui_factory.get_password(u'Private token')
-        if not no_check:
-            from breezy.transport import get_transport
-            from .gitlabs import GitLab
-            GitLab(get_transport(url), private_token=private_token)
-        store_gitlab_token(name=name, url=url, private_token=private_token)
-
-
 class cmd_my_merge_proposals(Command):
     __doc__ = """List all merge proposals owned by the logged-in user.
 

=== modified file 'breezy/plugins/propose/tests/__init__.py'
--- breezy/plugins/propose/tests/__init__.py	2020-04-13 01:55:32 +0000
+++ breezy/plugins/propose/tests/__init__.py	2020-06-01 19:36:54 +0000
@@ -19,8 +19,6 @@
 
 def test_suite():
     result = TestSuite()
-    from . import test_gitlab
 
     loader = TestLoader()
-    result.addTests(loader.loadTestsFromModule(test_gitlab))
     return result

=== modified file 'breezy/tests/blackbox/test_big_file.py'
--- breezy/tests/blackbox/test_big_file.py	2020-01-21 03:21:36 +0000
+++ breezy/tests/blackbox/test_big_file.py	2020-06-01 19:36:54 +0000
@@ -24,6 +24,7 @@
 import errno
 import os
 import resource
+import sys
 
 from breezy import (
     osutils,
@@ -40,6 +41,9 @@
 RESOURCE = resource.RLIMIT_AS
 LIMIT = 1024 * 1024 * 100
 
+if sys.version_info[0] == 2:
+    range = xrange
+
 
 def make_big_file(path):
     blob_1mb = BIG_FILE_CHUNK_SIZE * b'\x0c'

=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2020-01-31 03:05:58 +0000
+++ breezy/tests/blackbox/test_diff.py	2020-06-01 19:36:54 +0000
@@ -358,6 +358,26 @@
             "=== removed file 'a'\nBinary files old/a and new/a differ\n",
             output[0])
 
+    def test_moved_away(self):
+        # pad.lv/1880354
+        tree = self.make_branch_and_tree('.')
+        self.build_tree_contents([('a', 'asdf\n')])
+        tree.add(['a'])
+        tree.commit('add a')
+        tree.rename_one('a', 'b')
+        self.build_tree_contents([('a', 'qwer\n')])
+        tree.add('a')
+        output, error = self.run_bzr('diff -p0', retcode=1)
+        self.assertEqualDiff("""\
+=== added file 'a'
+--- a\tYYYY-MM-DD HH:MM:SS +ZZZZ
++++ a\tYYYY-MM-DD HH:MM:SS +ZZZZ
+@@ -0,0 +1,1 @@
++qwer
+
+=== renamed file 'a' => 'b'
+""", subst_dates(output))
+
 
 class TestCheckoutDiff(TestDiff):
 

=== modified file 'breezy/tests/blackbox/test_remember_option.py'
--- breezy/tests/blackbox/test_remember_option.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_remember_option.py	2020-06-01 19:36:54 +0000
@@ -195,8 +195,7 @@
             $ echo new parent > file
             $ brz commit -m 'new parent'
             $ cd ..
-            ''' % {'working_dir': self.working_dir},
-            null_output_matches_anything=True)
+            ''', null_output_matches_anything=True)
 
     def assertLocations(self, expected_locations):
         br, _ = branch.Branch.open_containing(self.working_dir)

=== modified file 'breezy/tests/test_bedding.py'
--- breezy/tests/test_bedding.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_bedding.py	2020-06-01 19:36:54 +0000
@@ -123,6 +123,13 @@
         os.makedirs(newdir)
         self.assertEqual(bedding.config_dir(), newdir)
 
+    def test_ensure_config_dir_exists(self):
+        xdgconfigdir = osutils.pathjoin(self.test_home_dir, 'xdgconfig')
+        self.overrideEnv('XDG_CONFIG_HOME', xdgconfigdir)
+        bedding.ensure_config_dir_exists()
+        newdir = osutils.pathjoin(xdgconfigdir, 'breezy')
+        self.assertTrue(os.path.isdir(newdir))
+
 
 class TestDefaultMailDomain(tests.TestCaseInTempDir):
     """Test retrieving default domain from mailname file"""

=== modified file 'breezy/tests/test_diff.py'
--- breezy/tests/test_diff.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_diff.py	2020-06-01 19:36:54 +0000
@@ -605,8 +605,8 @@
             [('tree/' + alpha, b'\0'),
              ('tree/' + omega,
               (b'The %s and the %s\n' % (alpha_utf8, omega_utf8)))])
-        tree.add([alpha], [b'file-id'])
-        tree.add([omega], [b'file-id-2'])
+        tree.add([alpha])
+        tree.add([omega])
         diff_content = StubO()
         diff.show_diff_trees(tree.basis_tree(), tree, diff_content)
         diff_content.check_types(self, bytes)
@@ -802,8 +802,11 @@
         self.differ.diff('olddir/oldfile', 'newdir/newfile')
         self.assertContainsRe(
             self.differ.to_file.getvalue(),
-            br'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
-            br' \@\@\n-old\n\n')
+            br'--- olddir/oldfile.*\n'
+            br'\+\+\+ newdir/newfile.*\n'
+            br'\@\@ -1,1 \+0,0 \@\@\n'
+            br'-old\n'
+            br'\n')
         self.assertContainsRe(self.differ.to_file.getvalue(),
                               b"=== target is 'new'\n")
 

=== modified file 'breezy/tests/test_ignores.py'
--- breezy/tests/test_ignores.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_ignores.py	2020-06-01 19:36:54 +0000
@@ -92,7 +92,8 @@
         self.assertPathDoesNotExist(ignore_path)
         os.mkdir('empty-home')
 
-        config_path = os.path.join(self.test_dir, 'empty-home', '.config')
+        config_path = os.path.join(
+            self.test_dir, 'empty-home', 'foo', '.config')
         self.overrideEnv('BRZ_HOME', config_path)
         self.assertPathDoesNotExist(config_path)
 

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2020-05-06 02:13:25 +0000
+++ breezy/transport/http/__init__.py	2020-06-01 19:36:54 +0000
@@ -1024,7 +1024,7 @@
         if bypass is None:
             # Nevertheless, there are platform-specific ways to
             # ignore proxies...
-            return urllib.proxy_bypass(host)
+            return urllib_request.proxy_bypass(host)
         else:
             return bypass
 

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2020-02-14 00:03:37 +0000
+++ doc/developers/releasing.txt	2020-06-01 19:36:54 +0000
@@ -56,7 +56,7 @@
 When do we release ?
 ====================
 
-As of September 2018, we maintain a single series: 3.0.
+As of May 2020, we maintain a two series: 3.1 and trunk (3.2).
 
 #. as much as possible releases should not disturb development, and
    ongoing development should not disturb releases,

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-05-05 23:32:39 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-06-01 19:36:54 +0000
@@ -9,83 +9,83 @@
 #########
 
 :Codename: Nirvana
-:3.1.0: NOT RELEASED YET
+:3.1.0: 2020-05-21
 
 External Compatibility Breaks
 *****************************
 
 .. These may require users to change the way they use Breezy.
 
- * The ``brz init-repo`` command has been renamed to
-   ``brz init-shared-repo`` to emphasize that it creates
-   shared repositories rather than just any kind of repository.
-   (Jelmer Vernooij)
+* The ``brz init-repo`` command has been renamed to
+  ``brz init-shared-repo`` to emphasize that it creates
+  shared repositories rather than just any kind of repository.
+  (Jelmer Vernooij)
 
 New Features
 ************
 
 .. New commands, options, etc that users may wish to try out.
 
- * A new ``brz land`` command can merge merge proposals on Launchpad,
-   GitHub and GitLab sites. (Jelmer Vernooij, #1816213)
-
- * The 'patch' command is now bundled with brz.
-   Imported from bzrtools by Aaron Bentley. (Jelmer Vernooij)
-
- * The 'quilt' plugin, extracted from brz-debian, is now
-   bundled. (Jelmer Vernooij)
-
- * A new ``calculate_revnos`` configuration option (defaults to enabled)
-   can be used to disable revno display for branch formats that
-   do not natively store revnos. This speeds up ``brz log`` on
-   the Samba git branch by 33%.
-   (Jelmer Vernooij)
-
- * Directly read mtab rather than using psutil when trying to figure out
-   filesystem types. This removes a dependency that not all users may
-   have installed and speeds up import time since psutil brings in
-   various other modules. (Jelmer Vernooij)
-
- * ``brz diff`` now has a --color argument that can write
-   color diff output. This is based on the cdiff code in
-   bzrtools by Aaron Bentley.
-   (Jelmer Vernooij, #376594)
-
- * Information about tree references can now be updated on remote
-   branches. (Jelmer Vernooij)
-
- * Warn the user when they attempt to use Breezy in a Subversion
-   working copy. (Jelmer Vernooij)
-
- * Add a basic Mercurial plugin that mentions that .hg repositories
-   are unsupported when the user attempts to access one.
-   (Jelmer Vernooij)
-
- * The ``2a`` format now officially supports storing tree references.
-   It always partially supported storing tree reference data,
-   and would happily pull in tree reference data from other repository
-   formats. (Jelmer Vernooij)
-
- * A new ``fossil`` plugin has been added that warns users when they
-   attempt to access Fossil repositories.
-   (Jelmer Vernooij, #1848821)
-
- * When pushing to Git repositories, symrefs are now followed.
-   (Jelmer Vernooij, #1800393)
-
- * New ``brz clone`` command, which clones everything under
-   a control directory. I.e. all colocated branches, like
-   ``git clone``. (Jelmer Vernooij, #831939)
-
- * ``brz sprout`` is now an alias for ``brz branch``.
-   (Jelmer Vernooij)
-
- * ``brz branch`` now accepts a ``-b`` flag with the
-   name of the colocated branch to sprout.
-   (Jelmer Vernooij, #1869977)
-
- * Add a ``breezy.__main__`` module so that
-   ``python3 -m breezy`` works. (Jelmer Vernooij)
+* A new ``brz land`` command can merge merge proposals on Launchpad,
+  GitHub and GitLab sites. (Jelmer Vernooij, #1816213)
+
+* The 'patch' command is now bundled with brz.
+  Imported from bzrtools by Aaron Bentley. (Jelmer Vernooij)
+
+* The 'quilt' plugin, extracted from brz-debian, is now
+  bundled. (Jelmer Vernooij)
+
+* A new ``calculate_revnos`` configuration option (defaults to enabled)
+  can be used to disable revno display for branch formats that
+  do not natively store revnos. This speeds up ``brz log`` on
+  the Samba git branch by 33%.
+  (Jelmer Vernooij)
+
+* Directly read mtab rather than using psutil when trying to figure out
+  filesystem types. This removes a dependency that not all users may
+  have installed and speeds up import time since psutil brings in
+  various other modules. (Jelmer Vernooij)
+
+* ``brz diff`` now has a --color argument that can write
+  color diff output. This is based on the cdiff code in
+  bzrtools by Aaron Bentley.
+  (Jelmer Vernooij, #376594)
+
+* Information about tree references can now be updated on remote
+  branches. (Jelmer Vernooij)
+
+* Warn the user when they attempt to use Breezy in a Subversion
+  working copy. (Jelmer Vernooij)
+
+* Add a basic Mercurial plugin that mentions that .hg repositories
+  are unsupported when the user attempts to access one.
+  (Jelmer Vernooij)
+
+* The ``2a`` format now officially supports storing tree references.
+  It always partially supported storing tree reference data,
+  and would happily pull in tree reference data from other repository
+  formats. (Jelmer Vernooij)
+
+* A new ``fossil`` plugin has been added that warns users when they
+  attempt to access Fossil repositories.
+  (Jelmer Vernooij, #1848821)
+
+* When pushing to Git repositories, symrefs are now followed.
+  (Jelmer Vernooij, #1800393)
+
+* New ``brz clone`` command, which clones everything under
+  a control directory. I.e. all colocated branches, like
+  ``git clone``. (Jelmer Vernooij, #831939)
+
+* ``brz sprout`` is now an alias for ``brz branch``.
+  (Jelmer Vernooij)
+
+* ``brz branch`` now accepts a ``-b`` flag with the
+  name of the colocated branch to sprout.
+  (Jelmer Vernooij, #1869977)
+
+* Add a ``breezy.__main__`` module so that
+  ``python3 -m breezy`` works. (Jelmer Vernooij)
 
 Improvements
 ************
@@ -121,18 +121,18 @@
 * CVS pserver URLs now indicate that the pserver protocol is not
   supported. (Jelmer Vernooij)
 
- * Git repositories with submodules can now be imported into 2a
-   branches; submodules are converted to nested trees.
-   (Jelmer Vernooij, #402814)
-
- * Python 3 is now used by default to run scripts, etc. from the makefile.
-   (Jelmer Vernooij)
-
- * ``.git/config`` is now consulted to determine the users' identity
-   for commits, and the gpg_signing_key. (Jelmer Vernooij)
-
- * Ignore special files (fifos, block/character devices, sockets)
-   when finding changes in Git working trees. (Jelmer Vernooij, #1857244)
+* Git repositories with submodules can now be imported into 2a
+  branches; submodules are converted to nested trees.
+  (Jelmer Vernooij, #402814)
+
+* Python 3 is now used by default to run scripts, etc. from the makefile.
+  (Jelmer Vernooij)
+
+* ``.git/config`` is now consulted to determine the users' identity
+  for commits, and the gpg_signing_key. (Jelmer Vernooij)
+
+* Ignore special files (fifos, block/character devices, sockets)
+  when finding changes in Git working trees. (Jelmer Vernooij, #1857244)
 
 
 Bug Fixes
@@ -178,6 +178,12 @@
 * Cope with non-ascii characters in Git signatures.
   (Jelmer Vernooij, #1869533)
 
+* Fix use of ``proxy_bypass`` on Python 3.
+  (Jelmer Vernooij, #1878698)
+
+* Create $XDG_HOME_DIR if it does not exist.
+  (Jelmer Vernooij)
+
 Documentation
 *************
 

=== modified file 'doc/en/whats-new/whats-new-in-3.1.txt'
--- doc/en/whats-new/whats-new-in-3.1.txt	2019-03-06 14:23:50 +0000
+++ doc/en/whats-new/whats-new-in-3.1.txt	2020-06-01 19:36:54 +0000
@@ -2,18 +2,87 @@
 What's New in Breezy 3.1?
 *************************
 
-Breezy 3.1 is still under development, and will be released when it is
-ready.  This document accumulates a high level summary of what's changed.
-See the :doc:`../release-notes/index` for a full list.
-
-<topics of interest here>
+This is the second release series for Breezy since it was forked from Bazaar.
+From here on, we will primarily make bugfix releases on the 3.1 series (3.1.1,
+etc) while 3.2 will become our new development series.
+
+This document accumulates a high level summary of what's changed.  See the
+:doc:`../release-notes/index` for a full list.
+
+Users are encouraged to upgrade from the other stable series.  This document
+outlines the improvements in Breezy 3.1 vs Breezy 3.0. As well as
+summarizing improvements made to the core product, it highlights
+enhancements within the broader Breezy world of potential interest to those
+upgrading.
+
+Breezy 3.1.0 is fully compatible both locally and on the network with Bazaar
+2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 and 2.7 as well as Breezy 3.0, and can read
+and write repositories generated by all previous versions.
+
+
+Python 2 EOL'ed
+***************
+
+The 3.1 series will be the last Breezy release series that supports Python 2.7.
+Release series 3.2 and later will only support Python 3.5 and later.
+
+New command names
+*****************
+
+``brz init-repo`` has been renamed to ``brz init-shared-repo``
+to emphasize that it creates
+shared repositories rather than just any kind of repository.
+
+``brz sprout`` is now an alias for ``brz branch``.
+
+New Commands
+************
+
+A new ``brz land`` command can merge merge proposals
+on Launchpad, GitHub or GitLab instances.
+
+The ``brz patch`` command (previously bundled in bzrtools) can apply
+patches to a tree.
+
+The ``brz clone`` command can clone an entire local or remote control
+directory, rather than just a single branch (as the ``brz branch`` command does).
+
+Better detection of other version control systems
+*************************************************
+
+Breezy can now detect local Subversion, Fossil and Mercurial
+repositories and notify the user about conversion
+options.
+
+It will also detect and inform about remote Mercurial, Fossil, CVS-Pserver and
+Subversion repositories.
+
+Nested Tree Support
+*******************
+
+This release improves support for by-reference nested trees in Breezy, both
+in the Bazaar and Git formats.
+
+Note that nested tree support is not complete yet, and commands for creating
+nested trees are still hidden.
+
+Improved Git support
+********************
+
+This release contains a large number of fixes for the Git support
+in Breezy, both for crash fixes and performance.
+
+There is also improved support for honoring more of the
+standard Git configuration variables in e.g. ~/.gitconfig.
+
+Repositories with Git submodules can now be imported into
+Bazaar branches.
 
 Further information
 *******************
 
 For more detailed information on the changes made, see the the
 :doc:`../release-notes/index` for:
-
 * the interim brz `milestones <https://launchpad.net/brz/3.1>`_
 * the plugins you use.
 

=== modified file 'po/brz.pot'
--- po/brz.pot	2019-01-14 01:27:55 +0000
+++ po/brz.pot	2020-06-01 19:36:54 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: brz\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2019-01-14 01:26+0000\n"
+"POT-Creation-Date: 2020-05-21 19:00+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -108,74 +108,79 @@
 msgid "Write log to this file."
 msgstr ""
 
-#: breezy/branch.py:832
+#: breezy/branch.py:828
 msgid "Unstacking"
 msgstr ""
 
-#: breezy/branch.py:2020
+#: breezy/branch.py:2009
 #, python-format
 msgid "Pushed up to revision %d."
 msgstr ""
 
-#: breezy/branch.py:2022
+#: breezy/branch.py:2012
+#, python-format
+msgid "Pushed up to revision id %s."
+msgstr ""
+
+#: breezy/branch.py:2015
 #, python-format
 msgid "%d tag updated."
 msgid_plural "%d tags updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/branch.py:2026
+#: breezy/branch.py:2019
 msgid "No new revisions or tags to push."
 msgstr ""
 
-#: breezy/branch.py:2028
+#: breezy/branch.py:2021
 msgid "No new revisions to push."
 msgstr ""
 
-#: breezy/branch.py:2048
+#: breezy/branch.py:2041
 #, python-brace-format
 msgid "checked branch {0} format {1}"
 msgstr ""
 
-#: breezy/branch.py:2051
+#: breezy/branch.py:2044
 #, python-format
 msgid "found error:%s"
 msgstr ""
 
-#: breezy/builtins.py:259 breezy/builtins.py:3015 breezy/workingtree.py:243
+#: breezy/builtins.py:262 breezy/builtins.py:3094 breezy/workingtree.py:251
 #, python-format
 msgid "Ignoring files outside view. View is %s"
 msgstr ""
 
-#: breezy/builtins.py:269
+#: breezy/builtins.py:272
 #, python-format
 msgid "brz %s --revision takes exactly one revision identifier"
 msgstr ""
 
-#: breezy/builtins.py:324
+#: breezy/builtins.py:327
 msgid "Display status summary."
 msgstr ""
 
-#: breezy/builtins.py:326
+#: breezy/builtins.py:329
 msgid ""
 "This reports on versioned and unknown files, reporting them\n"
 "grouped by state.  Possible states are:"
 msgstr ""
 
-#: breezy/builtins.py:329
+#: breezy/builtins.py:332
 msgid ""
 "added\n"
 "    Versioned in the working copy but not in the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:332
+#: breezy/builtins.py:335
 msgid ""
 "removed\n"
 "    Versioned in the previous revision but removed or deleted\n"
 "    in the working copy."
 msgstr ""
 
-#: breezy/builtins.py:336
+#: breezy/builtins.py:339
 msgid ""
 "renamed\n"
 "    Path of this file changed from the previous revision;\n"
@@ -183,46 +188,46 @@
 "    parent directory was renamed."
 msgstr ""
 
-#: breezy/builtins.py:341
+#: breezy/builtins.py:344
 msgid ""
 "modified\n"
 "    Text has changed since the previous revision."
 msgstr ""
 
-#: breezy/builtins.py:344
+#: breezy/builtins.py:347
 msgid ""
 "kind changed\n"
 "    File kind has been changed (e.g. from file to directory)."
 msgstr ""
 
-#: breezy/builtins.py:347
+#: breezy/builtins.py:350
 msgid ""
 "unknown\n"
 "    Not versioned and not matching an ignore pattern."
 msgstr ""
 
-#: breezy/builtins.py:350
+#: breezy/builtins.py:353
 msgid ""
 "Additionally for directories, symlinks and files with a changed\n"
-"executable bit, Bazaar indicates their type using a trailing\n"
+"executable bit, Breezy indicates their type using a trailing\n"
 "character: '/', '@' or '*' respectively. These decorations can be\n"
 "disabled using the '--no-classify' option."
 msgstr ""
 
-#: breezy/builtins.py:355
+#: breezy/builtins.py:358
 msgid ""
 "To see ignored files use 'brz ignored'.  For details on the\n"
 "changes to file texts, use 'brz diff'."
 msgstr ""
 
-#: breezy/builtins.py:358
+#: breezy/builtins.py:361
 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:362
+#: breezy/builtins.py:365
 msgid ""
 "If no arguments are specified, the status of the entire working\n"
 "directory is shown.  Otherwise, only the status of the specified\n"
@@ -230,7 +235,7 @@
 "is reported for everything inside that directory."
 msgstr ""
 
-#: breezy/builtins.py:367
+#: breezy/builtins.py:370
 msgid ""
 "Before merges are committed, the pending merge tip revisions are\n"
 "shown. To see all pending merge revisions, use the -v option.\n"
@@ -238,13 +243,13 @@
 "the no-pending option or specify a file/directory."
 msgstr ""
 
-#: breezy/builtins.py:372
+#: breezy/builtins.py:375
 msgid ""
 "To compare the working directory to a specific revision, pass a\n"
 "single revision to the revision argument."
 msgstr ""
 
-#: breezy/builtins.py:375
+#: breezy/builtins.py:378
 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"
@@ -252,132 +257,132 @@
 msgstr ""
 
 # help of 'short' option of 'status' command
-#: breezy/builtins.py:384
+#: breezy/builtins.py:387
 msgid "Use short status indicators."
 msgstr ""
 
 # help of 'versioned' option of 'status' command
-#: breezy/builtins.py:386
+#: breezy/builtins.py:389
 msgid "Only show versioned files."
 msgstr ""
 
 # help of 'no-pending' option of 'status' command
-#: breezy/builtins.py:388
+#: breezy/builtins.py:391
 msgid "Don't show pending merges."
 msgstr ""
 
 # help of 'no-classify' option of 'status' command
-#: breezy/builtins.py:390
+#: breezy/builtins.py:393
 msgid "Do not mark object type using indicator."
 msgstr ""
 
-#: breezy/builtins.py:405
+#: breezy/builtins.py:408
 msgid "brz status --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:449 breezy/builtins.py:5251
+#: breezy/builtins.py:452 breezy/builtins.py:5331
 msgid "You can only supply one of revision_id or --revision"
 msgstr ""
 
-#: breezy/builtins.py:453 breezy/builtins.py:5254
+#: breezy/builtins.py:456 breezy/builtins.py:5334
 msgid "You must supply either --revision or a revision_id"
 msgstr ""
 
-#: breezy/builtins.py:460
+#: breezy/builtins.py:463
 #, python-format
 msgid "Repository %r does not support access to raw revision texts"
 msgstr ""
 
-#: breezy/builtins.py:471
+#: breezy/builtins.py:474
 #, python-brace-format
 msgid "The repository {0} contains no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:478
+#: breezy/builtins.py:481
 msgid "You cannot specify a NULL revision."
 msgstr ""
 
-#: breezy/builtins.py:484
+#: breezy/builtins.py:487
 msgid "Remove the working tree from a given branch/checkout."
 msgstr ""
 
-#: breezy/builtins.py:486
+#: breezy/builtins.py:489
 msgid ""
 "Since a lightweight checkout is little more than a working tree\n"
 "this will refuse to run against one."
 msgstr ""
 
-#: breezy/builtins.py:489
+#: breezy/builtins.py:492
 msgid "To re-create the working tree, use \"brz checkout\"."
 msgstr ""
 
 # help of 'force' option of 'remove-tree' command
-#: breezy/builtins.py:495
+#: breezy/builtins.py:498
 msgid "Remove the working tree even if it has uncommitted or shelved changes."
 msgstr ""
 
-#: breezy/builtins.py:510
+#: breezy/builtins.py:513
 msgid "No working tree to remove"
 msgstr ""
 
-#: breezy/builtins.py:513
+#: breezy/builtins.py:516
 msgid "You cannot remove the working tree of a remote path"
 msgstr ""
 
-#: breezy/builtins.py:523
+#: breezy/builtins.py:526
 msgid "You cannot remove the working tree from a lightweight checkout"
 msgstr ""
 
-#: breezy/builtins.py:564
+#: breezy/builtins.py:567
 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:575
+#: breezy/builtins.py:578
 msgid ""
 ", the header appears corrupt, try passing -r -1 to set the state to the last "
 "commit"
 msgstr ""
 
-#: breezy/builtins.py:580
+#: breezy/builtins.py:583
 #, python-brace-format
 msgid "failed to reset the tree state{0}"
 msgstr ""
 
-#: breezy/builtins.py:584
+#: breezy/builtins.py:587
 msgid "Show current revision number."
 msgstr ""
 
-#: breezy/builtins.py:586
+#: breezy/builtins.py:589
 msgid "This is equal to the number of revisions on this branch."
 msgstr ""
 
-#: breezy/builtins.py:600
+#: breezy/builtins.py:603
 msgid "--tree and --revision can not be used together"
 msgstr ""
 
-#: breezy/builtins.py:616
+#: breezy/builtins.py:619
 msgid "Revision numbers only make sense for single revisions, not ranges"
 msgstr ""
 
 # help of 'tree' option of 'revno' command
-#: breezy/builtins.py:639
+#: breezy/builtins.py:642
 msgid "Show revno of working tree."
 msgstr ""
 
-#: breezy/builtins.py:688
+#: breezy/builtins.py:691
 msgid "Add specified files or directories."
 msgstr ""
 
-#: breezy/builtins.py:690
+#: breezy/builtins.py:693
 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:694
+#: breezy/builtins.py:697
 msgid ""
 "In recursive mode (the default), files are treated the same way\n"
 "but the behaviour for directories is different.  Directories that\n"
@@ -388,19 +393,19 @@
 "directories.  If no names are given '.' is assumed."
 msgstr ""
 
-#: breezy/builtins.py:702
+#: breezy/builtins.py:705
 msgid ""
 "A warning will be printed when nested trees are encountered,\n"
 "unless they are explicitly ignored."
 msgstr ""
 
-#: breezy/builtins.py:705
+#: breezy/builtins.py:708
 msgid ""
 "Therefore simply saying 'brz add' will version all files that\n"
 "are currently unknown."
 msgstr ""
 
-#: breezy/builtins.py:708
+#: breezy/builtins.py:711
 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"
@@ -408,13 +413,13 @@
 "get added when you add a file in the directory."
 msgstr ""
 
-#: breezy/builtins.py:713
+#: breezy/builtins.py:716
 msgid ""
 "--dry-run will show which files would be added, but not actually\n"
 "add them."
 msgstr ""
 
-#: breezy/builtins.py:716
+#: breezy/builtins.py:719
 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"
@@ -425,13 +430,13 @@
 "into a subdirectory of this one."
 msgstr ""
 
-#: breezy/builtins.py:724
+#: breezy/builtins.py:727
 msgid ""
 "Any files matching patterns in the ignore list will not be added\n"
 "unless they are explicitly mentioned."
 msgstr ""
 
-#: breezy/builtins.py:727
+#: breezy/builtins.py:730
 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"
@@ -439,112 +444,117 @@
 msgstr ""
 
 # help of 'no-recurse' option of 'add' command
-#: breezy/builtins.py:734
+#: breezy/builtins.py:737
 msgid "Don't recursively add the contents of directories."
 msgstr ""
 
 # help of 'file-ids-from' option of 'add' command
-#: breezy/builtins.py:742
+#: breezy/builtins.py:745
 msgid "Lookup file ids from this tree."
 msgstr ""
 
-#: breezy/builtins.py:779
+#: breezy/builtins.py:757
+msgid ""
+"Ignoring --file-ids-from, since the tree does not support setting file ids."
+msgstr ""
+
+#: breezy/builtins.py:788
 #, python-brace-format
 msgid "ignored {0} matching \"{1}\"\n"
 msgstr ""
 
-#: breezy/builtins.py:784
+#: breezy/builtins.py:793
 msgid "Create a new versioned directory."
 msgstr ""
 
-#: breezy/builtins.py:786
+#: breezy/builtins.py:795
 msgid "This is equivalent to creating the directory and then adding it."
 msgstr ""
 
 # help of 'parents' option of 'mkdir' command
-#: breezy/builtins.py:793
+#: breezy/builtins.py:802
 msgid "No error if existing, make parent directories as needed."
 msgstr ""
 
-#: breezy/builtins.py:827
+#: breezy/builtins.py:836
 #, python-format
 msgid "added %s\n"
 msgstr ""
 
-#: breezy/builtins.py:871
+#: breezy/builtins.py:883
 #, python-format
 msgid "invalid kind %r specified"
 msgstr ""
 
-#: breezy/builtins.py:909
+#: breezy/builtins.py:921
 msgid "Copy a file."
 msgstr ""
 
-#: breezy/builtins.py:911
+#: breezy/builtins.py:923
 msgid "    brz cp SOURCE... DESTINATION"
 msgstr ""
 
-#: breezy/builtins.py:913
+#: breezy/builtins.py:925
 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:917
+#: breezy/builtins.py:929
 msgid ""
 "Files cannot be copied between branches. Only files can be copied\n"
 "at the moment."
 msgstr ""
 
-#: breezy/builtins.py:933 breezy/builtins.py:1026
+#: breezy/builtins.py:945 breezy/builtins.py:1038
 msgid "missing file argument"
 msgstr ""
 
-#: breezy/builtins.py:939
+#: breezy/builtins.py:951
 msgid "can not copy root of branch"
 msgstr ""
 
-#: breezy/builtins.py:947
+#: breezy/builtins.py:959
 msgid "to copy multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: breezy/builtins.py:961 breezy/builtins.py:977
+#: breezy/builtins.py:973 breezy/builtins.py:989
 #, python-format
 msgid "Could not copy %s => %s: %s is not versioned."
 msgstr ""
 
-#: breezy/builtins.py:965
+#: breezy/builtins.py:977
 #, python-format
 msgid "Could not copy %s => %s . %s is not versioned\\."
 msgstr ""
 
-#: breezy/builtins.py:969
+#: breezy/builtins.py:981
 #, python-format
 msgid "Could not copy %s => %s . %s is a directory."
 msgstr ""
 
-#: breezy/builtins.py:981
+#: breezy/builtins.py:993
 #, python-format
 msgid "Could not copy to %s: %s is not a directory."
 msgstr ""
 
-#: breezy/builtins.py:988
+#: breezy/builtins.py:1000
 msgid "Move or rename a file."
 msgstr ""
 
-#: breezy/builtins.py:990
+#: breezy/builtins.py:1002
 msgid "    brz mv SOURCE... DESTINATION"
 msgstr ""
 
-#: breezy/builtins.py:992
+#: breezy/builtins.py:1004
 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:996
+#: breezy/builtins.py:1008
 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"
@@ -553,52 +563,52 @@
 "The same is valid when moving many SOURCE files to a DESTINATION."
 msgstr ""
 
-#: breezy/builtins.py:1002
+#: breezy/builtins.py:1014
 msgid "Files cannot be moved between branches."
 msgstr ""
 
 # help of 'after' option of 'mv' command
-#: breezy/builtins.py:1009
+#: breezy/builtins.py:1021
 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:1011
+#: breezy/builtins.py:1023
 msgid "Automatically guess renames."
 msgstr ""
 
 # help of 'dry-run' option of 'mv' command
-#: breezy/builtins.py:1013
+#: breezy/builtins.py:1025
 msgid "Avoid making changes when guessing renames."
 msgstr ""
 
-#: breezy/builtins.py:1022
+#: breezy/builtins.py:1034
 msgid "--dry-run requires --auto."
 msgstr ""
 
-#: breezy/builtins.py:1032
+#: breezy/builtins.py:1044
 msgid "can not move root of branch"
 msgstr ""
 
-#: breezy/builtins.py:1039
+#: breezy/builtins.py:1051
 msgid "Only one path may be specified to --auto."
 msgstr ""
 
-#: breezy/builtins.py:1042
+#: breezy/builtins.py:1054
 msgid "--after cannot be specified with --auto."
 msgstr ""
 
-#: breezy/builtins.py:1078
+#: breezy/builtins.py:1090
 msgid "to mv multiple files the destination must be a versioned directory"
 msgstr ""
 
-#: breezy/builtins.py:1131
+#: breezy/builtins.py:1143
 msgid "Turn this branch into a mirror of another branch."
 msgstr ""
 
-#: breezy/builtins.py:1133
+#: breezy/builtins.py:1145
 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"
@@ -606,21 +616,21 @@
 "parent."
 msgstr ""
 
-#: breezy/builtins.py:1138
+#: breezy/builtins.py:1150
 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:1142
+#: breezy/builtins.py:1154
 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:1146
+#: breezy/builtins.py:1158
 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"
@@ -628,14 +638,14 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1151
+#: breezy/builtins.py:1163
 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:1155
+#: breezy/builtins.py:1167
 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"
@@ -643,77 +653,77 @@
 msgstr ""
 
 # help of 'verbose' option of 'pull' command
-#: breezy/builtins.py:1163
+#: breezy/builtins.py:1175
 msgid "Show logs of pulled revisions."
 msgstr ""
 
 # help of 'directory' option of 'pull' command
-#: breezy/builtins.py:1165
+#: breezy/builtins.py:1177
 msgid ""
 "Branch to pull into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'local' option of 'pull' command
-#: breezy/builtins.py:1168
+#: breezy/builtins.py:1180
 msgid ""
 "Perform a local pull in a bound branch.  Local pulls are not applied to the "
 "master branch."
 msgstr ""
 
-#: breezy/builtins.py:1205
+#: breezy/builtins.py:1217
 msgid "No working tree, ignoring --show-base"
 msgstr ""
 
-#: breezy/builtins.py:1221
+#: breezy/builtins.py:1233 breezy/plugins/rewrite/commands.py:479
 msgid "No pull location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1228
+#: breezy/builtins.py:1240
 #, python-format
 msgid "Using saved parent location: %s\n"
 msgstr ""
 
-#: breezy/builtins.py:1235 breezy/builtins.py:4449
+#: breezy/builtins.py:1247 breezy/builtins.py:4529
 msgid "Cannot use -r with merge directives or bundles"
 msgstr ""
 
-#: breezy/builtins.py:1278
+#: breezy/builtins.py:1290
 msgid "Update a mirror of this branch."
 msgstr ""
 
-#: breezy/builtins.py:1280
+#: breezy/builtins.py:1292
 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:1283
+#: breezy/builtins.py:1295
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: breezy/builtins.py:1286
+#: breezy/builtins.py:1298
 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:1290
+#: breezy/builtins.py:1302
 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:1293
+#: breezy/builtins.py:1305
 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:1297
+#: breezy/builtins.py:1309
 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"
@@ -721,7 +731,7 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:1302
+#: breezy/builtins.py:1314
 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"
@@ -729,27 +739,27 @@
 msgstr ""
 
 # help of 'directory' option of 'push' command
-#: breezy/builtins.py:1313
+#: breezy/builtins.py:1325
 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:1316
+#: breezy/builtins.py:1328
 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:1321
+#: breezy/builtins.py:1333
 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:1324
+#: breezy/builtins.py:1336
 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 "
@@ -757,55 +767,55 @@
 msgstr ""
 
 # help of 'strict' option of 'push' command
-#: breezy/builtins.py:1329
+#: breezy/builtins.py:1341
 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:1332
+#: breezy/builtins.py:1344
 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:1335
+#: breezy/builtins.py:1347
 msgid "Overwrite tags only."
 msgstr ""
 
 # help of 'lossy' option of 'push' command
-#: breezy/builtins.py:1336
+#: breezy/builtins.py:1348
 msgid ""
 "Allow lossy push, i.e. dropping metadata that can't be represented in the "
 "target."
 msgstr ""
 
-#: breezy/builtins.py:1388
+#: breezy/builtins.py:1402
 msgid "Could not determine branch to refer to."
 msgstr ""
 
-#: breezy/builtins.py:1397
+#: 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:1403
+#: breezy/builtins.py:1417
 msgid "No push location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:1407
+#: breezy/builtins.py:1421
 #, python-format
 msgid "Using saved push location: %s"
 msgstr ""
 
-#: breezy/builtins.py:1418
+#: breezy/builtins.py:1432
 msgid "Create a new branch that is a copy of an existing branch."
 msgstr ""
 
-#: breezy/builtins.py:1420
+#: breezy/builtins.py:1434
 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 ./"
@@ -816,113 +826,118 @@
 "create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1427
+#: breezy/builtins.py:1441
 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:1439
+#: breezy/builtins.py:1454
 msgid "Create a branch without a working-tree."
 msgstr ""
 
 # help of 'switch' option of 'branch' command
-#: breezy/builtins.py:1441
+#: breezy/builtins.py:1456
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
 # help of 'stacked' option of 'branch' command
-#: breezy/builtins.py:1444
+#: breezy/builtins.py:1459
 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:1448
+#: breezy/builtins.py:1463
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'branch' command
-#: breezy/builtins.py:1450
+#: breezy/builtins.py:1465
 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:1455
+#: breezy/builtins.py:1470
 msgid "Bind new branch to from location."
 msgstr ""
 
-#: breezy/builtins.py:1492
+# help of 'colocated-branch' option of 'branch' command
+#: breezy/builtins.py:1474
+msgid "Name of colocated branch to sprout."
+msgstr ""
+
+#: breezy/builtins.py:1515
 #, python-format
 msgid "Target directory \"%s\" already exists."
 msgstr ""
 
-#: breezy/builtins.py:1504
+#: breezy/builtins.py:1527
 #, python-format
 msgid "Parent of \"%s\" does not exist."
 msgstr ""
 
-#: breezy/builtins.py:1522
+#: breezy/builtins.py:1546
 #, python-brace-format
 msgid "The branch {0} has no revision {1}."
 msgstr ""
 
-#: breezy/builtins.py:1538 breezy/push.py:54
+#: breezy/builtins.py:1563 breezy/push.py:54
 #, python-format
 msgid "Created new stacked branch referring to %s."
 msgstr ""
 
-#: breezy/builtins.py:1544
+#: breezy/builtins.py:1569
 #, python-format
 msgid "Branched %d revision."
 msgid_plural "Branched %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:1548 breezy/push.py:57
+#: breezy/builtins.py:1573 breezy/push.py:57
 msgid "Created new branch."
 msgstr ""
 
-#: breezy/builtins.py:1553
+#: breezy/builtins.py:1578
 #, python-format
 msgid "New branch bound to %s"
 msgstr ""
 
-#: breezy/builtins.py:1558
+#: breezy/builtins.py:1583
 #, python-format
 msgid "Switched to branch: %s"
 msgstr ""
 
-#: breezy/builtins.py:1563
+#: breezy/builtins.py:1588
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: breezy/builtins.py:1565
+#: breezy/builtins.py:1590
 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:1572
+#: breezy/builtins.py:1597
 msgid ""
 "Recursively scan for branches rather than just looking in the specified "
 "location."
 msgstr ""
 
-#: breezy/builtins.py:1601
+#: breezy/builtins.py:1626
 msgid "(default)"
 msgstr ""
 
-#: breezy/builtins.py:1613
+#: breezy/builtins.py:1638
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: breezy/builtins.py:1615
+#: breezy/builtins.py:1640
 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"
@@ -930,7 +945,7 @@
 "current location using SFTP."
 msgstr ""
 
-#: breezy/builtins.py:1620
+#: breezy/builtins.py:1645
 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 "
@@ -942,7 +957,7 @@
 "attempt to create ./foo-bar."
 msgstr ""
 
-#: breezy/builtins.py:1627
+#: breezy/builtins.py:1652
 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"
@@ -951,7 +966,7 @@
 msgstr ""
 
 # help of 'lightweight' option of 'checkout' command
-#: breezy/builtins.py:1637
+#: breezy/builtins.py:1662
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -961,40 +976,56 @@
 
 # help of 'files-from' option of 'branch' command
 # help of 'files-from' option of 'checkout' command
-#: breezy/builtins.py:1644
+#: breezy/builtins.py:1669
 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:1646
+#: breezy/builtins.py:1671
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: breezy/builtins.py:1686
+#: breezy/builtins.py:1711
+msgid ""
+"Clone a control directory.\n"
+"    "
+msgstr ""
+
+# help of 'no-recurse-nested' option of 'branch' command
+# help of 'no-recurse-nested' option of 'clone' command
+#: breezy/builtins.py:1717
+msgid "Do not recursively check out nested trees."
+msgstr ""
+
+#: breezy/builtins.py:1739
+msgid "Created new control directory."
+msgstr ""
+
+#: breezy/builtins.py:1743
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: breezy/builtins.py:1714
+#: breezy/builtins.py:1771
 msgid "Update a working tree to a new revision."
 msgstr ""
 
-#: breezy/builtins.py:1716
+#: breezy/builtins.py:1773
 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:1720
+#: breezy/builtins.py:1777
 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:1723
+#: breezy/builtins.py:1780
 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"
@@ -1002,15 +1033,15 @@
 "with the changes brought in by the change in basis revision."
 msgstr ""
 
-#: breezy/builtins.py:1728
+#: breezy/builtins.py:1785
 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:1731
+#: breezy/builtins.py:1788
 msgid ""
-"You cannot update just a single file or directory, because each Bazaar\n"
+"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"
 "file that has been removed locally, use 'brz revert' instead of 'brz\n"
 "update'.  If you want to restore a file to its state in a previous\n"
@@ -1018,150 +1049,150 @@
 "out the old content of that file to a new location."
 msgstr ""
 
-#: breezy/builtins.py:1738
+#: breezy/builtins.py:1795
 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:1754
+#: breezy/builtins.py:1811
 msgid "brz update --revision takes exactly one revision"
 msgstr ""
 
-#: breezy/builtins.py:1762
+#: breezy/builtins.py:1819
 msgid "brz update can only update a whole tree, not a file or subdirectory"
 msgstr ""
 
-#: breezy/builtins.py:1793
+#: breezy/builtins.py:1849
 #, python-brace-format
 msgid "Tree is up to date at revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1809
+#: breezy/builtins.py:1865
 #, 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:1815
+#: breezy/builtins.py:1871
 #, python-brace-format
 msgid "Updated to revision {0} of branch {1}"
 msgstr ""
 
-#: breezy/builtins.py:1819
+#: breezy/builtins.py:1875
 msgid ""
 "Your local commits will now show as pending merges with 'brz status', and "
 "can be committed with 'brz commit'."
 msgstr ""
 
-#: breezy/builtins.py:1828
+#: breezy/builtins.py:1884
 msgid "Show information about a working tree, branch or repository."
 msgstr ""
 
-#: breezy/builtins.py:1830
+#: breezy/builtins.py:1886
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: breezy/builtins.py:1833
+#: breezy/builtins.py:1889
 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:1837
+#: breezy/builtins.py:1893
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: breezy/builtins.py:1839 breezy/builtins.py:3750 breezy/builtins.py:4917
-#: breezy/builtins.py:6519 breezy/plugins/fastimport/cmds.py:211
-#: breezy/plugins/fastimport/cmds.py:417 breezy/plugins/propose/cmds.py:274
+#: 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
 msgid ":Examples:"
 msgstr ""
 
-#: breezy/builtins.py:1841
+#: breezy/builtins.py:1897
 msgid "  Display information on the format and related locations:"
 msgstr ""
 
-#: breezy/builtins.py:1843
+#: breezy/builtins.py:1899
 msgid "    brz info"
 msgstr ""
 
-#: breezy/builtins.py:1845
+#: breezy/builtins.py:1901
 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:1849
+#: breezy/builtins.py:1905
 msgid "    brz info -v"
 msgstr ""
 
-#: breezy/builtins.py:1851
+#: breezy/builtins.py:1907
 msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
-#: breezy/builtins.py:1853
+#: breezy/builtins.py:1909
 msgid "    brz info -vv"
 msgstr ""
 
-#: breezy/builtins.py:1872
+#: breezy/builtins.py:1928
 msgid "Remove files or directories."
 msgstr ""
 
-#: breezy/builtins.py:1874
+#: breezy/builtins.py:1930
 msgid ""
-"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"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"
 "will be backed up (adding an extension of the form .~#~). If no options or\n"
-"parameters are given Bazaar will scan for files that are being tracked by\n"
-"Bazaar but missing in your tree and stop tracking them for you."
+"parameters are given Breezy will scan for files that are being tracked by\n"
+"Breezy but missing in your tree and stop tracking them for you."
 msgstr ""
 
 # help of 'new' option of 'remove' command
-#: breezy/builtins.py:1883
+#: breezy/builtins.py:1939
 msgid "Only remove files that have never been committed."
 msgstr ""
 
 # help of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1885
+#: breezy/builtins.py:1941
 msgid "The file deletion mode to be used."
 msgstr ""
 
 # title of 'file-deletion-strategy' option of 'remove' command
-#: breezy/builtins.py:1886
+#: breezy/builtins.py:1942
 msgid "Deletion Strategy"
 msgstr ""
 
 # help of 'file-deletion-strategy=safe' option of 'remove' command
-#: breezy/builtins.py:1887
+#: breezy/builtins.py:1943
 msgid "Backup changed files (default)."
 msgstr ""
 
 # help of 'file-deletion-strategy=keep' option of 'remove' command
-#: breezy/builtins.py:1888
+#: breezy/builtins.py:1944
 msgid "Delete from brz but leave the working copy."
 msgstr ""
 
 # help of 'file-deletion-strategy=no-backup' option of 'remove' command
-#: breezy/builtins.py:1889
+#: breezy/builtins.py:1945
 msgid "Don't backup changed files."
 msgstr ""
 
-#: breezy/builtins.py:1910
+#: breezy/builtins.py:1966
 msgid "No matching files."
 msgstr ""
 
-#: breezy/builtins.py:1927
+#: breezy/builtins.py:1983
 msgid "Reconcile brz metadata in a branch."
 msgstr ""
 
-#: breezy/builtins.py:1929
+#: breezy/builtins.py:1985
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or brz upgrades. You should only\n"
@@ -1169,7 +1200,7 @@
 "advises you to run it."
 msgstr ""
 
-#: breezy/builtins.py:1934
+#: breezy/builtins.py:1990
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -1177,54 +1208,54 @@
 "correctly in both branches."
 msgstr ""
 
-#: breezy/builtins.py:1939
+#: breezy/builtins.py:1995
 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:1942
+#: breezy/builtins.py:1998
 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-repository' command
+# help of 'format=git-bare' option of 'init-shared-repository' command
 # help of 'format=git-bare' option of 'upgrade' command
-#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
+#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
 msgid "Bare GIT repository (no working tree)."
 msgstr ""
 
 # help of 'format=2a' option of 'init' command
 # help of 'format=bzr' option of 'init' command
 # help of 'format=default' option of 'init' command
-# help of 'format=2a' option of 'init-repository' command
-# help of 'format=bzr' option of 'init-repository' command
-# help of 'format=default' option of 'init-repository' command
+# help of 'format=2a' option of 'init-shared-repository' command
+# help of 'format=bzr' option of 'init-shared-repository' command
+# help of 'format=default' option of 'init-shared-repository' command
 # 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:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
+#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
 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-repository' command
+# help of 'format=git' option of 'init-shared-repository' command
 # help of 'format=git' option of 'upgrade' command
-#: breezy/builtins.py:2009 breezy/builtins.py:2130 breezy/builtins.py:3785
+#: breezy/builtins.py:2065 breezy/builtins.py:2186 breezy/builtins.py:3865
 msgid "GIT repository."
 msgstr ""
 
-#: breezy/builtins.py:2010
+#: breezy/builtins.py:2066
 msgid "Make a directory into a versioned branch."
 msgstr ""
 
-#: breezy/builtins.py:2012
+#: breezy/builtins.py:2068
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: breezy/builtins.py:2015
+#: breezy/builtins.py:2071
 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"
@@ -1232,17 +1263,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: breezy/builtins.py:2020
+#: breezy/builtins.py:2076
 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:2023
+#: breezy/builtins.py:2079
 msgid "Recipe for importing a tree of files::"
 msgstr ""
 
-#: breezy/builtins.py:2025
+#: breezy/builtins.py:2081
 msgid ""
 "    cd ~/project\n"
 "    brz init\n"
@@ -1253,52 +1284,52 @@
 
 # help of 'create-prefix' option of 'init' command
 # help of 'create-prefix' option of 'push' command
-#: breezy/builtins.py:2036
+#: breezy/builtins.py:2092
 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:2039
+#: breezy/builtins.py:2095
 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:2048
+#: breezy/builtins.py:2104
 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:2051
+#: breezy/builtins.py:2107
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: breezy/builtins.py:2072 breezy/push.py:112
+#: breezy/builtins.py:2128 breezy/push.py:112
 #, 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:2107
+#: breezy/builtins.py:2163
 msgid ""
 "This branch format cannot be set to append-revisions-only.  Try --default."
 msgstr ""
 
-#: breezy/builtins.py:2118
+#: breezy/builtins.py:2174
 #, python-brace-format
 msgid "Created a {0} (format: {1})\n"
 msgstr ""
 
-#: breezy/builtins.py:2127
+#: breezy/builtins.py:2183
 #, python-format
 msgid "Using shared repository: %s\n"
 msgstr ""
 
-#: breezy/builtins.py:2131
+#: breezy/builtins.py:2187
 msgid "Create a shared repository for branches to share storage space."
 msgstr ""
 
-#: breezy/builtins.py:2133
+#: breezy/builtins.py:2189
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -1306,7 +1337,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: breezy/builtins.py:2138
+#: breezy/builtins.py:2194
 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"
@@ -1316,51 +1347,59 @@
 "branches, such as on a server."
 msgstr ""
 
-#: breezy/builtins.py:2145
+#: breezy/builtins.py:2201
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: breezy/builtins.py:2148
+#: breezy/builtins.py:2204
 msgid ""
-"        brz init-repo --no-trees repo\n"
+"        brz init-shared-repo --no-trees repo\n"
 "        brz init repo/trunk"
 msgstr ""
 
-#: breezy/builtins.py:2151
+#: breezy/builtins.py:2207
 msgid "    Make a lightweight checkout elsewhere::"
 msgstr ""
 
-#: breezy/builtins.py:2153
+#: breezy/builtins.py:2209
 msgid ""
 "        brz checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
 "        (add files here)"
 msgstr ""
 
-# help of 'format' option of 'init-repository' command
-#: breezy/builtins.py:2161
+# help of 'format' option of 'init-shared-repository' command
+#: breezy/builtins.py:2217
 msgid ""
 "Specify a format for this repository. See \"brz help formats\" for details."
 msgstr ""
 
-# title of 'format' option of 'init-repository' command
+# title of 'format' option of 'init-shared-repository' command
 # title of 'format' option of 'fast-import' command
-#: breezy/builtins.py:2167 breezy/plugins/fastimport/cmds.py:287
+#: breezy/builtins.py:2223 breezy/plugins/fastimport/cmds.py:287
 msgid "Repository format"
 msgstr ""
 
-# help of 'no-trees' option of 'init-repository' command
-#: breezy/builtins.py:2169
+# help of 'no-trees' option of 'init-shared-repository' command
+#: breezy/builtins.py:2225
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
-#: breezy/builtins.py:2200
+# help of 'color' option of 'diff' command
+#: breezy/builtins.py:2255
+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
 msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
-#: breezy/builtins.py:2202
+#: breezy/builtins.py:2258
 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"
@@ -1370,13 +1409,13 @@
 "given."
 msgstr ""
 
-#: breezy/builtins.py:2209
+#: breezy/builtins.py:2265
 msgid ""
 "\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: breezy/builtins.py:2212
+#: breezy/builtins.py:2268
 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"
@@ -1386,7 +1425,7 @@
 "in the range."
 msgstr ""
 
-#: breezy/builtins.py:2219
+#: breezy/builtins.py:2275
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -1395,209 +1434,219 @@
 "    0 - no change"
 msgstr ""
 
-#: breezy/builtins.py:2225
+#: breezy/builtins.py:2281
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
-#: breezy/builtins.py:2228
+#: breezy/builtins.py:2284
 msgid "        brz diff"
 msgstr ""
 
-#: breezy/builtins.py:2230
+#: breezy/builtins.py:2286
 msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
-#: breezy/builtins.py:2232
+#: breezy/builtins.py:2288
 msgid "        brz diff -r1"
 msgstr ""
 
-#: breezy/builtins.py:2234
+#: breezy/builtins.py:2290
 msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
-#: breezy/builtins.py:2236
+#: breezy/builtins.py:2292
 msgid "        brz diff -r1..3"
 msgstr ""
 
-#: breezy/builtins.py:2238
+#: breezy/builtins.py:2294
 msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
-#: breezy/builtins.py:2240
+#: breezy/builtins.py:2296
 msgid "        brz diff -r1..3 xxx"
 msgstr ""
 
-#: breezy/builtins.py:2242
+#: breezy/builtins.py:2298
 msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
-#: breezy/builtins.py:2244
+#: breezy/builtins.py:2300
 msgid "        brz diff -c2"
 msgstr ""
 
-#: breezy/builtins.py:2246
+#: breezy/builtins.py:2302
 msgid "    To see the changes introduced by revision X::"
 msgstr ""
 
-#: breezy/builtins.py:2248
+#: breezy/builtins.py:2304
 msgid "        brz diff -cX"
 msgstr ""
 
-#: breezy/builtins.py:2250
+#: breezy/builtins.py:2306
 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:2254
+#: breezy/builtins.py:2310
 msgid "        brz diff -r<chosen_parent>..X"
 msgstr ""
 
-#: breezy/builtins.py:2256
+#: breezy/builtins.py:2312
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
-#: breezy/builtins.py:2259
+#: breezy/builtins.py:2315
 msgid "        brz diff -r-2.."
 msgstr ""
 
-#: breezy/builtins.py:2261
+#: breezy/builtins.py:2317
 msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2263
+#: breezy/builtins.py:2319
 msgid "        brz diff NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2265
+#: breezy/builtins.py:2321
 msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2267
+#: breezy/builtins.py:2323
 msgid "        brz diff xxx/NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2269
+#: breezy/builtins.py:2325
 msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
-#: breezy/builtins.py:2271
+#: breezy/builtins.py:2327
 msgid "        brz diff --old xxx"
 msgstr ""
 
-#: breezy/builtins.py:2273
+#: breezy/builtins.py:2329
 msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
-#: breezy/builtins.py:2275
+#: breezy/builtins.py:2331
 msgid "        brz diff --old xxx --new yyy NEWS"
 msgstr ""
 
-#: breezy/builtins.py:2277
+#: breezy/builtins.py:2333
 msgid "    Same as 'brz diff' but prefix paths with old/ and new/::"
 msgstr ""
 
-#: breezy/builtins.py:2279
+#: breezy/builtins.py:2335
 msgid "        brz diff --prefix old/:new/"
 msgstr ""
 
-#: breezy/builtins.py:2281
+#: breezy/builtins.py:2337
 msgid "    Show the differences using a custom diff program with options::"
 msgstr ""
 
-#: breezy/builtins.py:2283
+#: breezy/builtins.py:2339
 msgid "        brz diff --using /usr/bin/diff --diff-options -wu"
 msgstr ""
 
 # help of 'diff-options' option of 'diff' command
-#: breezy/builtins.py:2289
+#: breezy/builtins.py:2345
 msgid "Pass these options to the external diff program."
 msgstr ""
 
 # help of 'prefix' option of 'diff' command
-#: breezy/builtins.py:2292
+#: breezy/builtins.py:2348
 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:2295
+#: breezy/builtins.py:2351
 msgid "Branch/tree to compare from."
 msgstr ""
 
 # help of 'new' option of 'diff' command
-#: breezy/builtins.py:2299
+#: breezy/builtins.py:2355
 msgid "Branch/tree to compare to."
 msgstr ""
 
 # help of 'using' option of 'diff' command
-#: breezy/builtins.py:2305
+#: breezy/builtins.py:2361
 msgid "Use this command to compare files."
 msgstr ""
 
 # help of 'format' option of 'diff' command
-#: breezy/builtins.py:2310
+#: breezy/builtins.py:2366
 msgid "Diff format to use."
 msgstr ""
 
 # title of 'format' option of 'diff' command
-#: breezy/builtins.py:2312
+#: breezy/builtins.py:2368
 msgid "Diff format"
 msgstr ""
 
 # help of 'context' option of 'diff' command
-#: breezy/builtins.py:2314
+#: breezy/builtins.py:2370
 msgid "How many lines of context to show."
 msgstr ""
 
-#: breezy/builtins.py:2339
+# title of 'color' option of 'diff' command
+#: breezy/builtins.py:2376
+msgid "Color Mode"
+msgstr ""
+
+# help of 'check-style' option of 'diff' command
+#: breezy/builtins.py:2383
+msgid "Warn if trailing whitespace or spurious changes have been  added."
+msgstr ""
+
+#: breezy/builtins.py:2408
 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
 msgstr ""
 
-#: breezy/builtins.py:2343
+#: breezy/builtins.py:2412
 msgid "brz diff --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: breezy/builtins.py:2348 breezy/builtins.py:2744 breezy/builtins.py:2752
+#: breezy/builtins.py:2417 breezy/builtins.py:2823 breezy/builtins.py:2831
 #, python-brace-format
 msgid "{0} and {1} are mutually exclusive"
 msgstr ""
 
-#: breezy/builtins.py:2368
+#: breezy/builtins.py:2447
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
-#: breezy/builtins.py:2443
+#: breezy/builtins.py:2522
 msgid "Show the tree root directory."
 msgstr ""
 
-#: breezy/builtins.py:2445
+#: breezy/builtins.py:2524
 msgid ""
 "The root is the nearest enclosing directory with a control\n"
 "directory."
 msgstr ""
 
-#: breezy/builtins.py:2461
+#: breezy/builtins.py:2540
 msgid "The limit argument must be an integer."
 msgstr ""
 
-#: breezy/builtins.py:2469
+#: breezy/builtins.py:2548
 msgid "The levels argument must be an integer."
 msgstr ""
 
-#: breezy/builtins.py:2474
+#: breezy/builtins.py:2553
 msgid "Show historical log for a branch or subset of a branch."
 msgstr ""
 
-#: breezy/builtins.py:2476
+#: breezy/builtins.py:2555
 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"
@@ -1605,14 +1654,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: breezy/builtins.py:2481
+#: breezy/builtins.py:2560
 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:2485
+#: breezy/builtins.py:2564
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1622,11 +1671,11 @@
 "were merged."
 msgstr ""
 
-#: breezy/builtins.py:2492
+#: breezy/builtins.py:2571
 msgid ":Output control:"
 msgstr ""
 
-#: breezy/builtins.py:2494
+#: breezy/builtins.py:2573
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1634,13 +1683,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: breezy/builtins.py:2499
+#: breezy/builtins.py:2578
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: breezy/builtins.py:2502
+#: breezy/builtins.py:2581
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1649,25 +1698,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: breezy/builtins.py:2508
+#: breezy/builtins.py:2587
 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:2512
+#: breezy/builtins.py:2591
 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:2516
+#: breezy/builtins.py:2595
 msgid ":Ordering control:"
 msgstr ""
 
-#: breezy/builtins.py:2518
+#: breezy/builtins.py:2597
 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"
@@ -1675,17 +1724,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
-#: breezy/builtins.py:2523
+#: breezy/builtins.py:2602
 msgid ":Revision filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2525
+#: breezy/builtins.py:2604
 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:2528
+#: breezy/builtins.py:2607
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1693,13 +1742,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: breezy/builtins.py:2533
+#: breezy/builtins.py:2612
 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:2536
+#: breezy/builtins.py:2615
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1709,7 +1758,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: breezy/builtins.py:2543
+#: breezy/builtins.py:2622
 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"
@@ -1719,73 +1768,73 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
-#: breezy/builtins.py:2550
+#: breezy/builtins.py:2629
 msgid ":Path filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2552
+#: breezy/builtins.py:2631
 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:2556
+#: breezy/builtins.py:2635
 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:2560
+#: breezy/builtins.py:2639
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: breezy/builtins.py:2563
+#: breezy/builtins.py:2642
 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:2567
+#: breezy/builtins.py:2646
 msgid "  In this case:"
 msgstr ""
 
-#: breezy/builtins.py:2569
+#: breezy/builtins.py:2648
 msgid "  * ``brz log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
-#: breezy/builtins.py:2571
+#: breezy/builtins.py:2650
 msgid "  * ``brz log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
-#: breezy/builtins.py:2573
+#: breezy/builtins.py:2652
 msgid ""
 "  * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: breezy/builtins.py:2576
+#: breezy/builtins.py:2655
 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:2579
+#: breezy/builtins.py:2658
 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:2583
+#: breezy/builtins.py:2662
 msgid ":Other filtering:"
 msgstr ""
 
-#: breezy/builtins.py:2585
+#: breezy/builtins.py:2664
 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"
@@ -1794,11 +1843,11 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
-#: breezy/builtins.py:2591
+#: breezy/builtins.py:2670
 msgid ":Tips & tricks:"
 msgstr ""
 
-#: breezy/builtins.py:2593
+#: breezy/builtins.py:2672
 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"
@@ -1807,11 +1856,11 @@
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>."
 msgstr ""
 
-#: breezy/builtins.py:2599
+#: breezy/builtins.py:2678
 msgid "  You may find it useful to add the aliases below to ``breezy.conf``::"
 msgstr ""
 
-#: breezy/builtins.py:2601
+#: breezy/builtins.py:2680
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1819,20 +1868,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: breezy/builtins.py:2606
+#: breezy/builtins.py:2685
 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:2610
+#: breezy/builtins.py:2689
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``brz log -n0 -rX``."
 msgstr ""
 
-#: breezy/builtins.py:2613
+#: breezy/builtins.py:2692
 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"
@@ -1840,7 +1889,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: breezy/builtins.py:2618
+#: breezy/builtins.py:2697
 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"
@@ -1848,7 +1897,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: breezy/builtins.py:2623
+#: breezy/builtins.py:2702
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1857,169 +1906,169 @@
 msgstr ""
 
 # help of 'forward' option of 'log' command
-#: breezy/builtins.py:2632
+#: breezy/builtins.py:2711
 msgid "Show from oldest to newest."
 msgstr ""
 
 # help of 'verbose' option of 'log' command
-#: breezy/builtins.py:2635
+#: breezy/builtins.py:2714
 msgid "Show files changed in each revision."
 msgstr ""
 
 # help of 'change' option of 'log' command
-#: breezy/builtins.py:2641
+#: breezy/builtins.py:2720
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
 # help of 'authors' option of 'log' command
-#: breezy/builtins.py:2645
+#: breezy/builtins.py:2724
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
 # title of 'authors' option of 'log' command
-#: breezy/builtins.py:2646
+#: breezy/builtins.py:2725
 msgid "Authors"
 msgstr ""
 
 # help of 'levels' option of 'log' command
-#: breezy/builtins.py:2652
+#: breezy/builtins.py:2731
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
 # help of 'limit' option of 'log' command
-#: breezy/builtins.py:2662
+#: breezy/builtins.py:2741
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
 # help of 'show-diff' option of 'log' command
-#: breezy/builtins.py:2667
+#: breezy/builtins.py:2746
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
 # help of 'include-merged' option of 'log' command
-#: breezy/builtins.py:2669
+#: breezy/builtins.py:2748
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
 # help of 'omit-merges' option of 'log' command
-#: breezy/builtins.py:2673
+#: breezy/builtins.py:2752
 msgid "Do not report commits with more than one parent."
 msgstr ""
 
 # help of 'exclude-common-ancestry' option of 'log' command
-#: breezy/builtins.py:2675
+#: breezy/builtins.py:2754
 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:2679
+#: breezy/builtins.py:2758
 msgid "Show digital signature validity."
 msgstr ""
 
 # help of 'match' option of 'log' command
-#: breezy/builtins.py:2682
+#: breezy/builtins.py:2761
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
 # help of 'match-message' option of 'log' command
-#: breezy/builtins.py:2686
+#: breezy/builtins.py:2765
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
 # help of 'match-committer' option of 'log' command
-#: breezy/builtins.py:2690
+#: breezy/builtins.py:2769
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
 # help of 'match-author' option of 'log' command
-#: breezy/builtins.py:2694
+#: breezy/builtins.py:2773
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
 # help of 'match-bugs' option of 'log' command
-#: breezy/builtins.py:2698
+#: breezy/builtins.py:2777
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: breezy/builtins.py:2738
+#: breezy/builtins.py:2817
 msgid "--exclude-common-ancestry requires -r with two revisions"
 msgstr ""
 
-#: breezy/builtins.py:2766
+#: breezy/builtins.py:2845
 #, python-format
 msgid "Path unknown at end or start of revision range: %s"
 msgstr ""
 
-#: breezy/builtins.py:2884
+#: breezy/builtins.py:2963
 #, python-format
 msgid "brz %s doesn't accept two revisions in different branches."
 msgstr ""
 
-#: breezy/builtins.py:2900
+#: breezy/builtins.py:2979
 #, python-format
 msgid "brz %s --revision takes one or two values."
 msgstr ""
 
-#: breezy/builtins.py:2945
+#: breezy/builtins.py:3024
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
 # help of 'recursive' option of 'ls' command
-#: breezy/builtins.py:2954
+#: breezy/builtins.py:3033
 msgid "Recurse into subdirectories."
 msgstr ""
 
 # help of 'from-root' option of 'ls' command
-#: breezy/builtins.py:2956
+#: breezy/builtins.py:3035
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
 # help of 'unknown' option of 'ls' command
-#: breezy/builtins.py:2958
+#: breezy/builtins.py:3037
 msgid "Print unknown files."
 msgstr ""
 
 # help of 'versioned' option of 'ls' command
-#: breezy/builtins.py:2959
+#: breezy/builtins.py:3038
 msgid "Print versioned files."
 msgstr ""
 
 # help of 'ignored' option of 'ls' command
-#: breezy/builtins.py:2962
+#: breezy/builtins.py:3041
 msgid "Print ignored files."
 msgstr ""
 
 # help of 'kind' option of 'ls' command
-#: breezy/builtins.py:2964
+#: breezy/builtins.py:3043
 msgid ""
 "List entries of a particular kind: file, directory, symlink, tree-reference."
 msgstr ""
 
-#: breezy/builtins.py:2979
+#: breezy/builtins.py:3058
 msgid "invalid kind specified"
 msgstr ""
 
-#: breezy/builtins.py:2983
+#: breezy/builtins.py:3062
 msgid "Cannot set both --verbose and --null"
 msgstr ""
 
-#: breezy/builtins.py:2992
+#: breezy/builtins.py:3071
 msgid "cannot specify both --from-root and PATH"
 msgstr ""
 
-#: breezy/builtins.py:3079
+#: breezy/builtins.py:3158
 msgid "Ignore specified files or patterns."
 msgstr ""
 
-#: breezy/builtins.py:3081
+#: breezy/builtins.py:3160
 msgid "See ``brz help patterns`` for details on the syntax of patterns."
 msgstr ""
 
-#: breezy/builtins.py:3083
+#: breezy/builtins.py:3162
 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"
@@ -2028,7 +2077,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: breezy/builtins.py:3089
+#: breezy/builtins.py:3168
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -2036,105 +2085,106 @@
 "it."
 msgstr ""
 
-#: breezy/builtins.py:3094
+#: breezy/builtins.py:3173
 msgid ""
-"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
-"the global ignore file can be found in the application data directory as\n"
-"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"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"
+"directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.\n"
 "Global ignores are not touched by this command. The global ignore file\n"
 "can be edited directly using an editor."
 msgstr ""
 
-#: breezy/builtins.py:3100
+#: breezy/builtins.py:3180
 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:3104
+#: breezy/builtins.py:3184
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
-#: breezy/builtins.py:3107
+#: breezy/builtins.py:3187
 msgid ":Notes:"
 msgstr ""
 
-#: breezy/builtins.py:3109
+#: breezy/builtins.py:3189
 msgid ""
 "* Ignore patterns containing shell wildcards must be quoted from\n"
 "  the shell on Unix."
 msgstr ""
 
-#: breezy/builtins.py:3112
+#: breezy/builtins.py:3192
 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:3115
+#: breezy/builtins.py:3195
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
-#: breezy/builtins.py:3118
+#: breezy/builtins.py:3198
 msgid "        brz ignore ./Makefile"
 msgstr ""
 
-#: breezy/builtins.py:3120
+#: breezy/builtins.py:3200
 msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
-#: breezy/builtins.py:3122
+#: breezy/builtins.py:3202
 msgid "        brz ignore \"*.class\""
 msgstr ""
 
-#: breezy/builtins.py:3124
+#: breezy/builtins.py:3204
 msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
-#: breezy/builtins.py:3126
+#: breezy/builtins.py:3206
 msgid "        brz ignore \"!special.class\""
 msgstr ""
 
-#: breezy/builtins.py:3128
+#: breezy/builtins.py:3208
 msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
-#: breezy/builtins.py:3130
+#: breezy/builtins.py:3210
 msgid "        brz ignore \"RE:^#\""
 msgstr ""
 
-#: breezy/builtins.py:3132 breezy/builtins.py:3136
+#: breezy/builtins.py:3212 breezy/builtins.py:3216
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: breezy/builtins.py:3134
+#: breezy/builtins.py:3214
 msgid "        brz ignore \"lib/**/*.o\""
 msgstr ""
 
-#: breezy/builtins.py:3138
+#: breezy/builtins.py:3218
 msgid "        brz ignore \"RE:lib/.*\\.o\""
 msgstr ""
 
-#: breezy/builtins.py:3140
+#: breezy/builtins.py:3220
 msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
-#: breezy/builtins.py:3142
+#: breezy/builtins.py:3222
 msgid "        brz ignore \"RE:(?!debian/).*\""
 msgstr ""
 
-#: breezy/builtins.py:3144
+#: breezy/builtins.py:3224
 msgid ""
 "    Ignore everything except the \"local\" toplevel directory,\n"
 "    but always ignore autosave files ending in ~, even under local/::"
 msgstr ""
 
-#: breezy/builtins.py:3147
+#: breezy/builtins.py:3227
 msgid ""
 "        brz ignore \"*\"\n"
 "        brz ignore \"!./local\"\n"
@@ -2142,26 +2192,26 @@
 msgstr ""
 
 # help of 'default-rules' option of 'ignore' command
-#: breezy/builtins.py:3156
+#: breezy/builtins.py:3236
 msgid "Display the default ignore rules that brz uses."
 msgstr ""
 
-#: breezy/builtins.py:3168
+#: breezy/builtins.py:3248
 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
 msgstr ""
 
-#: breezy/builtins.py:3179
+#: breezy/builtins.py:3259
 #, python-format
 msgid "Invalid ignore pattern found. %s"
 msgid_plural "Invalid ignore patterns found. %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:3188
+#: breezy/builtins.py:3268
 msgid "NAME_PATTERN should not be an absolute path"
 msgstr ""
 
-#: breezy/builtins.py:3200
+#: breezy/builtins.py:3280
 #, python-format
 msgid ""
 "Warning: the following files are version controlled and match your ignore "
@@ -2171,62 +2221,62 @@
 "them.\n"
 msgstr ""
 
-#: breezy/builtins.py:3207
+#: breezy/builtins.py:3287
 msgid "List ignored files and the patterns that matched them."
 msgstr ""
 
-#: breezy/builtins.py:3209
+#: breezy/builtins.py:3289
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
-#: breezy/builtins.py:3212
+#: breezy/builtins.py:3292
 msgid "Alternatively, to list just the files::"
 msgstr ""
 
-#: breezy/builtins.py:3214
+#: breezy/builtins.py:3294
 msgid "    brz ls --ignored"
 msgstr ""
 
-#: breezy/builtins.py:3248
+#: breezy/builtins.py:3328
 #, python-format
 msgid "not a valid revision-number: %r"
 msgstr ""
 
-#: breezy/builtins.py:3256
+#: breezy/builtins.py:3336
 msgid "Export current or past revision to a destination directory or archive."
 msgstr ""
 
-#: breezy/builtins.py:3258
+#: breezy/builtins.py:3338
 msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
-#: breezy/builtins.py:3260
+#: breezy/builtins.py:3340
 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:3264
+#: breezy/builtins.py:3344
 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:3268
+#: breezy/builtins.py:3348
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
-#: breezy/builtins.py:3271
+#: breezy/builtins.py:3351
 msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
 msgstr ""
 
-#: breezy/builtins.py:3273
+#: breezy/builtins.py:3353
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -2240,78 +2290,78 @@
 msgstr ""
 
 # help of 'format' option of 'export' command
-#: breezy/builtins.py:3288
+#: breezy/builtins.py:3368
 msgid "Type of file to export to."
 msgstr ""
 
 # help of 'filters' option of 'export' command
-#: breezy/builtins.py:3291
+#: breezy/builtins.py:3371
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
 # help of 'root' option of 'export' command
-#: breezy/builtins.py:3295
+#: breezy/builtins.py:3375
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
 # help of 'per-file-timestamps' option of 'export' command
-#: breezy/builtins.py:3297
+#: breezy/builtins.py:3377
 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:3300
+#: breezy/builtins.py:3380
 msgid "Export the working tree contents rather than that of the last revision."
 msgstr ""
 
-#: breezy/builtins.py:3320
+#: breezy/builtins.py:3400
 msgid "--uncommitted requires a working tree"
 msgstr ""
 
-#: breezy/builtins.py:3348
+#: breezy/builtins.py:3428
 #, python-format
 msgid "Unsupported export format: %s"
 msgstr ""
 
-#: breezy/builtins.py:3352
+#: breezy/builtins.py:3432
 msgid "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: breezy/builtins.py:3354
+#: breezy/builtins.py:3434
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: breezy/builtins.py:3356
+#: breezy/builtins.py:3436
 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:3363
+#: breezy/builtins.py:3443
 msgid "The path name in the old tree."
 msgstr ""
 
 # help of 'filters' option of 'cat' command
-#: breezy/builtins.py:3364
+#: breezy/builtins.py:3444
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: breezy/builtins.py:3375
+#: breezy/builtins.py:3455
 msgid "brz cat --revision takes exactly one revision specifier"
 msgstr ""
 
-#: breezy/builtins.py:3395 breezy/builtins.py:3409
+#: breezy/builtins.py:3475 breezy/builtins.py:3489
 msgid "{0!r} is not present in revision {1}"
 msgstr ""
 
-#: breezy/builtins.py:3436
+#: breezy/builtins.py:3516
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: breezy/builtins.py:3438
+#: breezy/builtins.py:3518
 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"
@@ -2321,44 +2371,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: breezy/builtins.py:3445
+#: breezy/builtins.py:3525
 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:3449
+#: breezy/builtins.py:3529
 msgid ":Selective commits:"
 msgstr ""
 
-#: breezy/builtins.py:3451
+#: breezy/builtins.py:3531
 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:3455
+#: breezy/builtins.py:3535
 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:3459
+#: breezy/builtins.py:3539
 msgid "    brz commit foo -x foo/bar"
 msgstr ""
 
-#: breezy/builtins.py:3461
+#: breezy/builtins.py:3541
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: breezy/builtins.py:3463
+#: breezy/builtins.py:3543
 msgid ":Custom authors:"
 msgstr ""
 
-#: breezy/builtins.py:3465
+#: breezy/builtins.py:3545
 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"
@@ -2368,11 +2418,11 @@
 "  author."
 msgstr ""
 
-#: breezy/builtins.py:3472
+#: breezy/builtins.py:3552
 msgid ":Checks:"
 msgstr ""
 
-#: breezy/builtins.py:3474
+#: breezy/builtins.py:3554
 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"
@@ -2381,18 +2431,18 @@
 "  for details."
 msgstr ""
 
-#: breezy/builtins.py:3480
+#: breezy/builtins.py:3560
 msgid ":Things to note:"
 msgstr ""
 
-#: breezy/builtins.py:3482
+#: breezy/builtins.py:3562
 msgid ""
-"  If you accidentially commit the wrong changes or make a spelling\n"
+"  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:3486
+#: breezy/builtins.py:3566
 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"
@@ -2401,74 +2451,74 @@
 msgstr ""
 
 # help of 'exclude' option of 'commit' command
-#: breezy/builtins.py:3497
+#: breezy/builtins.py:3577
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
 # help of 'message' option of 'commit' command
-#: breezy/builtins.py:3500
+#: breezy/builtins.py:3580
 msgid "Description of the new revision."
 msgstr ""
 
 # help of 'unchanged' option of 'commit' command
-#: breezy/builtins.py:3503
+#: breezy/builtins.py:3583
 msgid "Commit even if nothing has changed."
 msgstr ""
 
 # help of 'file' option of 'commit' command
-#: breezy/builtins.py:3507
+#: breezy/builtins.py:3587
 msgid "Take commit message from this file."
 msgstr ""
 
 # help of 'strict' option of 'commit' command
-#: breezy/builtins.py:3509
+#: breezy/builtins.py:3589
 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:3512
+#: breezy/builtins.py:3592
 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:3516
+#: breezy/builtins.py:3596
 msgid "Link to a related bug. (see \"brz help bugs\")."
 msgstr ""
 
 # help of 'fixes' option of 'commit' command
-#: breezy/builtins.py:3519
+#: breezy/builtins.py:3599
 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:3523
+#: breezy/builtins.py:3603
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
 # help of 'local' option of 'commit' command
-#: breezy/builtins.py:3526
+#: breezy/builtins.py:3606
 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:3532
+#: breezy/builtins.py:3612
 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:3535
+#: breezy/builtins.py:3615
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: breezy/builtins.py:3552
+#: breezy/builtins.py:3632
 #, python-format
 msgid ""
 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
@@ -2476,7 +2526,7 @@
 "See \"brz help bugs\" for more information on this feature. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3561
+#: breezy/builtins.py:3641
 #, python-format
 msgid ""
 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
@@ -2484,106 +2534,106 @@
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3570
+#: breezy/builtins.py:3650
 #, python-format
 msgid "Unrecognized bug %s. Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3573
+#: breezy/builtins.py:3653
 #, python-format
 msgid ""
 "%s\n"
 "Commit refused."
 msgstr ""
 
-#: breezy/builtins.py:3600
+#: breezy/builtins.py:3680
 msgid "Could not parse --commit-time: "
 msgstr ""
 
-#: breezy/builtins.py:3644
+#: breezy/builtins.py:3724
 msgid "please specify either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3674
+#: breezy/builtins.py:3754
 msgid "please specify a commit message with either --message or --file"
 msgstr ""
 
-#: breezy/builtins.py:3677
+#: breezy/builtins.py:3757
 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:3697
+#: breezy/builtins.py:3777
 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:3701
+#: breezy/builtins.py:3781
 msgid ""
 "Conflicts detected in working tree.  Use \"brz conflicts\" to list, \"brz "
 "resolve FILE\" to resolve."
 msgstr ""
 
-#: breezy/builtins.py:3705
+#: breezy/builtins.py:3785
 msgid "Commit refused because there are unknown files in the working tree."
 msgstr ""
 
-#: breezy/builtins.py:3708
+#: breezy/builtins.py:3788
 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:3716
+#: breezy/builtins.py:3796
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: breezy/builtins.py:3718
+#: breezy/builtins.py:3798
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or brz bugs."
 msgstr ""
 
-#: breezy/builtins.py:3721
+#: breezy/builtins.py:3801
 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:3724
+#: breezy/builtins.py:3804
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3728
+#: breezy/builtins.py:3808
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3732
+#: breezy/builtins.py:3812
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
 "    are not properly referenced by the revision ancestry.  This is a\n"
-"    subtle problem that Bazaar can work around."
+"    subtle problem that Breezy can work around."
 msgstr ""
 
-#: breezy/builtins.py:3737
+#: breezy/builtins.py:3817
 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:3741
+#: breezy/builtins.py:3821
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -2592,66 +2642,65 @@
 "    indicate a problem."
 msgstr ""
 
-#: breezy/builtins.py:3747
+#: breezy/builtins.py:3827
 msgid ""
-"If no restrictions are specified, all Bazaar data that is found at the "
-"given\n"
+"If no restrictions are specified, all data that is found at the given\n"
 "location will be checked."
 msgstr ""
 
-#: breezy/builtins.py:3752
+#: breezy/builtins.py:3832
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: breezy/builtins.py:3754
+#: breezy/builtins.py:3834
 msgid "        brz check --tree --branch foo"
 msgstr ""
 
-#: breezy/builtins.py:3756
+#: breezy/builtins.py:3836
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: breezy/builtins.py:3758
+#: breezy/builtins.py:3838
 msgid "        brz check --repo bar"
 msgstr ""
 
-#: breezy/builtins.py:3760
+#: breezy/builtins.py:3840
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: breezy/builtins.py:3762
+#: breezy/builtins.py:3842
 msgid "        brz check baz"
 msgstr ""
 
 # help of 'branch' option of 'check' command
-#: breezy/builtins.py:3768
+#: breezy/builtins.py:3848
 msgid "Check the branch related to the current directory."
 msgstr ""
 
 # help of 'repo' option of 'check' command
-#: breezy/builtins.py:3770
+#: breezy/builtins.py:3850
 msgid "Check the repository related to the current directory."
 msgstr ""
 
 # help of 'tree' option of 'check' command
-#: breezy/builtins.py:3772
+#: breezy/builtins.py:3852
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: breezy/builtins.py:3786
+#: breezy/builtins.py:3866
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: breezy/builtins.py:3788
+#: breezy/builtins.py:3868
 msgid ""
 "When the default format has changed after a major new release of\n"
-"Bazaar, you may be informed during certain operations that you\n"
+"Bazaar/Breezy, you may be informed during certain operations that you\n"
 "should upgrade. Upgrading to a newer format may improve performance\n"
 "or make new features available. It may however limit interoperability\n"
-"with older repositories or with older versions of Bazaar."
+"with older repositories or with older versions of Bazaar or Breezy."
 msgstr ""
 
-#: breezy/builtins.py:3794
+#: breezy/builtins.py:3874
 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"
@@ -2661,7 +2710,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: breezy/builtins.py:3801
+#: breezy/builtins.py:3881
 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"
@@ -2672,7 +2721,7 @@
 "afterwards."
 msgstr ""
 
-#: breezy/builtins.py:3809
+#: breezy/builtins.py:3889
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -2680,170 +2729,171 @@
 "tried."
 msgstr ""
 
-#: breezy/builtins.py:3814
+#: breezy/builtins.py:3894
 msgid ""
-"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
+"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:3822
+#: breezy/builtins.py:3902
 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:3827
+#: breezy/builtins.py:3907
 msgid "Branch format"
 msgstr ""
 
 # help of 'clean' option of 'upgrade' command
-#: breezy/builtins.py:3829
+#: breezy/builtins.py:3909
 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
-#: breezy/builtins.py:3831
+# help of 'dry-run' option of 'rebase' command
+#: breezy/builtins.py:3911 breezy/plugins/rewrite/commands.py:97
 msgid "Show what would be done, but don't actually do anything."
 msgstr ""
 
-#: breezy/builtins.py:3846
+#: breezy/builtins.py:3926
 msgid "Show or set brz user id."
 msgstr ""
 
-#: breezy/builtins.py:3848
+#: breezy/builtins.py:3928
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3851
+#: breezy/builtins.py:3931
 msgid "        brz whoami --email"
 msgstr ""
 
-#: breezy/builtins.py:3853
+#: breezy/builtins.py:3933
 msgid "    Set the current user::"
 msgstr ""
 
-#: breezy/builtins.py:3855
+#: breezy/builtins.py:3935
 msgid "        brz whoami \"Frank Chu <[e-mail]>\""
 msgstr ""
 
 # help of 'email' option of 'whoami' command
-#: breezy/builtins.py:3859
+#: breezy/builtins.py:3939
 msgid "Display email address only."
 msgstr ""
 
 # help of 'branch' option of 'whoami' command
-#: breezy/builtins.py:3861
+#: breezy/builtins.py:3941
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: breezy/builtins.py:3887
+#: breezy/builtins.py:3967
 msgid "--email can only be used to display existing identity"
 msgstr ""
 
-#: breezy/builtins.py:3911
+#: breezy/builtins.py:3991
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: breezy/builtins.py:3913
+#: breezy/builtins.py:3993
 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:3917
+#: breezy/builtins.py:3997
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: breezy/builtins.py:3938
+#: breezy/builtins.py:4018
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: breezy/builtins.py:3940
+#: breezy/builtins.py:4020
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: breezy/builtins.py:3943
+#: breezy/builtins.py:4023
 msgid "        brz alias"
 msgstr ""
 
-#: breezy/builtins.py:3945
+#: breezy/builtins.py:4025
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:3947
+#: breezy/builtins.py:4027
 msgid "        brz alias ll"
 msgstr ""
 
-#: breezy/builtins.py:3949
+#: breezy/builtins.py:4029
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:3951
+#: breezy/builtins.py:4031
 msgid "        brz alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: breezy/builtins.py:3953
+#: breezy/builtins.py:4033
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: breezy/builtins.py:3955
+#: breezy/builtins.py:4035
 msgid "        brz alias --remove ll"
 msgstr ""
 
 # help of 'remove' option of 'alias' command
-#: breezy/builtins.py:3960
+#: breezy/builtins.py:4040
 msgid "Remove the alias."
 msgstr ""
 
-#: breezy/builtins.py:3978
+#: breezy/builtins.py:4058
 msgid "brz alias --remove expects an alias to remove."
 msgstr ""
 
-#: breezy/builtins.py:4169
+#: breezy/builtins.py:4249
 msgid "subunit not available. subunit needs to be installed to use --subunit."
 msgstr ""
 
-#: breezy/builtins.py:4186
+#: breezy/builtins.py:4266
 msgid "subunit not available. subunit needs to be installed to use --subunit2."
 msgstr ""
 
-#: breezy/builtins.py:4195
+#: breezy/builtins.py:4275
 msgid ""
 "--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
 msgstr ""
 
-#: breezy/builtins.py:4242
+#: breezy/builtins.py:4322
 msgid "Show version of brz."
 msgstr ""
 
 # help of 'short' option of 'version' command
-#: breezy/builtins.py:4246
+#: breezy/builtins.py:4326
 msgid "Print just the version number."
 msgstr ""
 
-#: breezy/builtins.py:4265
+#: breezy/builtins.py:4345
 msgid "It sure does!\n"
 msgstr ""
 
-#: breezy/builtins.py:4289
+#: breezy/builtins.py:4369
 #, python-format
 msgid "merge base is revision %s\n"
 msgstr ""
 
-#: breezy/builtins.py:4294
+#: breezy/builtins.py:4374
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: breezy/builtins.py:4296
+#: breezy/builtins.py:4376
 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"
@@ -2854,35 +2904,35 @@
 "the current working tree."
 msgstr ""
 
-#: breezy/builtins.py:4304
+#: breezy/builtins.py:4384
 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:4308
+#: breezy/builtins.py:4388
 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:4311
+#: breezy/builtins.py:4391
 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"
 "causes some revisions to be skipped, i.e. if the destination branch does\n"
 "not already contain revision BASE, such a merge is commonly referred to as\n"
-"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
+"a \"cherrypick\". Unlike a normal merge, Breezy does not currently track\n"
 "cherrypicks. The changes look like a normal commit, and the history of the\n"
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: breezy/builtins.py:4319
+#: breezy/builtins.py:4399
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: breezy/builtins.py:4321 breezy/conflicts.py:54 breezy/conflicts.py:109
+#: breezy/builtins.py:4401 breezy/conflicts.py:54 breezy/conflicts.py:111
 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"
@@ -2890,11 +2940,11 @@
 "before you can commit."
 msgstr ""
 
-#: breezy/builtins.py:4326
+#: breezy/builtins.py:4406
 msgid "Use brz resolve when you have fixed a problem.  See also brz conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4328
+#: breezy/builtins.py:4408
 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"
@@ -2902,14 +2952,14 @@
 "only be saved if the remote location can be accessed."
 msgstr ""
 
-#: breezy/builtins.py:4333
+#: breezy/builtins.py:4413
 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:4337
+#: breezy/builtins.py:4417
 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"
@@ -2918,60 +2968,60 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: breezy/builtins.py:4343
+#: breezy/builtins.py:4423
 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:4347
+#: breezy/builtins.py:4427
 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:4350
+#: breezy/builtins.py:4430
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4353
+#: breezy/builtins.py:4433
 msgid "        brz merge ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4355
+#: breezy/builtins.py:4435
 msgid "    To merge changes up to and including revision 82 from brz.dev::"
 msgstr ""
 
-#: breezy/builtins.py:4357
+#: breezy/builtins.py:4437
 msgid "        brz merge -r 82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4359
+#: breezy/builtins.py:4439
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: breezy/builtins.py:4361
+#: breezy/builtins.py:4441
 msgid "        brz merge -r 81..82 ../brz.dev"
 msgstr ""
 
-#: breezy/builtins.py:4363
+#: breezy/builtins.py:4443
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: breezy/builtins.py:4365
+#: breezy/builtins.py:4445
 msgid "        brz merge /tmp/merge"
 msgstr ""
 
-#: breezy/builtins.py:4367
+#: breezy/builtins.py:4447
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: breezy/builtins.py:4370
+#: breezy/builtins.py:4450
 msgid ""
 "        brz merge ../feature1a\n"
 "        brz merge ../feature1b --force\n"
@@ -2979,18 +3029,18 @@
 msgstr ""
 
 # help of 'force' option of 'merge' command
-#: breezy/builtins.py:4382
+#: breezy/builtins.py:4462
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
 # help of 'uncommitted' option of 'merge' command
-#: breezy/builtins.py:4388
+#: breezy/builtins.py:4468
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
 # help of 'pull' option of 'merge' command
-#: breezy/builtins.py:4390
+#: breezy/builtins.py:4470
 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 "
@@ -2998,114 +3048,115 @@
 msgstr ""
 
 # help of 'directory' option of 'merge' command
-#: breezy/builtins.py:4395
+#: breezy/builtins.py:4475
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'preview' option of 'merge' command
-#: breezy/builtins.py:4397
+#: breezy/builtins.py:4477
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
 # help of 'interactive' option of 'merge' command
-#: breezy/builtins.py:4399
+#: breezy/builtins.py:4479
 msgid "Select changes interactively."
 msgstr ""
 
-#: breezy/builtins.py:4422
+#: breezy/builtins.py:4502
 msgid ""
 "Merging into empty branches not currently supported, https://bugs.launchpad."
 "net/bzr/+bug/308562"
 msgstr ""
 
-#: breezy/builtins.py:4444
+#: breezy/builtins.py:4524
 msgid "Cannot use --uncommitted with bundles or merge directives."
 msgstr ""
 
-#: breezy/builtins.py:4455
+#: breezy/builtins.py:4535
 msgid "Cannot use --uncommitted and --revision at the same time."
 msgstr ""
 
-#: breezy/builtins.py:4475
+#: breezy/builtins.py:4555
 msgid "merger: "
 msgstr ""
 
-#: breezy/builtins.py:4477 breezy/bundle/apply_bundle.py:65
+#: breezy/builtins.py:4557 breezy/bzr/bundle/apply_bundle.py:65
+#: breezy/plugins/rewrite/commands.py:518
 msgid "Nothing to do."
 msgstr ""
 
-#: breezy/builtins.py:4482
+#: breezy/builtins.py:4562
 msgid "Cannot pull individual files"
 msgstr ""
 
-#: breezy/builtins.py:4490
+#: breezy/builtins.py:4570
 msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
 msgstr ""
 
-#: breezy/builtins.py:4548
+#: breezy/builtins.py:4628
 #, python-format
 msgid "Show-base is not supported for this merge type. %s"
 msgstr ""
 
-#: breezy/builtins.py:4557
+#: breezy/builtins.py:4637
 #, python-format
 msgid "Conflict reduction is not supported for merge type %s."
 msgstr ""
 
-#: breezy/builtins.py:4561
+#: breezy/builtins.py:4641
 msgid "Cannot do conflict reduction and show base."
 msgstr ""
 
-#: breezy/builtins.py:4570
+#: breezy/builtins.py:4650
 msgid "Plan file merge unsupported: Merge type incompatible with tree formats."
 msgstr ""
 
-#: breezy/builtins.py:4681
+#: breezy/builtins.py:4761
 msgid "No location specified or remembered"
 msgstr ""
 
-#: breezy/builtins.py:4683
+#: breezy/builtins.py:4763
 #, python-brace-format
 msgid "{0} remembered {1} location {2}"
 msgstr ""
 
-#: breezy/builtins.py:4689
+#: breezy/builtins.py:4769
 msgid "Redo a merge."
 msgstr ""
 
-#: breezy/builtins.py:4691
+#: breezy/builtins.py:4771
 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:4695
+#: breezy/builtins.py:4775
 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:4699
+#: breezy/builtins.py:4779
 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:4703
+#: breezy/builtins.py:4783
 msgid "        brz remerge --show-base"
 msgstr ""
 
-#: breezy/builtins.py:4705
+#: breezy/builtins.py:4785
 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:4708
+#: breezy/builtins.py:4788
 msgid "        brz remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
@@ -3113,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:4715
+#: breezy/builtins.py:4795
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: breezy/builtins.py:4728
+#: breezy/builtins.py:4808
 msgid ""
 "Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
 "merges."
 msgstr ""
 
-#: breezy/builtins.py:4783
+#: breezy/builtins.py:4862
 msgid ""
 "Set files in the working tree back to the contents of a previous revision."
 msgstr ""
 
-#: breezy/builtins.py:4785
+#: breezy/builtins.py:4864
 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"
@@ -3137,7 +3188,7 @@
 "the working tree basis revision."
 msgstr ""
 
-#: breezy/builtins.py:4791
+#: breezy/builtins.py:4870
 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"
@@ -3149,15 +3200,15 @@
 "update command."
 msgstr ""
 
-#: breezy/builtins.py:4800
+#: breezy/builtins.py:4879
 msgid ""
 "Uncommitted changes to files that are reverted will be discarded.\n"
-"Howver, by default, any files that have been manually changed will be\n"
+"However, by default, any files that have been manually changed will be\n"
 "backed up first.  (Files changed only by merge are not backed up.)  Backup\n"
 "files have '.~#~' appended to their name, where # is a number."
 msgstr ""
 
-#: breezy/builtins.py:4805
+#: breezy/builtins.py:4884
 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"
@@ -3165,7 +3216,7 @@
 "reverted."
 msgstr ""
 
-#: breezy/builtins.py:4810
+#: breezy/builtins.py:4889
 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"
@@ -3173,7 +3224,7 @@
 "deleted."
 msgstr ""
 
-#: breezy/builtins.py:4815
+#: breezy/builtins.py:4894
 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"
@@ -3185,7 +3236,7 @@
 "reverting any files."
 msgstr ""
 
-#: breezy/builtins.py:4824
+#: breezy/builtins.py:4903
 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"
@@ -3200,177 +3251,177 @@
 msgstr ""
 
 # help of 'no-backup' option of 'revert' command
-#: breezy/builtins.py:4838
+#: breezy/builtins.py:4918
 msgid "Do not save backups of reverted files."
 msgstr ""
 
 # help of 'forget-merges' option of 'revert' command
-#: breezy/builtins.py:4840
+#: breezy/builtins.py:4920
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: breezy/builtins.py:4871
+#: breezy/builtins.py:4951
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
 # help of 'long' option of 'help' command
-#: breezy/builtins.py:4876
+#: breezy/builtins.py:4956
 msgid "Show help on all commands."
 msgstr ""
 
-#: breezy/builtins.py:4905
+#: breezy/builtins.py:4985
 msgid "Show unmerged/unpulled revisions between two branches."
 msgstr ""
 
-#: breezy/builtins.py:4907
+#: breezy/builtins.py:4987
 msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
-#: breezy/builtins.py:4909
+#: breezy/builtins.py:4989
 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:4913
+#: breezy/builtins.py:4993
 msgid ""
 ":Exit values:\n"
 "    1 - some missing revisions\n"
 "    0 - no missing revisions"
 msgstr ""
 
-#: breezy/builtins.py:4919
+#: breezy/builtins.py:4999
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
-#: breezy/builtins.py:4922
+#: breezy/builtins.py:5002
 msgid "        brz missing"
 msgstr ""
 
-#: breezy/builtins.py:4924
+#: breezy/builtins.py:5004
 msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
-#: breezy/builtins.py:4926
+#: breezy/builtins.py:5006
 msgid "        brz missing http://server/branch"
 msgstr ""
 
-#: breezy/builtins.py:4928
+#: breezy/builtins.py:5008
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
-#: breezy/builtins.py:4931
+#: breezy/builtins.py:5011
 msgid "        brz missing -r ..-10"
 msgstr ""
 
-#: breezy/builtins.py:4933
+#: breezy/builtins.py:5013
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: breezy/builtins.py:4936
+#: breezy/builtins.py:5016
 msgid "        brz missing --my-revision ..-10"
 msgstr ""
 
 # help of 'reverse' option of 'missing' command
-#: breezy/builtins.py:4943
+#: breezy/builtins.py:5023
 msgid "Reverse the order of revisions."
 msgstr ""
 
 # help of 'mine-only' option of 'missing' command
-#: breezy/builtins.py:4945
+#: breezy/builtins.py:5025
 msgid "Display changes in the local branch only."
 msgstr ""
 
 # help of 'this' option of 'missing' command
-#: breezy/builtins.py:4946
+#: breezy/builtins.py:5026
 msgid "Same as --mine-only."
 msgstr ""
 
 # help of 'theirs-only' option of 'missing' command
-#: breezy/builtins.py:4948
+#: breezy/builtins.py:5028
 msgid "Display changes in the remote branch only."
 msgstr ""
 
 # help of 'other' option of 'missing' command
-#: breezy/builtins.py:4949
+#: breezy/builtins.py:5029
 msgid "Same as --theirs-only."
 msgstr ""
 
 # help of 'revision' option of 'missing' command
-#: breezy/builtins.py:4954
+#: breezy/builtins.py:5034
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'my-revision' option of 'missing' command
-#: breezy/builtins.py:4958
+#: breezy/builtins.py:5038
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'include-merged' option of 'missing' command
-#: breezy/builtins.py:4961
+#: breezy/builtins.py:5041
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: breezy/builtins.py:5002
+#: breezy/builtins.py:5082
 msgid "No peer location known or specified."
 msgstr ""
 
-#: breezy/builtins.py:5006
+#: breezy/builtins.py:5086
 #, python-brace-format
 msgid "Using saved parent location: {0}\n"
 msgstr ""
 
-#: breezy/builtins.py:5039
+#: breezy/builtins.py:5119
 #, python-format
 msgid "You have %d extra revision:\n"
 msgid_plural "You have %d extra revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5059
+#: breezy/builtins.py:5139
 #, python-format
 msgid "You are missing %d revision:\n"
 msgid_plural "You are missing %d revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: breezy/builtins.py:5074
+#: breezy/builtins.py:5154
 msgid "This branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5077
+#: breezy/builtins.py:5157
 msgid "Other branch has no new revisions.\n"
 msgstr ""
 
-#: breezy/builtins.py:5082
+#: breezy/builtins.py:5162
 msgid "Branches are up to date.\n"
 msgstr ""
 
-#: breezy/builtins.py:5093
+#: breezy/builtins.py:5173
 msgid "Compress the data within a repository."
 msgstr ""
 
-#: breezy/builtins.py:5095
+#: breezy/builtins.py:5175
 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:5099
+#: breezy/builtins.py:5179
 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"
@@ -3379,7 +3430,7 @@
 "used."
 msgstr ""
 
-#: breezy/builtins.py:5105
+#: breezy/builtins.py:5185
 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"
@@ -3388,34 +3439,34 @@
 msgstr ""
 
 # help of 'clean-obsolete-packs' option of 'pack' command
-#: breezy/builtins.py:5115
+#: breezy/builtins.py:5195
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
-#: breezy/builtins.py:5129
+#: breezy/builtins.py:5209
 msgid "List the installed plugins."
 msgstr ""
 
-#: breezy/builtins.py:5131
+#: breezy/builtins.py:5211
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
-#: breezy/builtins.py:5134
+#: breezy/builtins.py:5214
 msgid "--verbose shows the path where each plugin is located."
 msgstr ""
 
-#: breezy/builtins.py:5136
+#: breezy/builtins.py:5216
 msgid ""
-"A plugin is an external component for Bazaar that extends the\n"
-"revision control system, by adding or replacing code in Bazaar.\n"
+"A plugin is an external component for Breezy that extends the\n"
+"revision control system, by adding or replacing code in Breezy.\n"
 "Plugins can do a variety of things, including overriding commands,\n"
 "adding new commands, providing additional network transports and\n"
 "customizing log output."
 msgstr ""
 
-#: breezy/builtins.py:5142
+#: breezy/builtins.py:5222
 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"
@@ -3423,122 +3474,122 @@
 "plugins using the Python programming language."
 msgstr ""
 
-#: breezy/builtins.py:5158
+#: breezy/builtins.py:5238
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
 # help of 'long' option of 'testament' command
-#: breezy/builtins.py:5161
+#: breezy/builtins.py:5241
 msgid "Produce long-format testament."
 msgstr ""
 
 # help of 'strict' option of 'testament' command
-#: breezy/builtins.py:5163
+#: breezy/builtins.py:5243
 msgid "Produce a strict-format testament."
 msgstr ""
 
-#: breezy/builtins.py:5191
+#: breezy/builtins.py:5271
 msgid "Show the origin of each line in a file."
 msgstr ""
 
-#: breezy/builtins.py:5193
+#: breezy/builtins.py:5273
 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:5196
+#: breezy/builtins.py:5276
 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:5204
+#: breezy/builtins.py:5284
 msgid "Show annotations on all lines."
 msgstr ""
 
 # help of 'long' option of 'annotate' command
-#: breezy/builtins.py:5205
+#: breezy/builtins.py:5285
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: breezy/builtins.py:5293
+#: breezy/builtins.py:5362
 msgid "Cannot sign a range of non-revision-history revisions"
 msgstr ""
 
-#: breezy/builtins.py:5306
+#: breezy/builtins.py:5369
 msgid "Please supply either one revision, or a range."
 msgstr ""
 
-#: breezy/builtins.py:5310
+#: breezy/builtins.py:5373
 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:5313
+#: breezy/builtins.py:5376
 msgid ""
 "Once converted into a checkout, commits must succeed on the master branch\n"
 "before they will be applied to the local branch."