Merge lp:~jelmer/brz/push-non-mainline-to-git into lp:brz/3.0

[Jelmer Vernooij]

Fix pushing non-mainline revisions from bzr to git.

Fix pushing non-mainline revisions from bzr to git.

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2019-03-06 11:06:58 +0000
+++ breezy/__init__.py	2019-05-29 03:52:43 +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, 'final', 0)
+version_info = (3, 1, 0, 'dev', 1)
 
 
 def _format_version_tuple(version_info):

=== modified file 'breezy/directory_service.py'
--- breezy/directory_service.py	2019-02-09 03:23:20 +0000
+++ breezy/directory_service.py	2019-05-29 03:52:43 +0000
@@ -185,8 +185,8 @@
 
     def look_up(self, name, url, purpose=None):
         dir = _mod_controldir.ControlDir.open_containing('.')[0]
-        return urlutils.join_segment_parameters(dir.user_url,
-                                                {"branch": urlutils.escape(name)})
+        return urlutils.join_segment_parameters(
+            dir.user_url, {"branch": urlutils.escape(name)})
 
 
 directories.register('co:', ColocatedDirectory,

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2019-01-19 17:13:53 +0000
+++ breezy/git/branch.py	2019-05-29 03:52:43 +0000
@@ -76,7 +76,10 @@
 from .unpeel_map import (
     UnpeelMap,
     )
-from .urls import git_url_to_bzr_url
+from .urls import (
+    git_url_to_bzr_url,
+    bzr_url_to_git_url,
+    )
 
 
 class GitPullResult(branch.PullResult):
@@ -464,49 +467,76 @@
         # Git doesn't do stacking (yet...)
         raise branch.UnstackableBranchFormat(self._format, self.base)
 
+    def _get_push_origin(self, cs):
+        """Get the name for the push origin.
+
+        The exact behaviour is documented in the git-config(1) manpage.
+        """
+        try:
+            return cs.get((b'branch', self.name.encode('utf-8')), b'pushRemote')
+        except KeyError:
+            try:
+                return cs.get((b'branch', ), b'remote')
+            except KeyError:
+                try:
+                    return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
+                except KeyError:
+                    return b'origin'
+
+    def _get_origin(self, cs):
+        try:
+            return cs.get((b'branch', self.name.encode('utf-8')), b'remote')
+        except KeyError:
+            return b'origin'
+
+    def _get_related_push_branch(self, cs):
+        remote = self._get_push_origin(cs)
+        try:
+            location = cs.get((b"remote", remote), b"url")
+        except KeyError:
+            return None
+
+        return git_url_to_bzr_url(location.decode('utf-8'), ref=self.ref)
+
+    def _get_related_merge_branch(self, cs):
+        remote = self._get_origin(cs)
+        try:
+            location = cs.get((b"remote", remote), b"url")
+        except KeyError:
+            return None
+
+        try:
+            ref = cs.get((b"branch", remote), b"merge")
+        except KeyError:
+            ref = self.ref
+
+        return git_url_to_bzr_url(location.decode('utf-8'), ref=ref)
+
     def _get_parent_location(self):
         """See Branch.get_parent()."""
-        # FIXME: Set "origin" url from .git/config ?
         cs = self.repository._git.get_config_stack()
-        try:
-            location = cs.get((b"remote", b'origin'), b"url")
-        except KeyError:
-            return None
-
-        params = {}
-        try:
-            ref = cs.get((b"remote", b"origin"), b"merge")
-        except KeyError:
-            pass
-        else:
-            if ref != b'HEAD':
-                try:
-                    params['branch'] = urlutils.escape(ref_to_branch_name(ref))
-                except ValueError:
-                    params['ref'] = urlutils.quote_from_bytes(ref)
-
-        url = git_url_to_bzr_url(location.decode('utf-8'))
-        return urlutils.join_segment_parameters(url, params)
+        return self._get_related_merge_branch(cs)
+
+    def _write_git_config(self, cs):
+        f = BytesIO()
+        cs.write_to_file(f)
+        self.repository._git._put_named_file('config', f.getvalue())
 
     def set_parent(self, location):
-        # FIXME: Set "origin" url in .git/config ?
         cs = self.repository._git.get_config()
+        remote = self._get_origin(cs)
         this_url = urlutils.split_segment_parameters(self.user_url)[0]
-        target_url, target_params = urlutils.split_segment_parameters(location)
+        target_url, branch, ref = bzr_url_to_git_url(location)
         location = urlutils.relative_url(this_url, target_url)
-        cs.set((b"remote", b"origin"), b"url", location)
-        if 'branch' in target_params:
-            cs.set((b"remote", b"origin"), b"merge",
-                   branch_name_to_ref(target_params['branch']))
-        elif 'ref' in target_params:
-            cs.set((b"remote", b"origin"), b"merge",
-                   target_params['ref'])
+        cs.set((b"remote", remote), b"url", location)
+        if branch:
+            cs.set((b"branch", remote), b"merge", branch_name_to_ref(branch))
+        elif ref:
+            cs.set((b"branch", remote), b"merge", ref)
         else:
             # TODO(jelmer): Maybe unset rather than setting to HEAD?
-            cs.set((b"remote", b"origin"), b"merge", 'HEAD')
-        f = BytesIO()
-        cs.write_to_file(f)
-        self.repository._git._put_named_file('config', f.getvalue())
+            cs.set((b"branch", remote), b"merge", b'HEAD')
+        self._write_git_config(cs)
 
     def break_lock(self):
         raise NotImplementedError(self.break_lock)
@@ -720,7 +750,10 @@
     def get_push_location(self):
         """See Branch.get_push_location."""
         push_loc = self.get_config_stack().get('push_location')
-        return push_loc
+        if push_loc is not None:
+            return push_loc
+        cs = self.repository._git.get_config_stack()
+        return self._get_related_push_branch(cs)
 
     def set_push_location(self, location):
         """See Branch.set_push_location."""
@@ -1221,7 +1254,10 @@
         if stop_revision is None:
             (stop_revno, stop_revision) = self.source.last_revision_info()
         elif stop_revno is None:
-            stop_revno = self.source.revision_id_to_revno(stop_revision)
+            try:
+                stop_revno = self.source.revision_id_to_revno(stop_revision)
+            except errors.NoSuchRevision:
+                stop_revno = None
         if not isinstance(stop_revision, bytes):
             raise TypeError(stop_revision)
         main_ref = self.target.ref

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2019-05-28 21:46:53 +0000
+++ breezy/git/tests/test_blackbox.py	2019-05-29 03:52:43 +0000
@@ -150,6 +150,22 @@
         self.assertEqual(b"", output)
         self.assertTrue(error.endswith(b"Created new branch.\n"))
 
+    def test_push_lossy_non_mainline(self):
+        self.run_bzr(['init', '--git', 'bla'])
+        self.run_bzr(['init', 'foo'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
+        self.run_bzr(['branch', 'foo', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
+        self.run_bzr(['merge', '-d', 'foo', 'foo1'])
+        self.run_bzr(['commit', '--unchanged', '-m', 'merge', 'foo'])
+        output, error = self.run_bzr(['push', '--lossy', '-r1.1.1', '-d', 'foo', 'bla'])
+        self.assertEqual(b"", output)
+        self.assertEqual(
+            b'Pushing from a Bazaar to a Git repository. For better '
+            b'performance, push into a Bazaar repository.\n'
+            b'Pushed up to revision 2.\n', error)
+
     def test_log(self):
         # Smoke test for "bzr log" in a git repository.
         self.simple_commit()

=== modified file 'breezy/git/tests/test_urls.py'
--- breezy/git/tests/test_urls.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_urls.py	2019-05-29 03:52:43 +0000
@@ -42,7 +42,26 @@
             ('git+ssh://user@foo/bar/path'))
 
     def test_path(self):
-        self.assertEqual(
-            git_url_to_bzr_url(
-                '/bar/path'),
-            ('/bar/path'))
+        self.assertEqual(git_url_to_bzr_url('/bar/path'), ('/bar/path'))
+
+    def test_with_ref(self):
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', ref=b'HEAD'),
+            'git+ssh://foo/bar/path')
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', ref=b'refs/heads/blah'),
+            'git+ssh://foo/bar/path,branch=blah')
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', ref=b'refs/tags/blah'),
+            'git+ssh://foo/bar/path,ref=refs%2Ftags%2Fblah')
+
+    def test_with_branch(self):
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', branch=''),
+            'git+ssh://foo/bar/path')
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', branch='foo/blah'),
+            'git+ssh://foo/bar/path,branch=foo%2Fblah')
+        self.assertEqual(
+            git_url_to_bzr_url('foo:bar/path', branch='blah'),
+            'git+ssh://foo/bar/path,branch=blah')

