Merge lp:~jelmer/brz/overwrite-old-revision into lp:brz/3.2

[Jelmer Vernooij]

Handle pulling of old revisions.

Handle pulling of old revisions.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2021-05-02 15:07:21 +0000
+++ breezy/git/branch.py	2022-01-21 22:35:17 +0000
@@ -86,6 +86,19 @@
     )
 
 
+
+def _update_tip(source, target, revid, overwrite=False):
+    if not overwrite:
+        last_rev = target.last_revision()
+        graph = target.repository.get_graph(source.repository)
+        if graph.is_ancestor(revid, last_rev):
+            # target is ahead of revid
+            return
+        target.generate_revision_history(revid, last_rev, other_branch=source)
+    else:
+        target.generate_revision_history(revid)
+
+
 def _calculate_revnos(branch):
     if branch._format.stores_revno():
         return True
@@ -1027,13 +1040,9 @@
 
     def _update_revisions(self, stop_revision=None, overwrite=False, tag_selector=None):
         head, refs = self.fetch_objects(stop_revision, fetch_tags=None, tag_selector=tag_selector)
-        if overwrite:
-            prev_last_revid = None
-        else:
-            prev_last_revid = self.target.last_revision()
-        self.target.generate_revision_history(
-            self._last_revid, last_rev=prev_last_revid,
-            other_branch=self.source)
+        _update_tip(
+            self.source, self.target,
+            self._last_revid, overwrite)
         return head, refs
 
     def update_references(self, revid=None):
@@ -1260,10 +1269,10 @@
         result.target_branch = self.target
         result.old_revid = self.target.last_revision()
         refs, stop_revision = self.update_refs(stop_revision)
-        self.target.generate_revision_history(
+        _update_tip(
+            self.source, self.target,
             stop_revision,
-            (result.old_revid if ("history" not in overwrite) else None),
-            other_branch=self.source)
+            "history" in overwrite)
         tags_ret = self.source.tags.merge_to(
             self.target.tags,
             overwrite=("tags" in overwrite),
@@ -1311,10 +1320,10 @@
         with self.target.lock_write(), self.source.lock_read():
             result.old_revid = self.target.last_revision()
             refs, stop_revision = self.update_refs(stop_revision)
-            self.target.generate_revision_history(
+            _update_tip(
+                self.source, self.target,
                 stop_revision,
-                (result.old_revid if ("history" not in overwrite) else None),
-                other_branch=self.source)
+                "history" in overwrite)
             tags_ret = self.source.tags.merge_to(
                 self.target.tags, overwrite=("tags" in overwrite),
                 selector=tag_selector)

=== modified file 'breezy/git/tests/test_branch.py'
--- breezy/git/tests/test_branch.py	2020-02-18 01:57:45 +0000
+++ breezy/git/tests/test_branch.py	2022-01-21 22:35:17 +0000
@@ -330,6 +330,17 @@
             revid,
             wt.branch.get_master_branch().last_revision())
 
+    def test_interbranch_pull_older(self):
+        path, (gitsha1, gitsha2) = self.make_tworev_branch()
+        oldrepo = Repository.open(path)
+        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
+        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
+        newbranch = self.make_branch('g')
+        inter_branch = InterBranch.get(Branch.open(path), newbranch)
+        inter_branch.pull(stop_revision=revid2)
+        inter_branch.pull(stop_revision=revid1)
+        self.assertEqual(revid2, newbranch.last_revision())
+
 
 class ForeignTestsBranchFactory(object):