Merge lp:~vila/brz/trunk into lp:brz

[Vincent Ladeuil]

Open trunk again as 3.1.0dev1

[Vincent Ladeuil (vila)]

RM self-approval

review: Approve

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

There was nothing to merge
https://ci.breezy-vcs.org/job/brz/job/brz-land/269/

=== modified file '.bzrignore'
--- .bzrignore	2018-11-18 18:55:35 +0000
+++ .bzrignore	2019-03-06 14:35:55 +0000
@@ -2,6 +2,7 @@
 # These are created as byproducts of our test suite
 ./test*.tmp
 ./.python-eggs
+./breezy.egg-info
 ./.bzr.log
 # Generated files
 CHANGELOG

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2019-01-14 01:27:55 +0000
+++ breezy/__init__.py	2019-03-06 14:35:55 +0000
@@ -50,7 +50,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (3, 0, 0, 'beta', 1)
+version_info = (3, 1, 0, 'dev', 1)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2019-02-09 03:23:20 +0000
+++ breezy/builtins.py	2019-03-06 14:35:55 +0000
@@ -348,7 +348,7 @@
         Not versioned and not matching an ignore pattern.
 
     Additionally for directories, symlinks and files with a changed
-    executable bit, Bazaar indicates their type using a trailing
+    executable bit, Breezy indicates their type using a trailing
     character: '/', '@' or '*' respectively. These decorations can be
     disabled using the '--no-classify' option.
 
@@ -454,11 +454,11 @@
 
         b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
 
-        revisions = b.repository.revisions
+        revisions = getattr(b.repository, "revisions", None)
         if revisions is None:
             raise errors.BzrCommandError(
                 gettext('Repository %r does not support '
-                        'access to raw revision texts'))
+                        'access to raw revision texts') % b.repository)
 
         with b.repository.lock_read():
             # TODO: jam 20060112 should cat-revision always output utf-8?
@@ -1344,6 +1344,7 @@
             use_existing_dir=False, directory=None, stacked_on=None,
             stacked=False, strict=None, no_tree=False,
             overwrite_tags=False, lossy=False):
+        from .location import location_to_url
         from .push import _show_push_branch
 
         if overwrite:
@@ -1371,6 +1372,7 @@
                 more_warning='Uncommitted changes will not be pushed.')
         # Get the stacked_on branch, if any
         if stacked_on is not None:
+            stacked_on = location_to_url(stacked_on, 'read')
             stacked_on = urlutils.normalize_url(stacked_on)
         elif stacked:
             parent_url = br_from.get_parent()
@@ -1728,7 +1730,7 @@
     If the tree's branch is bound to a master branch, brz will also update
     the branch from the master.
 
-    You cannot update just a single file or directory, because each Bazaar
+    You cannot update just a single file or directory, because each Breezy
     working tree has just a single basis revision.  If you want to restore a
     file that has been removed locally, use 'brz revert' instead of 'brz
     update'.  If you want to restore a file to its state in a previous
@@ -1871,11 +1873,11 @@
 class cmd_remove(Command):
     __doc__ = """Remove files or directories.
 
-    This makes Bazaar stop tracking changes to the specified files. Bazaar will
+    This makes Breezy stop tracking changes to the specified files. Breezy will
     delete them if they can easily be recovered using revert otherwise they
     will be backed up (adding an extension of the form .~#~). If no options or
-    parameters are given Bazaar will scan for files that are being tracked by
-    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
+    Breezy but missing in your tree and stop tracking them for you.
     """
     takes_args = ['file*']
     takes_options = ['verbose',
@@ -3091,9 +3093,10 @@
     using this command or directly by using an editor, be sure to commit
     it.
 
-    Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
-    the global ignore file can be found in the application data directory as
-    C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
+    Breezy also supports a global ignore file ~/.config/breezy/ignore. On
+    Windows the global ignore file can be found in the application data
+    directory as
+    C:\\Documents and Settings\\<user>\\Application Data\\Breezy\\3.0\\ignore.
     Global ignores are not touched by this command. The global ignore file
     can be edited directly using an editor.
 
@@ -3732,7 +3735,7 @@
     unreferenced ancestors
         Texts that are ancestors of other texts, but
         are not properly referenced by the revision ancestry.  This is a
-        subtle problem that Bazaar can work around.
+        subtle problem that Breezy can work around.
 
     unique file texts
         This is the total number of unique file contents
@@ -3744,7 +3747,7 @@
         entries are modified, but the file contents are not.  It does not
         indicate a problem.
 
-    If no restrictions are specified, all Bazaar data that is found at the given
+    If no restrictions are specified, all data that is found at the given
     location will be checked.
 
     :Examples:
@@ -3786,10 +3789,10 @@
     __doc__ = """Upgrade a repository, branch or working tree to a newer format.
 
     When the default format has changed after a major new release of
-    Bazaar, you may be informed during certain operations that you
+    Bazaar/Breezy, you may be informed during certain operations that you
     should upgrade. Upgrading to a newer format may improve performance
     or make new features available. It may however limit interoperability
-    with older repositories or with older versions of Bazaar.
+    with older repositories or with older versions of Bazaar or Breezy.
 
     If you wish to upgrade to a particular format rather than the
     current default, that can be specified using the --format option.
@@ -3811,7 +3814,7 @@
     If the conversion of a branch fails, remaining branches are still
     tried.
 
-    For more information on upgrades, see the Bazaar Upgrade Guide,
+    For more information on upgrades, see the Breezy Upgrade Guide,
     https://www.breezy-vcs.org/doc/en/upgrade-guide/.
     """
 
@@ -4312,7 +4315,7 @@
     through OTHER, excluding BASE but including OTHER, will be merged.  If this
     causes some revisions to be skipped, i.e. if the destination branch does
     not already contain revision BASE, such a merge is commonly referred to as
-    a "cherrypick". Unlike a normal merge, Bazaar does not currently track
+    a "cherrypick". Unlike a normal merge, Breezy does not currently track
     cherrypicks. The changes look like a normal commit, and the history of the
     changes from the other branch is not stored in the commit.
 
@@ -5133,8 +5136,8 @@
 
     --verbose shows the path where each plugin is located.
 
-    A plugin is an external component for Bazaar that extends the
-    revision control system, by adding or replacing code in Bazaar.
+    A plugin is an external component for Breezy that extends the
+    revision control system, by adding or replacing code in Breezy.
     Plugins can do a variety of things, including overriding commands,
     adding new commands, providing additional network transports and
     customizing log output.
@@ -5420,10 +5423,10 @@
         else:
             self.add_cleanup(b.lock_write().unlock)
         return self._run(b, tree, dry_run, verbose, revision, force,
-                         local, keep_tags)
+                         local, keep_tags, location)
 
     def _run(self, b, tree, dry_run, verbose, revision, force, local,
-             keep_tags):
+             keep_tags, location):
         from .log import log_formatter, show_log
         from .uncommit import uncommit
 
@@ -5477,10 +5480,16 @@
                last_rev_id, rev_id)
         uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
                  revno=revno, local=local, keep_tags=keep_tags)
