← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: Alexander Belchenko
  • Date: 2012-03-29 08:34:13 UTC
  • mto: (6015.44.14 2.4)
  • mto: This revision was merged to the branch mainline in revision 6513.
  • Revision ID: bialix@ukr.net-20120329083413-d4bqqdtfn2yrxp4f
change st_dev, st_ino, st_uid, st_gid from int members to properties.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
import os
23
21
import sys
24
22
from StringIO import StringIO
29
27
import subprocess
30
28
 
31
29
from bzrlib import (
32
 
    config,
33
30
    errors,
34
31
    trace,
35
32
    ui,
36
33
    )
37
 
from bzrlib.i18n import (
38
 
    gettext, 
39
 
    ngettext,
40
 
    )
41
34
""")
42
35
 
43
 
from bzrlib.symbol_versioning import (
44
 
    deprecated_in,
45
 
    deprecated_method,
46
 
    )
 
36
class i18n:
 
37
    """this class is ready to use bzrlib.i18n but bzrlib.i18n is not ready to
 
38
    use so here is a stub until it is"""
 
39
    @staticmethod
 
40
    def gettext(string):
 
41
        return string
 
42
        
 
43
    @staticmethod
 
44
    def ngettext(single, plural, number):
 
45
        if number == 1:
 
46
            return single
 
47
        else:
 
48
            return plural
47
49
 
48
50
#verification results
49
51
SIGNATURE_VALID = 0
50
52
SIGNATURE_KEY_MISSING = 1
51
53
SIGNATURE_NOT_VALID = 2
52
54
SIGNATURE_NOT_SIGNED = 3
53
 
SIGNATURE_EXPIRED = 4
54
 
 
55
 
 
56
 
def bulk_verify_signatures(repository, revids, strategy,
57
 
        process_events_callback=None):
58
 
    """Do verifications on a set of revisions
59
 
 
60
 
    :param repository: repository object
61
 
    :param revids: list of revision ids to verify
62
 
    :param strategy: GPG strategy to use
63
 
    :param process_events_callback: method to call for GUI frontends that
64
 
        want to keep their UI refreshed
65
 
 
66
 
    :return: count dictionary of results of each type,
67
 
             result list for each revision,
68
 
             boolean True if all results are verified successfully
