/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/plugins/propose/cmds.py

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-11 20:19:38 UTC
  • mfrom: (7526.3.2 work)
  • Revision ID: gustav.hartvigsson@gmail.com-20210111201938-omr9wjz3qdgyxe8k
Merged lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/cmds.py
34
34
    Option,
35
35
    RegistryOption,
36
36
    )
37
 
from ...trace import note
 
37
from ...trace import note, warning
38
38
from ... import (
39
39
    propose as _mod_propose,
40
40
    )
46
46
    return urlutils.basename(branch.user_url)
47
47
 
48
48
 
 
49
def _check_already_merged(branch, target):
 
50
    # TODO(jelmer): Check entire ancestry rather than just last revision?
 
51
    if branch.last_revision() == target.last_revision():
 
52
        raise errors.CommandError(gettext(
 
53
            'All local changes are already present in target.'))
 
54
 
 
55
 
49
56
class cmd_publish_derived(Command):
50
57
    __doc__ = """Publish a derived branch.
51
58
 
79
86
            submit_branch = local_branch.get_parent()
80
87
            note(gettext('Using parent branch %s') % submit_branch)
81
88
        submit_branch = _mod_branch.Branch.open(submit_branch)
 
89
        _check_already_merged(local_branch, submit_branch)
82
90
        if name is None:
83
91
            name = branch_name(local_branch)
84
92
        hoster = _mod_propose.get_hoster(submit_branch)
135
143
        RegistryOption(
136
144
            'hoster',
137
145
            help='Use the hoster.',
138
 
            lazy_registry=('breezy.plugins.propose.propose', 'hosters')),
 
146
            lazy_registry=('breezy.propose', 'hosters')),
139
147
        ListOption('reviewers', short_name='R', type=str,
140
148
                   help='Requested reviewers.'),
141
149
        Option('name', help='Name of the new remote branch.', type=str),
151
159
               help='Allow fallback to lossy push, if necessary.'),
152
160
        Option('allow-collaboration',
153
161
               help='Allow collaboration from target branch maintainer(s)'),
 
162
        Option('allow-empty',
 
163
               help='Do not prevent empty merge proposals.'),
 
164
        Option('overwrite', help="Overwrite existing commits."),
154
165
        ]
155
166
    takes_args = ['submit_branch?']
156
167
 
159
170
    def run(self, submit_branch=None, directory='.', hoster=None,
160
171
            reviewers=None, name=None, no_allow_lossy=False, description=None,
161
172
            labels=None, prerequisite=None, commit_message=None, wip=False,
162
 
            allow_collaboration=False):
 
173
            allow_collaboration=False, allow_empty=False, overwrite=False):
163
174
        tree, branch, relpath = (
164
175
            controldir.ControlDir.open_containing_tree_or_branch(directory))
165
176
        if submit_branch is None:
167
178
        if submit_branch is None:
168
179
            submit_branch = branch.get_parent()
169
180
        if submit_branch is None:
170
 
            raise errors.BzrCommandError(
 
181
            raise errors.CommandError(
171
182
                gettext("No target location specified or remembered"))
172
 
        else:
173
 
            target = _mod_branch.Branch.open(submit_branch)
 
183
        target = _mod_branch.Branch.open(submit_branch)
 
184
        if not allow_empty:
 
185
            _check_already_merged(branch, target)
174
186
        if hoster is None:
175
187
            hoster = _mod_propose.get_hoster(target)
176
188
        else:
178
190
        if name is None:
179
191
            name = branch_name(branch)
180
192
        remote_branch, public_branch_url = hoster.publish_derived(
181
 
            branch, target, name=name, allow_lossy=not no_allow_lossy)
 
193
            branch, target, name=name, allow_lossy=not no_allow_lossy,
 
194
            overwrite=overwrite)
182
195
        branch.set_push_location(remote_branch.user_url)
183
196
        branch.set_submit_branch(target.user_url)
184
197
        note(gettext('Published branch to %s') % public_branch_url)
226
239
        if submit_branch is None:
227
240
            submit_branch = branch.get_parent()
228
241
        if submit_branch is None:
229
 
            raise errors.BzrCommandError(
 
242
            raise errors.CommandError(
230
243
                gettext("No target location specified or remembered"))
231
244
        else:
232
245
            target = _mod_branch.Branch.open(submit_branch)
235
248
            self.outf.write(gettext('Merge proposal: %s\n') % mp.url)
236
249
 
237
250
 
238
 
class cmd_github_login(Command):
239
 
    __doc__ = """Log into GitHub.