-        self.outf.write(
-            gettext('You can restore the old tip by running:\n'
-                    '  brz pull . -r revid:%s\n')
-            % last_rev_id.decode('utf-8'))
+        if location != '.':
+            self.outf.write(
+                gettext('You can restore the old tip by running:\n'
+                        '  brz pull -d %s %s -r revid:%s\n')
+                % (location, location, last_rev_id.decode('utf-8')))
+        else:
+            self.outf.write(
+                gettext('You can restore the old tip by running:\n'
+                        '  brz pull . -r revid:%s\n')
+                % last_rev_id.decode('utf-8'))
 
 
 class cmd_break_lock(Command):
@@ -5498,7 +5507,7 @@
     :Examples:
         brz break-lock
         brz break-lock brz+ssh://example.com/brz/foo
-        brz break-lock --conf ~/.bazaar
+        brz break-lock --conf ~/.config/breezy
     """
 
     takes_args = ['location?']
@@ -5789,7 +5798,7 @@
     branch containing submit_branch in its ancestory without needing access to
     the source branch.
 
-    If --no-bundle is specified, then Bazaar doesn't send the contents of the
+    If --no-bundle is specified, then Breezy doesn't send the contents of the
     revisions, but only a structured request to merge from the
     public_location.  In that case the public_branch is needed and it must be
     up-to-date and accessible to the recipient.  The public_branch is always

=== modified file 'breezy/git/cache.py'
--- breezy/git/cache.py	2018-11-12 01:41:38 +0000
+++ breezy/git/cache.py	2019-03-06 14:35:55 +0000
@@ -613,11 +613,9 @@
 
     def open(self, transport):
         try:
-            basepath = transport.local_abspath(".").encode(osutils._fs_enc)
+            basepath = transport.local_abspath(".")
         except bzr_errors.NotLocalUrl:
             basepath = get_cache_dir()
-        if not isinstance(basepath, str):
-            raise TypeError(basepath)
         try:
             return TdbBzrGitCache(os.path.join(basepath, "idmap.tdb"))
         except ImportError:

=== modified file 'breezy/git/git-remote-bzr'
--- breezy/git/git-remote-bzr	2018-03-26 22:28:24 +0000
+++ breezy/git/git-remote-bzr	2019-03-06 14:35:55 +0000
@@ -32,10 +32,12 @@
 import breezy
 breezy.initialize()
 
+from breezy.sixish import PY3
+
 from breezy.plugin import load_plugins
 load_plugins()
 
-from breezy.plugins.git.git_remote_helper import (
+from breezy.git.git_remote_helper import (
     RemoteHelper,
     open_local_dir,
     open_remote_dir,
@@ -46,4 +48,7 @@
 (shortname, url) = args
 
 helper = RemoteHelper(open_local_dir(), shortname, open_remote_dir(url))
-helper.process(sys.stdin, sys.stdout)
+if PY3:
+    helper.process(sys.stdin.buffer, sys.stdout.buffer)
+else:
+    helper.process(sys.stdin, sys.stdout)

=== modified file 'breezy/git/git_remote_helper.py'
--- breezy/git/git_remote_helper.py	2018-11-11 14:23:06 +0000
+++ breezy/git/git_remote_helper.py	2019-03-06 14:35:55 +0000
@@ -186,7 +186,7 @@
             self.batchcmd = None
         else:
             try:
-                self.commands[argv[0]](self, outf, argv)
+                self.commands[argv[0].decode()](self, outf, argv)
             except KeyError:
                 raise Exception("Unknown remote command %r" % argv)
         outf.flush()

=== modified file 'breezy/git/memorytree.py'
--- breezy/git/memorytree.py	2018-11-18 00:25:19 +0000
+++ breezy/git/memorytree.py	2019-03-06 14:35:55 +0000
@@ -258,3 +258,7 @@
     def kind(self, p):
         stat_value = self._file_transport.stat(p)
         return osutils.file_kind_from_stat_mode(stat_value.st_mode)
+
+    def get_symlink_target(self, path):
+        with self.lock_read():
+            return self._file_transport.readlink(path)

=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2019-01-01 21:23:40 +0000
+++ breezy/git/object_store.py	2019-03-06 14:35:55 +0000
@@ -359,7 +359,7 @@
             continue
 
         if tree.kind(path) != 'directory':
-            raise AssertionError
+            continue
 
         obj = Tree()
         for value in tree.iter_child_entries(path):
@@ -589,7 +589,7 @@
         for (file_id, revision, expected_sha), chunks in stream:
             blob = Blob()
             blob.chunked = chunks
-            if blob.id != expected_sha and blob.data == "":
+            if blob.id != expected_sha and blob.data == b"":
                 # Perhaps it's a symlink ?
                 tree = self.tree_cache.revision_tree(revision)
                 path = tree.id2path(file_id)

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-02-14 04:20:37 +0000
+++ breezy/git/tests/test_blackbox.py	2019-03-06 14:35:55 +0000
@@ -78,6 +78,15 @@
         self.assertEqual(output, '')
         self.assertFileEqual("foo\n", ".gitignore")
 
+    def test_cat_revision(self):
+        self.simple_commit()
+        output, error = self.run_bzr(['cat-revision', '-r-1'], retcode=3)
+        self.assertContainsRe(
+            error,
+            'brz: ERROR: Repository .* does not support access to raw '
+            'revision texts')
+        self.assertEqual(output, '')
+
     def test_branch(self):
         os.mkdir("gitbranch")
         GitRepo.init(os.path.join(self.test_dir, "gitbranch"))

=== modified file 'breezy/git/tests/test_branch.py'
--- breezy/git/tests/test_branch.py	2019-01-19 17:13:53 +0000
+++ breezy/git/tests/test_branch.py	2019-03-06 14:35:55 +0000
@@ -112,6 +112,7 @@
         reva = self.simple_commit_a()
         self.build_tree(['b'])
         r = GitRepo(".")
+        self.addCleanup(r.close)
         r.stage("b")
         revb = r.do_commit(b"b", committer=b"Somebody <[e-mail]>")
 
@@ -129,6 +130,7 @@
         o.tag_timezone = 0
         o.tag_time = 42
         r = GitRepo(".")
+        self.addCleanup(r.close)
         r.object_store.add_object(o)
         r[b'refs/tags/foo'] = o.id
         thebranch = Branch.open('.')
@@ -138,6 +140,7 @@
     def test_tag(self):
         reva = self.simple_commit_a()
         r = GitRepo(".")
+        self.addCleanup(r.close)
         r.refs[b"refs/tags/foo"] = reva
         thebranch = Branch.open('.')
         self.assertEqual({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
@@ -221,6 +224,7 @@
     def test_sprouted_tags(self):
         path, gitsha = self.make_onerev_branch()
         r = GitRepo(path)
+        self.addCleanup(r.close)
         r.refs[b"refs/tags/lala"] = r.head()
         oldrepo = Repository.open(path)
         revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
@@ -231,6 +235,7 @@
     def test_sprouted_ghost_tags(self):
         path, gitsha = self.make_onerev_branch()
         r = GitRepo(path)
+        self.addCleanup(r.close)
         r.refs[b"refs/tags/lala"] = b"aa" * 20
         oldrepo = Repository.open(path)
         revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
@@ -238,7 +243,7 @@
             self.clone_git_branch, path, "f")
         self.assertEqual({}, newbranch.tags.get_tag_dict())
         # Dulwich raises a UserWarning for tags with invalid target
-        self.assertEqual(1, len(warnings))
+        self.assertIn(('ref refs/tags/lala points at non-present sha ' + ("aa" * 20), ), [w.args for w in warnings])
 
     def test_interbranch_pull(self):
         path, (gitsha1, gitsha2) = self.make_tworev_branch()
@@ -272,6 +277,7 @@
     def test_interbranch_pull_with_tags(self):
         path, (gitsha1, gitsha2) = self.make_tworev_branch()
         gitrepo = GitRepo(path)
+        self.addCleanup(gitrepo.close)
         gitrepo.refs[b"refs/tags/sometag"] = gitsha2
         oldrepo = Repository.open(path)
         revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)

=== modified file 'breezy/git/tests/test_git_remote_helper.py'
--- breezy/git/tests/test_git_remote_helper.py	2018-11-21 03:39:28 +0000
+++ breezy/git/tests/test_git_remote_helper.py	2019-03-06 14:35:55 +0000
@@ -23,12 +23,15 @@
 
 from io import BytesIO
 import os
+import subprocess
+import sys
 
 from dulwich.repo import Repo
 
 from ...tests import (
     TestCaseWithTransport,
     )
+from ...tests.features import PathFeature
 
 from ..object_store import get_object_store
 from ..git_remote_helper import (
@@ -46,6 +49,11 @@
         return object_store._lookup_revision_sha1(bzr_revid)
 
 
+git_remote_bzr_path = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', 'git-remote-bzr'))
+git_remote_bzr_feature = PathFeature(git_remote_bzr_path)
+
+
 class OpenLocalDirTests(TestCaseWithTransport):
 
     def test_from_env_dir(self):
@@ -86,8 +94,29 @@
         self.assertEqual(out, b"\n")
         r = Repo('local')
         self.assertTrue(git_sha1 in r.object_store)
-        self.assertEqual({
-            }, r.get_refs())
+        self.assertEqual({}, r.get_refs())
+
+
+class ExecuteRemoteHelperTests(TestCaseWithTransport):
+
+    def test_run(self):
+        self.requireFeature(git_remote_bzr_feature)
+        local_dir = self.make_branch_and_tree('local', format='git').controldir
+        local_path = local_dir.control_transport.local_abspath('.')
+        remote_tree = self.make_branch_and_tree('remote')
+        remote_dir = remote_tree.controldir
+        shortname = 'bzr'
+        env = dict(os.environ)
+        env['GIT_DIR'] = local_path
+        env['PYTHONPATH'] = ':'.join(sys.path)
+        p = subprocess.Popen(
+            [sys.executable, git_remote_bzr_path, local_path, remote_dir.user_url],
+            stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE, env=env)
+        (out, err) = p.communicate(b'capabilities\n')
+        lines = out.splitlines()
+        self.assertIn(b'push', lines, "no 'push' in %r, error: %r" % (lines, err))
+        self.assertEqual(b'', err)
 
 
 class RemoteHelperTests(TestCaseWithTransport):

=== modified file 'breezy/git/tests/test_object_store.py'
--- breezy/git/tests/test_object_store.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_object_store.py	2019-03-06 14:35:55 +0000
@@ -18,6 +18,9 @@
 
 from __future__ import absolute_import
 
+import os
+import shutil
+
 from dulwich.objects import (
     Blob,
     Tree,
@@ -144,11 +147,11 @@
     def setUp(self):
         super(BazaarObjectStoreTests, self).setUp()
         self.branch = self.make_branch(".")
-        self.branch.lock_write()
-        self.addCleanup(self.branch.unlock)
         self.store = BazaarObjectStore(self.branch.repository)
 
     def test_get_blob(self):
+        self.branch.lock_write()
+        self.addCleanup(self.branch.unlock)
         b = Blob()
         b.data = b'a\nb\nc\nd\ne\n'
         self.store.lock_read()
@@ -167,7 +170,30 @@
         self.store.lock_read()
         self.assertEqual(b, self.store[b.id])
 
+    def test_directory_converted_to_symlink(self):
+        b = Blob()
+        b.data = b'trgt'
+        self.store.lock_read()
+        self.addCleanup(self.store.unlock)
+        self.assertRaises(KeyError, self.store.__getitem__, b.id)
+        tree = self.branch.controldir.create_workingtree()
+        self.build_tree_contents([
+            ('foo/', ),
+            ('foo/bar', b'a\nb\nc\nd\ne\n')])
+        tree.add(['foo', 'foo/bar'])
+        revid1 = tree.commit('commit 1')
+        shutil.rmtree('foo')
+        os.symlink('trgt', 'foo')
+        revid2 = tree.commit('commit 2')
+        # read locks cache
+        self.assertRaises(KeyError, self.store.__getitem__, b.id)
+        self.store.unlock()
+        self.store.lock_read()
+        self.assertEqual(b, self.store[b.id])
+
     def test_get_raw(self):
+        self.branch.lock_write()
+        self.addCleanup(self.branch.unlock)
         b = Blob()
         b.data = b'a\nb\nc\nd\ne\n'
         self.store.lock_read()
@@ -187,6 +213,8 @@
         self.assertEqual(b.as_raw_string(), self.store.get_raw(b.id)[1])
 
     def test_contains(self):
+        self.branch.lock_write()
+        self.addCleanup(self.branch.unlock)
         b = Blob()
         b.data = b'a\nb\nc\nd\ne\n'
         self.store.lock_read()

=== modified file 'breezy/globbing.py'
--- breezy/globbing.py	2018-11-18 19:48:57 +0000
+++ breezy/globbing.py	2019-03-06 14:35:55 +0000
@@ -248,7 +248,9 @@
             # the combined pattern we sent to regex. Instead we indicate to
             # the user that an ignore file needs fixing.
             mutter('Invalid pattern found in regex: %s.', e.msg)
-            e.msg = "File ~/.bazaar/ignore or .bzrignore contains error(s)."
+            e.msg = (
+                "File ~/.config/breezy/ignore or "
+                ".bzrignore contains error(s).")
             bad_patterns = ''
             for _, patterns in self._regex_patterns:
                 for p in patterns:

=== modified file 'breezy/ignores.py'
--- breezy/ignores.py	2018-11-12 01:41:38 +0000
+++ breezy/ignores.py	2019-03-06 14:35:55 +0000
@@ -33,7 +33,7 @@
     )
 """)
 
