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

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

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

=== added file 'SECURITY.md'
--- SECURITY.md	1970-01-01 00:00:00 +0000
+++ SECURITY.md	2021-03-22 21:17:36 +0000
@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| 3.1.x    | :white_check_mark: |
+| 3.0.x    | :x:                |
+
+## Reporting a Vulnerability
+
+Please report security issues by e-mail to [e-mail].

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2020-08-10 15:00:17 +0000
+++ breezy/builtins.py	2021-03-22 21:17:36 +0000
@@ -4584,7 +4584,7 @@
 
     def _do_merge(self, merger, change_reporter, allow_pending, verified):
         merger.change_reporter = change_reporter
-        conflict_count = merger.do_merge()
+        conflict_count = len(merger.do_merge())
         if allow_pending:
             merger.set_pending()
         if verified == 'failed':
@@ -4842,7 +4842,7 @@
             conflicts = merger.do_merge()
         finally:
             tree.set_parent_ids(parents)
-        if conflicts > 0:
+        if len(conflicts) > 0:
             return 1
         else:
             return 0

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2020-11-18 02:15:43 +0000
+++ breezy/bzr/workingtree.py	2021-03-22 21:17:36 +0000
@@ -1932,7 +1932,7 @@
         # local work is unreferenced and will appear to have been lost.
         #
         with self.lock_tree_write():
-            nb_conflicts = 0
+            nb_conflicts = []
             try:
                 last_rev = self.get_parent_ids()[0]
             except IndexError:
@@ -1953,7 +1953,7 @@
                                                  show_base=show_base)
                 if nb_conflicts:
                     self.add_parent_tree((old_tip, other_tree))
-                    return nb_conflicts
+                    return len(nb_conflicts)
 
             if last_rev != _mod_revision.ensure_null(revision):
                 # the working tree is up to date with the branch
@@ -1995,7 +1995,7 @@
                         (old_tip, self.branch.repository.revision_tree(old_tip)))
                 self.set_parent_trees(parent_trees)
                 last_rev = parent_trees[0][0]
-            return nb_conflicts
+            return len(nb_conflicts)
 
 
 class WorkingTreeFormatMetaDir(bzrdir.BzrFormat, WorkingTreeFormat):

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2021-01-10 00:25:52 +0000
+++ breezy/git/branch.py	2021-03-22 21:17:36 +0000
@@ -1450,13 +1450,26 @@
             for k, v in self.source.tags.get_tag_dict().items():
                 ret.append((None, v))
         ret.append((None, stop_revision))
-        try:
-            revidmap = self.interrepo.fetch_revs(ret, lossy=lossy, limit=limit)
-        except NoPushSupport:
-            raise errors.NoRoundtrippingSupport(self.source, self.target)
-        return _mod_repository.FetchResult(revidmap={
-            old_revid: new_revid
-            for (old_revid, (new_sha, new_revid)) in revidmap.items()})
+        if getattr(self.interrepo, 'fetch_revs', None):
+            try:
+                revidmap = self.interrepo.fetch_revs(ret, lossy=lossy, limit=limit)
+            except NoPushSupport:
+                raise errors.NoRoundtrippingSupport(self.source, self.target)
+            return _mod_repository.FetchResult(revidmap={
+                old_revid: new_revid
+                for (old_revid, (new_sha, new_revid)) in revidmap.items()})
+        else:
+            def determine_wants(refs):
+                wants = []
+                for git_sha, revid in ret:
+                    if git_sha is None:
+                        git_sha, mapping = self.target.lookup_bzr_revision_id(revid)
+                    wants.append(git_sha)
+                return wants
+
+            self.interrepo.fetch_objects(
+                determine_wants, lossy=lossy, limit=limit)
+            return _mod_repository.FetchResult()
 
     def pull(self, overwrite=False, stop_revision=None, local=False,
              possible_transports=None, run_hooks=True, _stop_revno=None,

=== modified file 'breezy/git/interrepo.py'
--- breezy/git/interrepo.py	2021-01-10 00:25:52 +0000
+++ breezy/git/interrepo.py	2021-03-22 21:17:36 +0000
@@ -801,9 +801,9 @@
         def git_update_refs(old_refs):
             ret = {}
             self.old_refs = {
-                k: (v, None) for (k, v) in viewitems(old_refs)}
+                k: (v, None) for (k, v) in old_refs.items()}
             new_refs = update_refs(self.old_refs)
-            for name, (gitid, revid) in viewitems(new_refs):
+            for name, (gitid, revid) in new_refs.items():
                 if gitid is None:
                     gitid = self.source_store._lookup_revision_sha1(revid)
                 if not overwrite:

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2020-08-22 22:46:24 +0000
+++ breezy/git/mapping.py	2021-03-22 21:17:36 +0000
@@ -411,9 +411,11 @@
                 rev.properties[u'author'] = commit.author.decode(encoding)
             rev.message, rev.git_metadata = self._decode_commit_message(
                 rev, commit.message, encoding)
