/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,
7143.21.1 by Jelmer Vernooij
Add WriteGroup contextmanager.
25
    repository as _mod_repository,
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 = [
7143.15.2 by Jelmer Vernooij
Run autopep8.
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()
7143.21.1 by Jelmer Vernooij
Add WriteGroup contextmanager.
70
            with _mod_repository.WriteGroup(repo):
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)
6491.1.2 by Jelmer Vernooij
Translate another string.
89
        self.outf.write(
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
90
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n',
91
                     count) % count)
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
92
93
5971.1.52 by Jonathan Riddell
change command name to verify-signatures
94
class cmd_verify_signatures(Command):
5971.1.3 by Jonathan Riddell
tidying up
95
    __doc__ = """Verify all commit signatures.
96
97
    Verifies that all commits in the branch are signed by known GnuPG keys.
5971.1.1 by Jonathan Riddell
add a verify command
98
    """
5971.1.3 by Jonathan Riddell
tidying up
99
5971.1.12 by Jonathan Riddell
add acceptable-keys option
100
    takes_options = [
7143.15.2 by Jelmer Vernooij
Run autopep8.
101
        Option('acceptable-keys',
102
               help='Comma separated list of GPG key patterns which are'
103
               ' acceptable for verification.',
104
               short_name='k',
105
               type=text_type,),
106
        'revision',
107
        'verbose',
108
        ]
5971.1.76 by Jonathan Riddell
change directory option to location argument
109
    takes_args = ['location?']
5971.1.12 by Jonathan Riddell
add acceptable-keys option
110
5971.1.53 by Jonathan Riddell
add directory option
111
    def run(self, acceptable_keys=None, revision=None, verbose=None,
7143.15.2 by Jelmer Vernooij
Run autopep8.
112
            location=u'.'):
6207.3.3 by jelmer at samba
Fix tests and the like.
113
        bzrdir = controldir.ControlDir.open_containing(location)[0]
5971.1.1 by Jonathan Riddell
add a verify command
114
        branch = bzrdir.open_branch()
115
        repo = branch.repository
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
116
        branch_config = branch.get_config_stack()
5971.1.1 by Jonathan Riddell
add a verify command
117
        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
118
5971.1.69 by Jonathan Riddell
move some code from cmd_verify to gpg.set_acceptable_keys
119
        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
120
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
121
        def write(string):
122
            self.outf.write(string + "\n")
7143.15.2 by Jelmer Vernooij
Run autopep8.
123
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
124
        def write_verbose(string):
125
            self.outf.write("  " + string + "\n")
126
6491.1.3 by Jelmer Vernooij
Make 'bzr verify-signatures' show a progress bar.
127
        self.add_cleanup(repo.lock_read().unlock)
7143.15.2 by Jelmer Vernooij
Run autopep8.
128
        # get our list of revisions
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
129
        revisions = []
130
        if revision is not None:
131
            if len(revision) == 1:
132
                revno, rev_id = revision[0].in_history(branch)
133
                revisions.append(rev_id)
134
            elif len(revision) == 2:
135
                from_revno, from_revid = revision[0].in_history(branch)
136
                to_revno, to_revid = revision[1].in_history(branch)
137
                if to_revid is None:
138
                    to_revno = branch.revno()
139
                if from_revno is None or to_revno is None:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
140
                    raise errors.BzrCommandError(
141
                        gettext('Cannot verify a range of non-revision-history'
142
                                ' revisions'))
5971.1.15 by Jonathan Riddell
add a revision argument to bzr verify
143
                for revno in range(from_revno, to_revno + 1):
144
                    revisions.append(branch.get_rev_id(revno))
145
        else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
146
            # all revisions by default including merges
5971.1.50 by Jonathan Riddell
merge in trunk
147
            graph = repo.get_graph()
148
            revisions = []
149
            for rev_id, parents in graph.iter_ancestry(
150
                    [branch.last_revision()]):
151
                if _mod_revision.is_null(rev_id):
152
                    continue
153
                if parents is None:
154
                    # Ignore ghosts
155
                    continue
156
                revisions.append(rev_id)
6589.3.1 by Vincent Ladeuil
Fix command line override handling for acceptable_keys
157
        count, result, all_verifiable = gpg.bulk_verify_signatures(
158
            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
159
        if all_verifiable:
7143.15.2 by Jelmer Vernooij
Run autopep8.
160
            write(gettext("All commits signed with verifiable keys"))
161
            if verbose:
162
                for message in gpg.verbose_valid_message(result):
163
                    write_verbose(message)
164
            return 0
5971.1.2 by Jonathan Riddell
give result to user
165
        else:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
166
            write(gpg.valid_commits_message(count))
167
            if verbose:
7143.15.2 by Jelmer Vernooij
Run autopep8.
168
                for message in gpg.verbose_valid_message(result):
169
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
170
            write(gpg.expired_commit_message(count))
171
            if verbose:
7143.15.2 by Jelmer Vernooij
Run autopep8.
172
                for message in gpg.verbose_expired_key_message(result, repo):
173
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
174
            write(gpg.unknown_key_message(count))
175
            if verbose:
176
                for message in gpg.verbose_missing_key_message(result):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
177
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
178
            write(gpg.commit_not_valid_message(count))
5971.1.74 by Jonathan Riddell
formatting changes necessary for qbzr
179
            if verbose:
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
180
                for message in gpg.verbose_not_valid_message(result, repo):
7143.15.2 by Jelmer Vernooij
Run autopep8.
181
                    write_verbose(message)
6491.1.5 by Jelmer Vernooij
Add Repository.verify_revision_signatures.
182
            write(gpg.commit_not_signed_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_signed_message(result, repo):
5971.1.75 by Jonathan Riddell
fix verbose messages, now return a list
185
                    write_verbose(message)
5971.1.2 by Jonathan Riddell
give result to user
186
            return 1