/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/log.py

  • Committer: Jelmer Vernooij
  • Date: 2017-08-29 21:07:17 UTC
  • mfrom: (6772 brz)
  • mto: This revision was merged to the branch mainline in revision 6773.
  • Revision ID: jelmer@jelmer.uk-20170829210717-ud3w6rh8x8fv48l9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/log.py
323
323
    return result
324
324
 
325
325
 
326
 
def format_signature_validity(rev_id, repo):
 
326
def format_signature_validity(rev_id, branch):
327
327
    """get the signature validity
328
328
 
329
329
    :param rev_id: revision id to validate
330
 
    :param repo: repository of revision
 
330
    :param branch: branch of revision
331
331
    :return: human readable string to print to log
332
332
    """
333
333
    from breezy import gpg
334
334
 
335
 
    gpg_strategy = gpg.GPGStrategy(None)
336
 
    result = repo.verify_revision_signature(rev_id, gpg_strategy)
 
335
    gpg_strategy = gpg.GPGStrategy(branch.get_config_stack())
 
336
    result = branch.repository.verify_revision_signature(rev_id, gpg_strategy)
337
337
    if result[0] == gpg.SIGNATURE_VALID:
338
338
        return u"valid signature from {0}".format(result[1])
339
339
    if result[0] == gpg.SIGNATURE_KEY_MISSING:
467
467
                else:
468
468
                    diff = self._format_diff(rev, rev_id, diff_type)
469
469
                if show_signature:
470
 
                    signature = format_signature_validity(rev_id,
471
 
                                                self.branch.repository)
 
470
                    signature = format_signature_validity(rev_id, self.branch)
472
471
                else:
473
472
                    signature = None
474
473
                yield LogRevision(rev, revno, merge_depth, delta,