+
         if commit.encoding is not None:
             rev.properties[u'git-explicit-encoding'] = commit.encoding.decode(
                 'ascii')
+        if commit.encoding is not None and commit.encoding != b'false':
             decode_using_encoding(rev, commit, commit.encoding.decode('ascii'))
         else:
             for encoding in ('utf-8', 'latin1'):

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-08-10 15:00:17 +0000
+++ breezy/git/remote.py	2021-03-22 21:17:36 +0000
@@ -630,8 +630,8 @@
                 except errors.NoSuchRevision:
                     raise errors.NoRoundtrippingSupport(
                         source, self.open_branch(name=name, nascent_ok=True))
+            old_sha = remote_refs.get(actual_refname)
             if not overwrite:
-                old_sha = remote_refs.get(actual_refname)
                 if remote_divergence(old_sha, new_sha, source_store):
                     raise DivergedBranches(
                         source, self.open_branch(name, nascent_ok=True))

=== modified file 'breezy/git/tests/test_mapping.py'
--- breezy/git/tests/test_mapping.py	2020-06-10 23:47:24 +0000
+++ breezy/git/tests/test_mapping.py	2021-03-22 21:17:36 +0000
@@ -140,6 +140,26 @@
         self.assertEqual("iso8859-1", rev.properties[u"git-explicit-encoding"])
         self.assertTrue(u"git-implicit-encoding" not in rev.properties)
 
+    def test_explicit_encoding_false(self):
+        c = Commit()
+        c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
+        c.message = b"Some message"
+        c.committer = b"Committer"
+        c.commit_time = 4
+        c.author_time = 5
+        c.commit_timezone = 60 * 5
+        c.author_timezone = 60 * 3
+        c.author = u"Authér".encode("utf-8")
+        c.encoding = b"false"
+        mapping = BzrGitMappingv1()
+        rev, roundtrip_revid, verifiers = mapping.import_commit(
+            c, mapping.revision_id_foreign_to_bzr)
+        self.assertEqual(None, roundtrip_revid)
+        self.assertEqual({}, verifiers)
+        self.assertEqual(u"Authér", rev.properties[u'author'])
+        self.assertEqual("false", rev.properties[u"git-explicit-encoding"])
+        self.assertTrue(u"git-implicit-encoding" not in rev.properties)
+
     def test_implicit_encoding_fallback(self):
         c = Commit()
         c.tree = b"cc9462f7f8263ef5adfbeff2fb936bb36b504cba"

=== modified file 'breezy/git/tests/test_transform.py'
--- breezy/git/tests/test_transform.py	2020-09-02 16:35:18 +0000
+++ breezy/git/tests/test_transform.py	2021-03-22 21:17:36 +0000
@@ -20,7 +20,7 @@
 
 import os
 
-from ...transform import ROOT_PARENT, conflict_pass, resolve_conflicts
+from ...transform import ROOT_PARENT, conflict_pass, resolve_conflicts, revert
 from . import TestCaseWithTransport
 
 
@@ -39,3 +39,16 @@
         self.assertEqual([], list(conflicts))
         tt.apply()
         self.assertEqual(set(['name1', 'name2']), set(os.listdir('dir')))
+
+    def test_revert_does_not_remove(self):
+        tree = self.make_branch_and_tree('.', format='git')
+        tt = tree.transform()
+        dir1 = tt.new_directory('dir', ROOT_PARENT)
+        tid = tt.new_file('name1', dir1, [b'content1'])
+        tt.version_file(tid)
+        tt.apply()
+        tree.commit('start')
+        with open('dir/name1', 'wb') as f:
+            f.write(b'new content2')
+        revert(tree, tree.basis_tree())
+        self.assertEqual([], list(tree.iter_changes(tree.basis_tree())))

=== modified file 'breezy/git/transform.py'
--- breezy/git/transform.py	2020-11-19 17:40:49 +0000
+++ breezy/git/transform.py	2021-03-22 21:17:36 +0000
@@ -1440,7 +1440,7 @@
         changes = {}
         changed_ids = set()
         for id_set in [self._new_name, self._new_parent,
-                       self._new_executability]:
+                       self._new_executability, self._new_contents]:
             changed_ids.update(id_set)
         for id_set in [self._new_name, self._new_parent]:
             removed_id.update(id_set)

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2020-11-18 02:15:43 +0000
+++ breezy/git/workingtree.py	2021-03-22 21:17:36 +0000
@@ -1518,7 +1518,7 @@
         #
         with self.lock_tree_write():
             from .. import merge
-            nb_conflicts = 0
+            nb_conflicts = []
             try:
                 last_rev = self.get_parent_ids()[0]
             except IndexError:
@@ -1539,7 +1539,7 @@
                                                  show_base=show_base)
                 if nb_conflicts:
                     self.add_parent_tree((old_tip, other_tree))
