Merge lp:~knittl/bzr/cat-signature into lp:bzr

[Daniel Knittl-Frank]

new hidden command `cat-signature` to print the signature for a commit

[lp:~knittl/bzr/cat-signature]

5438. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Fix whitespace (4, not 2 per level)

[John A Meinel (jameinel)]

cmd_cat_signature should be indented to 4 spaces, not 2 as per our guidelines, and there should be some more spacing between options.

We probably also want the output encoding to be exact. The content should be 7-bit safe, but just in case.

I'm not sure that @display_command actually makes sense. It means that we'll ignore stuff like EPIPE, I'd probably take it off, but it isn't a big deal.

Something like:

+class cmd_cat_signature(Command):
+ __doc__ = """Show signature of a revision's testament"""
+
+ hidden = True
+ takes_options = ['revision']
+ takes_args = ['branch?']
+ encoding = 'exact'
+
+ def run(self, branch=u'.', revision=None):

46
47 === added file 'bzrlib/tests/blackbox/test_cat_signature.py'
48 --- bzrlib/tests/blackbox/test_cat_signature.py 1970-01-01 00:00:00 +0000
49 +++ bzrlib/tests/blackbox/test_cat_signature.py 2010-09-23 16:27:46 +0000
50 @@ -0,0 +1,58 @@
51 +# Copyright (C) 2007-2010 Canonical Ltd

Copyright for this file should be only 2010

But the tests themselves seem fine to me. And the actual functional code seems good.

review: Needs Fixing

[lp:~knittl/bzr/cat-signature]

5439. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Use exact encoding

5440. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Copyright 2010

[Martin Pool (mbp)]

Also, could you please execute the contributor agreement at
http://canonical.com/contributors/

[Vincent Ladeuil (vila)]

Will mark as wip until the contributor agreement is sorted out.

[Daniel Knittl-Frank (knittl)]

> Will mark as wip until the contributor agreement is sorted out.

Does bzr still require contributors to sign a (canonical) CLA? Couldn't find anything in the Bazaar documentation.

review: Needs Resubmitting

Unmerged revisions

5440. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Copyright 2010

5439. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Use exact encoding

5438. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Fix whitespace (4, not 2 per level)

5437. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Add blackbox tests for cat-signature

5436. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Return non-zero exit code when there is no signature

5435. By Daniel Knittl-Frank <email address hidden> on 2010-09-23

Make command hidden

5434. By Daniel Knittl-Frank <email address hidden> on 2010-09-18

add cleanup line (used in cmd_testament)

5433. By Daniel Knittl-Frank <email address hidden> on 2010-09-17

rename to cat-signature to be consistent with cat-revision, etc.

5432. By Daniel Knittl-Frank <email address hidden> on 2010-09-17

new command: show-signature [-r revision] [branch]

prints the signature for the testament of a given revision

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2010-09-20 04:56:26 +0000
+++ bzrlib/builtins.py	2010-09-23 18:25:59 +0000
@@ -4504,6 +4504,31 @@
                 self.outf.write("   %s\n" % path)
             self.outf.write("\n")
 
+class cmd_cat_signature(Command):
+    __doc__ = """Show signature of a revision's testament"""
+
+    hidden = True
+    takes_options = ['revision']
+    takes_args = ['branch?']
+    encoding = 'exact'
+
+    def run(self, branch=u'.', revision=None):
+        if branch == u'.':
+            b = Branch.open_containing(branch)[0]
+        else:
+            b = Branch.open(branch)
+        self.add_cleanup(b.lock_read().unlock)
+
+        if revision is None:
+            rev_id = b.last_revision()
+        else:
+            rev_id = revision[0].as_revision_id(b)
+
+        try:
+            self.outf.write(b.repository.get_signature_text(rev_id))
+        except errors.NoSuchRevision:
+            return 1
+
 
 class cmd_testament(Command):
     __doc__ = """Show testament (signing-form) of a revision."""

=== modified file 'bzrlib/tests/blackbox/__init__.py'
--- bzrlib/tests/blackbox/__init__.py	2010-07-28 07:05:19 +0000
+++ bzrlib/tests/blackbox/__init__.py	2010-09-23 18:25:59 +0000
@@ -49,6 +49,7 @@
                      'bzrlib.tests.blackbox.test_bundle_info',
                      'bzrlib.tests.blackbox.test_cat',
                      'bzrlib.tests.blackbox.test_cat_revision',
+                     'bzrlib.tests.blackbox.test_cat_signature',
                      'bzrlib.tests.blackbox.test_check',
                      'bzrlib.tests.blackbox.test_checkout',
                      'bzrlib.tests.blackbox.test_clean_tree',

=== added file 'bzrlib/tests/blackbox/test_cat_signature.py'
--- bzrlib/tests/blackbox/test_cat_signature.py	1970-01-01 00:00:00 +0000
+++ bzrlib/tests/blackbox/test_cat_signature.py	2010-09-23 18:25:59 +0000
@@ -0,0 +1,58 @@
+# Copyright (C) 2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Black-box tests for bzr cat-revision.
+"""
+
+from bzrlib.bzrdir import BzrDir
+from bzrlib.tests import TestCaseWithTransport
+
+
+class TestCatSignature(TestCaseWithTransport):
+
+    def setup_tree(self):
+        wt = BzrDir.create_standalone_workingtree('.')
+        b = wt.branch
+        # commit without signature
+        wt.commit("base A", allow_pointless=True, rev_id='A')
+        # next commit has a dummy signature attached
+        wt.commit("base B", allow_pointless=True, rev_id='B')
+        b.repository.lock_write()
+        b.repository.start_write_group()
+        try:
+            wt.branch.repository.add_signature_text('B', 'dummy signature')
+        except:
+            b.repository.abort_write_group()
+            raise
+        else:
+            b.repository.commit_write_group()
+        finally:
+            b.repository.unlock()
+
+        return wt
+
+    def test_cat_signature(self):
+        """Print out the signature for a revision"""
+        wt = self.setup_tree()
+        out, err = self.run_bzr('cat-signature -r revid:B')
+        self.assertEquals(out, 'dummy signature')
+
+    def test_cat_signature_unsigned(self):
+        """Do not output anything when there is no signature,
+        but exit with code 1"""
+        self.setup_tree()
+        out, err = self.run_bzr('cat-signature -r revid:A', retcode=1)
+        self.assertEquals(out, '')