Merge lp:~jelmer/brz/git-follow-symref into lp:brz

[Jelmer Vernooij]

Follow symrefs when pushing to git repositories.

Follow symrefs when pushing to git repositories.

[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/692/

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-01-12 15:16:27 +0000
+++ breezy/git/remote.py	2020-02-08 18:52:28 +0000
@@ -48,6 +48,7 @@
     PermissionDenied,
     UninitializableFormat,
     )
+from ..revision import NULL_REVISION
 from ..revisiontree import RevisionTree
 from ..sixish import (
     text_type,
@@ -452,10 +453,10 @@
         else:
             pb = None
 
-        def get_changed_refs_wrapper(refs):
-            # TODO(jelmer): This drops symref information
-            self._refs = remote_refs_dict_to_container(refs)
-            return get_changed_refs(refs)
+        def get_changed_refs_wrapper(remote_refs):
+            if self._refs is not None:
+                update_refs_container(self._refs, remote_refs)
+            return get_changed_refs(remote_refs)
         try:
             return self._client.send_pack(
                 self._client_path, get_changed_refs_wrapper,
@@ -471,11 +472,10 @@
         refname = self._get_selected_ref(name, ref)
         if refname != b'HEAD' and refname in self.get_refs_container():
             raise AlreadyBranchError(self.user_url)
-        if refname in self.get_refs_container():
-            ref_chain, unused_sha = self.get_refs_container().follow(
-                self._get_selected_ref(None))
-            if ref_chain[0] == b'HEAD':
-                refname = ref_chain[1]
+        ref_chain, unused_sha = self.get_refs_container().follow(
+            self._get_selected_ref(name))
+        if ref_chain and ref_chain[0] == b'HEAD':
+            refname = ref_chain[1]
         repo = self.open_repository()
         return RemoteGitBranch(self, repo, refname)
 
@@ -570,12 +570,18 @@
         push_result.branch_push_result = None
         repo = self.find_repository()
         refname = self._get_selected_ref(name)
+        ref_chain, old_sha = self.get_refs_container().follow(refname)
+        if ref_chain:
+            actual_refname = ref_chain[-1]
+        else:
+            actual_refname = refname
         if isinstance(source, GitBranch) and lossy:
             raise errors.LossyPushToSameVCS(source.controldir, self)
         source_store = get_object_store(source.repository)
         fetch_tags = source.get_config_stack().get('branch.fetch_tags')
-        def get_changed_refs(refs):
-            self._refs = remote_refs_dict_to_container(refs)
+        def get_changed_refs(remote_refs):
+            if self._refs is not None:
+                update_refs_container(self._refs, remote_refs)
             ret = {}
             # TODO(jelmer): Unpeel if necessary
             push_result.new_original_revid = revision_id
@@ -588,11 +594,10 @@
                     raise errors.NoRoundtrippingSupport(
                         source, self.open_branch(name=name, nascent_ok=True))
             if not overwrite:
-                if remote_divergence(ret.get(refname), new_sha,
-                                     source_store):
+                if remote_divergence(old_sha, new_sha, source_store):
                     raise DivergedBranches(
                         source, self.open_branch(name, nascent_ok=True))
-            ret[refname] = new_sha
+            ret[actual_refname] = new_sha
             if fetch_tags:
                 for tagname, revid in viewitems(source.tags.get_tag_dict()):
                     if lossy:
@@ -611,15 +616,15 @@
                 generate_pack_data = source_store.generate_pack_data
             new_refs = self.send_pack(get_changed_refs, generate_pack_data)
         push_result.new_revid = repo.lookup_foreign_revision_id(
-            new_refs[refname])
-        try:
-            old_remote = self._refs[refname]
-        except KeyError:
-            old_remote = ZERO_SHA
-        push_result.old_revid = repo.lookup_foreign_revision_id(old_remote)
-        self._refs = remote_refs_dict_to_container(new_refs)
+            new_refs[actual_refname])
+        if old_sha is not None:
+            push_result.old_revid = repo.lookup_foreign_revision_id(old_sha)
+        else:
+            push_result.old_revid = NULL_REVISION
+        if self._refs is not None:
+            update_refs_container(self._refs, new_refs)
         push_result.target_branch = self.open_branch(name)
-        if old_remote != ZERO_SHA:
+        if old_sha is not None:
             push_result.branch_push_result = GitBranchPushResult()
             push_result.branch_push_result.source_branch = source
             push_result.branch_push_result.target_branch = (
@@ -1029,3 +1034,15 @@
     ret = DictRefsContainer(base)
     ret._peeled = peeled
     return ret
+
+
+def update_refs_container(container, refs_dict):
+    peeled = {}
+    base = {}
+    for k, v in refs_dict.items():
+        if is_peeled(k):
+            peeled[k[:-3]] = v
+        else:
+            base[k] = v
+    container._peeled = peeled
+    container._refs.update(base)

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2019-11-19 18:10:28 +0000
+++ breezy/git/tests/test_remote.py	2020-02-08 18:52:28 +0000
@@ -357,6 +357,42 @@
              },
             self.remote_real.get_refs())
 
+    def test_push_branch_symref(self):
+        cfg = self.remote_real.get_config()
+        cfg.set((b'core', ), b'bare', True)
+        cfg.write_to_path()
+        self.remote_real.refs.set_symbolic_ref(b'HEAD', b'refs/heads/master')
+        c1 = self.remote_real.do_commit(
+            message=b'message',
+            committer=b'committer <[e-mail]>',
+            author=b'author <[e-mail]>',
+            ref=b'refs/heads/master')
+        remote = ControlDir.open(self.remote_url)
+        wt = self.make_branch_and_tree('local', format=self._from_format)
+        self.build_tree(['local/blah'])
+        wt.add(['blah'])
+        revid = wt.commit('blah')
+
+        if self._from_format == 'git':
+            result = remote.push_branch(wt.branch, overwrite=True)
+        else:
+            result = remote.push_branch(wt.branch, lossy=True, overwrite=True)
+
+        self.assertEqual(None, result.old_revno)
+        if self._from_format == 'git':
+            self.assertEqual(1, result.new_revno)
+        else:
+            self.assertIs(None, result.new_revno)
+
+        result.report(BytesIO())
+
+        self.assertEqual(
+            {
+                b'HEAD': self.remote_real.refs[b'refs/heads/master'],
+                b'refs/heads/master': self.remote_real.refs[b'refs/heads/master'],
+            },
+            self.remote_real.get_refs())
+
     def test_push_branch_new_with_tags(self):
         remote = ControlDir.open(self.remote_url)
         builder = self.make_branch_builder('local', format=self._from_format)

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-01-31 17:43:44 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-02-08 18:52:28 +0000
@@ -70,6 +70,9 @@
    attempt to access Fossil repositories.
    (Jelmer Vernooij, #1848821)
 
+ * When pushing to Git repositories, symrefs are now followed.
+   (Jelmer Vernooij, #1800393)
+
 Improvements
 ************