-                    return nb_conflicts
+                    return len(nb_conflicts)
 
             if last_rev != _mod_revision.ensure_null(revision):
                 to_tree = self.branch.repository.revision_tree(revision)
@@ -1572,7 +1572,7 @@
                         (old_tip, self.branch.repository.revision_tree(old_tip)))
                 self.set_parent_trees(parent_trees)
                 last_rev = parent_trees[0][0]
-            return nb_conflicts
+            return len(nb_conflicts)
 
 
 class GitWorkingTreeFormat(workingtree.WorkingTreeFormat):

=== modified file 'breezy/merge.py'
--- breezy/merge.py	2020-08-22 22:46:24 +0000
+++ breezy/merge.py	2021-03-22 21:17:36 +0000
@@ -666,7 +666,7 @@
             trace.note(gettext("%d conflicts encountered.")
                        % len(merge.cooked_conflicts))
 
-        return len(merge.cooked_conflicts)
+        return merge.cooked_conflicts
 
 
 class _InventoryNoneEntry(object):

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2020-11-18 02:15:43 +0000
+++ breezy/plugins/github/hoster.py	2021-03-22 21:17:36 +0000
@@ -456,7 +456,7 @@
         repo = self._get_repo(owner, project)
         return github_url_to_bzr_url(repo['ssh_url'], branch_name)
 
-    def get_derived_branch(self, base_branch, name, project=None, owner=None):
+    def get_derived_branch(self, base_branch, name, project=None, owner=None, preferred_schemes=None):
         base_owner, base_project, base_branch_name = parse_github_branch_url(base_branch)
         base_repo = self._get_repo(base_owner, base_project)
         if owner is None:
@@ -465,10 +465,24 @@
             project = base_repo['name']
         try:
             remote_repo = self._get_repo(owner, project)
-            full_url = github_url_to_bzr_url(remote_repo['ssh_url'], name)
-            return _mod_branch.Branch.open(full_url)
         except NoSuchProject:
             raise errors.NotBranchError('%s/%s/%s' % (WEB_GITHUB_URL, owner, project))
+        if preferred_schemes is None:
+            preferred_schemes = ['git+ssh']
+        for scheme in preferred_schemes:
+            if scheme == 'git+ssh':
+                github_url = remote_repo['ssh_url']
+                break
+            if scheme == 'https':
+                github_url = remote_repo['clone_url']
+                break
+            if scheme == 'git':
+                github_url = remote_repo['git_url']
+                break
+        else:
+            raise AssertionError
+        full_url = github_url_to_bzr_url(github_url, name)
+        return _mod_branch.Branch.open(full_url)
 
     def get_proposer(self, source_branch, target_branch):
         return GitHubMergeProposalBuilder(self, source_branch, target_branch)

=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2020-11-18 02:15:43 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-03-22 21:17:36 +0000
@@ -81,7 +81,8 @@
     _fmt = "GitLab can not process request: %(error)s."
 
     def __init__(self, error):
-        errors.BzrError.__init__(self, error=error)
+        errors.BzrError.__init__(self)
+        self.error = error
 
 
 class DifferentGitLabInstances(errors.BzrError):
@@ -112,7 +113,8 @@
     _fmt = "Conflict during operation: %(reason)s"
 
     def __init__(self, reason):
-        errors.BzrError(self, reason=reason)
+        errors.BzrError(self)
+        self.reason = reason
 
 
 class ForkingDisabled(errors.BzrError):
@@ -228,7 +230,13 @@
         self._mr = mr
 
     def _update(self, **kwargs):
-        self.gl._update_merge_request(self._mr['project_id'], self._mr['iid'], kwargs)
+        try:
+            self.gl._update_merge_request(
+                self._mr['project_id'], self._mr['iid'], kwargs)
+        except GitLabConflict as e:
+            self.gl._handle_merge_request_conflict(
+                e.reason, self.get_source_branch_url(),
+                self._mr['target_project_id'])
 
     def __repr__(self):
         return "<%s at %r>" % (type(self).__name__, self._mr['web_url'])
@@ -302,7 +310,7 @@
         elif self._mr['merge_status'] == 'can_be_merged':
             return True
         elif self._mr['merge_status'] in (
-                'unchecked', 'cannot_be_merged_recheck'):
+                'unchecked', 'cannot_be_merged_recheck', 'checking'):
             # See https://gitlab.com/gitlab-org/gitlab/-/commit/7517105303c for
             # an explanation of the distinction between unchecked and
             # cannot_be_merged_recheck
@@ -407,7 +415,17 @@
             return json.loads(response.data)
         _unexpected_status(path, response)
 