=== modified file 'breezy/git/urls.py'
--- breezy/git/urls.py	2018-11-11 14:23:06 +0000
+++ breezy/git/urls.py	2019-05-29 03:52:43 +0000
@@ -18,7 +18,10 @@
 
 from __future__ import absolute_import
 
-from breezy.urlutils import URL, quote
+from .. import urlutils
+from .refs import (
+    ref_to_branch_name,
+    )
 
 from dulwich.client import parse_rsync_url
 
@@ -26,22 +29,46 @@
 KNOWN_GIT_SCHEMES = ['git+ssh', 'git', 'http', 'https', 'ftp']
 
 
-def git_url_to_bzr_url(location):
-    url = URL.from_string(location)
-    if (url.scheme not in KNOWN_GIT_SCHEMES
-            and not url.scheme.startswith('chroot-')):
+def git_url_to_bzr_url(location, branch=None, ref=None):
+    if branch is not None and ref is not None:
+        raise ValueError('only specify one of branch or ref')
+    url = urlutils.URL.from_string(location)
+    if (url.scheme not in KNOWN_GIT_SCHEMES and
+            not url.scheme.startswith('chroot-')):
         try:
             (username, host, path) = parse_rsync_url(location)
         except ValueError:
             return location
         else:
-            url = URL(
+            url = urlutils.URL(
                 scheme='git+ssh',
-                quoted_user=(quote(username) if username else None),
+                quoted_user=(urlutils.quote(username) if username else None),
                 quoted_password=None,
-                quoted_host=quote(host),
+                quoted_host=urlutils.quote(host),
                 port=None,
-                quoted_path=quote(path, safe="/~"))
-        return str(url)
-    else:
-        return location
+                quoted_path=urlutils.quote(path, safe="/~"))
+        location = str(url)
+    if ref == b'HEAD':
+        ref = branch = None
+    if ref:
+        try:
+            branch = ref_to_branch_name(ref)
+        except ValueError:
+            branch = None
+        else:
+            ref = None
+    if ref or branch:
+        params = {}
+        if ref:
+            params['ref'] = urlutils.quote_from_bytes(ref, safe='')
+        if branch:
+            params['branch'] = urlutils.escape(branch, safe='')
+        location = urlutils.join_segment_parameters(location, params)
+    return location
+
+
+def bzr_url_to_git_url(location):
+    target_url, target_params = urlutils.split_segment_parameters(location)
+    branch = target_params.get('branch')
+    ref = target_params.get('ref')
+    return target_url, branch, ref