69
 
    """
70
 
    count = {SIGNATURE_VALID: 0,
71
 
             SIGNATURE_KEY_MISSING: 0,
72
 
             SIGNATURE_NOT_VALID: 0,
73
 
             SIGNATURE_NOT_SIGNED: 0,
74
 
             SIGNATURE_EXPIRED: 0}
75
 
    result = []
76
 
    all_verifiable = True
77
 
    total = len(revids)
78
 
    pb = ui.ui_factory.nested_progress_bar()
79
 
    try:
80
 
        for i, (rev_id, verification_result, uid) in enumerate(
81
 
                repository.verify_revision_signatures(
82
 
                    revids, strategy)):
83
 
            pb.update("verifying signatures", i, total)
84
 
            result.append([rev_id, verification_result, uid])
85
 
            count[verification_result] += 1
86
 
            if verification_result != SIGNATURE_VALID:
87
 
                all_verifiable = False
88
 
            if process_events_callback is not None:
89
 
                process_events_callback()
90
 
    finally:
91
 
        pb.finished()
92
 
    return (count, result, all_verifiable)
93
55
 
94
56
 
95
57
class DisabledGPGStrategy(object):
142
104
                else:
143
105
                    self.acceptable_keys.append(pattern)
144
106
 
145
 
    @deprecated_method(deprecated_in((2, 6, 0)))
146
107
    def do_verifications(self, revisions, repository):
147
 
        return bulk_verify_signatures(repository, revisions, self)
 
108
        count = {SIGNATURE_VALID: 0,
 
109
                 SIGNATURE_KEY_MISSING: 0,
 
110
                 SIGNATURE_NOT_VALID: 0,
 
111
                 SIGNATURE_NOT_SIGNED: 0}
 
112
        result = []
 
113
        all_verifiable = True
 
114
        for rev_id in revisions:
 
115
            verification_result, uid =\
 
116
                                repository.verify_revision(rev_id,self)
 
117
            result.append([rev_id, verification_result, uid])
 
118
            count[verification_result] += 1
 
119
            if verification_result != SIGNATURE_VALID:
 
120
                all_verifiable = False
 
121
        return (count, result, all_verifiable)
148
122
 
149
 
    @deprecated_method(deprecated_in((2, 6, 0)))
150
123
    def valid_commits_message(self, count):
151
 
        return valid_commits_message(count)
 
124
        return i18n.gettext(u"{0} commits with valid signatures").format(
 
125
                                        count[SIGNATURE_VALID])            
152
126
 
153
 
    @deprecated_method(deprecated_in((2, 6, 0)))
154
127
    def unknown_key_message(self, count):
155
 
        return unknown_key_message(count)
 
128
        return i18n.ngettext(u"{0} commit with unknown key",
 
129
                             u"{0} commits with unknown keys",
 
130
                             count[SIGNATURE_KEY_MISSING]).format(
 
131
                                        count[SIGNATURE_KEY_MISSING])
156
132
 
157
 
    @deprecated_method(deprecated_in((2, 6, 0)))
158
133
    def commit_not_valid_message(self, count):
159
 
        return commit_not_valid_message(count)
 
134
        return i18n.ngettext(u"{0} commit not valid",
 
135
                             u"{0} commits not valid",
 
136
                             count[SIGNATURE_NOT_VALID]).format(
 
137
                                            count[SIGNATURE_NOT_VALID])
160
138
 
161
 
    @deprecated_method(deprecated_in((2, 6, 0)))
162
139
    def commit_not_signed_message(self, count):
163
 
        return commit_not_signed_message(count)
164
 
 
165
 
    @deprecated_method(deprecated_in((2, 6, 0)))
166
 
    def expired_commit_message(self, count):
167
 
        return expired_commit_message(count)
 
140
        return i18n.ngettext(u"{0} commit not signed",
 
141
                             u"{0} commits not signed",
 
142
                             count[SIGNATURE_NOT_SIGNED]).format(
 
143
                                        count[SIGNATURE_NOT_SIGNED])
168
144
 
169
145
 
170
146
def _set_gpg_tty():
185
161
 
186
162
    acceptable_keys = None
187
163
 
188
 
    def __init__(self, config_stack):
189
 
        self._config_stack = config_stack
190
 
        try:
191
 
            import gpgme
192
 
            self.context = gpgme.Context()
193
 
        except ImportError, error:
194
 
            pass # can't use verify()
195
 
 
196
164
    @staticmethod
197
165
    def verify_signatures_available():
198
166
        """
207
175
            return False
208
176
 
209
177
    def _command_line(self):
210
 
        key = self._config_stack.get('gpg_signing_key')
211
 
        if key is None or key == 'default':
212
 
            # 'default' or not setting gpg_signing_key at all means we should
213
 
            # use the user email address
214
 
            key = config.extract_email_address(self._config_stack.get('email'))
215
 
        return [self._config_stack.get('gpg_signing_command'), '--clearsign',
216
 
                '-u', key]
 
178
        return [self._config.gpg_signing_command(), '--clearsign']
 
179
 
 
180
    def __init__(self, config):
 
181
        self._config = config
 
182
        try:
 
183
            import gpgme
 
184
            self.context = gpgme.Context()
 
185
        except ImportError, error:
 
186
            pass # can't use verify()
217
187
 
218
188
    def sign(self, content):
219
189
        if isinstance(content, unicode):
253
223
 
254
224
    def verify(self, content, testament):
255
225
        """Check content has a valid signature.
256
 
 
 
226
        
257
227
        :param content: the commit signature
258
228
        :param testament: the valid testament string for the commit
259
 
 
 
229
        
260
230
        :return: SIGNATURE_VALID or a failed SIGNATURE_ value, key uid if valid
261
231
        """
262
232
        try:
266
236
 
267
237
        signature = StringIO(content)
268
238
        plain_output = StringIO()
 
239
        
269
240
        try:
270
241
            result = self.context.verify(signature, None, plain_output)
271
242
        except gpgme.GpgmeError,error:
272
243
            raise errors.SignatureVerificationFailed(error[2])
273
244
 
274
 
        # No result if input is invalid.
275
 
        # test_verify_invalid()
276
245
        if len(result) == 0:
277
246
            return SIGNATURE_NOT_VALID, None
278
 
        # User has specified a list of acceptable keys, check our result is in
279
 
        # it.  test_verify_unacceptable_key()
280
247
        fingerprint = result[0].fpr
281
248
        if self.acceptable_keys is not None:
282
249
            if not fingerprint in self.acceptable_keys:
283
250
                return SIGNATURE_KEY_MISSING, fingerprint[-8:]
284
 
        # Check the signature actually matches the testament.
285
 
        # test_verify_bad_testament()
286
251
        if testament != plain_output.getvalue():
287
252
            return SIGNATURE_NOT_VALID, None
288
 
        # Yay gpgme set the valid bit.
289
 
        # Can't write a test for this one as you can't set a key to be
290
 
        # trusted using gpgme.
291
253
        if result[0].summary & gpgme.SIGSUM_VALID:
292
254
            key = self.context.get_key(fingerprint)
293
255
            name = key.uids[0].name
294
256
            email = key.uids[0].email
295
257
            return SIGNATURE_VALID, name + " <" + email + ">"
296
 
        # Sigsum_red indicates a problem, unfortunatly I have not been able
297
 
        # to write any tests which actually set this.
298
258
        if result[0].summary & gpgme.SIGSUM_RED:
299
259
            return SIGNATURE_NOT_VALID, None
300
 
        # GPG does not know this key.
301
 
        # test_verify_unknown_key()
302
260
        if result[0].summary & gpgme.SIGSUM_KEY_MISSING:
303
261
            return SIGNATURE_KEY_MISSING, fingerprint[-8:]
304
 
        # Summary isn't set if sig is valid but key is untrusted but if user
305
 
        # has explicity set the key as acceptable we can validate it.
 
262
        #summary isn't set if sig is valid but key is untrusted
306
263
        if result[0].summary == 0 and self.acceptable_keys is not None:
307
264
            if fingerprint in self.acceptable_keys:
308
 
                # test_verify_untrusted_but_accepted()
309
265
                return SIGNATURE_VALID, None
310
 
        # test_verify_valid_but_untrusted()
311
 
        if result[0].summary == 0 and self.acceptable_keys is None:
312
 
            return SIGNATURE_NOT_VALID, None
313
 
        if result[0].summary & gpgme.SIGSUM_KEY_EXPIRED:
314
 
            expires = self.context.get_key(result[0].fpr).subkeys[0].expires
315
 
            if expires > result[0].timestamp:
316
 
                # The expired key was not expired at time of signing.
317
 
                # test_verify_expired_but_valid()
318
 
                return SIGNATURE_EXPIRED, fingerprint[-8:]
319
 
            else:
320
 
                # I can't work out how to create a test where the signature
321
 
                # was expired at the time of signing.
322
 
                return SIGNATURE_NOT_VALID, None
323
 
        # A signature from a revoked key gets this.
324
 
        # test_verify_revoked_signature()
325
 
        if result[0].summary & gpgme.SIGSUM_SYS_ERROR:
326
 
            return SIGNATURE_NOT_VALID, None
327
 
        # Other error types such as revoked keys should (I think) be caught by
328
 
        # SIGSUM_RED so anything else means something is buggy.
 
266
        else:
 
267
            return SIGNATURE_KEY_MISSING, None
329
268
        raise errors.SignatureVerificationFailed("Unknown GnuPG key "\
330
269
                                                 "verification result")
331
270
 
332
271
    def set_acceptable_keys(self, command_line_input):
333
 
        """Set the acceptable keys for verifying with this GPGStrategy.
334
 
 
 
272
        """sets the acceptable keys for verifying with this GPGStrategy
 
273
        
335
274
        :param command_line_input: comma separated list of patterns from
336
275
                                command line
337
276
        :return: nothing
338
277
        """
339
278
        key_patterns = None
340
 
        acceptable_keys_config = self._config_stack.get('acceptable_keys')
 
279
        acceptable_keys_config = self._config.acceptable_keys()
341
280
        try:
342
281
            if isinstance(acceptable_keys_config, unicode):
343
282
                acceptable_keys_config = str(acceptable_keys_config)
344
283
        except UnicodeEncodeError:
345
 
            # gpg Context.keylist(pattern) does not like unicode
346
 
            raise errors.BzrCommandError(
347
 
                gettext('Only ASCII permitted in option names'))
 
284
            #gpg Context.keylist(pattern) does not like unicode
 
285
            raise errors.BzrCommandError('Only ASCII permitted in option names')
348
286
 
349
287
        if acceptable_keys_config is not None:
350
288
            key_patterns = acceptable_keys_config
351
 
        if command_line_input is not None: # command line overrides config
 
289
        if command_line_input is not None: #command line overrides config
352
290
            key_patterns = command_line_input
353
291
        if key_patterns is not None:
354
292
            patterns = key_patterns.split(",")
362
300
                    self.acceptable_keys.append(key.subkeys[0].fpr)
363
301
                    trace.mutter("Added acceptable key: " + key.subkeys[0].fpr)
364
302
                if not found_key:
365
 
                    trace.note(gettext(
366
 
                            "No GnuPG key results for pattern: {0}"
 
303
                    trace.note(i18n.gettext(
 
304
                            "No GnuPG key results for pattern: {}"
367
305
                                ).format(pattern))
368
306
 
369
 
    @deprecated_method(deprecated_in((2, 6, 0)))
370
307
    def do_verifications(self, revisions, repository,
371
308
                            process_events_callback=None):
372
309
        """do verifications on a set of revisions