-    def _fork_project(self, project_name, timeout=50, interval=5, owner=None):
+    def create_project(self, project_name):
+        fields = {'name': project_name}
+        response = self._api_request('POST', 'projects', fields=fields)
+        if response.status == 403:
+            raise errors.PermissionDenied(response.text)
+        if response.status not in (200, 201):
+            _unexpected_status('projects', response)
+        project = json.loads(response.data)
+        return project
+
+    def fork_project(self, project_name, timeout=50, interval=5, owner=None):
         path = 'projects/%s/fork' % urlutils.quote(str(project_name), '')
         fields = {}
         if owner is not None:
@@ -434,6 +452,18 @@
             project = self._get_project(project['path_with_namespace'])
         return project
 
+    def _handle_merge_request_conflict(self, message, source_url, target_project):
+        m = re.fullmatch(
+            r'Another open merge request already exists for '
+            r'this source branch: \!([0-9]+)',
+            message[0])
+        if m:
+            merge_id = int(m.group(1))
+            mr = self._get_merge_request(target_project, merge_id)
+            raise MergeProposalExists(
+                source_url, GitLabMergeProposal(self, mr))
+        raise MergeRequestConflict(reason)
+
     def get_current_user(self):
         return self._current_user['username']
 
@@ -493,6 +523,8 @@
         response = self._api_request('PUT', path, fields=mr)
         if response.status == 200:
             return json.loads(response.data)
+        if response.status == 409:
+            raise GitLabConflict(json.loads(response.data).get('message'))
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         _unexpected_status(path, response)
@@ -527,7 +559,7 @@
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         if response.status == 409:
-            raise MergeRequestConflict(json.loads(response.data))
+            raise GitLabConflict(json.loads(response.data).get('message'))
         if response.status == 422:
             data = json.loads(response.data)
             raise GitLabUnprocessable(data['error'])
@@ -555,7 +587,7 @@
         try:
             target_project = self._get_project('%s/%s' % (owner, project))
         except NoSuchProject:
-            target_project = self._fork_project(
+            target_project = self.fork_project(
                 base_project['path_with_namespace'], owner=owner)
         remote_repo_url = git_url_to_bzr_url(target_project['ssh_url_to_repo'])
         remote_dir = controldir.ControlDir.open(remote_repo_url)
@@ -573,7 +605,7 @@
             target_project['http_url_to_repo'], name)
         return push_result.target_branch, public_url
 