-# ~/.bazaar/ignore will be filled out using
+# ~/.config/breezy/ignore will be filled out using
 # this ignore list, if it does not exist
 # please keep these sorted (in C locale order) to aid merging
 USER_DEFAULTS = [

=== modified file 'breezy/memorytree.py'
--- breezy/memorytree.py	2018-11-18 00:25:19 +0000
+++ breezy/memorytree.py	2019-03-06 14:35:55 +0000
@@ -22,6 +22,7 @@
 from __future__ import absolute_import
 
 import os
+import stat
 
 from . import (
     errors,
@@ -62,7 +63,15 @@
         with self.lock_tree_write():
             for f, file_id, kind in zip(files, ids, kinds):
                 if kind is None:
-                    kind = 'file'
+                    st_mode = self._file_transport.stat(f).st_mode
+                    if stat.S_ISREG(st_mode):
+                        kind = 'file'
+                    elif stat.S_ISLNK(st_mode):
+                        kind = 'symlink'
+                    elif stat.S_ISDIR(st_mode):
+                        kind = 'directory'
+                    else:
+                        raise AssertionError('Unknown file kind')
                 if file_id is None:
                     self._inventory.add_path(f, kind=kind)
                 else:
@@ -127,7 +136,7 @@
             # memory tree does not support nested trees yet.
             return kind, None, None, None
         elif kind == 'symlink':
-            raise NotImplementedError('symlink support')
+            return kind, None, None, self._inventory[id].symlink_target
         else:
             raise NotImplementedError('unknown kind')
 
@@ -148,8 +157,7 @@
         return self._inventory.get_entry_by_path(path).executable
 
     def kind(self, path):
-        file_id = self.path2id(path)
-        return self._inventory[file_id].kind
+        return self._inventory.get_entry_by_path(path).kind
 
     def mkdir(self, path, file_id=None):
         """See MutableTree.mkdir()."""
@@ -227,6 +235,8 @@
                 continue
             if entry.kind == 'directory':
                 self._file_transport.mkdir(path)
+            elif entry.kind == 'symlink':
+                self._file_transport.symlink(entry.symlink_target, path)
             elif entry.kind == 'file':
                 self._file_transport.put_file(
                     path, self._basis_tree.get_file(path))
@@ -302,6 +312,10 @@
             else:
                 raise
 
+    def get_symlink_target(self, path):
+        with self.lock_read():
+            return self._file_transport.readlink(path)
+
     def set_parent_trees(self, parents_list, allow_leftmost_as_ghost=False):
         """See MutableTree.set_parent_trees()."""
         if len(parents_list) == 0:

=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2019-02-10 18:37:58 +0000
+++ breezy/plugins/propose/launchpad.py	2019-03-06 14:35:55 +0000
@@ -140,6 +140,7 @@
 
     def set_description(self, description):
         self._mp.description = description
+        self._mp.lp_save()
 
     def close(self):
         self._mp.setStatus(status='Rejected')

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2018-11-16 12:08:41 +0000
+++ breezy/tests/blackbox/test_push.py	2019-03-06 14:35:55 +0000
@@ -22,6 +22,7 @@
 from breezy import (
     branch,
     controldir,
+    directory_service,
     errors,
     osutils,
     tests,
@@ -498,6 +499,25 @@
         self.assertPublished(branch_tree.last_revision(),
                              trunk_tree.branch.base)
 
+    def test_push_new_branch_stacked_on(self):
+        """Pushing a new branch with --stacked-on can use directory URLs."""
+        trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
+        class FooDirectory(object):
+            def look_up(self, name, url, purpose=None):
+                if url == 'foo:':
+                    return trunk_tree.branch.base
+                return url
+        directory_service.directories.register('foo:', FooDirectory, 'Foo directory')
+        self.addCleanup(directory_service.directories.remove, 'foo:')
+        # we publish branch_tree with a reference to the mainline.
+        out, err = self.run_bzr(['push', '--stacked-on', 'foo:',
+                                 self.get_url('published')], working_dir='branch')
+        self.assertEqual('', out)
+        self.assertEqual('Created new stacked branch referring to %s.\n' %
+                         trunk_tree.branch.base, err)
+        self.assertPublished(branch_tree.last_revision(),
+                             trunk_tree.branch.base)
+
     def test_push_new_branch_stacked_uses_parent_when_no_public_url(self):
         """When the parent has no public url the parent is used as-is."""
         trunk_tree, branch_tree = self.create_trunk_and_feature_branch()

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

=== modified file 'breezy/tests/features.py'
--- breezy/tests/features.py	2019-01-19 01:44:20 +0000
+++ breezy/tests/features.py	2019-03-06 14:35:55 +0000
@@ -568,3 +568,17 @@
 
 
 BackslashFilenameFeature = _BackslashFilenameFeature()
+
+
+class PathFeature(Feature):
+    """Feature testing whether a particular path exists."""
+
+    def __init__(self, path):
+        super(PathFeature, self).__init__()
+        self.path = path
+
+    def _probe(self):
+        return os.path.exists(self.path)
+
+    def feature_name(self):
+        return "%s exists" % self.path

=== modified file 'breezy/tests/test_memorytree.py'
--- breezy/tests/test_memorytree.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_memorytree.py	2019-03-06 14:35:55 +0000
@@ -46,21 +46,17 @@
         rev_id = tree.commit('first post')
         tree.unlock()
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_read()
-        self.assertEqual([rev_id], tree.get_parent_ids())
-        with tree.get_file('foo') as f:
-            self.assertEqual(b'contents of foo\n', f.read())
-        tree.unlock()
+        with tree.lock_read():
+            self.assertEqual([rev_id], tree.get_parent_ids())
+            with tree.get_file('foo') as f:
+                self.assertEqual(b'contents of foo\n', f.read())
 
     def test_get_root_id(self):
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        try:
+        with tree.lock_write():
             tree.add([''])
             self.assertIsNot(None, tree.get_root_id())
-        finally:
-            tree.unlock()
 
     def test_lock_tree_write(self):
         """Check we can lock_tree_write and unlock MemoryTrees."""
@@ -73,9 +69,8 @@
         """Check that we error when trying to upgrade a read lock to write."""
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_read()
-        self.assertRaises(errors.ReadOnlyError, tree.lock_tree_write)
-        tree.unlock()
+        with tree.lock_read():
+            self.assertRaises(errors.ReadOnlyError, tree.lock_tree_write)
 
     def test_lock_write(self):
         """Check we can lock_write and unlock MemoryTrees."""
@@ -88,58 +83,63 @@
         """Check that we error when trying to upgrade a read lock to write."""
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_read()
-        self.assertRaises(errors.ReadOnlyError, tree.lock_write)
-        tree.unlock()
+        with tree.lock_read():
+            self.assertRaises(errors.ReadOnlyError, tree.lock_write)
 
     def test_add_with_kind(self):
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        tree.add(['', 'afile', 'adir'], None,
-                 ['directory', 'file', 'directory'])
-        self.assertEqual('afile', tree.id2path(tree.path2id('afile')))
-        self.assertEqual('adir', tree.id2path(tree.path2id('adir')))
-        self.assertFalse(tree.has_filename('afile'))
-        self.assertFalse(tree.has_filename('adir'))
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'afile', 'adir'], None,
+                     ['directory', 'file', 'directory'])
+            self.assertEqual('afile', tree.id2path(tree.path2id('afile')))
+            self.assertEqual('adir', tree.id2path(tree.path2id('adir')))
+            self.assertFalse(tree.has_filename('afile'))
+            self.assertFalse(tree.has_filename('adir'))
 
     def test_put_new_file(self):
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
-                 kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', b'barshoom')
-        self.assertEqual(b'barshoom', tree.get_file('foo').read())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
+                     kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            with tree.get_file('foo') as f:
+                self.assertEqual(b'barshoom', f.read())
 
     def test_put_existing_file(self):
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
-                 kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', b'first-content')
-        tree.put_file_bytes_non_atomic('foo', b'barshoom')
-        self.assertEqual(b'barshoom', tree.get_file('foo').read())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
+                     kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'first-content')
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            self.assertEqual(b'barshoom', tree.get_file('foo').read())
 
     def test_add_in_subdir(self):
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        self.addCleanup(tree.unlock)
-        tree.add([''], [b'root-id'], ['directory'])
-        # Unfortunately, the only way to 'mkdir' is to call 'tree.mkdir', but
-        # that *always* adds the directory as well. So if you want to create a
-        # file in a subdirectory, you have to split out the 'mkdir()' calls
-        # from the add and put_file_bytes_non_atomic calls. :(
-        tree.mkdir('adir', b'dir-id')
-        tree.add(['adir/afile'], [b'file-id'], ['file'])
-        self.assertEqual('adir/afile', tree.id2path(b'file-id'))
-        self.assertEqual('adir', tree.id2path(b'dir-id'))
-        tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
+        with tree.lock_write():
+            tree.add([''], [b'root-id'], ['directory'])
+            # Unfortunately, the only way to 'mkdir' is to call 'tree.mkdir', but
+            # that *always* adds the directory as well. So if you want to create a
+            # file in a subdirectory, you have to split out the 'mkdir()' calls
+            # from the add and put_file_bytes_non_atomic calls. :(
+            tree.mkdir('adir', b'dir-id')
+            tree.add(['adir/afile'], [b'file-id'], ['file'])
+            self.assertEqual('adir/afile', tree.id2path(b'file-id'))
+            self.assertEqual('adir', tree.id2path(b'dir-id'))
+            tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
+
+    def test_add_symlink(self):
+        branch = self.make_branch('branch')
+        tree = MemoryTree.create_on_branch(branch)
+        with tree.lock_write():
+            tree._file_transport.symlink('bar', 'foo')
+            tree.add(['', 'foo'])
+            self.assertEqual('symlink', tree.kind('foo'))
+            self.assertEqual('bar', tree.get_symlink_target('foo'))
 
     def test_commit_trivial(self):
         """Smoke test for commit on a MemoryTree.
@@ -149,40 +149,35 @@
         """
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
-                 kinds=['directory', 'file'])
-        tree.put_file_bytes_non_atomic('foo', b'barshoom')
-        revision_id = tree.commit('message baby')
-        # the parents list for the tree should have changed.
-        self.assertEqual([revision_id], tree.get_parent_ids())
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
+                     kinds=['directory', 'file'])
+            tree.put_file_bytes_non_atomic('foo', b'barshoom')
+            revision_id = tree.commit('message baby')
+            # the parents list for the tree should have changed.
+            self.assertEqual([revision_id], tree.get_parent_ids())
         # and we should have a revision that is accessible outside the tree lock
         revtree = tree.branch.repository.revision_tree(revision_id)
