/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/commit_signature_commands.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit_signature_commands.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Command which looks for unsigned commits by the current user, and signs them.
18
 
"""
 
17
"""Command that signs unsigned commits by the current user. """
19
18
 
20
19
from __future__ import absolute_import
21
20
 
45
44
    # repository
46
45
 
47
46
    takes_options = [
48
 
            Option('dry-run',
49
 
                   help='Don\'t actually sign anything, just print'
50
 
                        ' the revisions that would be signed.'),
51
 
            ]
 
47
        Option('dry-run',
 
48
               help='Don\'t actually sign anything, just print'
 
49
               ' the revisions that would be signed.'),
 
50
        ]
52
51
    takes_args = ['location?', 'committer?']
53
52
 
54
53
    def run(self, location=None, committer=None, dry_run=False):
88
87
                    if not dry_run:
89
88
                        repo.sign_revision(rev_id, gpg_strategy)
90
89
        self.outf.write(
91
 
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n', count) %
92
 
            count)
 
90
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n',
 
91
                     count) % count)
93
92
 
94
93
 
95
94
class cmd_verify_signatures(Command):
99
98
    """
100
99
 
101
100
    takes_options = [
102
 
            Option('acceptable-keys',
103
 
                   help='Comma separated list of GPG key patterns which are'
104
 
                        ' acceptable for verification.',
105
 
                   short_name='k',
106
 
                   type=text_type,),
107
 
            'revision',
108
 
            'verbose',
109
 
          ]
 
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
        ]
110
109
    takes_args = ['location?']
111
110
 
112
111
    def run(self, acceptable_keys=None, revision=None, verbose=None,
113
 
                                                            location=u'.'):
 
112
            location=u'.'):
114
113
        bzrdir = controldir.ControlDir.open_containing(location)[0]
115
114
        branch = bzrdir.open_branch()
116
115
        repo = branch.repository
121
120
 
122
121
        def write(string):
123
122
            self.outf.write(string + "\n")
 
123
 
124
124
        def write_verbose(string):
125
125
            self.outf.write("  " + string + "\n")
126
126
 
127
127
        self.add_cleanup(repo.lock_read().unlock)
128
 
        #get our list of revisions
 
128
        # get our list of revisions
129
129
        revisions = []
130
130
        if revision is not None:
131
131
            if len(revision) == 1:
137
137
                if to_revid is None:
138
138
                    to_revno = branch.revno()
139
139
                if from_revno is None or to_revno is None:
140
 
                    raise errors.BzrCommandError(gettext(
141
 
                    'Cannot verify a range of non-revision-history revisions'))
 
140
                    raise errors.BzrCommandError(
 
141
                        gettext('Cannot verify a range of non-revision-history'
 
142
                                ' revisions'))
142
143
                for revno in range(from_revno, to_revno + 1):
143
144
                    revisions.append(branch.get_rev_id(revno))
144
145
        else:
145
 
            #all revisions by default including merges
 
146
            # all revisions by default including merges
146
147
            graph = repo.get_graph()
147
148
            revisions = []
148
149
            for rev_id, parents in graph.iter_ancestry(
156
157
        count, result, all_verifiable = gpg.bulk_verify_signatures(
157
158
            repo, revisions, gpg_strategy)
158
159
        if all_verifiable:
159
 
               write(gettext("All commits signed with verifiable keys"))
160
 
               if verbose:
161
 
                   for message in gpg.verbose_valid_message(result):
162
 
                       write_verbose(message)
163
 
               return 0
 
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
164
165
        else:
165
166
            write(gpg.valid_commits_message(count))
166
167
            if verbose:
167
 
               for message in gpg.verbose_valid_message(result):
168
 
                   write_verbose(message)
 
168
                for message in gpg.verbose_valid_message(result):
 
169
                    write_verbose(message)
169
170
            write(gpg.expired_commit_message(count))
170
171
            if verbose:
171
 
               for message in gpg.verbose_expired_key_message(result, repo):
172
 
                   write_verbose(message)
 
172
                for message in gpg.verbose_expired_key_message(result, repo):
 
173
                    write_verbose(message)
173
174
            write(gpg.unknown_key_message(count))
174
175
            if verbose:
175
176
                for message in gpg.verbose_missing_key_message(result):
177
178
            write(gpg.commit_not_valid_message(count))
178
179
            if verbose:
179
180
                for message in gpg.verbose_not_valid_message(result, repo):
180
 
                   write_verbose(message)
 
181
                    write_verbose(message)
181
182
            write(gpg.commit_not_signed_message(count))
182
183
            if verbose:
183
184
                for message in gpg.verbose_not_signed_message(result, repo):