Merge lp:~jelmer/brz/git-remote-uncommit into lp:brz

[Jelmer Vernooij]

Support uncommit on remote git branches.

Support uncommit on remote git branches.

[Martin Packman (gz)]

Thanks, makes sense with the explaining.

review: Approve

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2018-10-14 12:46:54 +0000
+++ breezy/git/remote.py	2018-11-12 21:12:26 +0000
@@ -927,6 +927,19 @@
                 raise TypeError(tag_name)
             yield (ref_name, tag_name, peeled, unpeeled)
 
+    def set_last_revision_info(self, revno, revid):
+        self.generate_revision_history(revid)
+
+    def generate_revision_history(self, revision_id, last_rev=None,
+                                  other_branch=None):
+        sha = self.lookup_bzr_revision_id(revision_id)[0]
+        def get_changed_refs(old_refs):
+            return {self.ref: sha}
+        def generate_pack_data(have, want, ofs_delta=False):
+            return pack_objects_to_data([])
+        self.repository.send_pack(get_changed_refs, generate_pack_data)
+        self._sha = sha
+
 
 def remote_refs_dict_to_container(refs_dict, symrefs_dict={}):
     base = {}

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2018-10-06 21:01:10 +0000
+++ breezy/git/tests/test_remote.py	2018-11-12 21:12:26 +0000
@@ -141,6 +141,37 @@
         self.assertTrue(self.format.supports_tags())
 
 
+class TestRemoteGitBranch(TestCaseWithTransport):
+
+    def setUp(self):
+        TestCaseWithTransport.setUp(self)
+        self.remote_real = GitRepo.init('remote', mkdir=True)
+        self.remote_url = 'git://%s/' % os.path.abspath(self.remote_real.path)
+        self.permit_url(self.remote_url)
+
+    def test_set_last_revision_info(self):
+        c1 = self.remote_real.do_commit(
+                message=b'message 1',
+                committer=b'committer <[e-mail]>',
+                author=b'author <[e-mail]>',
+                ref=b'refs/heads/newbranch')
+        c2 = self.remote_real.do_commit(
+                message=b'message 2',
+                committer=b'committer <[e-mail]>',
+                author=b'author <[e-mail]>',
+                ref=b'refs/heads/newbranch')
+
+        remote = ControlDir.open(self.remote_url)
+        newbranch = remote.open_branch('newbranch')
+        self.assertEqual(newbranch.lookup_foreign_revision_id(c2),
+                         newbranch.last_revision())
+        newbranch.set_last_revision_info(
+            1, newbranch.lookup_foreign_revision_id(c1))
+        self.assertEqual(c1, self.remote_real.refs[b'refs/heads/newbranch'])
+        self.assertEqual(newbranch.last_revision(),
+                         newbranch.lookup_foreign_revision_id(c1))
+
+
 class FetchFromRemoteTestBase(object):
 
     _test_needs_features = [ExecutableFeature('git')]