Merge lp:~jelmer/brz-git/diverged-branches into lp:brz-git

[Jelmer Vernooij]

Check for diverged branches during push.

Check for diverged branches during push.

[Jelmer Vernooij (jelmer)]

Rubberstamp! Proposer approves of own proposal.

review: Approve

=== modified file 'branch.py'
--- branch.py	2018-03-26 22:28:24 +0000
+++ branch.py	2018-03-31 18:16:06 +0000
@@ -58,6 +58,9 @@
     NoPushSupport,
     NoSuchRef,
     )
+from .push import (
+    remote_divergence,
+    )
 from .refs import (
     is_tag,
     ref_to_branch_name,
@@ -943,17 +946,22 @@
                 isinstance(target, RemoteGitBranch))
 
     def _basic_push(self, overwrite, stop_revision):
-        # TODO(jelmer): Support overwrite
         result = GitBranchPushResult()
         result.source_branch = self.source
         result.target_branch = self.target
         if stop_revision is None:
             stop_revision = self.source.last_revision()
-        # TODO(jelmer): Check for diverged branches
         def get_changed_refs(old_refs):
-            old_ref = old_refs.get(self.target.ref, ZERO_SHA)
-            result.old_revid = self.target.lookup_foreign_revision_id(old_ref)
-            refs = { self.target.ref: self.source.repository.lookup_bzr_revision_id(stop_revision)[0] }
+            old_ref = old_refs.get(self.target.ref, None)
+            if old_ref is None:
+                result.old_revid = revision.NULL_REVISION
+            else:
+                result.old_revid = self.target.lookup_foreign_revision_id(old_ref)
+            new_ref = self.source.repository.lookup_bzr_revision_id(stop_revision)[0]
+            if not overwrite:
+                if remote_divergence(old_ref, new_ref, self.source.repository._git.object_store):
+                    raise errors.DivergedBranches(self.source, self.target)
+            refs = { self.target.ref: new_ref }
             result.new_revid = stop_revision
             for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
                 refs[tag_name_to_ref(name)] = sha
@@ -1219,7 +1227,7 @@
                 return self._update_refs(result, old_refs, new_refs, overwrite)
             try:
                 result.revidmap, old_refs, new_refs = self.interrepo.fetch_refs(
-                    update_refs, lossy=lossy)
+                    update_refs, lossy=lossy, overwrite=overwrite)
             except NoPushSupport:
                 raise errors.NoRoundtrippingSupport(self.source, self.target)
             (old_sha1, result.old_revid) = old_refs.get(main_ref, (ZERO_SHA, NULL_REVISION))

=== modified file 'fetch.py'
--- fetch.py	2018-03-30 21:27:44 +0000
+++ fetch.py	2018-03-31 18:16:06 +0000
@@ -182,7 +182,7 @@
 
 class SubmodulesRequireSubtrees(BzrError):
     _fmt = ("The repository you are fetching from contains submodules, "
-            "which are not yet supported.")
+            "which require a Bazaar format that supports tree references.")
     internal = False
 
 

=== modified file 'interrepo.py'
--- interrepo.py	2018-03-31 11:45:36 +0000
+++ interrepo.py	2018-03-31 18:16:06 +0000
@@ -33,6 +33,7 @@
 from dulwich.walk import Walker
 
 from ...errors import (
+    DivergedBranches,
     FetchLimitUnsupported,
     InvalidRevisionId,
     LossyPushToSameVCS,
@@ -67,6 +68,7 @@
     )
 from .push import (
     MissingObjectsIterator,
+    remote_divergence,
     )
 from .refs import (
     is_tag,
@@ -102,7 +104,7 @@
         """See InterRepository.copy_content."""
         self.fetch(revision_id, pb, find_ghosts=False)
 
-    def fetch_refs(self, update_refs, lossy):
+    def fetch_refs(self, update_refs, lossy, overwrite=False):
         """Fetch possibly roundtripped revisions into the target repository
         and update refs.
 
@@ -244,7 +246,7 @@
             bzr_refs[k] = (v, revid)
         return bzr_refs
 
-    def fetch_refs(self, update_refs, lossy):
+    def fetch_refs(self, update_refs, lossy, overwrite=False):
         self._warn_slow()
         with self.source_store.lock_read():
             old_refs = self._get_target_bzr_refs()
@@ -321,7 +323,7 @@
 
 class InterToRemoteGitRepository(InterToGitRepository):
 
-    def fetch_refs(self, update_refs, lossy):
+    def fetch_refs(self, update_refs, lossy, overwrite=False):
         """Import the gist of the ancestry of a particular revision."""
         if not lossy and not self.mapping.roundtripping:
             raise NoPushSupport(self.source, self.target, self.mapping)
@@ -334,9 +336,11 @@
             for name, (gitid, revid) in self.new_refs.iteritems():
                 if gitid is None:
                     git_sha = self.source_store._lookup_revision_sha1(revid)
-                    ret[name] = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
-                else:
-                    ret[name] = gitid
+                    gitid = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
+                if not overwrite:
+                    if remote_divergence(old_refs.get(name), gitid, self.source_store):
+                        raise DivergedBranches(self.source, self.target)
+                ret[name] = gitid
             return ret
         self._warn_slow()
         with self.source_store.lock_read():
@@ -597,7 +601,7 @@
 class InterGitGitRepository(InterFromGitRepository):
     """InterRepository that copies between Git repositories."""
 
-    def fetch_refs(self, update_refs, lossy):
+    def fetch_refs(self, update_refs, lossy, overwrite=False):
         if lossy:
             raise LossyPushToSameVCS(self.source, self.target)
         old_refs = self.target.controldir.get_refs_container()

=== modified file 'push.py'
--- push.py	2018-03-30 21:27:44 +0000
+++ push.py	2018-03-31 18:16:06 +0000
@@ -68,3 +68,34 @@
 
     def __iter__(self):
         return iter(self._pending)
+
+
+class ObjectStoreParentsProvider(object):
+
+    def __init__(self, store):
+        self._store = store
+
+    def get_parent_map(self, shas):
+        ret = {}
+        for sha in shas:
+            if sha is None:
+                parents = []
+            else:
+                try:
+                    parents = self._store[sha].parents
+                except KeyError:
+                    parents = None
+            ret[sha] = parents
+        return ret
+
+
+def remote_divergence(old_sha, new_sha, store):
+    if old_sha is None:
+        return False
+    if not isinstance(old_sha, bytes):
+        raise TypeError(old_sha)
+    if not isinstance(new_sha, bytes):
+        raise TypeError(new_sha)
+    from breezy.graph import Graph
+    graph = Graph(ObjectStoreParentsProvider(store))
+    return not graph.is_ancestor(old_sha, new_sha)

=== modified file 'refs.py'
--- refs.py	2018-03-26 22:28:24 +0000
+++ refs.py	2018-03-31 18:16:06 +0000
@@ -18,6 +18,11 @@
 
 from __future__ import absolute_import
 
+from dulwich.refs import (
+    ANNOTATED_TAG_SUFFIX,
+    LOCAL_BRANCH_PREFIX,
+    LOCAL_TAG_PREFIX,
+    )
 from dulwich.repo import (
     RefsContainer,
     )
@@ -28,9 +33,9 @@
     revision as _mod_revision,
     )
 
-is_tag = lambda x: x.startswith("refs/tags/")
-is_head = lambda x: x.startswith("refs/heads/")
-is_peeled = lambda x: x.endswith("^{}")
+is_tag = lambda x: x.startswith(LOCAL_TAG_PREFIX)
+is_head = lambda x: x.startswith(LOCAL_BRANCH_PREFIX)
+is_peeled = lambda x: x.endswith(ANNOTATED_TAG_SUFFIX)
 
 
 def gather_peeled(refs):
@@ -39,7 +44,7 @@
         if is_peeled(k):
             continue
         try:
-            peeled = refs[k+"^{}"]
+            peeled = refs[k+ANNOTATED_TAG_SUFFIX]
             unpeeled = v
         except KeyError:
             peeled = v
@@ -57,7 +62,7 @@
     if name == "":
         return "HEAD"
     if not name.startswith("refs/"):
-        return "refs/heads/%s" % osutils.safe_utf8(name)
+        return LOCAL_BRANCH_PREFIX + osutils.safe_utf8(name)
     else:
         return osutils.safe_utf8(name)
 
@@ -68,7 +73,7 @@
     :param name: Tag name
     :return: ref string
     """
-    return "refs/tags/%s" % osutils.safe_utf8(name)
+    return LOCAL_TAG_PREFIX + osutils.safe_utf8(name)
 
 
 def ref_to_branch_name(ref):
@@ -81,14 +86,14 @@
         return u""
     if ref is None:
         return ref
-    if ref.startswith("refs/heads/"):
-        return osutils.safe_unicode(ref[len("refs/heads/"):])
+    if ref.startswith(LOCAL_BRANCH_PREFIX):
+        return osutils.safe_unicode(ref[len(LOCAL_BRANCH_PREFIX):])
     raise ValueError("unable to map ref %s back to branch name" % ref)
 
 
 def ref_to_tag_name(ref):
-    if ref.startswith("refs/tags/"):
-        return ref[len('refs/tags/'):].decode("utf-8")
+    if ref.startswith(LOCAL_TAG_PREFIX):
+        return ref[len(LOCAL_TAG_PREFIX):].decode("utf-8")
     raise ValueError("unable to map ref %s back to tag name" % ref)
 
 

=== modified file 'remote.py'
--- remote.py	2018-03-31 13:08:14 +0000
+++ remote.py	2018-03-31 18:16:06 +0000
@@ -21,6 +21,7 @@
 from ... import (
     config,
     debug,
+    errors,
     trace,
     ui,
     urlutils,
@@ -31,6 +32,7 @@
 from ...errors import (
     AlreadyBranchError,
     BzrError,
+    DivergedBranches,
     InProcessTransport,
     InvalidRevisionId,
     NoSuchFile,
@@ -71,6 +73,9 @@
 from .object_store import (
     get_object_store,
     )
+from .push import (
+    remote_divergence,
+    )
 from .repository import (
     GitRepository,
     )
@@ -424,9 +429,14 @@
                 ret = dict(refs)
                 # TODO(jelmer): Unpeel if necessary
                 if lossy:
-                    ret[refname] = source_store._lookup_revision_sha1(revision_id)
+                    new_sha = source_store._lookup_revision_sha1(revision_id)
                 else:
-                    ret[refname] = repo.lookup_bzr_revision_id(revision_id)[0]
+                    new_sha = repo.lookup_bzr_revision_id(revision_id)[0]
+                if not overwrite:
+                    if remote_divergence(ret.get(refname), new_sha, source_store):
+                        raise DivergedBranches(
+                                source, self.open_branch(name, nascent_ok=True))
+                ret[refname] = new_sha
                 return ret
             if lossy:
                 generate_pack_data = source_store.generate_lossy_pack_data

=== modified file 'tests/test_remote.py'
--- tests/test_remote.py	2018-03-31 13:08:14 +0000
+++ tests/test_remote.py	2018-03-31 18:16:06 +0000
@@ -24,6 +24,7 @@
 from ....controldir import ControlDir
 from ....errors import (
     BzrError,
+    DivergedBranches,
     NotBranchError,
     NoSuchTag,
     )
@@ -248,6 +249,36 @@
                 },
                 self.remote_real.get_refs())
 
+    def test_push_diverged(self):
+        c1 = self.remote_real.do_commit(
+                message='message',
+                committer='committer <[e-mail]>',
+                author='author <[e-mail]>',
+                ref='refs/heads/newbranch')
+
+        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')
+
+        newbranch = remote.open_branch('newbranch')
+        if self._from_format == 'git':
+            self.assertRaises(DivergedBranches, wt.branch.push, newbranch)
+        else:
+            self.assertRaises(DivergedBranches, wt.branch.push, newbranch, lossy=True)
+
+        self.assertEqual(
+                {'refs/heads/newbranch': c1 },
+                self.remote_real.get_refs())
+
+        if self._from_format == 'git':
+            wt.branch.push(newbranch, overwrite=True)
+        else:
+            wt.branch.push(newbranch, lossy=True, overwrite=True)
+
+        self.assertNotEqual(c1, self.remote_real.refs['refs/heads/newbranch'])
+
 
 class PushToRemoteFromBzrTests(PushToRemoteBase,TestCaseWithTransport):
 

=== modified file 'transportgit.py'
--- transportgit.py	2018-03-28 21:22:43 +0000
+++ transportgit.py	2018-03-31 18:16:06 +0000
@@ -392,6 +392,9 @@
     def controldir(self):
         return self._controltransport.local_abspath('.')
 
+    def commondir(self):
+        return self._commontransport.local_abspath('.')
+
     @property
     def path(self):
         return self.transport.local_abspath('.')