373
 
 
 
310
        
374
311
        :param revisions: list of revision ids to verify
375
312
        :param repository: repository object
376
313
        :param process_events_callback: method to call for GUI frontends that
377
 
            want to keep their UI refreshed
378
 
 
 
314
                                                want to keep their UI refreshed
 
315
        
379
316
        :return: count dictionary of results of each type,
380
317
                 result list for each revision,
381
318
                 boolean True if all results are verified successfully
382
319
        """
383
 
        return bulk_verify_signatures(repository, revisions, self,
384
 
            process_events_callback)
 
320
        count = {SIGNATURE_VALID: 0,
 
321
                 SIGNATURE_KEY_MISSING: 0,
 
322
                 SIGNATURE_NOT_VALID: 0,
 
323
                 SIGNATURE_NOT_SIGNED: 0}
 
324
        result = []
 
325
        all_verifiable = True
 
326
        for rev_id in revisions:
 
327
            verification_result, uid =\
 
328
                                repository.verify_revision(rev_id,self)
 
329
            result.append([rev_id, verification_result, uid])
 
330
            count[verification_result] += 1
 
331
            if verification_result != SIGNATURE_VALID:
 
332
                all_verifiable = False
 
333
            if process_events_callback is not None:
 
334
                process_events_callback()
 
335
        return (count, result, all_verifiable)
385
336
 
386
 
    @deprecated_method(deprecated_in((2, 6, 0)))
387
337
    def verbose_valid_message(self, result):
388
338
        """takes a verify result and returns list of signed commits strings"""
389
 
        return verbose_valid_message(result)
390
 
 
391
 
    @deprecated_method(deprecated_in((2, 6, 0)))
 
339
        signers = {}
 
340
        for rev_id, validity, uid in result:
 
341
            if validity == SIGNATURE_VALID:
 
342
                signers.setdefault(uid, 0)
 
343
                signers[uid] += 1
 
344
        result = []
 
345
        for uid, number in signers.items():
 
346
             result.append( i18n.ngettext(u"{0} signed {1} commit", 
 
347
                             u"{0} signed {1} commits",
 
348
                             number).format(uid, number) )
 
349
        return result
 
350
 
 
351
 
392
352
    def verbose_not_valid_message(self, result, repo):
393
353
        """takes a verify result and returns list of not valid commit info"""
394
 
        return verbose_not_valid_message(result, repo)
 
354
        signers = {}
 
355
        for rev_id, validity, empty in result:
 
356
            if validity == SIGNATURE_NOT_VALID:
 
357
                revision = repo.get_revision(rev_id)
 
358
                authors = ', '.join(revision.get_apparent_authors())
 
359
                signers.setdefault(authors, 0)
 
360
                signers[authors] += 1
 
361
        result = []
 
362
        for authors, number in signers.items():
 
363
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
 
364
                                 u"{0} commits by author {1}",
 
365
                                 number).format(number, authors) )
 
366
        return result
395
367
 
396
 
    @deprecated_method(deprecated_in((2, 6, 0)))
397
368
    def verbose_not_signed_message(self, result, repo):
398
369
        """takes a verify result and returns list of not signed commit info"""
399
 
        return verbose_not_valid_message(result, repo)
 
370
        signers = {}
 
371
        for rev_id, validity, empty in result:
 
372
            if validity == SIGNATURE_NOT_SIGNED:
 
373
                revision = repo.get_revision(rev_id)
 
374
                authors = ', '.join(revision.get_apparent_authors())
 
375
                signers.setdefault(authors, 0)
 
376
                signers[authors] += 1
 
377
        result = []
 
378
        for authors, number in signers.items():
 
379
            result.append( i18n.ngettext(u"{0} commit by author {1}", 
 
380
                                 u"{0} commits by author {1}",
 
381
                                 number).format(number, authors) )
 
382
        return result
400
383
 
401
 
    @deprecated_method(deprecated_in((2, 6, 0)))
402
384
    def verbose_missing_key_message(self, result):
403
385
        """takes a verify result and returns list of missing key info"""
404
 
        return verbose_missing_key_message(result)
405
 
 
406
 
    @deprecated_method(deprecated_in((2, 6, 0)))
407
 
    def verbose_expired_key_message(self, result, repo):
408
 
        """takes a verify result and returns list of expired key info"""
409
 
        return verbose_expired_key_message(result, repo)
410
 
 
411
 
    @deprecated_method(deprecated_in((2, 6, 0)))
 
386
        signers = {}
 
387
        for rev_id, validity, fingerprint in result:
 
388
            if validity == SIGNATURE_KEY_MISSING:
 
389
                signers.setdefault(fingerprint, 0)
 
390
                signers[fingerprint] += 1
 
391
        result = []
 
392
        for fingerprint, number in signers.items():
 
393
            result.append( i18n.ngettext(u"Unknown key {0} signed {1} commit", 
 
394
                                 u"Unknown key {0} signed {1} commits",
 
395
                                 number).format(fingerprint, number) )
 
396
        return result
 
397
 
412
398
    def valid_commits_message(self, count):
413
399
        """returns message for number of commits"""
414
 
        return valid_commits_message(count)
 
400
        return i18n.gettext(u"{0} commits with valid signatures").format(
 
401
                                        count[SIGNATURE_VALID])
415
402
 
416
 
    @deprecated_method(deprecated_in((2, 6, 0)))
417
403
    def unknown_key_message(self, count):
418
404
        """returns message for number of commits"""
419
 
        return unknown_key_message(count)
 
405
        return i18n.ngettext(u"{0} commit with unknown key",
 
406
                             u"{0} commits with unknown keys",
 
407
                             count[SIGNATURE_KEY_MISSING]).format(
 
408
                                        count[SIGNATURE_KEY_MISSING])
420
409
 
421
 
    @deprecated_method(deprecated_in((2, 6, 0)))
422
410
    def commit_not_valid_message(self, count):
423
411
        """returns message for number of commits"""
424
 
        return commit_not_valid_message(count)
 
412
        return i18n.ngettext(u"{0} commit not valid",
 
413
                             u"{0} commits not valid",
 
414
                             count[SIGNATURE_NOT_VALID]).format(
 
415
                                            count[SIGNATURE_NOT_VALID])
425
416
 
426
 
    @deprecated_method(deprecated_in((2, 6, 0)))
427
417
    def commit_not_signed_message(self, count):
428
418
        """returns message for number of commits"""
429
 
        return commit_not_signed_message(count)
430
 
 
431
 
    @deprecated_method(deprecated_in((2, 6, 0)))
432
 
    def expired_commit_message(self, count):
433
 
        """returns message for number of commits"""
434
 
        return expired_commit_message(count)
435
 
 
436
 
 
437
 
def valid_commits_message(count):
438
 
    """returns message for number of commits"""
439
 
    return gettext(u"{0} commits with valid signatures").format(
440
 
                                    count[SIGNATURE_VALID])
441
 
 
442
 
 
443
 
def unknown_key_message(count):
444
 
    """returns message for number of commits"""
445
 
    return ngettext(u"{0} commit with unknown key",
446
 
                    u"{0} commits with unknown keys",
447
 
                    count[SIGNATURE_KEY_MISSING]).format(
448
 
                                    count[SIGNATURE_KEY_MISSING])
449
 
 
450
 
 
451
 
def commit_not_valid_message(count):
452
 
    """returns message for number of commits"""
453
 
    return ngettext(u"{0} commit not valid",
454
 
                    u"{0} commits not valid",
455
 
                    count[SIGNATURE_NOT_VALID]).format(
456
 
                                        count[SIGNATURE_NOT_VALID])
457
 
 
458
 
 
459
 
def commit_not_signed_message(count):
460
 
    """returns message for number of commits"""
461
 
    return ngettext(u"{0} commit not signed",
462
 
                    u"{0} commits not signed",
463
 
                    count[SIGNATURE_NOT_SIGNED]).format(
464
 
                                    count[SIGNATURE_NOT_SIGNED])
465
 
 
466
 
 
467
 
def expired_commit_message(count):
468
 
    """returns message for number of commits"""
469
 
    return ngettext(u"{0} commit with key now expired",
470
 
                    u"{0} commits with key now expired",
471
 
                    count[SIGNATURE_EXPIRED]).format(
472
 
                                count[SIGNATURE_EXPIRED])
473
 
 
474
 
 
475
 
def verbose_expired_key_message(result, repo):
476
 
    """takes a verify result and returns list of expired key info"""
477
 
    signers = {}
478
 
    fingerprint_to_authors = {}
479
 
    for rev_id, validity, fingerprint in result:
480
 
        if validity == SIGNATURE_EXPIRED:
481
 
            revision = repo.get_revision(rev_id)
482
 
            authors = ', '.join(revision.get_apparent_authors())
483
 
            signers.setdefault(fingerprint, 0)
484
 
            signers[fingerprint] += 1
485
 
            fingerprint_to_authors[fingerprint] = authors
486
 
    result = []
487
 
    for fingerprint, number in signers.items():
488
 
        result.append(
489
 
            ngettext(u"{0} commit by author {1} with key {2} now expired",
490
 
                     u"{0} commits by author {1} with key {2} now expired",
491
 
                     number).format(
492
 
                number, fingerprint_to_authors[fingerprint], fingerprint))
493
 
    return result
494
 
 
495
 
 
496
 
def verbose_valid_message(result):
497
 
    """takes a verify result and returns list of signed commits strings"""
498
 
    signers = {}
499
 
    for rev_id, validity, uid in result:
500
 
        if validity == SIGNATURE_VALID:
501
 
            signers.setdefault(uid, 0)
502
 
            signers[uid] += 1
503
 
    result = []
504
 
    for uid, number in signers.items():
505
 
         result.append(ngettext(u"{0} signed {1} commit",
506
 
                                u"{0} signed {1} commits",
507
 
                                number).format(uid, number))
508
 
    return result
509
 
 
510
 
 
511
 
def verbose_not_valid_message(result, repo):
512
 
    """takes a verify result and returns list of not valid commit info"""
513
 
    signers = {}
514
 
    for rev_id, validity, empty in result:
515
 
        if validity == SIGNATURE_NOT_VALID:
516
 
            revision = repo.get_revision(rev_id)
517
 
            authors = ', '.join(revision.get_apparent_authors())
518
 
            signers.setdefault(authors, 0)
519
 
            signers[authors] += 1
520
 
    result = []
521
 
    for authors, number in signers.items():
522
 
        result.append(ngettext(u"{0} commit by author {1}",
523
 
                               u"{0} commits by author {1}",
524
 
                               number).format(number, authors))
525
 
    return result
526
 
 
527
 
 
528
 
def verbose_not_signed_message(result, repo):
529
 
    """takes a verify result and returns list of not signed commit info"""
530
 
    signers = {}
531
 
    for rev_id, validity, empty in result:
532
 
        if validity == SIGNATURE_NOT_SIGNED:
533
 
            revision = repo.get_revision(rev_id)
534
 
            authors = ', '.join(revision.get_apparent_authors())
535
 
            signers.setdefault(authors, 0)
536
 
            signers[authors] += 1
537
 
    result = []
538
 
    for authors, number in signers.items():
539
 
        result.append(ngettext(u"{0} commit by author {1}",
540
 
                               u"{0} commits by author {1}",
541
 
                               number).format(number, authors))
542
 
    return result
543
 
 
544
 
 
545
 
def verbose_missing_key_message(result):
546
 
    """takes a verify result and returns list of missing key info"""
547
 
    signers = {}
548
 
    for rev_id, validity, fingerprint in result:
549
 
        if validity == SIGNATURE_KEY_MISSING:
550
 
            signers.setdefault(fingerprint, 0)
551
 
            signers[fingerprint] += 1
552
 
    result = []
553
 
    for fingerprint, number in signers.items():
554
 
        result.append(ngettext(u"Unknown key {0} signed {1} commit",
555
 
                               u"Unknown key {0} signed {1} commits",
556
 
                               number).format(fingerprint, number))
557
 
    return result
 
419
        return i18n.ngettext(u"{0} commit not signed",
 
420
                             u"{0} commits not signed",
 
421
                             count[SIGNATURE_NOT_SIGNED]).format(
 
422
                                        count[SIGNATURE_NOT_SIGNED])