-        revtree.lock_read()
-        self.addCleanup(revtree.unlock)
-        with revtree.get_file('foo') as f:
+        with revtree.lock_read(), revtree.get_file('foo') as f:
             self.assertEqual(b'barshoom', f.read())
 
     def test_unversion(self):
         """Some test for unversion of a memory tree."""
         branch = self.make_branch('branch')
         tree = MemoryTree.create_on_branch(branch)
-        tree.lock_write()
-        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
-                 kinds=['directory', 'file'])
-        tree.unversion(['foo'])
-        self.assertFalse(tree.is_versioned('foo'))
-        self.assertFalse(tree.has_id(b'foo-id'))
-        tree.unlock()
+        with tree.lock_write():
+            tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
+                     kinds=['directory', 'file'])
+            tree.unversion(['foo'])
+            self.assertFalse(tree.is_versioned('foo'))
+            self.assertFalse(tree.has_id(b'foo-id'))
 
     def test_last_revision(self):
         """There should be a last revision method we can call."""
         tree = self.make_branch_and_memory_tree('branch')
-        tree.lock_write()
-        tree.add('')
-        rev_id = tree.commit('first post')
-        tree.unlock()
+        with tree.lock_write():
+            tree.add('')
+            rev_id = tree.commit('first post')
         self.assertEqual(rev_id, tree.last_revision())
 
     def test_rename_file(self):

