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

[Jelmer Vernooij]

Merge lp:brz/3.1.

Merge lp:brz/3.1.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2021-03-22 21:07:08 +0000
+++ breezy/git/branch.py	2021-04-03 12:59:06 +0000
@@ -151,7 +151,7 @@
                 else:
                     conflicts.append(
                         (tag_name,
-                         self.repository.lookup_foreign_revision_id(peeled),
+                         self.source.branch.repository.lookup_foreign_revision_id(peeled),
                          self.target.branch.repository.lookup_foreign_revision_id(
                              old_refs[ref_name])))
             return ret
@@ -258,7 +258,7 @@
             return updates, conflicts
 
     def _merge_to(self, to_tags, source_tag_refs, overwrite=False,
-                  selector=None):
+                  selector=None, ignore_master=False):
         unpeeled_map = defaultdict(set)
         conflicts = []
         updates = {}
@@ -497,8 +497,9 @@
         if getattr(self.repository, '_git', None):
             cs = self.repository._git.get_config_stack()
             try:
-                return cs.get((b"branch", self.name.encode('utf-8')),
-                        b"nick").decode("utf-8")
+                return cs.get(
+                    (b"branch", self.name.encode('utf-8')),
+                    b"nick").decode("utf-8")
             except KeyError:
                 pass
         return self.name or u"HEAD"
@@ -517,6 +518,9 @@
         return "<%s(%r, %r)>" % (self.__class__.__name__, self.repository.base,
                                  self.name)
 
+    def set_last_revision(self, revid):
+        raise NotImplementedError(self.set_last_revision)
+
     def generate_revision_history(self, revid, last_rev=None,
                                   other_branch=None):
         if last_rev is not None:
@@ -592,7 +596,7 @@
         try:
             ref = cs.get((b"branch", remote), b"merge")
         except KeyError:
-            ref = self.ref
+            ref = b'HEAD'
 
         return git_url_to_bzr_url(location.decode('utf-8'), ref=ref)
 
@@ -601,11 +605,6 @@
         cs = self.repository._git.get_config_stack()
         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):
         cs = self.repository._git.get_config()
         remote = self._get_origin(cs)
@@ -613,14 +612,17 @@
         target_url, branch, ref = bzr_url_to_git_url(location)
         location = urlutils.relative_url(this_url, target_url)
         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"branch", remote), b"merge", b'HEAD')
-        self._write_git_config(cs)
+        cs.set((b"remote", remote), b'fetch',
+               b'+refs/heads/*:refs/remotes/%s/*' % remote)
+        if self.name:
+            if branch:
+                cs.set((b"branch", self.name.encode()), b"merge", branch_name_to_ref(branch))
+            elif ref:
+                cs.set((b"branch", self.name.encode()), b"merge", ref)
+            else:
+                # TODO(jelmer): Maybe unset rather than setting to HEAD?
+                cs.set((b"branch", self.name.encode()), b"merge", b'HEAD')
+        self.repository._write_git_config(cs)
 
     def break_lock(self):
         raise NotImplementedError(self.break_lock)
 
=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2020-07-28 02:11:05 +0000
+++ breezy/git/dir.py	2021-04-03 12:59:06 +0000
@@ -233,13 +233,13 @@
         from ..repository import InterRepository
         from .mapping import default_mapping
         from ..transport.local import LocalTransport
-        if stacked_on is not None:
-            raise _mod_branch.UnstackableBranchFormat(
-                self._format, self.user_url)
+        from .refs import is_peeled
         if no_tree:
             format = BareLocalGitControlDirFormat()
         else:
             format = LocalGitControlDirFormat()
