/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
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
17
"""Command that signs unsigned commits by the current user. """
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
18
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
19
from __future__ import absolute_import
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
6207.3.3 by jelmer at samba
Fix tests and the like.
22
    controldir,
5972.3.23 by Jelmer Vernooij
Fix handling of ghosts in sign_my_commits.
23
    errors,
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
24
    gpg,
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
25
    revision as _mod_revision,
1996.3.14 by John Arbash Meinel
lazy_import osutils and sign_my_commits
26
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from .commands import Command
28
from .option import Option
29
from .i18n import gettext, ngettext
6808 by Jelmer Vernooij
merge lp:~jelmer/brz/options-unicode/
30
from .sixish import text_type
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
31
6491.1.2 by Jelmer Vernooij
Translate another string.
32
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
33
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
34
    __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.
35
36
    If location is not specified the local tree is used.
37
    If committer is not specified the default committer is used.
38
39
    This does not sign commits that already have signatures.
40
    """
1732.2.3 by Martin Pool
sign-my-commits just signs revisions in the branch's ancestry.
41
    # Note that this signs everything on the branch's ancestry
42
    # (both mainline and merged), but not other revisions that may be in the
43
    # repository
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
44
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
45
    takes_options = [
7143.15.2 by Jelmer Vernooij
Run autopep8.
46
        Option('dry-run',
47
               help='Don\'t actually sign anything, just print'
48
               ' the revisions that would be signed.'),
49
        ]
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
50
    takes_args = ['location?', 'committer?']
51
52
    def run(self, location=None, committer=None, dry_run=False):
53
        if location is None:
6207.3.3 by jelmer at samba
Fix tests and the like.
54
            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.
55
        else:
56
            # Passed in locations should be exact
6207.3.3 by jelmer at samba
Fix tests and the like.
57
            bzrdir = controldir.ControlDir.open(location)
1732.2.3 by Martin Pool
sign-my-commits just signs revisions in the branch's ancestry.
58
        branch = bzrdir.open_branch()
59
        repo = branch.repository
6449.6.4 by Jelmer Vernooij
Use config stack.
60
        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.
61
62
        if committer is None:
6449.6.4 by Jelmer Vernooij
Use config stack.
63
            committer = branch_config.get('email')
64
        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.
65
66
        count = 0
6969.3.3 by Jelmer Vernooij
Use context managers in a few more places.
67
        with repo.lock_write():
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
68
            graph = repo.get_graph()
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
69
            repo.start_write_group()
70
            try:
5972.3.2 by Jelmer Vernooij
Use iter_ancestry rather than get_ancestry.
71
                for rev_id, parents in graph.iter_ancestry(
72
                        [branch.last_revision()]):
73
                    if _mod_revision.is_null(rev_id):
74
                        continue
5972.3.24 by Jelmer Vernooij
Simplify ghost check.
75
                    if parents is None:
76
                        # Ignore ghosts
77
                        continue
78
                    if repo.has_signature_for_revision_id(rev_id):
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
79
                        continue
80
                    rev = repo.get_revision(rev_id)
81
                    if rev.committer != committer:
82
                        continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
83
                    # 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.
84
                    # matching committer, start signing
6491.1.2 by Jelmer Vernooij
Translate another string.
85
                    self.outf.write("%s\n" % rev_id)
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
86
                    count += 1
87
                    if not dry_run:
88
                        repo.sign_revision(rev_id, gpg_strategy)
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
89
            except BaseException:
3010.1.15 by Robert Collins
Manage write groups in sign_my_commits, for efficiency.
90
                repo.abort_write_group()
91
                raise
92
            else:
93
                repo.commit_write_group()
6491.1.2 by Jelmer Vernooij
Translate another string.
94
        self.outf.write(
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
95
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n',
96
                     count) % count)
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
97
98
5971.1.52 by Jonathan Riddell
change command name to verify-signatures
99
class cmd_verify_signatures(Command):
5971.1.3 by Jonathan Riddell
tidying up
100
    __doc__ = """Verify all commit signatures.
