Merge lp:~jelmer/brz/bzr-bound-to-git into lp:brz

[Jelmer Vernooij]

Support committing to a bzr branch bound to a git branch.

Support committing to a bzr branch bound to a git branch.

[Martin Packman (gz)]

Thanks, all makes sense.

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/61/

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

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

=== modified file 'breezy/commit.py'
--- breezy/commit.py	2018-11-16 18:40:46 +0000
+++ breezy/commit.py	2018-11-17 00:41:27 +0000
@@ -562,9 +562,9 @@
         #       to local.
 
         # Make sure the local branch is identical to the master
-        master_info = self.master_branch.last_revision_info()
-        local_info = self.branch.last_revision_info()
-        if local_info != master_info:
+        master_revid = self.master_branch.last_revision()
+        local_revid = self.branch.last_revision()
+        if local_revid != master_revid:
             raise errors.BoundBranchOutOfDate(self.branch,
                                               self.master_branch)
 
@@ -588,7 +588,11 @@
             # - in a checkout scenario the tree may have no
             # parents but the branch may do.
             first_tree_parent = breezy.revision.NULL_REVISION
-        old_revno, master_last = self.master_branch.last_revision_info()
+        try:
+            old_revno, master_last = self.master_branch.last_revision_info()
+        except errors.UnsupportedOperation:
+            master_last = self.master_branch.last_revision()
+            old_revno = self.branch.revision_id_to_revno(master_last)
         if master_last != first_tree_parent:
             if master_last != breezy.revision.NULL_REVISION:
                 raise errors.OutOfDateTree(self.work_tree)

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2018-11-16 18:40:46 +0000
+++ breezy/git/branch.py	2018-11-17 00:41:27 +0000
@@ -595,6 +595,26 @@
                 self._tag_refs = list(self._iter_tag_refs())
             return self._tag_refs
 
+    def import_last_revision_info_and_tags(self, source, revno, revid,
+                                           lossy=False):
+        """Set the last revision info, importing from another repo if necessary.
+
+        This is used by the bound branch code to upload a revision to
+        the master branch first before updating the tip of the local branch.
+        Revisions referenced by source's tags are also transferred.
+
+        :param source: Source branch to optionally fetch from
+        :param revno: Revision number of the new tip
+        :param revid: Revision id of the new tip
+        :param lossy: Whether to discard metadata that can not be
+            natively represented
+        :return: Tuple with the new revision number and revision id
+            (should only be different from the arguments when lossy=True)
+        """
+        push_result = source.push(
+            self, stop_revision=revid, lossy=lossy, _stop_revno=revno)
+        return (push_result.new_revno, push_result.new_revid)
+
 
 class LocalGitBranch(GitBranch):
     """A local Git branch."""
@@ -1188,12 +1208,13 @@
         return (not isinstance(source, GitBranch) and
                 isinstance(target, GitBranch))
 
-    def _get_new_refs(self, stop_revision=None, fetch_tags=None):
+    def _get_new_refs(self, stop_revision=None, fetch_tags=None,
+                      stop_revno=None):
         if not self.source.is_locked():
             raise errors.ObjectNotLocked(self.source)
         if stop_revision is None:
             (stop_revno, stop_revision) = self.source.last_revision_info()
-        else:
+        elif stop_revno is None:
             stop_revno = self.source.revision_id_to_revno(stop_revision)
         if not isinstance(stop_revision, bytes):
             raise TypeError(stop_revision)
@@ -1285,13 +1306,13 @@
             raise errors.NoRoundtrippingSupport(self.source, self.target)
 
     def pull(self, overwrite=False, stop_revision=None, local=False,
-             possible_transports=None, run_hooks=True):
+             possible_transports=None, run_hooks=True, _stop_revno=None):
         result = GitBranchPullResult()
         result.source_branch = self.source
         result.target_branch = self.target
         with self.source.lock_read(), self.target.lock_write():
             new_refs, main_ref, stop_revinfo = self._get_new_refs(
-                stop_revision)
+                stop_revision, stop_revno=_stop_revno)
 
             def update_refs(old_refs):
                 return self._update_refs(result, old_refs, new_refs, overwrite)
