Merge lp:~jelmer/brz/cross-branch-fetch into lp:brz

[Jelmer Vernooij]

Fix fetching between non-default colocated git branches.

Fix fetching between non-default colocated git branches.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/git/branch.py'
--- breezy/git/branch.py	2018-08-15 19:35:30 +0000
+++ breezy/git/branch.py	2018-10-15 19:18:07 +0000
@@ -1078,9 +1078,9 @@
         fetch_tags = c.get('branch.fetch_tags')
 
         if stop_revision is None:
-            refs = interrepo.fetch(branches=[b"HEAD"], include_tags=fetch_tags)
+            refs = interrepo.fetch(branches=[self.source.ref], include_tags=fetch_tags)
             try:
-                head = refs[b"HEAD"]
+                head = refs[self.source.ref]
             except KeyError:
                 stop_revision = revision.NULL_REVISION
             else:

=== modified file 'breezy/tests/per_interbranch/test_push.py'
--- breezy/tests/per_interbranch/test_push.py	2018-07-23 22:25:11 +0000
+++ breezy/tests/per_interbranch/test_push.py	2018-10-15 19:18:07 +0000
@@ -179,6 +179,30 @@
             raise tests.TestNotApplicable(
                 'push between branches of same format')
 
+    def test_between_colocated(self):
+        """Pushing from one colocated branch to another doesn't change the active branch."""
+        source = self.make_from_branch_and_tree('source')
+        target = self.make_to_branch('target')
+
+        self.build_tree(['source/a'])
+        source.add(['a'])
+        revid1 = source.commit('a')
+
+        self.build_tree(['source/b'])
+        source.add(['b'])
+        revid2 = source.commit('b')
+
+        source_colo = source.controldir.create_branch('colo')
+        source_colo.generate_revision_history(revid1)
+        try:
+            source_colo.push(target)
+        except errors.NoRoundtrippingSupport:
+            raise tests.TestNotApplicable(
+                'push between branches of different format')
+        self.assertEqual(source_colo.last_revision(), revid1)
+        self.assertEqual(source.last_revision(), revid2)
+        self.assertEqual(target.last_revision(), revid1)
+
     def test_push_within_repository(self):
         """Push from one branch to another inside the same repository."""
         try: