Merge lp:~jelmer/brz/move-testament into lp:brz

[Jelmer Vernooij]

Move the testament module to breezy.bzr.

Move the testament module to breezy.bzr.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-11-21 03:20:30 +0000
+++ breezy/builtins.py	2018-11-30 17:12:07 +0000
@@ -5210,7 +5210,7 @@
 
     @display_command
     def run(self, branch=u'.', revision=None, long=False, strict=False):
-        from .testament import Testament, StrictTestament
+        from .bzr.testament import Testament, StrictTestament
         if strict is True:
             testament_class = StrictTestament
         else:

=== modified file 'breezy/bundle/bundle_data.py'
--- breezy/bundle/bundle_data.py	2018-11-22 03:51:03 +0000
+++ breezy/bundle/bundle_data.py	2018-11-30 17:12:07 +0000
@@ -44,7 +44,7 @@
 from ..sixish import (
     viewitems,
     )
-from ..testament import StrictTestament
+from ..bzr.testament import StrictTestament
 from ..trace import mutter, warning
 from ..tree import Tree
 from ..bzr.xml5 import serializer_v5

=== modified file 'breezy/bundle/serializer/v08.py'
--- breezy/bundle/serializer/v08.py	2018-11-16 18:40:46 +0000
+++ breezy/bundle/serializer/v08.py	2018-11-30 17:12:07 +0000
@@ -35,7 +35,7 @@
 from breezy.diff import internal_diff
 from breezy.revision import NULL_REVISION
 from breezy.sixish import text_type
-from breezy.testament import StrictTestament
+from breezy.bzr.testament import StrictTestament
 from breezy.timestamp import (
     format_highres_date,
     )

=== modified file 'breezy/bundle/serializer/v09.py'
--- breezy/bundle/serializer/v09.py	2018-06-17 20:17:39 +0000
+++ breezy/bundle/serializer/v09.py	2018-11-30 17:12:07 +0000
@@ -18,9 +18,10 @@
 
 from breezy.bundle.serializer import _get_bundle_header
 from breezy.bundle.serializer.v08 import BundleSerializerV08, BundleReader
-from breezy.testament import StrictTestament3
 from breezy.bundle.bundle_data import BundleInfo
 
+from breezy.bzr.testament import StrictTestament3
+
 
 """Serializer for bundle format 0.9"""
 

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2018-11-18 00:25:19 +0000
+++ breezy/bzr/remote.py	2018-11-30 17:12:07 +0000
@@ -37,13 +37,13 @@
     registry,
     repository as _mod_repository,
     revision as _mod_revision,
-    testament as _mod_testament,
     urlutils,
     )
 from . import (
     branch as bzrbranch,
     bzrdir as _mod_bzrdir,
     inventory_delta,
+    testament as _mod_testament,
     vf_repository,
     vf_search,
     )

=== renamed file 'breezy/testament.py' => 'breezy/bzr/testament.py'
--- breezy/testament.py	2018-11-21 03:20:30 +0000
+++ breezy/bzr/testament.py	2018-11-30 17:12:07 +0000
@@ -73,13 +73,13 @@
 
 from copy import copy
 
-from .osutils import (
+from ..osutils import (
     contains_whitespace,
     contains_linebreaks,
     sha_strings,
     )
-from .sixish import text_type
-from .tree import Tree
+from ..sixish import text_type
+from ..tree import Tree
 
 
 class Testament(object):

=== modified file 'breezy/bzr/vf_repository.py'
--- breezy/bzr/vf_repository.py	2018-11-16 18:40:46 +0000
+++ breezy/bzr/vf_repository.py	2018-11-30 17:12:07 +0000
@@ -46,8 +46,8 @@
     )
 
 from breezy.recordcounter import RecordCounter
-from breezy.testament import Testament
 from breezy.i18n import gettext