240
 
 
241
 
    When communicating with GitHub, some commands need to authenticate to
242
 
    GitHub.
243
 
    """
244
 
 
245
 
    takes_args = ['username?']
246
 
 
247
 
    def run(self, username=None):
248
 
        from github import Github, GithubException
249
 
        from breezy.config import AuthenticationConfig
250
 
        authconfig = AuthenticationConfig()
251
 
        if username is None:
252
 
            username = authconfig.get_user(
253
 
                'https', 'github.com', prompt=u'GitHub username', ask=True)
254
 
        password = authconfig.get_password('https', 'github.com', username)
255
 
        client = Github(username, password)
256
 
        user = client.get_user()
257
 
        try:
258
 
            authorization = user.create_authorization(
259
 
                scopes=['user', 'repo', 'delete_repo'], note='Breezy',
260
 
                note_url='https://github.com/breezy-team/breezy')
261
 
        except GithubException as e:
262
 
            errs = e.data.get('errors', [])
263
 
            if errs:
264
 
                err_code = errs[0].get('code')
265
 
                if err_code == u'already_exists':
266
 
                    raise errors.BzrCommandError('token already exists')
267
 
            raise errors.BzrCommandError(e.data['message'])
268
 
        # TODO(jelmer): This should really use something in
269
 
        # AuthenticationConfig
270
 
        from .github import store_github_token
271
 
        store_github_token(scheme='https', host='github.com',
272
 
                           token=authorization.token)
273
 
 
274
 
 
275
 
class cmd_gitlab_login(Command):
276
 
    __doc__ = """Log into a GitLab instance.
277
 
 
278
 
    This command takes a GitLab instance URL (e.g. https://gitlab.com)
279
 
    as well as an optional private token. Private tokens can be created via the
280
 
    web UI.
281
 
 
282
 
    :Examples:
283
 
 
284
 
      Log into GNOME's GitLab (prompts for a token):
285
 
 
286
 
         brz gitlab-login https://gitlab.gnome.org/
287
 
 
288
 
      Log into Debian's salsa, using a token created earlier:
289
 
 
290
 
         brz gitlab-login https://salsa.debian.org if4Theis6Eich7aef0zo
291
 
    """
292
 
 
293
 
    takes_args = ['url', 'private_token?']
294
 
 
295
 
    takes_options = [
296
 
        Option('name', help='Name for GitLab site in configuration.',
297
 
               type=str),
298
 
        Option('no-check',
299
 
               "Don't check that the token is valid."),
300
 
        ]
301
 
 
302
 
    def run(self, url, private_token=None, name=None, no_check=False):
303
 
        from breezy import ui
304
 
        from .gitlabs import store_gitlab_token
305
 
        if name is None:
306
 
            try:
307
 
                name = urlutils.parse_url(url)[3].split('.')[-2]
308
 
            except (ValueError, IndexError):
309
 
                raise errors.BzrCommandError(
310
 
                    'please specify a site name with --name')
311
 
        if private_token is None:
312
 
            note("Please visit %s to obtain a private token.",
313
 
                 urlutils.join(url, "profile/personal_access_tokens"))
314
 
            private_token = ui.ui_factory.get_password(u'Private token')
315
 
        if not no_check:
316
 
            from breezy.transport import get_transport
317
 
            from .gitlabs import GitLab
318
 
            GitLab(get_transport(url), private_token=private_token)
319
 
        store_gitlab_token(name=name, url=url, private_token=private_token)
320
 
 
321
 
 
322
251
class cmd_my_merge_proposals(Command):
323
252
    __doc__ = """List all merge proposals owned by the logged-in user.
324
253
 
326
255
 
327
256
    hidden = True
328
257
 
 
258
    takes_args = ['base-url?']
329
259
    takes_options = [
330
260
        'verbose',
331
261
        RegistryOption.from_kwargs(
337
267
            all='All merge proposals',
338
268
            open='Open merge proposals',
339
269
            merged='Merged merge proposals',
340
 
            closed='Closed merge proposals')]
341
 
 
342
 
    def run(self, status='open', verbose=False):
343
 
        for name, hoster_cls in _mod_propose.hosters.items():
344
 
            for instance in hoster_cls.iter_instances():
 
270
            closed='Closed merge proposals'),
 