-    def get_derived_branch(self, base_branch, name, project=None, owner=None):
+    def get_derived_branch(self, base_branch, name, project=None, owner=None, preferred_schemes=None):
         (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
         if owner is None:
             owner = self.get_current_user()
@@ -583,8 +615,19 @@
             target_project = self._get_project('%s/%s' % (owner, project))
         except NoSuchProject:
             raise errors.NotBranchError('%s/%s/%s' % (self.base_url, owner, project))
-        return _mod_branch.Branch.open(gitlab_url_to_bzr_url(
-            target_project['ssh_url_to_repo'], name))
+        if preferred_schemes is None:
+            preferred_schemes = ['git+ssh']
+        for scheme in preferred_schemes:
+            if scheme == 'git+ssh':
+                gitlab_url = target_project['ssh_url_to_repo']
+                break
+            elif scheme == 'https':
+                gitlab_url = target_project['http_url_to_repo']
+                break
+        else:
+            raise AssertionError
+        return _mod_branch.Branch.open(
+            gitlab_url_to_bzr_url(gitlab_url, name))
 
     def get_proposer(self, source_branch, target_branch):
         return GitlabMergeProposalBuilder(self, source_branch, target_branch)
@@ -657,7 +700,7 @@
             yield GitLabMergeProposal(self, mp)
 
     def iter_my_forks(self, owner=None):
-        if owner is not None:
+        if owner is None:
             owner = self.get_current_user()
         for project in self._list_projects(owner=owner):
             base_project = project.get('forked_from_project')
@@ -754,18 +797,10 @@
                 kwargs['assignee_ids'].append(user['id'])
         try:
             merge_request = self.gl._create_mergerequest(**kwargs)
-        except MergeRequestConflict as e:
-            m = re.fullmatch(
-                r'Another open merge request already exists for '
-                r'this source branch: \!([0-9]+)',
-                e.reason['message'][0])
-            if m:
-                merge_id = int(m.group(1))
-                mr = self.gl._get_merge_request(
-                    target_project['path_with_namespace'], merge_id)
-                raise MergeProposalExists(
-                    self.source_branch.user_url, GitLabMergeProposal(self.gl, mr))
-            raise Exception('conflict: %r' % e.reason)
+        except GitLabConflict as e:
+            self.gl._handle_merge_request_conflict(
+                e.reason, self.source_branch.user_url,
+                target_project['path_with_namespace'])
         except GitLabUnprocessable as e:
             if e.error == [
                     "Source project is not a fork of the target project"]:

=== modified file 'breezy/plugins/launchpad/hoster.py'
--- breezy/plugins/launchpad/hoster.py	2020-11-18 02:15:43 +0000
+++ breezy/plugins/launchpad/hoster.py	2021-03-22 21:17:36 +0000
@@ -408,7 +408,8 @@
         else:
             raise AssertionError('not a valid Launchpad URL')
 
-    def get_derived_branch(self, base_branch, name, project=None, owner=None):
+    def get_derived_branch(self, base_branch, name, project=None, owner=None, preferred_schemes=None):
+        # TODO(jelmer): honor preferred_schemes
         if owner is None:
             owner = self.launchpad.me.name
         (base_vcs, base_user, base_password, base_path,

=== added directory 'breezy/plugins/pypi'
=== added file 'breezy/plugins/pypi/__init__.py'
--- breezy/plugins/pypi/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/pypi/__init__.py	2021-03-22 21:17:36 +0000
@@ -0,0 +1,29 @@
+# Copyright (C) 2021 Breezy Developers
+#
+# 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 looking up URLs from pypi.
+"""
+
+from __future__ import absolute_import
+
+from ... import (
+    version_info,  # noqa: F401
+    )
+from ...directory_service import directories
+
+directories.register_lazy('pypi:', __name__ + '.directory',
+                          'PypiDirectory',
+                          'Pypi-based directory service',)

=== added file 'breezy/plugins/pypi/directory.py'
--- breezy/plugins/pypi/directory.py	1970-01-01 00:00:00 +0000
+++ breezy/plugins/pypi/directory.py	2021-03-22 21:17:36 +0000
@@ -0,0 +1,78 @@
+# Copyright (C) 2021 Breezy Developers
+#
+# 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
+
+"""Directory lookup that uses pypi."""
+
+from __future__ import absolute_import
+
+from breezy.errors import BzrError
+from breezy.trace import note
+from breezy.urlutils import InvalidURL
+
+import json
+
+try:
+    from urllib.request import urlopen
+    from urllib.parse import urlparse
+    from urllib.error import HTTPError
+except ImportError:  # python < 3
+    from urllib import urlopen, HTTPError
+    from urlparse import urlparse
+
+
+class PypiProjectWithoutRepositoryURL(InvalidURL):
+
+    _fmt = "No repository URL set for pypi project %(name)s"
+
+    def __init__(self, name, url=None):
+        BzrError.__init__(self, name=name, url=url)
+
+
+class NoSuchPypiProject(InvalidURL):
+
+    _fmt = "No pypi project with name %(name)s"
+
+    def __init__(self, name, url=None):
+        BzrError.__init__(self, name=name, url=url)
+
+
+def find_repo_url(data):
+    for key, value in data['info']['project_urls'].items():
+        if key == 'Repository':
+            note('Found repository URL %s for pypi project %s',
+                 value, name)
+            return value
+        parsed_url = urlparse(value)
+        if (parsed_url.hostname == 'github.com' and
+                parsed_url.path.strip('/').count('/') == 1):
+            return value
+
+
+class PypiDirectory(object):
+
+    def look_up(self, name, url, purpose=None):
+        """See DirectoryService.look_up"""
+        try:
+            with urlopen('https://pypi.org/pypi/%s/json' % name) as f:
+                data = json.load(f)
+        except HTTPError as e:
+            if e.status == 404:
+                raise NoSuchPypiProject(name, url=url)
+            raise
+        url = find_repo_url(data)
+        if url is None:
+            raise PypiProjectWithoutRepositoryURL(name, url=url)
+        return url

=== modified file 'breezy/plugins/quilt/tests/test_merge.py'
--- breezy/plugins/quilt/tests/test_merge.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/quilt/tests/test_merge.py	2021-03-22 21:17:36 +0000
@@ -149,7 +149,7 @@
 """, "a/debian/patches/patch1")
         # "a" should be unapplied again
         self.assertPathDoesNotExist("a/a")
-        self.assertEquals(1, conflicts)
+        self.assertEquals(1, len(conflicts))
 
     def test_auto_apply_patches_after_checkout(self):
         self.enable_hooks()
@@ -286,7 +286,7 @@
 c
 >>>>>>> MERGE-SOURCE
 """, "a/a")
-        self.assertEquals(2, conflicts)
+        self.assertEquals(2, len(conflicts))
 
 
 

=== modified file 'breezy/propose.py'
--- breezy/propose.py	2020-11-18 02:15:43 +0000
+++ breezy/propose.py	2021-03-22 21:17:36 +0000
@@ -286,7 +286,7 @@
         """
         raise NotImplementedError(self.publish_derived)
 
-    def get_derived_branch(self, base_branch, name, project=None, owner=None):
+    def get_derived_branch(self, base_branch, name, project=None, owner=None, preferred_schemes=None):
         """Get a derived branch ('a fork').
         """
         raise NotImplementedError(self.get_derived_branch)

=== modified file 'breezy/tests/per_workingtree/test_commit.py'
--- breezy/tests/per_workingtree/test_commit.py	2020-08-15 22:46:49 +0000
+++ breezy/tests/per_workingtree/test_commit.py	2021-03-22 21:17:36 +0000
@@ -101,11 +101,11 @@
 
         # Merging from A should introduce conflicts because 'n' was modified
         # (in A) and removed (in B), so 'a' needs to be restored.
-        num_conflicts = tree_b.merge_from_branch(tree_a.branch)
+        conflicts = tree_b.merge_from_branch(tree_a.branch)
         if tree_b.has_versioned_directories():
-            self.assertEqual(3, num_conflicts)
+            self.assertEqual(3, len(conflicts))
         else:
-            self.assertEqual(2, num_conflicts)
+            self.assertEqual(2, len(conflicts))
 
         self.assertThat(
             tree_b, HasPathRelations(

=== modified file 'breezy/tests/per_workingtree/test_merge_from_branch.py'
--- breezy/tests/per_workingtree/test_merge_from_branch.py	2020-08-15 22:46:49 +0000
+++ breezy/tests/per_workingtree/test_merge_from_branch.py	2021-03-22 21:17:36 +0000
@@ -224,9 +224,9 @@
         outer.commit('delete file3')
         nb_conflicts = outer.merge_from_branch(inner, to_revision=revs[2])
         if outer.supports_rename_tracking():
-            self.assertEqual(4, nb_conflicts)
+            self.assertEqual(4, len(nb_conflicts))
         else:
-            self.assertEqual(1, nb_conflicts)
+            self.assertEqual(1, len(nb_conflicts))
         self.assertTreeLayout(['dir-outer',
                                'dir-outer/dir',
                                'dir-outer/dir/file1',
@@ -245,9 +245,9 @@
         # file4 could not be added to its original root, so it gets added to
         # the new root with a conflict.
         if outer.supports_rename_tracking():
-            self.assertEqual(1, nb_conflicts)
+            self.assertEqual(1, len(nb_conflicts))
         else:
-            self.assertEqual(0, nb_conflicts)
+            self.assertEqual(0, len(nb_conflicts))
         self.assertTreeLayout(['dir-outer',
                                'dir-outer/dir',
                                'dir-outer/dir/file1',
@@ -261,9 +261,9 @@
         # 1 conflict, because file4 can't be put into the old root
         nb_conflicts = outer.merge_from_branch(inner, to_revision=revs[3])
         if outer.supports_rename_tracking():
-            self.assertEqual(1, nb_conflicts)
+            self.assertEqual(1, len(nb_conflicts))
         else:
-            self.assertEqual(0, nb_conflicts)
+            self.assertEqual(0, len(nb_conflicts))
         try:
             outer.set_conflicts([])
         except errors.UnsupportedOperation:
@@ -275,7 +275,7 @@
         # And now file4 gets renamed into an existing dir
         nb_conflicts = outer.merge_from_branch(inner, to_revision=revs[4])
         if outer.supports_rename_tracking():
-            self.assertEqual(1, nb_conflicts)
+            self.assertEqual(1, len(nb_conflicts))
             self.assertTreeLayout(['dir-outer',
                                    'dir-outer/dir',
                                    'dir-outer/dir/file1',
@@ -285,9 +285,9 @@
                                   outer)
         else:
             if outer.has_versioned_directories():
-                self.assertEqual(2, nb_conflicts)
+                self.assertEqual(2, len(nb_conflicts))
             else:
-                self.assertEqual(1, nb_conflicts)
+                self.assertEqual(1, len(nb_conflicts))
             self.assertTreeLayout(['dir',
                                    'dir-outer',
                                    'dir-outer/dir',

=== modified file 'breezy/tests/per_workingtree/test_unversion.py'
--- breezy/tests/per_workingtree/test_unversion.py	2020-08-15 17:47:31 +0000
+++ breezy/tests/per_workingtree/test_unversion.py	2021-03-22 21:17:36 +0000
@@ -175,11 +175,11 @@
         # Merging from A should introduce conflicts because 'n' was modified
         # and removed, so 'a' needs to be restored. We also have a conflict
         # because 'a' is still an existing directory
-        num_conflicts = tree_b.merge_from_branch(tree_a.branch)
+        conflicts = tree_b.merge_from_branch(tree_a.branch)
         if tree_b.has_versioned_directories():
-            self.assertEqual(4, num_conflicts)
+            self.assertEqual(4, len(conflicts))
         else:
-            self.assertEqual(1, num_conflicts)
+            self.assertEqual(1, len(conflicts))
 
         self.assertThat(
             tree_b,

=== modified file 'breezy/tests/test_merge.py'
--- breezy/tests/test_merge.py	2020-08-22 22:46:24 +0000
+++ breezy/tests/test_merge.py	2021-03-22 21:17:36 +0000
@@ -434,8 +434,8 @@
                                                      first_rev)
         merger.merge_type = _mod_merge.Merge3Merger
         merger.interesting_files = 'a'
-        conflict_count = merger.do_merge()
-        self.assertEqual(0, conflict_count)
+        conflicts = merger.do_merge()
+        self.assertEqual([], conflicts)
 
         self.assertPathDoesNotExist("a")
         tree.revert()
@@ -515,8 +515,8 @@
                                                      _mod_revision.NULL_REVISION,
                                                      first_rev)
         merger.merge_type = _mod_merge.Merge3Merger
-        conflict_count = merger.do_merge()
-        self.assertEqual(0, conflict_count)
+        conflicts = merger.do_merge()
+        self.assertEqual([], conflicts)
         self.assertEqual({''}, set(tree.all_versioned_paths()))
         tree.set_parent_ids([])
 
@@ -2190,7 +2190,7 @@
                                [('modify', ('a', b'a\nb\nc\nd\ne\nf\n'))],
                                revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'E-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         # The merge should have simply update the contents of 'a'
         self.assertEqual(b'a\nb\nc\nd\ne\nf\n', wt.get_file_text('a'))
 
@@ -2220,7 +2220,7 @@
                                [('rename', ('bar', 'baz'))], revision_id=b'F-id')
         builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         # The merge should simply recognize that the final rename takes
         # precedence
         self.assertEqual('baz', wt.id2path(b'foo-id'))
@@ -2251,7 +2251,7 @@
                                [('unversion', 'bar')], revision_id=b'F-id')
         builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         self.assertRaises(errors.NoSuchId, wt.id2path, b'foo-id')
 
     def test_executable_changes(self):
@@ -2286,7 +2286,7 @@
         wt.revert()
         self.assertFalse(wt.is_executable('foo'))
         conflicts = wt.merge_from_branch(wt.branch, to_revision=b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual(0, len(conflicts))
         self.assertTrue(wt.is_executable('foo'))
 
     def test_create_symlink(self):
@@ -2322,7 +2322,7 @@
         wt.revert()
         self.assertFalse(wt.is_versioned('foo'))
         conflicts = wt.merge_from_branch(wt.branch, to_revision=b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual(0, len(conflicts))
         self.assertEqual(b'foo-id', wt.path2id('foo'))
         self.assertEqual('bar', wt.get_symlink_target('foo'))
 
@@ -2352,7 +2352,7 @@
         builder.build_snapshot([b'B-id', b'C-id'], [],
                                revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'E-id')
-        self.assertEqual(1, conflicts)
+        self.assertEqual(1, len(conflicts))
         self.assertEqualDiff(b'<<<<<<< TREE\n'
                              b'B content\n'
                              b'=======\n'
@@ -2402,7 +2402,7 @@
         wt.merge_from_branch(wt.branch, b'C-id')
         wt.commit('D merges B & C', rev_id=b'D-id')
         conflicts = wt.merge_from_branch(wt.branch, to_revision=b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual(0, len(conflicts))
         self.assertEqual('bing', wt.get_symlink_target('foo'))
 
     def test_renamed_symlink(self):
@@ -2459,7 +2459,7 @@
                            False),
                           ], entries)
         conflicts = wt.merge_from_branch(wt.branch, to_revision=b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual(0, len(conflicts))
         self.assertEqual('blah', wt.id2path(b'foo-id'))
 
     def test_symlink_no_content_change(self):
@@ -2509,7 +2509,7 @@
         self.assertEqual([], list(merge_obj._entries_lca()))
         # Now do a real merge, just to test the rest of the stack
         conflicts = wt.merge_from_branch(wt.branch, to_revision=b'E-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual(0, len(conflicts))
         self.assertEqual('bing', wt.get_symlink_target('foo'))
 
     def test_symlink_this_changed_kind(self):
@@ -2652,7 +2652,7 @@
                                [('rename', ('bar', 'foo'))], revision_id=b'F-id')  # Rename back to BASE
         builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         self.assertEqual('foo', wt.id2path(b'foo-id'))
 
     def test_other_reverted_content_to_base(self):
@@ -2673,7 +2673,7 @@
                                revision_id=b'F-id')  # Revert back to BASE
         builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         # TODO: We need to use the per-file graph to properly select a BASE
         #       before this will work. Or at least use the LCA trees to find
         #       the appropriate content base. (which is B, not A).
@@ -2697,7 +2697,7 @@
                                revision_id=b'F-id')  # Override B content
         builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
         wt, conflicts = self.do_merge(builder, b'F-id')
-        self.assertEqual(0, conflicts)
+        self.assertEqual([], conflicts)
         self.assertEqual(b'F content\n', wt.get_file_text('foo'))
 
     def test_all_wt(self):
@@ -3302,7 +3302,7 @@
         dest_wt = self.setup_simple_branch('dest', ['dir/', 'dir/file.txt'])
         self.setup_simple_branch('src', ['README'])
         conflicts = self.do_merge_into('src', 'dest/dir')
-        self.assertEqual(1, conflicts)
+        self.assertEqual(1, len(conflicts))
         dest_wt.lock_read()
         self.addCleanup(dest_wt.unlock)
         # The r1-lib1 revision should be merged into this one
@@ -3330,7 +3330,7 @@
         # This is an edge case that shouldn't happen to users very often.  So
         # we don't care really about the exact presentation of the conflict,
         # just that there is one.
-        self.assertEqual(1, conflicts)
+        self.assertEqual(1, len(conflicts))
 
     def test_only_subdir(self):
         """When the location points to just part of a tree, merge just that

=== modified file 'breezy/tests/test_merge_core.py'
--- breezy/tests/test_merge_core.py	2020-08-09 18:10:01 +0000
+++ breezy/tests/test_merge_core.py	2021-03-22 21:17:36 +0000
@@ -503,13 +503,13 @@
         self.build_tree_contents([('b/file', b'this contents contents\n')])
         wtb = d_b.open_workingtree()
         wtb.commit('this revision', allow_pointless=False)
-        self.assertEqual(1, wtb.merge_from_branch(wta.branch))
+        self.assertEqual(1, len(wtb.merge_from_branch(wta.branch)))
         self.assertPathExists('b/file.THIS')
         self.assertPathExists('b/file.BASE')
         self.assertPathExists('b/file.OTHER')
         wtb.revert()
-        self.assertEqual(1, wtb.merge_from_branch(wta.branch,
-                                                  merge_type=WeaveMerger))
+        self.assertEqual(1, len(wtb.merge_from_branch(wta.branch,
+                                                  merge_type=WeaveMerger)))
         self.assertPathExists('b/file')
         self.assertPathExists('b/file.THIS')
         self.assertPathExists('b/file.BASE')
@@ -544,9 +544,9 @@
             revision_id=b'E-id')
         builder.finish_series()
         tree = builder.get_branch().create_checkout('tree', lightweight=True)
-        self.assertEqual(1, tree.merge_from_branch(tree.branch,
+        self.assertEqual(1, len(tree.merge_from_branch(tree.branch,
                                                    to_revision=b'D-id',
-                                                   merge_type=WeaveMerger))
+                                                   merge_type=WeaveMerger)))
         self.assertPathExists('tree/foo.THIS')
         self.assertPathExists('tree/foo.OTHER')
         self.expectFailure('fail to create .BASE in some criss-cross merges',
@@ -640,8 +640,10 @@
         b_wt.rename_one('deux', 'un')
         b_wt.rename_one('tmp', 'deux')
         b_wt.commit('r1', rev_id=b'r1')
-        self.assertEqual(0, a_wt.merge_from_branch(b_wt.branch,
-                                                   b_wt.branch.last_revision(), b_wt.branch.get_rev_id(1)))
+        self.assertEqual(
+            0, len(a_wt.merge_from_branch(
+                b_wt.branch, b_wt.branch.last_revision(),
+                b_wt.branch.get_rev_id(1))))
         self.assertPathExists('a/un')
         self.assertTrue('a/deux')
         self.assertFalse(os.path.exists('a/tmp'))

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2020-11-19 18:28:52 +0000
+++ breezy/transform.py	2021-03-22 21:17:36 +0000
@@ -729,7 +729,7 @@
     return conflicts, merge_modified
 
 
-def revert(working_tree, target_tree, filenames, backups=False,
+def revert(working_tree, target_tree, filenames=None, backups=False,
            pb=None, change_reporter=None, merge_modified=None, basis_tree=None):
     """Revert a working tree's contents to those of a target tree."""
     with contextlib.ExitStack() as es:

=== modified file 'breezy/workspace.py'
--- breezy/workspace.py	2020-08-06 22:27:46 +0000
+++ breezy/workspace.py	2021-03-22 21:17:36 +0000
@@ -52,7 +52,7 @@
       subpath: Subpath to operate on
     """
     revert(local_tree, local_tree.branch.basis_tree(),
-           [subpath] if subpath not in ('.', '') else None)
+           [subpath] if subpath else None)
     deletables = list(iter_deletables(
         local_tree, unknown=True, ignored=False, detritus=False))
     delete_items(deletables)

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-11-22 15:50:02 +0000
+++ doc/en/release-notes/brz-3.1.txt	2021-03-22 21:17:36 +0000
@@ -54,6 +54,9 @@
    but it prevents the DWIM revision specifier from treating "svn:"
    as a URL. (Jelmer Vernooij)
 
+ * New `pypi` directory that can be used to access remote repositories
+   declared in pypi. (Jelmer Vernooij)
+
 Bug Fixes
 *********
 
@@ -96,6 +99,10 @@
  * File ids are no longer returned in ``Tree.walkdirs``.
    (Jelmer Vernooij)
 
+ * ``WorkingTree.merge_from_branch``, ``Merge.do_merge`` and
+   ``merge_inner`` now return a list of conflicts rather than number of
+   conflicts.  (Jelmer Vernooij)
+
 Internals
 *********