~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit_signature_commands.py

  • Committer: Jelmer Vernooij
  • Date: 2012-03-11 16:51:49 UTC
  • mto: This revision was merged to the branch mainline in revision 6494.
  • Revision ID: jelmer@samba.org-20120311165149-s2bs5pe2t160h85r
Add Repository.verify_revision_signatures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
95
95
        finally:
96
96
            repo.unlock()
97
97
        self.outf.write(
98
 
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n', count),
 
98
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n', count) %
99
99
            count)
100
100
 
101
101
 
161
161
                    continue
162
162
                revisions.append(rev_id)
163
163
        count, result, all_verifiable =\
164
 
                                gpg.bulk_verify_signatures(revisions, repo, gpg_strategy)
 
164
                                gpg.bulk_verify_signatures(repo, revisions, gpg_strategy)
165
165
        if all_verifiable:
166
166
               write(gettext("All commits signed with verifiable keys"))
167
167
               if verbose:
168
 
                   write(gpg_strategy.verbose_valid_message(result))
 
168
                   write(gpg.verbose_valid_message(result))
169
169
               return 0
170
170
        else:
171
 
            write(gpg_strategy.valid_commits_message(count))
172
 
            if verbose:
173
 
               for message in gpg_strategy.verbose_valid_message(result):
174
 
                   write_verbose(message)
175
 
            write(gpg_strategy.expired_commit_message(count))
176
 
            if verbose:
177
 
               for message in gpg_strategy.verbose_expired_key_message(result,
178
 
                                                                          repo):
179
 
                   write_verbose(message)
180
 
            write(gpg_strategy.unknown_key_message(count))
181
 
            if verbose:
182
 
                for message in gpg_strategy.verbose_missing_key_message(result):
 
171
            write(gpg.valid_commits_message(count))
 
172
            if verbose:
 
173
               for message in gpg.verbose_valid_message(result):
 
174
                   write_verbose(message)
 
175
            write(gpg.expired_commit_message(count))
 
176
            if verbose:
 
177
               for message in gpg.verbose_expired_key_message(result, repo):
 
178
                   write_verbose(message)
 
179
            write(gpg.unknown_key_message(count))
 
180
            if verbose:
 
181
                for message in gpg.verbose_missing_key_message(result):
183
182
                    write_verbose(message)
184
 
            write(gpg_strategy.commit_not_valid_message(count))
 
183
            write(gpg.commit_not_valid_message(count))
185
184
            if verbose:
186
 
                for message in gpg_strategy.verbose_not_valid_message(result,
187
 
                                                                        repo):
 
185
                for message in gpg.verbose_not_valid_message(result, repo):
188
186
                   write_verbose(message)
189
 
            write(gpg_strategy.commit_not_signed_message(count))
 
187
            write(gpg.commit_not_signed_message(count))
190
188
            if verbose:
191
 
                for message in gpg_strategy.verbose_not_signed_message(result,
192
 
                                                                          repo):
 
189
                for message in gpg.verbose_not_signed_message(result, repo):
193
190
                    write_verbose(message)
194
191
            return 1