+        if stacked_on is not None:
+            raise _mod_branch.UnstackableBranchFormat(format, self.user_url)
         (target_repo, target_controldir, stacking,
          repo_policy) = format.initialize_on_transport_ex(
             transport, use_existing_dir=use_existing_dir,
@@ -257,10 +257,21 @@
         (pack_hint, _, refs) = interrepo.fetch_objects(determine_wants,
                                                        mapping=default_mapping)
         for name, val in refs.items():
-            target_git_repo.refs[name] = val
+            if is_peeled(name):
+                continue
+            if val in target_git_repo.object_store:
+                target_git_repo.refs[name] = val
         result_dir = LocalGitDir(transport, target_git_repo, format)
+        result_branch = result_dir.open_branch()
+        try:
+            parent = self.open_branch().get_parent()
+        except brz_errors.InaccessibleParent:
+            pass
+        else:
+            if parent:
+                result_branch.set_parent(parent)
         if revision_id is not None:
-            result_dir.open_branch().set_last_revision(revision_id)
+            result_branch.set_last_revision(revision_id)
         if not no_tree and isinstance(result_dir.root_transport, LocalTransport):
             if result_dir.open_repository().make_working_trees():
                 try:
 
=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2021-03-22 21:07:08 +0000
+++ breezy/git/remote.py	2021-04-03 12:59:06 +0000
@@ -201,6 +201,8 @@
         return PermissionDenied(url, message)
     if message.endswith(' does not appear to be a git repository'):
         return NotBranchError(url, message)
+    if message == 'A repository for this project does not exist yet.':
+        return NotBranchError(url, message)
     if message == 'pre-receive hook declined':
         return PermissionDenied(url, message)
     if re.match('(.+) is not a valid repository name',
@@ -384,7 +386,7 @@
 
     def progress(self, text):
         text = text.rstrip(b"\r\n")
-        text = text.decode('utf-8')
+        text = text.decode('utf-8', 'surrogateescape')
         if text.lower().startswith('error: '):
             trace.show_error('git: %s', text[len(b'error: '):])
         else:
@@ -499,7 +501,7 @@
             raise AlreadyBranchError(self.user_url)
         ref_chain, unused_sha = self.get_refs_container().follow(
             self._get_selected_ref(name))
-        if ref_chain and ref_chain[0] == b'HEAD':
+        if ref_chain and ref_chain[0] == b'HEAD' and len(ref_chain) > 1:
             refname = ref_chain[1]
         repo = self.open_repository()
         return RemoteGitBranch(self, repo, refname)
 
=== modified file 'breezy/git/repository.py'
--- breezy/git/repository.py	2021-01-10 00:25:52 +0000
+++ breezy/git/repository.py	2021-04-03 12:59:06 +0000
@@ -17,6 +17,8 @@
 
 """An adapter between a Git Repository and a Bazaar Branch"""
 
+from io import BytesIO
+
 from .. import (
     check,
     errors,
@@ -258,6 +260,11 @@
         self.start_write_group()
         return builder
 
+    def _write_git_config(self, cs):
+        f = BytesIO()
+        cs.write_to_file(f)
+        self._git._put_named_file('config', f.getvalue())
+
     def get_file_graph(self):
         return _mod_graph.Graph(GitFileParentProvider(
             self._file_change_scanner))
 
=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2020-08-10 15:00:17 +0000
+++ breezy/git/tests/test_remote.py	2021-04-03 12:59:06 +0000
@@ -205,6 +205,16 @@
                     [b'=======',
                      b'You are not allowed to push code to this project.', b'', b'======'])))
 
+    def test_notbrancherror_yet(self):
+        self.assertEqual(
+            NotBranchError('http://', 'A repository for this project does not exist yet.'),
+            parse_git_hangup(
+                'http://',
+                HangupException(
+                    [b'=======',
+                     b'',
+                     b'A repository for this project does not exist yet.', b'', b'======'])))
+
 
 class TestRemoteGitBranchFormat(TestCase):
 
 
=== modified file 'breezy/git/transform.py'
--- breezy/git/transform.py	2021-03-22 21:07:08 +0000
+++ breezy/git/transform.py	2021-04-03 12:59:06 +0000
@@ -1497,7 +1497,7 @@
 
     def __init__(self, tree, pb=None, case_sensitive=True):
         tree.lock_read()
-        limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
+        limbodir = osutils.mkdtemp(prefix='git-limbo-')
         DiskTreeTransform.__init__(self, tree, limbodir, pb, case_sensitive)
 
     def canonical_path(self, path):
 