=== modified file 'breezy/tests/test_urlutils.py'
--- breezy/tests/test_urlutils.py	2018-11-23 03:06:01 +0000
+++ breezy/tests/test_urlutils.py	2019-03-06 14:35:55 +0000
@@ -599,6 +599,9 @@
         self.assertEqual(("foo/base,key1=val1/other/elements",
                           {"key2": "val2"}), split_segment_parameters(
             "foo/base,key1=val1/other/elements,key2=val2"))
+        self.assertRaises(
+            urlutils.InvalidURL, split_segment_parameters,
+            "foo/base,key1")
         # TODO: Check full URLs as well as relative references
 
     def test_win32_strip_local_trailing_slash(self):

=== modified file 'breezy/transport/memory.py'
--- breezy/transport/memory.py	2018-11-17 16:53:10 +0000
+++ breezy/transport/memory.py	2019-03-06 14:35:55 +0000
@@ -26,9 +26,10 @@
 from io import (
     BytesIO,
     )
+import itertools
 import os
 import errno
-from stat import S_IFREG, S_IFDIR, S_IFLNK
+from stat import S_IFREG, S_IFDIR, S_IFLNK, S_ISDIR
 
 from .. import (
     transport,
@@ -50,20 +51,16 @@
 
 class MemoryStat(object):
 
-    def __init__(self, size, kind, perms):
+    def __init__(self, size, kind, perms=None):
         self.st_size = size
-        if kind == 'file':
+        if not S_ISDIR(kind):
             if perms is None:
                 perms = 0o644
-            self.st_mode = S_IFREG | perms
-        elif kind == 'directory':
+            self.st_mode = kind | perms
+        else:
             if perms is None:
                 perms = 0o755
-            self.st_mode = S_IFDIR | perms
-        elif kind == 'symlink':
-            self.st_mode = S_IFLNK | 0o644
-        else:
-            raise AssertionError('unknown kind %r' % kind)
+            self.st_mode = kind | perms
 
 
 class MemoryTransport(transport.Transport):
@@ -111,7 +108,7 @@
 
     def append_file(self, relpath, f, mode=None):
         """See Transport.append_file()."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         self._check_parent(_abspath)
         orig_content, orig_mode = self._files.get(_abspath, (b"", None))
         if mode is None:
@@ -128,16 +125,20 @@
     def has(self, relpath):
         """See Transport.has()."""
         _abspath = self._abspath(relpath)
-        return ((_abspath in self._files)
-                or (_abspath in self._dirs)
-                or (_abspath in self._symlinks))
+        for container in (self._files, self._dirs, self._symlinks):
+            if _abspath in container.keys():
+                return True
+        return False
 
     def delete(self, relpath):
         """See Transport.delete()."""
         _abspath = self._abspath(relpath)
-        if _abspath not in self._files:
+        if _abspath in self._files:
+            del self._files[_abspath]
+        elif _abspath in self._symlinks:
+            del self._symlinks[_abspath]
+        else:
             raise NoSuchFile(relpath)
-        del self._files[_abspath]
 
     def external_url(self):
         """See breezy.transport.Transport.external_url."""
@@ -147,7 +148,7 @@
 
     def get(self, relpath):
         """See Transport.get()."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         if _abspath not in self._files:
             if _abspath in self._dirs:
                 return LateReadError(relpath)
@@ -157,15 +158,20 @@
 
     def put_file(self, relpath, f, mode=None):
         """See Transport.put_file()."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         self._check_parent(_abspath)
         raw_bytes = f.read()
         self._files[_abspath] = (raw_bytes, mode)
         return len(raw_bytes)
 
+    def symlink(self, source, target):
+        _abspath = self._resolve_symlinks(target)
+        self._check_parent(_abspath)
+        self._symlinks[_abspath] = self._abspath(source)
+
     def mkdir(self, relpath, mode=None):
         """See Transport.mkdir()."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         self._check_parent(_abspath)
         if _abspath in self._dirs:
             raise FileExists(relpath)
@@ -183,13 +189,13 @@
         return True
 
     def iter_files_recursive(self):
-        for file in self._files:
+        for file in itertools.chain(self._files, self._symlinks):
             if file.startswith(self._cwd):
                 yield urlutils.escape(file[len(self._cwd):])
 
     def list_dir(self, relpath):
         """See Transport.list_dir()."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         if _abspath != '/' and _abspath not in self._dirs:
             raise NoSuchFile(relpath)
         result = []
@@ -197,7 +203,7 @@
         if not _abspath.endswith('/'):
             _abspath += '/'
 
-        for path_group in self._files, self._dirs:
+        for path_group in self._files, self._dirs, self._symlinks:
             for path in path_group:
                 if path.startswith(_abspath):
                     trailing = path[len(_abspath):]
@@ -207,8 +213,8 @@
 
     def rename(self, rel_from, rel_to):
         """Rename a file or directory; fail if the destination exists"""
-        abs_from = self._abspath(rel_from)
-        abs_to = self._abspath(rel_to)
+        abs_from = self._resolve_symlinks(rel_from)
+        abs_to = self._resolve_symlinks(rel_to)
 
         def replace(x):
             if x == abs_from:
@@ -233,21 +239,25 @@
         # fail differently depending on dict order. So work on copy, fail on
         # error on only replace dicts if all goes well.
         renamed_files = self._files.copy()
+        renamed_symlinks = self._symlinks.copy()
         renamed_dirs = self._dirs.copy()
         do_renames(renamed_files)
+        do_renames(renamed_symlinks)
         do_renames(renamed_dirs)
         # We may have been cloned so modify in place
         self._files.clear()
         self._files.update(renamed_files)
+        self._symlinks.clear()
+        self._symlinks.update(renamed_symlinks)
         self._dirs.clear()
         self._dirs.update(renamed_dirs)
 
     def rmdir(self, relpath):
         """See Transport.rmdir."""
-        _abspath = self._abspath(relpath)
+        _abspath = self._resolve_symlinks(relpath)
         if _abspath in self._files:
             self._translate_error(IOError(errno.ENOTDIR, relpath), relpath)
-        for path in self._files:
+        for path in itertools.chain(self._files, self._symlinks):
             if path.startswith(_abspath + '/'):
                 self._translate_error(IOError(errno.ENOTEMPTY, relpath),
                                       relpath)
@@ -262,13 +272,13 @@
     def stat(self, relpath):
         """See Transport.stat()."""
         _abspath = self._abspath(relpath)
-        if _abspath in self._files:
-            return MemoryStat(len(self._files[_abspath][0]), 'file',
+        if _abspath in self._files.keys():
+            return MemoryStat(len(self._files[_abspath][0]), S_IFREG,
                               self._files[_abspath][1])
-        elif _abspath in self._dirs:
-            return MemoryStat(0, 'directory', self._dirs[_abspath])
-        elif _abspath in self._symlinks:
-            return MemoryStat(0, 'symlink', 0)
+        elif _abspath in self._dirs.keys():
+            return MemoryStat(0, S_IFDIR, self._dirs[_abspath])
+        elif _abspath in self._symlinks.keys():
+            return MemoryStat(0, S_IFLNK)
         else:
             raise NoSuchFile(_abspath)
 
@@ -280,6 +290,12 @@
         """See Transport.lock_write()."""
         return _MemoryLock(self._abspath(relpath), self)
 
+    def _resolve_symlinks(self, relpath):
+        path = self._abspath(relpath)
+        while path in self._symlinks.keys():
+            path = self._symlinks[path]
+        return path
+
     def _abspath(self, relpath):
         """Generate an internal absolute path."""
         relpath = urlutils.unescape(relpath)
@@ -336,6 +352,7 @@
     def start_server(self):
         self._dirs = {'/': None}
         self._files = {}
+        self._symlinks = {}
         self._locks = {}
         self._scheme = "memory+%s:///" % id(self)
 
@@ -344,6 +361,7 @@
             result = memory.MemoryTransport(url)
             result._dirs = self._dirs
             result._files = self._files
+            result._symlinks = self._symlinks
             result._locks = self._locks
             return result
         self._memory_factory = memory_factory

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2018-11-16 23:19:12 +0000
+++ breezy/urlutils.py	2019-03-06 14:35:55 +0000
@@ -561,7 +561,10 @@
     (base_url, subsegments) = split_segment_parameters_raw(url)
     parameters = {}
     for subsegment in subsegments:
-        (key, value) = subsegment.split("=", 1)
+        try:
+            (key, value) = subsegment.split("=", 1)
+        except ValueError:
+            raise InvalidURL(url, "missing = in subsegment")
         if not isinstance(key, str):
             raise TypeError(key)
         if not isinstance(value, str):

=== modified file 'brz'
--- brz	2018-11-18 12:41:12 +0000
+++ brz	2019-03-06 14:35:55 +0000
@@ -25,7 +25,7 @@
 import warnings
 
 # update this on each release
-_script_version = (3, 0, 0)
+_script_version = (3, 1, 0)
 
 NEED_VERS = (2, 7)
 

=== modified file 'byov.conf'
--- byov.conf	2018-12-19 01:30:58 +0000
+++ byov.conf	2019-03-06 14:35:55 +0000
@@ -13,6 +13,8 @@
 sphinx_epytext.install3 = (pip3 install sphinx_epytext)
 flake8.install = (pip install flake8)
 flake8.install3 = (pip3 install flake8)
+cython.install = (pip install cython)
+cython.install3 = (pip3 install cython)
 
 [brz]
 # FIXME: we're stuck on xenial
@@ -25,12 +27,12 @@
 
 # FIXME: Arguably this should be vm.build_deps=brz but it requires either an
 # available package or at least a debian/ dir ? -- vila 2018-02-23
-brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, cython, cython3, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib
+brz.build_deps = gcc, debhelper, python, python-all-dev, python3-all-dev, python-configobj, python3-configobj, python-docutils, python3-docutils, python-paramiko, python3-paramiko, python-subunit, python3-subunit, python-testtools, python3-testtools, subunit, python-pip, python3-pip, python-setuptools, python3-setuptools, python-flake8, python3-flake8, python-sphinx, python3-sphinx, python-launchpadlib, python3-launchpadlib
 subunit.build_deps = python-testscenarios, python3-testscenarios, python-testtools, python3-testtools
 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
 [brz-xenial]
 vm.release = xenial
-byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3})
+byoci.setup.command = ({dulwich.clone} && {dulwich.install} && {dulwich.install3} && {fastimport.clone} && {fastimport.install} && {fastimport.install3} && {subunit.clone} && {flake8.install} && {flake8.install3} && {sphinx_epytext.install} && {sphinx_epytext.install3} && {cython.install} && {cython.install3})
 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
 [brz-bionic]

=== modified file 'doc/developers/apport.txt'
--- doc/developers/apport.txt	2009-12-02 20:34:07 +0000
+++ doc/developers/apport.txt	2019-03-06 14:35:55 +0000
@@ -41,7 +41,7 @@
 
 #. An exception reaches the top-level handler.
 
-#. We log it in apport-format to a file in ~/.bazaar/crash.
+#. We log it in apport-format to a file in ~/.config/breezy/crash.
 
 #. We tell the user where that file is, and invite them to file a bug
    report.

=== modified file 'doc/developers/configuration.txt'
--- doc/developers/configuration.txt	2017-07-30 16:59:50 +0000
+++ doc/developers/configuration.txt	2019-03-06 14:35:55 +0000
@@ -154,20 +154,6 @@
 though). The ``bzr-bookmarks`` plugin defines a ``BOOKMARKS`` section there
 for example.
 
-pkgimport.conf
-==============
-
-The Ubuntu package importer defines a store and two stacks involving
-``pkgimport.conf``. A no-name section contains the options common to all
-packages and sections named after their corresponding package can also be
-defined.
-
-The ``ImporterStack`` uses ``locations.conf`` and the no-name section in
-``pkgimport.conf`` for the importer options.
-
-The ``PackageStack`` uses only ``pkgimport.conf`` and uses the section name
-after the package followed by the no-name section.
-
 location.conf
 =============
 

=== modified file 'doc/developers/contribution-quickstart.txt'
--- doc/developers/contribution-quickstart.txt	2019-01-01 21:38:07 +0000
+++ doc/developers/contribution-quickstart.txt	2019-03-06 14:35:55 +0000
@@ -46,7 +46,7 @@
 closely-related cluster of bugs per branch, to make reviews and merges
 flow more smoothly.
 
-You probably want this configuration in ``~/.bazaar/locations.conf``::
+You probably want this configuration in ``~/.config/breezy/locations.conf``::
 
     [/home/USER/brz]
     push_location = lp:~LAUNCHPAD_USER/brz/{branchname}

=== modified file 'doc/developers/plugin-development.txt'
--- doc/developers/plugin-development.txt	2018-11-22 02:23:26 +0000
+++ doc/developers/plugin-development.txt	2019-03-06 14:35:55 +0000
@@ -31,7 +31,7 @@
 To ensure your plugin under development is available to Breezy, set
 the ``BRZ_PLUGIN_PATH`` environment variable to its parent directory.
 Alternatively, you may wish to develop your plugin within a directory
-under your personal plugins area (``~/.bazaar/plugins`` on GNU/Linux)
+under your personal plugins area (``~/.config/breezy/plugins`` on GNU/Linux)
 or put a symbolic link in that area pointing to your plugin under
 test.  Finally you can use ``BRZ_PLUGINS_AT`` to point to a specific
 directory for a specific plugin (separated by your platform's value of

=== modified file 'doc/en/admin-guide/hooks-plugins.txt'
--- doc/en/admin-guide/hooks-plugins.txt	2018-11-18 13:20:01 +0000
+++ doc/en/admin-guide/hooks-plugins.txt	2019-03-06 14:35:55 +0000
@@ -25,10 +25,10 @@
 http://doc.bazaar.canonical.com/plugins/en/.  For purposes of installation,
 plugins are simply python packages.  They can be installed alongside Bazaar in
 the ``bzrlib.plugins`` package using each plugin's ``setup.py``.  They can
-also be installed in the plugin path which is the user's ``~/.bazaar/plugins``
-directory or can be specified with the ``BZR_PLUGIN_PATH`` environment
-variable.  See ``bzr help configuration`` for more on specifying the location
-of plugins.
+also be installed in the plugin path which is the user's
+``~/.config/breezy/plugins`` directory or can be specified with the
+``BZR_PLUGIN_PATH`` environment variable.  See ``bzr help configuration`` for
+more on specifying the location of plugins.
 
 
 Email Notification

=== modified file 'doc/en/admin-guide/migration.txt'
--- doc/en/admin-guide/migration.txt	2018-11-18 13:20:01 +0000
+++ doc/en/admin-guide/migration.txt	2019-03-06 14:35:55 +0000
@@ -56,7 +56,7 @@
 This command has flexible ways to specify what paths within the Subversion
 repository contain branches and which contain tags.  For example, the
 recommended layout for Subversion projects (called ``trunk`` by the svn
-plugin) could be specified in ``~/.bazaar/subversion.conf`` as
+plugin) could be specified in ``~/.config/breezy/subversion.conf`` as
 
 ::
 

=== modified file 'doc/en/index.txt'
--- doc/en/index.txt	2018-09-14 09:31:24 +0000
+++ doc/en/index.txt	2019-03-06 14:35:55 +0000
@@ -10,7 +10,7 @@
 .. toctree::
    :maxdepth: 1
 
-   whats-new/whats-new-in-3.0
+   whats-new/whats-new-in-3.1
    user-guide/index
    tutorials/index
    quick-reference/index

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-03-02 22:31:28 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-03-06 14:35:55 +0000
@@ -5,16 +5,16 @@
 .. toctree::
    :maxdepth: 1
 
+brz 3.0.0
+#########
+
+:Codename: Pelican
+:3.0.0: 2019-03-06
+
 brz 3.0.0 is the first release of ``Breezy``, a fork of Bazaar. For more
 information, see our release announcement on the Bazaar mailing list and
 README.
 
-brz 3.0.0
-#########
-
-:Codename: Pelican
-:3.0.0: NOT RELEASED YET
-
 External Compatibility Breaks
 *****************************
 
@@ -85,6 +85,9 @@
    longer performed, since there are no longer
    any automated imports. (Jelmer Vernooij)
 
+ * ``setuptools`` is now required to build and install Breezy.
+   (Jelmer Vernooij)
+
 New Features
 ************
 
@@ -234,6 +237,13 @@
 * Don't report .git files as unknown files.
   (Jelmer Vernooij, Debian Bug #921240)
 
+* Raise better error when path subsegments lack =.
+  (Jelmer Vernooij, #891483)
+
+* Display correct pull location argument in
+  output of ``brz uncommit``.
+  (Jelmer Vernooij, #386577)
+
 Documentation
 *************
 

=== added file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	1970-01-01 00:00:00 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-03-06 14:35:55 +0000
@@ -0,0 +1,62 @@
+####################
+Breezy Release Notes
+####################
+
+.. toctree::
+   :maxdepth: 1
+
+brz 3.1.0
+#########
+
+:Codename: Nirvana
+:3.1.0: NOT RELEASED YET
+
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Breezy.
+
+New Features
+************
+
+.. New commands, options, etc that users may wish to try out.
+
+Improvements
+************
+
+.. Improvements to existing commands, especially improved performance 
+   or memory usage, or better results.
+
+Bug Fixes
+*********
+
+.. Fixes for situations where brz would previously crash or give incorrect
+   or undesirable results.
+
+Documentation
+*************
+
+.. Improved or updated documentation.
+
+API Changes
+***********
+
+.. Changes that may require updates in plugins or other code that uses
+   breezy.
+
+Internals
+*********
+
+.. Major internal changes, unlikely to be visible to users or plugin 
+   developers, but interesting for brz developers.
+
+Testing
+*******
+
+.. Fixes and changes that are only relevant to brz's test framework and 
+   suite.  This can include new facilities for writing tests, fixes to 
+   spurious test failures and changes to the way things should be tested.
+
+
+..
+   vim: tw=74 ft=rst ff=unix

=== modified file 'doc/en/user-guide/controlling_registration.txt'
--- doc/en/user-guide/controlling_registration.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/controlling_registration.txt	2019-03-06 14:35:55 +0000
@@ -95,12 +95,12 @@
 There are some ignored files which are not project specific, but more user
 specific. Things like editor temporary files, or personal temporary files.
 Rather than add these ignores to every project, brz supports a global
-ignore file in ``~/.bazaar/ignore`` [#]_. It has the same syntax as the
+ignore file in ``~/.config/breezy/ignore`` [#]_. It has the same syntax as the
 per-project ignore file.
 
 .. [#] On Windows, the users configuration files can be found in the
-   application data directory. So instead of ``~/.bazaar/branch.conf``
+   application data directory. So instead of ``~/.config/breezy/branch.conf``
    the configuration file can be found as:
-   ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\branch.conf``.
+   ``C:\Documents and Settings\<username>\Application Data\Breezy\3.0\branch.conf``.
    The same is true for ``locations.conf``, ``ignore``, and the
    ``plugins`` directory.

=== added file 'doc/en/user-guide/git_limitations.txt'
--- doc/en/user-guide/git_limitations.txt	1970-01-01 00:00:00 +0000
+++ doc/en/user-guide/git_limitations.txt	2019-03-06 14:35:55 +0000
@@ -0,0 +1,18 @@
+Git Limitations
+===============
+
+Breezy's support for Git repositories currently has the following limitations:
+
+* No support for creating annotated tags. pad.lv/1758185
+* No support for gitattributes and the features that depend on it (lfs, eol, etc). pad.lv/1802797
+* Limited support for submodules. pad.lv/402814
+* No rename/copy inference. pad.lv/1760740
+* No support for creating shallow branches (pad.lv/1760151)
+* No good way to refer to git remotes from the command-line (pad.lv/1702283)
+* No mailmap support (pad.lv/544031)
+
+Functionality similar to git that's missing:
+
+* No rebase command. pad.lv/1708046
+* No --amend option for commit. pad.lv/507529
+* No clone/fetch commands. pad.lv/831939

=== modified file 'doc/en/user-guide/index-plain.txt'
--- doc/en/user-guide/index-plain.txt	2018-11-24 15:56:05 +0000
+++ doc/en/user-guide/index-plain.txt	2019-03-06 14:35:55 +0000
@@ -114,6 +114,7 @@
 .. include:: setting_up_email.txt
 .. include:: http_smart_server.txt
 .. include:: writing_a_plugin.txt
+.. include:: git_limitations.txt
 .. include:: licence.txt
 
 .. |--| unicode:: U+2014

=== modified file 'doc/en/user-guide/installing_breezy.txt'
--- doc/en/user-guide/installing_breezy.txt	2018-11-18 13:43:04 +0000
+++ doc/en/user-guide/installing_breezy.txt	2019-03-06 14:35:55 +0000
@@ -90,7 +90,7 @@
   3. Put the created directory on your PATH.
 
 Advanced users may also wish to build the optional C extensions for greater
-speed. This can be done using ``make`` and requires ``pyrex`` and a C compiler.
+speed. This can be done using ``make`` and requires ``cython`` and a C compiler.
 Please contact us on email or IRC if you need assistance with this.
 
 

=== modified file 'doc/en/user-guide/plugins.txt'
--- doc/en/user-guide/plugins.txt	2017-05-21 13:41:54 +0000
+++ doc/en/user-guide/plugins.txt	2019-03-06 14:35:55 +0000
@@ -35,7 +35,7 @@
 
 Installing a plugin is very easy! If not already created, create a
 ``plugins`` directory under your Breezy configuration directory,
-``~/.bazaar/`` on Unix and
+``~/.config/breezy/`` on Unix and
 ``C:\Documents and Settings\<username>\Application Data\Breezy\2.0\``
 on Windows. Within this directory (referred to as $BZR_HOME below),
 each plugin is placed in its own subdirectory.
@@ -45,7 +45,7 @@
 one can perform the following::
 
     brz branch http://panoramicfeedback.com/opensource/brz/brztools
-    ~/.bazaar/plugins/brztools
+    ~/.config/breezy/plugins/brztools
 
 When installing plugins, the directories that you install them in must
 be valid python identifiers. This means that they can only contain

=== modified file 'doc/en/whats-new/template.txt'
--- doc/en/whats-new/template.txt	2011-07-18 15:58:50 +0000
+++ doc/en/whats-new/template.txt	2019-03-06 14:35:55 +0000
@@ -1,8 +1,8 @@
 *************************
-What's New in Bazaar x.y?
+What's New in Breezy x.y?
 *************************
 
-Bazaar x.y is still under development, and will be released in Month Year.
+Breezy x.y is still under development, and will be released in Month Year.
 This document accumulates a high level summary of what's changed.  See the
 :doc:`../release-notes/index` for a full list.
 
@@ -14,7 +14,7 @@
 For more detailed information on the changes made, see the the
 :doc:`../release-notes/index` for:
 
-* the interim bzr `milestones <https://launchpad.net/bzr/x.y>`_
+* the interim brz `milestones <https://launchpad.net/bzr/x.y>`_
 * the plugins you use.
 
 For a summary of changes made in earlier releases, see:

=== added file 'doc/en/whats-new/whats-new-in-3.1.txt'
--- doc/en/whats-new/whats-new-in-3.1.txt	1970-01-01 00:00:00 +0000
+++ doc/en/whats-new/whats-new-in-3.1.txt	2019-03-06 14:35:55 +0000
@@ -0,0 +1,22 @@
+*************************
+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>
+
+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.
+
+For a summary of changes made in earlier releases, see:
+
+* :doc:`whats-new-in-3.0`

=== modified file 'setup.py'
--- setup.py	2019-02-06 05:44:37 +0000
+++ setup.py	2019-03-06 14:35:55 +0000
@@ -16,6 +16,14 @@
     sys.stderr.write("[ERROR] Not a supported Python version. Need 2.7+\n")
     sys.exit(1)
 
+
+try:
+    import setuptools
+except ImportError:
+    sys.stderr.write("[ERROR] Please install setuptools\n")
+    sys.exit(1)
+
+
 # NOTE: The directory containing setup.py, whether run by 'python setup.py' or
 # './setup.py' or the equivalent with another path, should always be at the
 # start of the path, so this should find the right one...
@@ -118,8 +126,7 @@
 BREEZY['packages'] = get_breezy_packages()
 
 
-from distutils import log
-from distutils.core import setup
+from setuptools import setup
 from distutils.version import LooseVersion
 from distutils.command.install_scripts import install_scripts
 from distutils.command.install_data import install_data
@@ -211,8 +218,17 @@
     print("")
     from distutils.command.build_ext import build_ext
 else:
-    have_cython = True
+    minimum_cython_version = '0.29'
     cython_version_info = LooseVersion(cython_version)
+    if cython_version_info < LooseVersion(minimum_cython_version):
+        print("Version of Cython is too old. "
+              "Current is %s, need at least %s."
+              % (cython_version, minimum_cython_version))
+        print("If the .c files are available, they will be built,"
+              " but modifying the .pyx files will not rebuild them.")
+        have_cython = False
+    else:
+        have_cython = True
 
 
 class build_ext_if_possible(build_ext):