@@ -1314,7 +1335,7 @@
         return result
 
     def push(self, overwrite=False, stop_revision=None, lossy=False,
-             _override_hook_source_branch=None):
+             _override_hook_source_branch=None, _stop_revno=None):
         result = GitBranchPushResult()
         result.source_branch = self.source
         result.target_branch = self.target
@@ -1322,7 +1343,7 @@
         result.master_branch = result.target_branch
         with self.source.lock_read(), self.target.lock_write():
             new_refs, main_ref, stop_revinfo = self._get_new_refs(
-                stop_revision)
+                stop_revision, stop_revno=_stop_revno)
 
             def update_refs(old_refs):
                 return self._update_refs(result, old_refs, new_refs, overwrite)

=== modified file 'breezy/git/interrepo.py'
--- breezy/git/interrepo.py	2018-11-16 11:47:52 +0000
+++ breezy/git/interrepo.py	2018-11-17 00:41:27 +0000
@@ -264,6 +264,7 @@
 
     def fetch_refs(self, update_refs, lossy, overwrite=False):
         self._warn_slow()
+        result_refs = {}
         with self.source_store.lock_read():
             old_refs = self._get_target_bzr_refs()
             new_refs = update_refs(old_refs)
@@ -288,7 +289,8 @@
                         self.target_refs.add_if_new(name, gitid)
                     else:
                         self.target_refs.set_if_equals(name, old_git_id, gitid)
-        return revidmap, old_refs, new_refs
+                    result_refs[name] = (gitid, revid if not lossy else self.mapping.revision_id_foreign_to_bzr(gitid))
+        return revidmap, old_refs, result_refs
 
     def fetch_objects(self, revs, lossy, limit=None):
         if not lossy and not self.mapping.roundtripping:
@@ -362,10 +364,10 @@
 
         def git_update_refs(old_refs):
             ret = {}
-            self.old_refs = dict([(k, (v, None))
-                                  for (k, v) in viewitems(old_refs)])
-            self.new_refs = update_refs(self.old_refs)
-            for name, (gitid, revid) in viewitems(self.new_refs):
+            self.old_refs = {
+                k: (v, None) for (k, v) in viewitems(old_refs)}
+            new_refs = update_refs(self.old_refs)
+            for name, (gitid, revid) in viewitems(new_refs):
                 if gitid is None:
                     git_sha = self.source_store._lookup_revision_sha1(revid)
                     gitid = unpeel_map.re_unpeel_tag(
@@ -381,7 +383,7 @@
             new_refs = self.target.send_pack(
                 git_update_refs, self.source_store.generate_lossy_pack_data)
         # FIXME: revidmap?
-        return revidmap, self.old_refs, self.new_refs
+        return revidmap, self.old_refs, new_refs
 
     @staticmethod
     def is_compatible(source, target):

=== modified file 'breezy/git/tests/test_branch.py'
--- breezy/git/tests/test_branch.py	2018-11-11 04:08:32 +0000
+++ breezy/git/tests/test_branch.py	2018-11-17 00:41:27 +0000
@@ -32,6 +32,7 @@
 import os
 
 from ... import (
+    errors,
     revision,
     urlutils,
     )
@@ -271,6 +272,19 @@
         self.assertEqual(revid1, newbranch.last_revision())
         self.assertTrue(newbranch.repository.has_revision(revid2))
 
+    def test_bzr_branch_bound_to_git(self):
+        path, (gitsha1, gitsha2) = self.make_tworev_branch()
+        wt = Branch.open(path).create_checkout('co')
+        self.build_tree_contents([('co/foobar', b'blah')])
+        self.assertRaises(
+            errors.NoRoundtrippingSupport, wt.commit,
+            'commit from bound branch.')
+        revid = wt.commit('commit from bound branch.', lossy=True)
+        self.assertEqual(revid, wt.branch.last_revision())
+        self.assertEqual(
+            revid,
+            wt.branch.get_master_branch().last_revision())
+
 
 class ForeignTestsBranchFactory(object):