=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2021-03-22 21:07:08 +0000
+++ breezy/plugins/github/hoster.py	2021-04-03 12:59:06 +0000
@@ -281,11 +281,11 @@
                 headers=headers, body=body, retries=3)
         except UnexpectedHttpStatus as e:
             if e.code == 401:
-                raise GitHubLoginRequired(self)
+                raise GitHubLoginRequired(self.base_url)
             else:
                 raise
         if response.status == 401:
-            raise GitHubLoginRequired(self)
+            raise GitHubLoginRequired(self.base_url)
         return response
 
     def _get_repo(self, owner, repo):
 
=== modified file 'breezy/plugins/gitlab/hoster.py'
--- breezy/plugins/gitlab/hoster.py	2021-03-22 21:07:08 +0000
+++ breezy/plugins/gitlab/hoster.py	2021-04-03 12:59:06 +0000
@@ -42,6 +42,7 @@
     PrerequisiteBranchUnsupported,
     SourceNotDerivedFromTarget,
     UnsupportedHoster,
+    HosterLoginRequired,
     )
 
 
@@ -76,13 +77,24 @@
         self.url = url
 
 
+class GitLabError(errors.BzrError):
+
+    _fmt = "GitLab error: %(error)s"
+
+    def __init__(self, error, full_response):
+        errors.BzrError.__init__(self)
+        self.error = error
+        self.full_response = full_response
+
+
 class GitLabUnprocessable(errors.BzrError):
 
     _fmt = "GitLab can not process request: %(error)s."
 
-    def __init__(self, error):
+    def __init__(self, error, full_response):
         errors.BzrError.__init__(self)
         self.error = error
+        self.full_response = full_response
 
 
 class DifferentGitLabInstances(errors.BzrError):
@@ -95,9 +107,9 @@
         self.target_host = target_host
 
 
-class GitLabLoginMissing(errors.BzrError):
+class GitLabLoginMissing(HosterLoginRequired):
 
-    _fmt = ("Please log into GitLab")
+    _fmt = ("Please log into GitLab instance at %(hoster)s")
 
 
 class GitlabLoginError(errors.BzrError):
@@ -416,8 +428,24 @@
         _unexpected_status(path, response)
 
     def create_project(self, project_name):
-        fields = {'name': project_name}
+        if project_name.endswith('.git'):
+            project_name = project_name[:-4]
+        if '/' in project_name:
+            namespace, path = project_name.rsplit('/', 1)
+        else:
+            namespace = None
+            path = project_name
+        fields = {
+            'path': path,
+            'name': path.replace('-', '_'),
+            'namespace_path': namespace,
+            }
         response = self._api_request('POST', 'projects', fields=fields)
+        if response.status == 400:
+            ret = json.loads(response.data)
+            if ret.get("message", {}).get("path") == ["has already been taken"]:
+                raise errors.AlreadyControlDirError(project_name)
+            raise
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         if response.status not in (200, 201):
@@ -556,13 +584,15 @@
         if labels:
             fields['labels'] = labels
         response = self._api_request('POST', path, fields=fields)
+        if response.status == 400:
+            raise GitLabError(data.get('message'), data)
         if response.status == 403:
             raise errors.PermissionDenied(response.text)
         if response.status == 409:
             raise GitLabConflict(json.loads(response.data).get('message'))
         if response.status == 422:
             data = json.loads(response.data)
-            raise GitLabUnprocessable(data['error'])
+            raise GitLabUnprocessable(data.get('error'), data)
         if response.status != 201:
             _unexpected_status(path, response)
         return json.loads(response.data)
@@ -659,13 +689,18 @@
         return self.base_hostname == host
 
     def check(self):
-        response = self._api_request('GET', 'user')
+        try:
+            response = self._api_request('GET', 'user')
+        except errors.UnexpectedHttpStatus as e:
+            if e.code == 401:
+                raise GitLabLoginMissing(self.base_url)
+            raise
         if response.status == 200:
             self._current_user = json.loads(response.data)
             return
