/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/commit_signature_commands.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
"""Command which looks for unsigned commits by the current user, and signs them.
18
 
"""
 
17
"""Command that signs unsigned commits by the current user. """
19
18
 
20
19
from __future__ import absolute_import
21
20
 
44
43
    # repository
45
44
 
46
45
    takes_options = [
47
 
            Option('dry-run',
48
 
                   help='Don\'t actually sign anything, just print'
49
 
                        ' the revisions that would be signed.'),
50
 
            ]
 
46
        Option('dry-run',
 
47
               help='Don\'t actually sign anything, just print'
 
48
               ' the revisions that would be signed.'),
 
49
        ]
51
50
    takes_args = ['location?', 'committer?']
52
51
 
53
52
    def run(self, location=None, committer=None, dry_run=False):
87
86
                    count += 1
88
87
                    if not dry_run:
89
88
                        repo.sign_revision(rev_id, gpg_strategy)
90
 
            except:
 
89
            except BaseException:
91
90
                repo.abort_write_group()
92
91
                raise
93
92
            else:
94
93
                repo.commit_write_group()
95
94
        self.outf.write(
96
 
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n', count) %
97
 
            count)
 
95
            ngettext('Signed %d revision.\n', 'Signed %d revisions.\n',
 
96
                     count) % count)
98
97
 
99
98
 
100
99
class cmd_verify_signatures(Command):
104
103
    """
105
104
 
106
105
    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
 
          ]
 
106
        Option('acceptable-keys',
 
107
               help='Comma separated list of GPG key patterns which are'
 
108
               ' acceptable for verification.',
 
109
               short_name='k',
 
110
               type=text_type,),
 
111
        'revision',
 
112
        'verbose',
 
113
        ]
115
114
    takes_args = ['location?']
116
115
 
117
116
    def run(self, acceptable_keys=None, revision=None, verbose=None,
118
 
                                                            location=u'.'):
 
117
            location=u'.'):
119
118
        bzrdir = controldir.ControlDir.open_containing(location)[0]
120
119
        branch = bzrdir.open_branch()
121
120
        repo = branch.repository
126
125
 
127
126
        def write(string):
128
127
            self.outf.write(string + "\n")
 
128
 
129
129
        def write_verbose(string):
130
130
            self.outf.write("  " + string + "\n")
131
131
 
132
132
        self.add_cleanup(repo.lock_read().unlock)
133
 
        #get our list of revisions
 
133
        # get our list of revisions
134
134
        revisions = []
135
135
        if revision is not None:
136
136
            if len(revision) == 1:
142
142
                if to_revid is None:
143
143
                    to_revno = branch.revno()
144
144
                if from_revno is None or to_revno is None:
145
 
                    raise errors.BzrCommandError(gettext(
146
 
                    'Cannot verify a range of non-revision-history revisions'))
 
145
                    raise errors.BzrCommandError(
 
146
                        gettext('Cannot verify a range of non-revision-history'
 
147
                                ' 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):