Merge lp:~jelmer/brz/hpss-ghost-rev-error into lp:brz

[Jelmer Vernooij]

Handle GhostRevisionsHaveNoRevno in hpss.

Handle GhostRevisionsHaveNoRevno in hpss.

[Martin Packman (gz)]

Okay.

review: Approve

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2018-05-13 16:23:17 +0000
+++ breezy/bzr/remote.py	2018-05-19 17:45:36 +0000
@@ -4234,6 +4234,8 @@
     lambda err, find, get_path: errors.UnresumableWriteGroup(
         repository=find('repository'), write_groups=err.error_args[0],
         reason=err.error_args[1]))
+no_context_error_translators.register(b'GhostRevisionsHaveNoRevno',
+    lambda err: errors.GhostRevisionsHaveNoRevno(*err.error_args))
 no_context_error_translators.register(b'IncompatibleRepositories',
     lambda err: errors.IncompatibleRepositories(
         err.error_args[0].decode('utf-8'), err.error_args[1].decode('utf-8'), err.error_args[2].decode('utf-8')))

=== modified file 'breezy/bzr/smart/request.py'
--- breezy/bzr/smart/request.py	2018-05-13 02:18:13 +0000
+++ breezy/bzr/smart/request.py	2018-05-19 17:45:36 +0000
@@ -469,6 +469,8 @@
         return (b'TokenMismatch', err.given_token, err.lock_token)
     elif isinstance(err, errors.LockContention):
         return (b'LockContention',)
+    elif isinstance(err, errors.GhostRevisionsHaveNoRevno):
+        return (b'GhostRevisionsHaveNoRevno', err.revision_id, err.ghost_revision_id)
     elif isinstance(err, MemoryError):
         # GZ 2011-02-24: Copy breezy.trace -Dmem_dump functionality here?
         return (b'MemoryError',)

=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2018-05-13 02:45:58 +0000
+++ breezy/tests/test_remote.py	2018-05-19 17:45:36 +0000
@@ -3749,6 +3749,12 @@
             "details here")
         self.assertEqual(expected_error, translated_error)
 
+    def test_GhostRevisionsHaveNoRevno(self):
+        translated_error = self.translateTuple((b'GhostRevisionsHaveNoRevno',
+            b"revid1", b"revid2"))
+        expected_error = errors.GhostRevisionsHaveNoRevno(b"revid1", b"revid2")
+        self.assertEqual(expected_error, translated_error)
+
     def test_PermissionDenied_no_args(self):
         path = 'a path'
         translated_error = self.translateTuple((b'PermissionDenied',),

=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2018-05-13 02:18:13 +0000
+++ breezy/tests/test_smart.py	2018-05-19 17:45:36 +0000
@@ -853,6 +853,17 @@
         self.assertEqual(smart_req.SmartServerResponse((b'ok', b'0', b'null:')),
             request.execute(b''))
 
+    def test_ghost(self):
+        """For an empty branch, the result is ('ok', '0', 'null:')."""
+        backing = self.get_transport()
+        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
+        branch = self.make_branch('.')
+        def last_revision_info():
+            raise errors.GhostRevisionsHaveNoRevno('revid1', 'revid2')
+        self.overrideAttr(branch, 'last_revision_info', last_revision_info)
+        self.assertRaises(errors.GhostRevisionsHaveNoRevno,
+            request.do_with_branch, branch)
+
     def test_not_empty(self):
         """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
         backing = self.get_transport()

=== modified file 'breezy/tests/test_smart_request.py'
--- breezy/tests/test_smart_request.py	2018-05-13 02:45:58 +0000
+++ breezy/tests/test_smart_request.py	2018-05-19 17:45:36 +0000
@@ -208,6 +208,11 @@
     def test_MemoryError(self):
         self.assertTranslationEqual((b"MemoryError",), MemoryError())
 
+    def test_GhostRevisionsHaveNoRevno(self):
+        self.assertTranslationEqual(
+            (b"GhostRevisionsHaveNoRevno", b'revid1', b'revid2'),
+            errors.GhostRevisionsHaveNoRevno(b'revid1', b'revid2'))
+
     def test_generic_Exception(self):
         self.assertTranslationEqual((b'error', b'Exception', b""),
             Exception())