-        if response == 401:
+        if response.status == 401:
             if json.loads(response.data) == {"message": "401 Unauthorized"}:
-                raise GitLabLoginMissing()
+                raise GitLabLoginMissing(self.base_url)
             else:
                 raise GitlabLoginError(response.text)
         raise UnsupportedHoster(self.base_url)
@@ -681,7 +716,17 @@
         credentials = get_credentials_by_url(transport.base)
         if credentials is not None:
             return cls(transport, credentials.get('private_token'))
-        raise UnsupportedHoster(url)
+        try:
+            resp = transport.request(
+                'GET', 'https://%s/api/v4/projects/%s' % (host, urlutils.quote(str(project), '')))
+        except errors.UnexpectedHttpStatus as e:
+            raise UnsupportedHoster(url)
+        else:
+            if not resp.getheader('X-Gitlab-Feature-Category'):
+                raise UnsupportedHoster(url)
+            if resp.status in (200, 401):
+                raise GitLabLoginMissing('https://%s/' % host)
+            raise UnsupportedHoster(url)
 
     @classmethod
     def iter_instances(cls):
@@ -806,6 +851,7 @@
                     "Source project is not a fork of the target project"]:
                 raise SourceNotDerivedFromTarget(
                     self.source_branch, self.target_branch)
+            raise
         return GitLabMergeProposal(self.gl, merge_request)
 
 
 
=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-11-18 02:15:43 +0000
+++ breezy/plugins/propose/cmds.py	2021-04-03 12:59:06 +0000
@@ -300,7 +300,7 @@
                                  for l in description.splitlines()])
                         self.outf.write('\n')
             except _mod_propose.HosterLoginRequired as e:
-                warning('Skipping %r, login required.', instance)
+                warning('Skipping %s, login required.', instance)
 
 
 class cmd_land_merge_proposal(Command):
 
=== modified file 'breezy/propose.py'
--- breezy/propose.py	2021-03-22 21:07:08 +0000
+++ breezy/propose.py	2021-04-03 12:59:06 +0000
@@ -388,7 +388,11 @@
 
 def determine_title(description):
     """Determine the title for a merge proposal based on full description."""
-    firstline = description.splitlines()[0]
+    for firstline in description.splitlines():
+        if firstline.strip():
+            break
+    else:
+        raise ValueError
     try:
         i = firstline.index('. ')
     except ValueError:
 
=== modified file 'breezy/tests/per_branch/test_http.py'
--- breezy/tests/per_branch/test_http.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_branch/test_http.py	2021-04-03 12:59:06 +0000
@@ -76,4 +76,4 @@
         # from, even if that branch has an invalid parent.
         branch_b = self.get_branch_with_invalid_parent()
         branch_c = branch_b.controldir.sprout('c').open_branch()
-        self.assertEqual(branch_b.user_url, branch_c.get_parent())
+        self.assertEqual(branch_b.base, branch_c.get_parent())
 
=== modified file 'breezy/tests/test_propose.py'
--- breezy/tests/test_propose.py	2020-10-22 22:14:42 +0000
+++ breezy/tests/test_propose.py	2021-04-03 12:59:06 +0000
@@ -127,3 +127,9 @@
 
 And here are some more details.
 """))
+        self.assertEqual('Release version 5.1', determine_title("""\
+
+Release version 5.1
+
+And here are some more details.
+"""))
 
=== modified file 'breezy/transport/http/urllib.py'
--- breezy/transport/http/urllib.py	2021-01-10 01:22:28 +0000
+++ breezy/transport/http/urllib.py	2021-04-03 12:59:06 +0000
@@ -176,7 +176,7 @@
     """
 
     # Some responses have bodies in which we have no interest
-    _body_ignored_responses = [301, 302, 303, 307, 308, 400, 401, 403, 404, 501]
+    _body_ignored_responses = [301, 302, 303, 307, 308, 403, 404, 501]
 
     # in finish() below, we may have to discard several MB in the worst
     # case. To avoid buffering that much, we read and discard by chunks