+from breezy.bzr.testament import Testament
 """)
 
 from .. import (
@@ -1121,6 +1121,39 @@
             self.signatures.add_lines((revision_id,), (),
                                       osutils.split_lines(signature))
 
+    def sign_revision(self, revision_id, gpg_strategy):
+        with self.lock_write():
+            testament = Testament.from_revision(
+                self, revision_id)
+            plaintext = testament.as_short_text()
+            self.store_revision_signature(gpg_strategy, plaintext, revision_id)
+
+    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
+        with self.lock_write():
+            signature = gpg_strategy.sign(plaintext, gpg.MODE_CLEAR)
+            self.add_signature_text(revision_id, signature)
+
+    def verify_revision_signature(self, revision_id, gpg_strategy):
+        """Verify the signature on a revision.
+
+        :param revision_id: the revision to verify
+        :gpg_strategy: the GPGStrategy object to used
+
+        :return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
+        """
+        with self.lock_read():
+            if not self.has_signature_for_revision_id(revision_id):
+                return gpg.SIGNATURE_NOT_SIGNED, None
+            signature = self.get_signature_text(revision_id)
+
+            testament = Testament.from_revision(
+                self, revision_id)
+
+            (status, key, signed_plaintext) = gpg_strategy.verify(signature)
+            if testament.as_short_text() != signed_plaintext:
+                return gpg.SIGNATURE_NOT_VALID, None
+            return (status, key)
+
     def find_text_key_references(self):
         """Find the text key references within the repository.
 

=== modified file 'breezy/git/fetch.py'
--- breezy/git/fetch.py	2018-11-17 16:53:10 +0000
+++ breezy/git/fetch.py	2018-11-30 17:12:07 +0000
@@ -52,7 +52,7 @@
     )
 from ..bzr.inventorytree import InventoryRevisionTree
 from ..sixish import text_type
-from ..testament import (
+from ..bzr.testament import (
     StrictTestament3,
     )
 from ..tsort import (

=== modified file 'breezy/git/object_store.py'
--- breezy/git/object_store.py	2018-11-18 00:25:19 +0000
+++ breezy/git/object_store.py	2018-11-30 17:12:07 +0000
@@ -47,7 +47,7 @@
     NULL_REVISION,
     )
 from ..sixish import viewitems
-from ..testament import (
+from ..bzr.testament import (
     StrictTestament3,
     )
 

=== modified file 'breezy/merge_directive.py'
--- breezy/merge_directive.py	2018-11-12 01:41:38 +0000
+++ breezy/merge_directive.py	2018-11-30 17:12:07 +0000
@@ -31,10 +31,12 @@
     registry,
     revision as _mod_revision,
     rio,
-    testament,
     timestamp,
     trace,
     )
+from breezy.bzr import (
+    testament,
+    )
 from breezy.bundle import (
     serializer as bundle_serializer,
     )

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2018-11-18 19:48:57 +0000
+++ breezy/repository.py	2018-11-30 17:12:07 +0000
@@ -28,7 +28,6 @@
     graph,
     osutils,
     revision as _mod_revision,
-    testament as _mod_testament,
     gpg,
     )
 from breezy.bundle import serializer
@@ -887,9 +886,7 @@
                 [r], specific_fileids=specific_fileids))[0]
 
     def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
-        with self.lock_write():
-            signature = gpg_strategy.sign(plaintext, gpg.MODE_CLEAR)
-            self.add_signature_text(revision_id, signature)
+        raise NotImplementedError(self.store_revision_signature)
 
     def add_signature_text(self, revision_id, signature):
         """Store a signature text for a revision.
@@ -1087,11 +1084,7 @@
         raise NotImplementedError(self.make_working_trees)
 
     def sign_revision(self, revision_id, gpg_strategy):
-        with self.lock_write():
-            testament = _mod_testament.Testament.from_revision(
-                self, revision_id)
-            plaintext = testament.as_short_text()
-            self.store_revision_signature(gpg_strategy, plaintext, revision_id)
+        raise NotImplementedError(self.sign_revision)
 
     def verify_revision_signature(self, revision_id, gpg_strategy):
         """Verify the signature on a revision.
