Merge lp:~jelmer/brz/ghost-revisions into lp:brz

[Jelmer Vernooij]

Raise consistent GhostRevisionsHaveNoRevno from dotted_revno_to_revision_id.

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2019-02-15 04:22:43 +0000
+++ breezy/branch.py	2019-03-13 23:26:23 +0000
@@ -364,7 +364,10 @@
         provide a more efficient implementation.
         """
         if len(revno) == 1:
-            return self.get_rev_id(revno[0])
+            try:
+                return self.get_rev_id(revno[0])
+            except errors.RevisionNotPresent as e:
+                raise errors.GhostRevisionsHaveNoRevno(revno[0], e.revision_id)
         revision_id_to_revno = self.get_revision_id_to_revno_map()
         revision_ids = [revision_id for revision_id, this_revno
                         in viewitems(revision_id_to_revno)

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2019-02-15 14:00:31 +0000
+++ breezy/bzr/remote.py	2019-03-13 23:26:23 +0000
@@ -18,6 +18,7 @@
 
 import bz2
 import os
+import re
 import sys
 import zlib
 
@@ -4032,6 +4033,14 @@
             except errors.UnknownSmartMethod:
                 self._ensure_real()
                 return self._real_branch.revision_id_to_dotted_revno(revision_id)
+            except errors.UnknownErrorFromSmartServer as e:
+                # Deal with older versions of bzr/brz that didn't explicitly
+                # wrap GhostRevisionsHaveNoRevno.
+                if e.error_tuple[1] == b'GhostRevisionsHaveNoRevno':
+                    (revid, ghost_revid) = re.findall(b"{([^}]+)}", e.error_tuple[2])
+                    raise errors.GhostRevisionsHaveNoRevno(
+                        revid, ghost_revid)
+                raise
             if response[0] == b'ok':
                 return tuple([int(x) for x in response[1:]])
             else:

=== modified file 'breezy/bzr/smart/branch.py'
--- breezy/bzr/smart/branch.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/smart/branch.py	2019-03-13 23:26:23 +0000
@@ -236,6 +236,10 @@
             dotted_revno = branch.revision_id_to_dotted_revno(revid)
         except errors.NoSuchRevision:
             return FailedSmartServerResponse((b'NoSuchRevision', revid))
+        except errors.GhostRevisionsHaveNoRevno as e:
+            return FailedSmartServerResponse(
+                (b'GhostRevisionsHaveNoRevno', e.revision_id,
+                    e.ghost_revision_id))
         return SuccessfulSmartServerResponse(
             (b'ok', ) + tuple([b'%d' % x for x in dotted_revno]))
 

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2019-02-15 14:45:15 +0000
+++ breezy/git/remote.py	2019-03-13 23:26:23 +0000
@@ -89,6 +89,7 @@
     )
 from .repository import (
     GitRepository,
+    GitRepositoryFormat,
     )
 from .refs import (
     branch_name_to_ref,
@@ -753,6 +754,10 @@
     def get_branch_format(self):
         return RemoteGitBranchFormat()
 
+    @property
+    def repository_format(self):
+        return GitRepositoryFormat()
+
     def is_initializable(self):
         return False
 

=== modified file 'breezy/tests/per_branch/test_dotted_revno_to_revision_id.py'
--- breezy/tests/per_branch/test_dotted_revno_to_revision_id.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/per_branch/test_dotted_revno_to_revision_id.py	2019-03-13 23:26:23 +0000
@@ -17,6 +17,8 @@
 """Tests for Branch.dotted_revno_to_revision_id()"""
 
 from breezy import errors
+from breezy.bzr.fullhistory import FullHistoryBzrBranch
+from breezy.tests import TestNotApplicable
 
 from breezy.tests.per_branch import TestCaseWithBranch
 
@@ -52,3 +54,20 @@
         self.assertEqual(
             (1,),
             the_branch._partial_revision_id_to_revno_cache.get(revmap['1']))
+
+    def test_ghost_revision(self):
+        if not self.bzrdir_format.repository_format.supports_ghosts:
+            raise TestNotApplicable("repository format does not support ghosts")
+        builder = self.make_branch_builder('foo')
+        builder.start_series()
+        try:
+            revid1 = builder.build_snapshot(
+                [b'ghost'], [('add', ('', b'ROOT_ID', 'directory', ''))],
+                allow_leftmost_as_ghost=True, revision_id=b'tip')
+        finally:
+            builder.finish_series()
+        b = builder.get_branch()
+        if isinstance(b, FullHistoryBzrBranch):
+            raise TestNotApplicable("branch format stores full history")
+        b.set_last_revision_info(4, revid1)
+        self.assertRaises(errors.GhostRevisionsHaveNoRevno, b.dotted_revno_to_revision_id, (2,))

=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2019-02-15 14:00:31 +0000
+++ breezy/tests/test_remote.py	2019-03-13 23:26:23 +0000
@@ -2214,6 +2214,31 @@
                           branch.revision_id_to_dotted_revno, b'unknown')
         self.assertFinished(client)
 
+    def test_ghost_revid(self):
+        transport = MemoryTransport()
+        client = FakeClient(transport.base)
+        client.add_expected_call(
+            b'Branch.get_stacked_on_url', (b'quack/',),
+            b'error', (b'NotStacked',),)
+        # Some older versions of bzr/brz didn't explicitly return
+        # GhostRevisionsHaveNoRevno
+        client.add_expected_call(
+            b'Branch.revision_id_to_revno', (b'quack/', b'revid'),
+            b'error', (b'error', b'GhostRevisionsHaveNoRevno',
+                       b'The reivison {revid} was not found because there was '
+                       b'a ghost at {ghost-revid}'))
+        client.add_expected_call(
+            b'Branch.revision_id_to_revno', (b'quack/', b'revid'),
+            b'error', (b'GhostRevisionsHaveNoRevno', b'revid', b'ghost-revid',))
+        transport.mkdir('quack')
+        transport = transport.clone('quack')
+        branch = self.make_remote_branch(transport, client)
+        self.assertRaises(errors.GhostRevisionsHaveNoRevno,
+                          branch.revision_id_to_dotted_revno, b'revid')
+        self.assertRaises(errors.GhostRevisionsHaveNoRevno,
+                          branch.revision_id_to_dotted_revno, b'revid')
+        self.assertFinished(client)
+
     def test_dotted_no_smart_verb(self):
         self.setup_smart_server_with_call_log()
         branch = self.make_branch('.')

=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2018-11-29 23:42:41 +0000
+++ breezy/tests/test_smart.py	2019-03-13 23:26:23 +0000
@@ -905,6 +905,19 @@
         self.assertEqual(smart_req.SmartServerResponse((b'ok', b'0')),
                          request.execute(b'', b'null:'))
 
+    def test_ghost_revision(self):
+        backing = self.get_transport()
+        request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(
+            backing)
+        branch = self.make_branch('.')
+        def revision_id_to_dotted_revno(revid):
+            raise errors.GhostRevisionsHaveNoRevno(revid, b'ghost-revid')
+        self.overrideAttr(branch, 'revision_id_to_dotted_revno', revision_id_to_dotted_revno)
+        self.assertEqual(
+            smart_req.FailedSmartServerResponse(
+                (b'GhostRevisionsHaveNoRevno', b'revid', b'ghost-revid')),
+            request.do_with_branch(branch, b'revid'))
+
     def test_simple(self):
         backing = self.get_transport()
         request = smart_branch.SmartServerBranchRequestRevisionIdToRevno(