← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit_signature_commands.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-24 11:35:46 UTC
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110624113546-q1jsjrgqphiptbhi
formatting changes necessary for qbzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit_signature_commands.py
124
124
 
125
125
        gpg_strategy.set_acceptable_keys(acceptable_keys)
126
126
 
 
127
        def write(string):
 
128
            self.outf.write(string + "\n")
 
129
        def write_verbose(string):
 
130
            self.outf.write("  " + string + "\n")
 
131
 
127
132
        #get our list of revisions
128
133
        revisions = []
129
134
        if revision is not None:
157
162
        count, result, all_verifiable =\
158
163
                                gpg_strategy.do_verifications(revisions, repo)
159
164
        if all_verifiable:
160
 
               self.outf.write(gettext(
 
165
               write(gettext(
161
166
                            "All commits signed with verifiable keys\n"))
162
167
               if verbose:
163
 
                   self.outf.write(gpg_strategy.verbose_valid_message(result))
 
168
                   write(gpg_strategy.verbose_valid_message(result))
164
169
               return 0
165
170
        else:
166
 
            self.outf.write(gpg_strategy.valid_commits_message(count))
167
 
            if verbose:
168
 
               self.outf.write(gpg_strategy.verbose_valid_message(result))
169
 
            self.outf.write(gpg_strategy.unknown_key_message(count))
170
 
            if verbose:
171
 
                self.outf.write(gpg_strategy.verbose_missing_key_message(
172
 
                                                                        result))
173
 
            self.outf.write(gpg_strategy.commit_not_valid_message(count))
174
 
            if verbose:
175
 
                self.outf.write(gpg_strategy.verbose_not_valid_message(result,
176
 
                                                                        repo))
177
 
            self.outf.write(gpg_strategy.commit_not_signed_message(count))
178
 
            if verbose:
179
 
                self.outf.write(gpg_strategy.verbose_not_signed_message(result,
180
 
                                                                          repo))
 
171
            write(gpg_strategy.valid_commits_message(count))
 
172
            if verbose:
 
173
               write_verbose(gpg_strategy.verbose_valid_message(result))
 
174
            write(gpg_strategy.unknown_key_message(count))
 
175
            if verbose:
 
176
                write_verbose(gpg_strategy.verbose_missing_key_message(result))
 
177
            write(gpg_strategy.commit_not_valid_message(count))
 
178
            if verbose:
 
179
                write_verbose(gpg_strategy.verbose_not_valid_message(result,
 
180
                                                                        repo))
 
181
            write(gpg_strategy.commit_not_signed_message(count))
 
182
            if verbose:
 
183
                write_verbose(gpg_strategy.verbose_not_signed_message(result,
 
184
                                                                        repo))
181
185
            return 1