@@ -1101,18 +1094,7 @@
 
         :return: gpg.SIGNATURE_VALID or a failed SIGNATURE_ value
         """
-        with self.lock_read():
-            if not self.has_signature_for_revision_id(revision_id):
-                return gpg.SIGNATURE_NOT_SIGNED, None
-            signature = self.get_signature_text(revision_id)
-
-            testament = _mod_testament.Testament.from_revision(
-                self, revision_id)
-
-            (status, key, signed_plaintext) = gpg_strategy.verify(signature)
-            if testament.as_short_text() != signed_plaintext:
-                return gpg.SIGNATURE_NOT_VALID, None
-            return (status, key)
+        raise NotImplementedError(self.verify_revision_signature)
 
     def verify_revision_signatures(self, revision_ids, gpg_strategy):
         """Verify revision signatures for a number of revisions.

=== modified file 'breezy/tests/blackbox/test_merge.py'
--- breezy/tests/blackbox/test_merge.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_merge.py	2018-11-30 17:12:07 +0000
@@ -308,7 +308,7 @@
         tree_b.commit('merge branch_c')
 
     def test_merge_bundle(self):
-        from breezy.testament import Testament
+        from breezy.bzr.testament import Testament
         tree_a = self.make_branch_and_tree('branch_a')
         self.build_tree_contents([('branch_a/a', b'hello')])
         tree_a.add('a')

=== modified file 'breezy/tests/blackbox/test_pull.py'
--- breezy/tests/blackbox/test_pull.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_pull.py	2018-11-30 17:12:07 +0000
@@ -274,7 +274,7 @@
                          branch_b.get_parent())
 
     def test_pull_bundle(self):
-        from breezy.testament import Testament
+        from breezy.bzr.testament import Testament
         # Build up 2 trees and prepare for a pull
         tree_a = self.make_branch_and_tree('branch_a')
         with open('branch_a/a', 'wb') as f:

=== modified file 'breezy/tests/blackbox/test_re_sign.py'
--- breezy/tests/blackbox/test_re_sign.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_re_sign.py	2018-11-30 17:12:07 +0000
@@ -24,7 +24,7 @@
     tests,
     )
 from breezy.controldir import ControlDir
-from breezy.testament import Testament
+from breezy.bzr.testament import Testament
 
 
 class ReSign(tests.TestCaseInTempDir):

=== modified file 'breezy/tests/per_repository/test_signatures.py'
--- breezy/tests/per_repository/test_signatures.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/per_repository/test_signatures.py	2018-11-30 17:12:07 +0000
@@ -23,7 +23,7 @@
     urlutils,
     )
 
-from breezy.testament import Testament
+from breezy.bzr.testament import Testament
 from breezy.tests import per_repository
 
 

=== modified file 'breezy/tests/test_bundle.py'
--- breezy/tests/test_bundle.py	2018-11-21 03:20:30 +0000
+++ breezy/tests/test_bundle.py	2018-11-30 17:12:07 +0000
@@ -1447,7 +1447,7 @@
         tree_a.commit("base", allow_pointless=True, rev_id=b'A')
         self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
         try:
-            from ..testament import Testament
+            from ..bzr.testament import Testament
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
             new_config = test_commit.MustSignConfig()

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_commit.py	2018-11-30 17:12:07 +0000
@@ -444,7 +444,7 @@
         wt.commit("base", allow_pointless=True, rev_id=b'A')
         self.assertFalse(branch.repository.has_signature_for_revision_id(b'A'))
         try:
-            from ..testament import Testament
+            from ..bzr.testament import Testament
             # monkey patch gpg signing mechanism
             breezy.gpg.GPGStrategy = breezy.gpg.LoopbackGPGStrategy
             conf = config.MemoryStack(b'''

=== modified file 'breezy/tests/test_smart.py'
--- breezy/tests/test_smart.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_smart.py	2018-11-30 17:12:07 +0000
@@ -53,7 +53,7 @@
     server,
     vfs,
     )
-from breezy.testament import Testament
+from breezy.bzr.testament import Testament
 from breezy.tests import test_server
 from breezy.transport import (
     chroot,

=== modified file 'breezy/tests/test_testament.py'
--- breezy/tests/test_testament.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/test_testament.py	2018-11-30 17:12:07 +0000
@@ -22,7 +22,7 @@
 
 from breezy import osutils
 from breezy.tests import TestCaseWithTransport
-from breezy.testament import (
+from breezy.bzr.testament import (
     Testament,
     StrictTestament,
     StrictTestament3,