101
102
    Verifies that all commits in the branch are signed by known GnuPG keys.
5971.1.1 by Jonathan Riddell
add a verify command
103
    """
5971.1.3 by Jonathan Riddell
tidying up
104
5971.1.12 by Jonathan Riddell
add acceptable-keys option
105
    takes_options = [
7143.15.2 by Jelmer Vernooij
Run autopep8.
106
        Option('acceptable-keys',
107
               help='Comma separated list of GPG key patterns which are'
108
               ' acceptable for verification.',
109
               short_name='k',
110
               type=text_type,),
111
        'revision',
112
        'verbose',
113
        ]
5971.1.76 by Jonathan Riddell
change directory option to location argument
114
    takes_args = ['location?']
5971.1.12 by Jonathan Riddell
add acceptable-keys option
115
5971.1.53 by Jonathan Riddell
add directory option
116
    def run(self, acceptable_keys=None, revision=None, verbose=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
117
            location=u'.'):
6207.3.3 by jelmer at samba
Fix tests and the like.
118
        bzrdir = controldir.ControlDir.open_containing(location)[0]
5971.1.1 by Jonathan Riddell
add a verify command
119
        branch = bzrdir.open_branch()
120
        repo = branch.repository
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
121
        branch_config = branch.get_config_stack()
5971.1.1 by Jonathan Riddell
add a verify command
122
        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
123
5971.1.69 by Jonathan Riddell
move some code from cmd_verify to gpg.set_acceptable_keys
124
        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
125
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
126
        def write(string):
127
            self.outf.write(string + "\n")
7143.15.2 by Jelmer Vernooij
Run autopep8.
128
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
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)
7143.15.2 by Jelmer Vernooij
Run autopep8.
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:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
145
                    raise errors.BzrCommandError(
146
                        gettext('Cannot verify a range of non-revision-history'
147
                                ' revisions'))
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
148
                for revno in range(from_revno, to_revno + 1):
149
                    revisions.append(branch.get_rev_id(revno))
150
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
151
            # all revisions by default including merges
5971.1.50 by Jonathan Riddell
merge in trunk
152
            graph = repo.get_graph()
153
            revisions = []
154
            for rev_id, parents in graph.iter_ancestry(
155
                    [branch.last_revision()]):
156
                if _mod_revision.is_null(rev_id):
157
                    continue
158
                if parents is None:
159
                    # Ignore ghosts
160
                    continue
161
                revisions.append(rev_id)
6589.3.1 by Vincent Ladeuil
Fix command line override handling for acceptable_keys
162
        count, result, all_verifiable = gpg.bulk_verify_signatures(
163
            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
164
        if all_verifiable:
7143.15.2 by Jelmer Vernooij
Run autopep8.
165
            write(gettext("All commits signed with verifiable keys"))
166
            if verbose:
167
                for message in gpg.verbose_valid_message(result):
168
                    write_verbose(message)
169
            return 0
5971.1.2 by Jonathan Riddell
give result to user
170
        else:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
171
            write(gpg.valid_commits_message(count))
172
            if verbose:
7143.15.2 by Jelmer Vernooij
Run autopep8.
173
                for message in gpg.verbose_valid_message(result):
174
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
175
            write(gpg.expired_commit_message(count))
176
            if verbose:
7143.15.2 by Jelmer Vernooij
Run autopep8.
177
                for message in gpg.verbose_expired_key_message(result, repo):
178
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
179
            write(gpg.unknown_key_message(count))
180
            if verbose:
181
                for message in gpg.verbose_missing_key_message(result):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
182
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
183
            write(gpg.commit_not_valid_message(count))
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
184
            if verbose:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
185
                for message in gpg.verbose_not_valid_message(result, repo):
7143.15.2 by Jelmer Vernooij
Run autopep8.
186
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
187
            write(gpg.commit_not_signed_message(count))
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
188
            if verbose:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
189
                for message in gpg.verbose_not_signed_message(result, repo):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
190
                    write_verbose(message)
5971.1.2 by Jonathan Riddell
give result to user
191
            return 1