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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit_signature_commands.py
44
44
    # repository
45
45
 
46
46
    takes_options = [
47
 
            Option('dry-run',
48
 
                   help='Don\'t actually sign anything, just print'
49
 
                        ' the revisions that would be signed.'),
50
 
            ]
 
47
        Option('dry-run',
 
48
               help='Don\'t actually sign anything, just print'
 
49
               ' the revisions that would be signed.'),
 
50
        ]
51
51
    takes_args = ['location?', 'committer?']
52
52
 
53
53
    def run(self, location=None, committer=None, dry_run=False):
104
104
    """
105
105
 
106
106
    takes_options = [
107
 
            Option('acceptable-keys',
108
 
                   help='Comma separated list of GPG key patterns which are'
109
 
                        ' acceptable for verification.',
110
 
                   short_name='k',
111
 
                   type=text_type,),
112
 
            'revision',
113
 
            'verbose',
114
 
          ]
 
107
        Option('acceptable-keys',
 
108
               help='Comma separated list of GPG key patterns which are'
 
109
               ' acceptable for verification.',
 
110
               short_name='k',
 
111
               type=text_type,),
 
112
        'revision',
 
113
        'verbose',
 
114
        ]
115
115
    takes_args = ['location?']
116
116
 
117
117
    def run(self, acceptable_keys=None, revision=None, verbose=None,
118
 
                                                            location=u'.'):
 
118
            location=u'.'):
119
119
        bzrdir = controldir.ControlDir.open_containing(location)[0]
120
120
        branch = bzrdir.open_branch()
121
121
        repo = branch.repository
126
126
 
127
127
        def write(string):
128
128
            self.outf.write(string + "\n")
 
129
 
129
130
        def write_verbose(string):
130
131
            self.outf.write("  " + string + "\n")
131
132
 
132
133
        self.add_cleanup(repo.lock_read().unlock)
133
 
        #get our list of revisions
 
134
        # get our list of revisions
134
135
        revisions = []
135
136
        if revision is not None:
136
137
            if len(revision) == 1:
143
144
                    to_revno = branch.revno()
144
145
                if from_revno is None or to_revno is None:
145
146
                    raise errors.BzrCommandError(gettext(
146
 
                    'Cannot verify a range of non-revision-history revisions'))
 
147
                        'Cannot verify a range of non-revision-history revisions'))
147
148
                for revno in range(from_revno, to_revno + 1):
148
149
                    revisions.append(branch.get_rev_id(revno))
149
150
        else:
150
 
            #all revisions by default including merges
 
151
            # all revisions by default including merges
151
152
            graph = repo.get_graph()
152
153
            revisions = []
153
154
            for rev_id, parents in graph.iter_ancestry(
161
162
        count, result, all_verifiable = gpg.bulk_verify_signatures(
162
163
            repo, revisions, gpg_strategy)
163
164
        if all_verifiable:
164
 
               write(gettext("All commits signed with verifiable keys"))
165
 
               if verbose:
166
 
                   for message in gpg.verbose_valid_message(result):
167
 
                       write_verbose(message)
168
 
               return 0
 
165
            write(gettext("All commits signed with verifiable keys"))
 
166
            if verbose:
 
167
                for message in gpg.verbose_valid_message(result):
 
168
                    write_verbose(message)
 
169
            return 0
169
170
        else:
170
171
            write(gpg.valid_commits_message(count))
171
172
            if verbose:
172
 
               for message in gpg.verbose_valid_message(result):
173
 
                   write_verbose(message)
 
173
                for message in gpg.verbose_valid_message(result):
 
174
                    write_verbose(message)
174
175
            write(gpg.expired_commit_message(count))
175
176
            if verbose:
176
 
               for message in gpg.verbose_expired_key_message(result, repo):
177
 
                   write_verbose(message)
 
177
                for message in gpg.verbose_expired_key_message(result, repo):
 
178
                    write_verbose(message)
178
179
            write(gpg.unknown_key_message(count))
179
180
            if verbose:
180
181
                for message in gpg.verbose_missing_key_message(result):
182
183
            write(gpg.commit_not_valid_message(count))
183
184
            if verbose:
184
185
                for message in gpg.verbose_not_valid_message(result, repo):
185
 
                   write_verbose(message)
 
186
                    write_verbose(message)
186
187
            write(gpg.commit_not_signed_message(count))
187
188
            if verbose:
188
189
                for message in gpg.verbose_not_signed_message(result, repo):