271
        RegistryOption(
 
272
            'hoster',
 
273
            help='Use the hoster.',
 
274
            lazy_registry=('breezy.propose', 'hosters')),
 
275
        ]
 
276
 
 
277
    def run(self, status='open', verbose=False, hoster=None, base_url=None):
 
278
 
 
279
        for instance in _mod_propose.iter_hoster_instances(hoster=hoster):
 
280
            if base_url is not None and instance.base_url != base_url:
 
281
                continue
 
282
            try:
345
283
                for mp in instance.iter_my_proposals(status=status):
346
284
                    self.outf.write('%s\n' % mp.url)
347
285
                    if verbose:
348
 
                        self.outf.write(
349
 
                            '(Merging %s into %s)\n' %
350
 
                            (mp.get_source_branch_url(),
351
 
                             mp.get_target_branch_url()))
 
286
                        source_branch_url = mp.get_source_branch_url()
 
287
                        if source_branch_url:
 
288
                            self.outf.write(
 
289
                                '(Merging %s into %s)\n' %
 
290
                                (source_branch_url,
 
291
                                 mp.get_target_branch_url()))
 
292
                        else:
 
293
                            self.outf.write(
 
294
                                '(Merging into %s)\n' %
 
295
                                mp.get_target_branch_url())
352
296
                        description = mp.get_description()
353
297
                        if description:
354
298
                            self.outf.writelines(
355
299
                                ['\t%s\n' % l
356
300
                                 for l in description.splitlines()])
357
301
                        self.outf.write('\n')
 
302
            except _mod_propose.HosterLoginRequired as e:
 
303
                warning('Skipping %r, login required.', instance)
358
304
 
359
305
 
360
306
class cmd_land_merge_proposal(Command):
367
313
    def run(self, url, message=None):
368
314
        proposal = _mod_propose.get_proposal_by_url(url)
369
315
        proposal.merge(commit_message=message)
 
316
 
 
317
 
 
318
class cmd_hosters(Command):
 
319
    __doc__ = """List all known hosting sites and user details."""
 
320
 
 
321
    hidden = True
 
322
 
 
323
    def run(self):
 
324
        for instance in _mod_propose.iter_hoster_instances():
 
325
            current_user = instance.get_current_user()
 
326
            if current_user is not None:
 
327
                current_user_url = instance.get_user_url(current_user)
 
328
                if current_user_url is not None:
 
329
                    self.outf.write(
 
330
                        gettext('%s (%s) - user: %s (%s)\n') % (
 
331
                            instance.name, instance.base_url,
 
332
                            current_user, current_user_url))
 
333
                else:
 
334
                    self.outf.write(
 
335
                        gettext('%s (%s) - user: %s\n') % (
 
336
                            instance.name, instance.base_url,
 
337
                            current_user))
 
338
            else:
 
339
                self.outf.write(
 
340
                    gettext('%s (%s) - not logged in\n') % (
 
341
                        instance.name, instance.base_url))