← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Martin Packman
  • Date: 2011-11-28 19:07:58 UTC
  • mfrom: (6318 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6319.
  • Revision ID: martin.packman@canonical.com-20111128190758-5gj44o5uzwz5sjfq
Merge bzr.dev to resolve conflicts with updated registry help strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
341
341
    from bzrlib import gpg
342
342
 
343
343
    gpg_strategy = gpg.GPGStrategy(None)
344
 
    result = repo.verify_revision(rev_id, gpg_strategy)
 
344
    result = repo.verify_revision_signature(rev_id, gpg_strategy)
345
345
    if result[0] == gpg.SIGNATURE_VALID:
346
346
        return "valid signature from {0}".format(result[1])
347
347
    if result[0] == gpg.SIGNATURE_KEY_MISSING:
1807
1807
 
1808
1808
 
1809
1809
log_formatter_registry.register('short', ShortLogFormatter,
1810
 
                                'Moderately short log format')
 
1810
                                'Moderately short log format.')
1811
1811
log_formatter_registry.register('long', LongLogFormatter,
1812
 
                                'Detailed log format')
 
1812
                                'Detailed log format.')
1813
1813
log_formatter_registry.register('line', LineLogFormatter,
1814
 
                                'Log format with one line per revision')
 
1814
                                'Log format with one line per revision.')
1815
1815
log_formatter_registry.register('gnu-changelog', GnuChangelogLogFormatter,
1816
 
                                'Format used by GNU ChangeLog files')
 
1816
                                'Format used by GNU ChangeLog files.')
1817
1817
 
1818
1818
 
1819
1819
def register_formatter(name, formatter):