=== modified file 'breezy/location.py'
--- breezy/location.py	2019-02-09 03:23:20 +0000
+++ breezy/location.py	2019-05-29 03:52:43 +0000
@@ -19,6 +19,8 @@
 
 from __future__ import absolute_import
 
+import re
+
 from . import (
     urlutils,
     )
@@ -44,6 +46,28 @@
 hooks = LocationHooks()
 
 
+def rcp_location_to_url(location, scheme='ssh'):
+    """Convert a rcp-style location to a URL.
+
+    :param location: Location to convert, e.g. "foo:bar"
+    :param schenme: URL scheme to return, defaults to "ssh"
+    :return: A URL, e.g. "ssh://foo/bar"
+    :raises ValueError: if this is not a RCP-style URL
+    """
+    m = re.match('^(?P<user>[^@:/]+@)?(?P<host>[^/:]+):(?P<path>.*)$', location)
+    if not m:
+        raise ValueError("Not a RCP URL")
+    if m.group('path').startswith('//'):
+        raise ValueError("Not a RCP URL: already looks like a URL")
+    quoted_user = urlutils.quote(m.group('user')[:-1]) if m.group('user') else None
+    url = urlutils.URL(
+        scheme=scheme, quoted_user=quoted_user,
+        port=None, quoted_password=None,
+        quoted_host=urlutils.quote(m.group('host')),
+        quoted_path=urlutils.quote(m.group('path')))
+    return str(url)
+
+
 def location_to_url(location, purpose=None):
     """Determine a fully qualified URL from a location string.
 
@@ -65,8 +89,8 @@
         location = location.encode('ascii')
     except UnicodeError:
         if urlutils.is_url(location):
-            raise urlutils.InvalidURL(path=location,
-                                      extra='URLs must be properly escaped')
+            raise urlutils.InvalidURL(
+                path=location, extra='URLs must be properly escaped')
         location = urlutils.local_path_to_url(location)
     else:
         if PY3:
@@ -75,6 +99,13 @@
     if location.startswith("file:") and not location.startswith("file://"):
         return urlutils.join(urlutils.local_path_to_url("."), location[5:])
 
+    try:
+        url = rcp_location_to_url(location, scheme="ssh")
+    except ValueError:
+        pass
+    else:
+        return url
+
     if not urlutils.is_url(location):
         return urlutils.local_path_to_url(location)
 

=== modified file 'breezy/plugins/propose/github.py'
--- breezy/plugins/propose/github.py	2019-02-14 04:35:05 +0000
+++ breezy/plugins/propose/github.py	2019-05-29 03:52:43 +0000
@@ -132,8 +132,7 @@
         self._pr.edit(state='closed')
 
 
-def parse_github_url(branch):
-    url = urlutils.split_segment_parameters(branch.user_url)[0]
+def parse_github_url(url):
     (scheme, user, password, host, port, path) = urlutils.parse_url(
         url)
     if host != 'github.com':
@@ -141,6 +140,12 @@
     (owner, repo_name) = path.strip('/').split('/')
     if repo_name.endswith('.git'):
         repo_name = repo_name[:-4]
+    return owner, repo_name
+
+
+def parse_github_branch_url(branch):
+    url = urlutils.split_segment_parameters(branch.user_url)[0]
+    owner, repo_name = parse_github_url(url)
     return owner, repo_name, branch.name
 
 
@@ -186,7 +191,7 @@
                         owner=None, revision_id=None, overwrite=False,
                         allow_lossy=True):
         import github
-        base_owner, base_project, base_branch_name = parse_github_url(base_branch)
+        base_owner, base_project, base_branch_name = parse_github_branch_url(base_branch)
         base_repo = self.gh.get_repo('%s/%s' % (base_owner, base_project))
         if owner is None:
             owner = self.gh.get_user().login
@@ -222,14 +227,14 @@
 
     @convert_github_error
     def get_push_url(self, branch):
-        owner, project, branch_name = parse_github_url(branch)
+        owner, project, branch_name = parse_github_branch_url(branch)
         repo = self.gh.get_repo('%s/%s' % (owner, project))
         return github_url_to_bzr_url(repo.ssh_url, branch_name)
 
     @convert_github_error
     def get_derived_branch(self, base_branch, name, project=None, owner=None):
         import github
-        base_owner, base_project, base_branch_name = parse_github_url(base_branch)
+        base_owner, base_project, base_branch_name = parse_github_branch_url(base_branch)
         base_repo = self.gh.get_repo('%s/%s' % (base_owner, base_project))
         if owner is None:
             owner = self.gh.get_user().login
@@ -249,9 +254,9 @@
     @convert_github_error
     def iter_proposals(self, source_branch, target_branch, status='open'):
         (source_owner, source_repo_name, source_branch_name) = (
-            parse_github_url(source_branch))
+            parse_github_branch_url(source_branch))
         (target_owner, target_repo_name, target_branch_name) = (
-            parse_github_url(target_branch))
+            parse_github_branch_url(target_branch))
         target_repo = self.gh.get_repo(
             "%s/%s" % (target_owner, target_repo_name))
         state = {
@@ -277,18 +282,18 @@
 
     def hosts(self, branch):
         try:
-            parse_github_url(branch)
+            parse_github_branch_url(branch)
         except NotGitHubUrl:
             return False
         else:
             return True
 
     @classmethod
-    def probe(cls, branch):
+    def probe_from_url(cls, url):
         try:
-            parse_github_url(branch)
+            parse_github_url(url)
         except NotGitHubUrl:
-            raise UnsupportedHoster(branch)
+            raise UnsupportedHoster(url)
         return cls()
 
     @classmethod
@@ -319,9 +324,9 @@
         self.source_branch = source_branch
         self.target_branch = target_branch
         (self.target_owner, self.target_repo_name, self.target_branch_name) = (
-            parse_github_url(self.target_branch))
+            parse_github_branch_url(self.target_branch))
         (self.source_owner, self.source_repo_name, self.source_branch_name) = (
-            parse_github_url(self.source_branch))
+            parse_github_branch_url(self.source_branch))
 
     def get_infotext(self):
         """Determine the initial comment for the merge proposal."""

=== modified file 'breezy/plugins/propose/gitlabs.py'
--- breezy/plugins/propose/gitlabs.py	2019-02-12 23:38:25 +0000
+++ breezy/plugins/propose/gitlabs.py	2019-05-29 03:52:43 +0000
@@ -110,17 +110,22 @@
             raise GitLabLoginMissing()
 
 
-def parse_gitlab_url(branch):
-    url = urlutils.split_segment_parameters(branch.user_url)[0]
+def parse_gitlab_url(url):
     (scheme, user, password, host, port, path) = urlutils.parse_url(
         url)
     if scheme not in ('git+ssh', 'https', 'http'):
-        raise NotGitLabUrl(branch.user_url)
+        raise NotGitLabUrl(url)
     if not host:
-        raise NotGitLabUrl(branch.user_url)
+        raise NotGitLabUrl(url)
     path = path.strip('/')
     if path.endswith('.git'):
         path = path[:-4]
+    return host, path
+
+
+def parse_gitlab_branch_url(branch):
+    url = urlutils.split_segment_parameters(branch.user_url)[0]
+    host, path = parse_gitlab_url(url)
     return host, path, branch.name
 
 
@@ -183,7 +188,7 @@
         self.gl = gl
 
     def get_push_url(self, branch):
-        (host, project_name, branch_name) = parse_gitlab_url(branch)
+        (host, project_name, branch_name) = parse_gitlab_branch_url(branch)
         project = self.gl.projects.get(project_name)
         return gitlab_url_to_bzr_url(
             project.ssh_url_to_repo, branch_name)
@@ -192,7 +197,7 @@
                         owner=None, revision_id=None, overwrite=False,
                         allow_lossy=True):
         import gitlab
-        (host, base_project, base_branch_name) = parse_gitlab_url(base_branch)
+        (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
         self.gl.auth()
         try:
             base_project = self.gl.projects.get(base_project)
@@ -230,7 +235,7 @@
 
     def get_derived_branch(self, base_branch, name, project=None, owner=None):
         import gitlab
-        (host, base_project, base_branch_name) = parse_gitlab_url(base_branch)
+        (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
         self.gl.auth()
         try:
             base_project = self.gl.projects.get(base_project)
@@ -258,9 +263,9 @@
     def iter_proposals(self, source_branch, target_branch, status):
         import gitlab
         (source_host, source_project_name, source_branch_name) = (
-            parse_gitlab_url(source_branch))
+            parse_gitlab_branch_url(source_branch))
         (target_host, target_project_name, target_branch_name) = (
-            parse_gitlab_url(target_branch))
+            parse_gitlab_branch_url(target_branch))
         if source_host != target_host:
             raise DifferentGitLabInstances(source_host, target_host)
         self.gl.auth()
@@ -281,17 +286,17 @@
 
     def hosts(self, branch):
         try:
-            (host, project, branch_name) = parse_gitlab_url(branch)
+            (host, project, branch_name) = parse_gitlab_branch_url(branch)
         except NotGitLabUrl:
             return False
         return (self.gl.url == ('https://%s' % host))
 
     @classmethod
-    def probe(cls, branch):
+    def probe_from_url(cls, url):
         try:
-            (host, project, branch_name) = parse_gitlab_url(branch)
+            (host, project) = parse_gitlab_url(url)
         except NotGitLabUrl:
-            raise UnsupportedHoster(branch)
+            raise UnsupportedHoster(url)
         import gitlab
         import requests.exceptions
         try:
@@ -299,12 +304,12 @@
             gl.auth()
         except requests.exceptions.SSLError:
             # Well, I guess it could be..
-            raise UnsupportedHoster(branch)
+            raise UnsupportedHoster(url)
         except gitlab.GitlabGetError:
-            raise UnsupportedHoster(branch)
+            raise UnsupportedHoster(url)
         except gitlab.GitlabHttpError as e:
             if e.response_code in (404, 405, 503):
-                raise UnsupportedHoster(branch)
+                raise UnsupportedHoster(url)
             else:
                 raise
         return cls(gl)
@@ -332,10 +337,10 @@
         self.gl = gl
         self.source_branch = source_branch
         (self.source_host, self.source_project_name, self.source_branch_name) = (
-            parse_gitlab_url(source_branch))
+            parse_gitlab_branch_url(source_branch))
         self.target_branch = target_branch
         (self.target_host, self.target_project_name, self.target_branch_name) = (
-            parse_gitlab_url(target_branch))
+            parse_gitlab_branch_url(target_branch))
         if self.source_host != self.target_host:
             raise DifferentGitLabInstances(self.source_host, self.target_host)
 

=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2019-02-17 02:00:36 +0000
+++ breezy/plugins/propose/launchpad.py	2019-05-29 03:52:43 +0000
@@ -175,10 +175,10 @@
         return plausible_launchpad_url(branch.user_url)
 
     @classmethod
-    def probe(cls, branch):
-        if plausible_launchpad_url(branch.user_url):
+    def probe_from_url(cls, url):
+        if plausible_launchpad_url(url):
             return Launchpad()
-        raise UnsupportedHoster(branch)
+        raise UnsupportedHoster(url)
 
     def _get_lp_git_ref_from_branch(self, branch):
         url, params = urlutils.split_segment_parameters(branch.user_url)

=== modified file 'breezy/plugins/propose/propose.py'
--- breezy/plugins/propose/propose.py	2019-02-10 00:54:14 +0000
+++ breezy/plugins/propose/propose.py	2019-05-29 03:52:43 +0000
@@ -22,6 +22,7 @@
     errors,
     hooks,
     registry,
+    urlutils,
     )
 
 
@@ -225,9 +226,15 @@
         raise NotImplementedError(self.hosts)
 
     @classmethod
-    def probe(cls, branch):
+    def probe_from_branch(cls, branch):
         """Create a Hoster object if this hoster knows about a branch."""
-        raise NotImplementedError(cls.probe)
+        url = urlutils.split_segment_parameters(branch.user_url)[0]
+        return cls.probe_from_url(url)
+
+    @classmethod
+    def probe_from_url(cls, url):
+        """Create a Hoster object if this hoster knows about a URL."""
+        raise NotImplementedError(cls.probe_from_url)
 
     # TODO(jelmer): Some way of cleaning up old branch proposals/branches
 
@@ -259,7 +266,7 @@
                 return hoster
     for name, hoster_cls in hosters.items():
         try:
-            hoster = hoster_cls.probe(branch)
+            hoster = hoster_cls.probe_from_branch(branch)
         except UnsupportedHoster:
             pass
         else:

=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_branch/test_branch.py	2019-05-29 03:52:43 +0000
@@ -164,7 +164,9 @@
 
         branch_b = wt_a.branch.controldir.sprout(
             'b', revision_id=rev1).open_branch()
-        self.assertEqual(wt_a.branch.user_url, branch_b.get_parent())
+        self.assertEqual(
+            urlutils.split_segment_parameters(wt_a.branch.user_url)[0],
+            urlutils.split_segment_parameters(branch_b.get_parent())[0])
         return branch_b
 
     def test_clone_branch_nickname(self):

=== modified file 'breezy/tests/per_branch/test_sprout.py'
--- breezy/tests/per_branch/test_sprout.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_branch/test_sprout.py	2019-05-29 03:52:43 +0000
@@ -23,6 +23,7 @@
     osutils,
     revision as _mod_revision,
     tests,
+    urlutils,
     )
 from breezy.bzr import (
     branch as _mod_bzrbranch,
@@ -43,7 +44,9 @@
     def test_sprout_branch_parent(self):
         source = self.make_branch('source')
         target = source.controldir.sprout(self.get_url('target')).open_branch()
-        self.assertEqual(source.user_url, target.get_parent())
+        self.assertEqual(
+            urlutils.split_segment_parameters(source.user_url)[0],
+            urlutils.split_segment_parameters(target.get_parent())[0])
 
     def test_sprout_uses_bzrdir_branch_format(self):
         # branch.sprout(bzrdir) is defined as using the branch format selected

=== modified file 'breezy/tests/test_http_response.py'
--- breezy/tests/test_http_response.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_http_response.py	2019-05-29 03:52:43 +0000
@@ -39,9 +39,12 @@
 
 try:
     import http.client as http_client
+except ImportError:  # python < 3 without future
+    import httplib as http_client
+
+try:
     parse_headers = http_client.parse_headers
-except ImportError:  # python < 3
-    import httplib as http_client
+except AttributeError:  # python 2
     parse_headers = http_client.HTTPMessage
 
 from .. import (

=== modified file 'breezy/tests/test_location.py'
--- breezy/tests/test_location.py	2019-02-09 02:59:15 +0000
+++ breezy/tests/test_location.py	2019-05-29 03:52:43 +0000
@@ -25,6 +25,7 @@
 from ..location import (
     hooks as location_hooks,
     location_to_url,
+    rcp_location_to_url,
     )
 
 
@@ -75,6 +76,11 @@
     def test_absolute_file_url(self):
         self.assertEqual("file:///bar", location_to_url("file:/bar"))
 
+    def test_rcp_url(self):
+        self.assertEqual(
+            "ssh://example.com/srv/git/bar",
+            location_to_url("example.com:/srv/git/bar"))
+
     def test_rewrite_hook(self):
         self.assertEqual(
             'http://foo.example.com/blah', location_to_url('http://foo.example.com/blah'))
@@ -84,3 +90,23 @@
         location_hooks.install_named_hook('rewrite_url', rewrite_url, 'test')
         self.assertEqual(
             'http://bar.example.com/bar', location_to_url('http://foo.example.com/foo'))
+
+
+class RCPLocationTests(tests.TestCase):
+
+    def test_without_user(self):
+        self.assertEqual(
+            "git+ssh://example.com/srv/git/bar",
+            rcp_location_to_url("example.com:/srv/git/bar", scheme='git+ssh'))
+        self.assertEqual(
+            "ssh://example.com/srv/git/bar",
+            rcp_location_to_url("example.com:/srv/git/bar"))
+
+    def test_with_user(self):
+        self.assertEqual(
+            "git+ssh://[e-mail]/srv/git/bar",
+            rcp_location_to_url("[e-mail]:/srv/git/bar", scheme='git+ssh'))
+
+    def test_invalid(self):
+        self.assertRaises(ValueError, rcp_location_to_url, "http://srv/git/bar")
+        self.assertRaises(ValueError, rcp_location_to_url, "git/bar")

=== modified file 'breezy/tests/test_transport.py'
--- breezy/tests/test_transport.py	2018-11-23 23:51:34 +0000
+++ breezy/tests/test_transport.py	2019-05-29 03:52:43 +0000
@@ -119,11 +119,13 @@
         try:
             transport.get_transport_from_url('ssh://fooserver/foo')
         except errors.UnsupportedProtocol as e:
-            self.assertEqual('Unsupported protocol'
-                             ' for url "ssh://fooserver/foo":'
-                             ' bzr supports bzr+ssh to operate over ssh,'
-                             ' use "bzr+ssh://fooserver/foo".',
-                             str(e))
+            self.assertEqual(
+                'Unsupported protocol'
+                ' for url "ssh://fooserver/foo":'
+                ' Use bzr+ssh for Bazaar operations over SSH, '
+                'e.g. "bzr+ssh://fooserver/foo". Use git+ssh '
+                'for Git operations over SSH, e.g. "git+ssh://fooserver/foo".',
+                str(e))
         else:
             self.fail('Did not raise UnsupportedProtocol')
 

=== modified file 'breezy/transport/remote.py'
--- breezy/transport/remote.py	2018-11-11 04:08:32 +0000
+++ breezy/transport/remote.py	2019-05-29 03:52:43 +0000
@@ -602,11 +602,15 @@
 
 
 class HintingSSHTransport(transport.Transport):
-    """Simple transport that handles ssh:// and points out bzr+ssh://."""
+    """Simple transport that handles ssh:// and points out bzr+ssh:// and git+ssh://."""
+
+    # TODO(jelmer): Implement support for detecting whether the repository at the
+    # other end is a git or bzr repository.
 
     def __init__(self, url):
