/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1732.2.3 by Martin Pool
sign-my-commits just signs revisions in the branch's ancestry.
16
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
17
"""Command which looks for unsigned commits by the current user, and signs them.
18
"""
19
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
20
from __future__ import absolute_import
21
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
22
from . import (
6207.3.3 by jelmer at samba
Fix tests and the like.
23
    controldir,
5972.3.23 by Jelmer Vernooij
Fix handling of ghosts in sign_my_commits.
24
    errors,
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
25
    gpg,
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
26
    revision as _mod_revision,
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
27
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
28
from .commands import Command
29
from .option import Option
30
from .i18n import gettext, ngettext
6808 by Jelmer Vernooij
merge lp:~jelmer/brz/options-unicode/
31
from .sixish import text_type
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
32
6491.1.2 by Jelmer Vernooij
Translate another string.
33
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
34
class cmd_sign_my_commits(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
35
    __doc__ = """Sign all commits by a given committer.
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
36
37
    If location is not specified the local tree is used.
38
    If committer is not specified the default committer is used.
39
40
    This does not sign commits that already have signatures.
41
    """
1732.2.3 by Martin Pool
sign-my-commits just signs revisions in the branch's ancestry.
42
    # Note that this signs everything on the branch's ancestry
43
    # (both mainline and merged), but not other revisions that may be in the
44
    # repository
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
45
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
46
    takes_options = [
47
            Option('dry-run',
48
                   help='Don\'t actually sign anything, just print'
49
                        ' the revisions that would be signed.'),
50
            ]
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
51
    takes_args = ['location?', 'committer?']
52
53
    def run(self, location=None, committer=None, dry_run=False):
54
        if location is None:
6207.3.3 by jelmer at samba
Fix tests and the like.
55
            bzrdir = controldir.ControlDir.open_containing('.')[0]
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
56
        else:
57
            # Passed in locations should be exact
6207.3.3 by jelmer at samba
Fix tests and the like.
58
            bzrdir = controldir.ControlDir.open(location)
1732.2.3 by Martin Pool
sign-my-commits just signs revisions in the branch's ancestry.
59
        branch = bzrdir.open_branch()
60
        repo = branch.repository
6449.6.4 by Jelmer Vernooij
Use config stack.
61
        branch_config = branch.get_config_stack()
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
62
63
        if committer is None:
6449.6.4 by Jelmer Vernooij
Use config stack.
64
            committer = branch_config.get('email')
65
        gpg_strategy = gpg.GPGStrategy(branch_config)
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
66
67
        count = 0
6969.3.3 by Jelmer Vernooij
Use context managers in a few more places.
68
        with repo.lock_write():
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
69
            graph = repo.get_graph()
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
70
            repo.start_write_group()
71
            try:
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
72
                for rev_id, parents in graph.iter_ancestry(
73
                        [branch.last_revision()]):
74
                    if _mod_revision.is_null(rev_id):
75
                        continue
5972.3.24 by Jelmer Vernooij
Simplify ghost check.
76
                    if parents is None:
77
                        # Ignore ghosts
78
                        continue
79
                    if repo.has_signature_for_revision_id(rev_id):
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
80
                        continue
81
                    rev = repo.get_revision(rev_id)
82
                    if rev.committer != committer:
83
                        continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
84
                    # We have a revision without a signature who has a
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
85
                    # matching committer, start signing
6491.1.2 by Jelmer Vernooij
Translate another string.
86
                    self.outf.write("%s\n" % rev_id)
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
87
                    count += 1
88
                    if not dry_run:
89
                        repo.sign_revision(rev_id, gpg_strategy)
90
            except:
91
                repo.abort_write_group()
92
                raise
93
            else:
94
                repo.commit_write_group()
6491.1.2 by Jelmer Vernooij
Translate another string.
95
        self.outf.write(
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
96
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n', count) %
6491.1.2 by Jelmer Vernooij
Translate another string.
97
            count)
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
98
99
5971.1.52 by Jonathan Riddell
change command name to verify-signatures
100
class cmd_verify_signatures(Command):
5971.1.3 by Jonathan Riddell
tidying up
101
    __doc__ = """Verify all commit signatures.
102
103
    Verifies that all commits in the branch are signed by known GnuPG keys.
5971.1.1 by Jonathan Riddell
add a verify command
104
    """
5971.1.3 by Jonathan Riddell
tidying up
105
5971.1.12 by Jonathan Riddell
add acceptable-keys option
106
    takes_options = [
107
            Option('acceptable-keys',
108
                   help='Comma separated list of GPG key patterns which are'
109
                        ' acceptable for verification.',
110
                   short_name='k',
6805.1.2 by Jelmer Vernooij
Text type.
111
                   type=text_type,),
6589.3.1 by Vincent Ladeuil
Fix command line override handling for acceptable_keys
112
            'revision',
5971.1.17 by Jonathan Riddell
add verbose option
113
            'verbose',
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
114
          ]
5971.1.76 by Jonathan Riddell
change directory option to location argument
115
    takes_args = ['location?']
5971.1.12 by Jonathan Riddell
add acceptable-keys option
116
5971.1.53 by Jonathan Riddell
add directory option
117
    def run(self, acceptable_keys=None, revision=None, verbose=None,
5971.1.76 by Jonathan Riddell
change directory option to location argument
118
                                                            location=u'.'):
6207.3.3 by jelmer at samba
Fix tests and the like.
119
        bzrdir = controldir.ControlDir.open_containing(location)[0]
5971.1.1 by Jonathan Riddell
add a verify command
120
        branch = bzrdir.open_branch()
121
        repo = branch.repository
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
122
        branch_config = branch.get_config_stack()
5971.1.1 by Jonathan Riddell
add a verify command
123
        gpg_strategy = gpg.GPGStrategy(branch_config)
5971.1.56 by Jonathan Riddell
add an option for acceptable_keys in config, also make config docs match reality for signature options
124
5971.1.69 by Jonathan Riddell
move some code from cmd_verify to gpg.set_acceptable_keys
125
        gpg_strategy.set_acceptable_keys(acceptable_keys)
5971.1.70 by Jonathan Riddell
move code which does verifications of revisions from cmd_verify_signatures to gpg.do_verifications
126
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
127
        def write(string):
128
            self.outf.write(string + "\n")
129
        def write_verbose(string):
130
            self.outf.write("  " + string + "\n")
131
6491.1.3 by Jelmer Vernooij
Make 'bzr verify-signatures' show a progress bar.
132
        self.add_cleanup(repo.lock_read().unlock)
5971.1.70 by Jonathan Riddell
move code which does verifications of revisions from cmd_verify_signatures to gpg.do_verifications
133
        #get our list of revisions
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
134
        revisions = []
135
        if revision is not None:
136
            if len(revision) == 1:
137
                revno, rev_id = revision[0].in_history(branch)
138
                revisions.append(rev_id)
139
            elif len(revision) == 2:
140
                from_revno, from_revid = revision[0].in_history(branch)
141
                to_revno, to_revid = revision[1].in_history(branch)
142
                if to_revid is None:
143
                    to_revno = branch.revno()
144
                if from_revno is None or to_revno is None:
6138.3.1 by Jonathan Riddell
use gettext() in more files
145
                    raise errors.BzrCommandError(gettext(
146
                    'Cannot verify a range of non-revision-history revisions'))
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
147
                for revno in range(from_revno, to_revno + 1):
148
                    revisions.append(branch.get_rev_id(revno))
149
        else:
5971.1.16 by Jonathan Riddell
tidying
150
            #all revisions by default including merges
5971.1.50 by Jonathan Riddell
merge in trunk
151
            graph = repo.get_graph()
152
            revisions = []
153
            for rev_id, parents in graph.iter_ancestry(
154
                    [branch.last_revision()]):
155
                if _mod_revision.is_null(rev_id):
156
                    continue
157
                if parents is None:
158
                    # Ignore ghosts
159
                    continue
160
                revisions.append(rev_id)
6589.3.1 by Vincent Ladeuil
Fix command line override handling for acceptable_keys
161
        count, result, all_verifiable = gpg.bulk_verify_signatures(
162
            repo, revisions, gpg_strategy)
5971.1.70 by Jonathan Riddell
move code which does verifications of revisions from cmd_verify_signatures to gpg.do_verifications
163
        if all_verifiable:
6491.1.2 by Jelmer Vernooij
Translate another string.
164
               write(gettext("All commits signed with verifiable keys"))
5971.1.17 by Jonathan Riddell
add verbose option
165
               if verbose:
6583.4.1 by Reagan Sanders
Fix an issue with verify-signatures --verbose. We were attempting to pass an array of strings to write directly. Changed to loop through the array and write them all.
166
                   for message in gpg.verbose_valid_message(result):
167
                       write_verbose(message)
5971.1.2 by Jonathan Riddell
give result to user
168
               return 0
169
        else:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
170
            write(gpg.valid_commits_message(count))
171
            if verbose:
172
               for message in gpg.verbose_valid_message(result):
173
                   write_verbose(message)
174
            write(gpg.expired_commit_message(count))
175
            if verbose:
176
               for message in gpg.verbose_expired_key_message(result, repo):
177
                   write_verbose(message)
178
            write(gpg.unknown_key_message(count))
179
            if verbose:
180
                for message in gpg.verbose_missing_key_message(result):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
181
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
182
            write(gpg.commit_not_valid_message(count))
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
183
            if verbose:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
184
                for message in gpg.verbose_not_valid_message(result, repo):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
185
                   write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
186
            write(gpg.commit_not_signed_message(count))
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
187
            if verbose:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
188
                for message in gpg.verbose_not_signed_message(result, repo):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
189
                    write_verbose(message)
5971.1.2 by Jonathan Riddell
give result to user
190
            return 1