-        raise errors.UnsupportedProtocol(url,
-                                         'bzr supports bzr+ssh to operate over ssh, use "bzr+%s".' % url)
+        raise errors.UnsupportedProtocol(
+            url, 'Use bzr+ssh for Bazaar operations over SSH, e.g. "bzr+%s". '
+            'Use git+ssh for Git operations over SSH, e.g. "git+%s".' % (url, url))
 
 
 def get_test_permutations():

=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2019-02-16 02:57:26 +0000
+++ breezy/urlutils.py	2019-05-29 03:52:43 +0000
@@ -162,11 +162,11 @@
 unquote = urlparse.unquote
 
 
-def escape(relpath):
+def escape(relpath, safe='/~'):
     """Escape relpath to be a valid url."""
     if not isinstance(relpath, str) and sys.version_info[0] == 2:
         relpath = relpath.encode('utf-8')
-    return quote(relpath, safe='/~')
+    return quote(relpath, safe=safe)
 
 
 def file_relpath(base, path):

=== modified file 'brz'
--- brz	2018-11-18 12:41:12 +0000
+++ brz	2019-05-29 03:52:43 +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 'doc/en/index.txt'
--- doc/en/index.txt	2018-09-14 09:31:24 +0000
+++ doc/en/index.txt	2019-05-29 03:52:43 +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-05-28 23:00:41 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-05-29 03:52:43 +0000
@@ -198,6 +198,10 @@
  * Plugins can now be registered using the 'entrypoints' mechanism in
    setuptools. (Jelmer Vernooij, #1802647)
 
+ * The Breezy UI now handles RCP-style URLs and suggests the
+   user specify either ``git+ssh`` or ``bzr+ssh``.
+   (Jelmer Vernooij)
+
 Improvements
 ************
 

=== 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-05-29 03:52:43 +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/whats-new/template.txt'
--- doc/en/whats-new/template.txt	2011-07-18 15:58:50 +0000
+++ doc/en/whats-new/template.txt	2019-05-29 03:52:43 +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-05-29 03:52:43 +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 'tools/time_graph.py'
--- tools/time_graph.py	2019-03-06 10:26:59 +0000
+++ tools/time_graph.py	2019-05-29 03:52:43 +0000
@@ -74,13 +74,13 @@
     graph._counters[1] = 0
     graph._counters[2] = 0
 
-    begin = time.clock()
+    begin = osutils.perf_counter()
     g = graph_klass(parent_map)
     if opts.lsprof is not None:
         heads = commands.apply_lsprofiled(opts.lsprof, all_heads_comp, g, comb)
     else:
         heads = all_heads_comp(g, comb)
-    end = time.clock()
+    end = osutils.perf_counter()
     return dict(elapsed=(end - begin), graph=g, heads=heads)
 
 def report(name, g):