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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-05-06 03:06:18 UTC
  • mfrom: (7500.1.2 trunk-merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200506030618-131sjbc876q7on66
Merge the 3.1 branch.

Merged from https://code.launchpad.net/~jelmer/brz/trunk-merge-3.1/+merge/383481

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
166
166
        raise NotGitLabUrl(url)
167
167
    path = path.strip('/')
168
168
    parts = path.split('/')
 
169
    if len(parts) < 2:
 
170
        raise NotMergeRequestUrl(host, url)
169
171
    if parts[-2] != 'merge_requests':
170
172
        raise NotMergeRequestUrl(host, url)
171
 
    return host, '/'.join(parts[:-2]), int(parts[-1])
 
173
    if parts[-3] == '-':
 
174
        project_name = '/'.join(parts[:-3])
 
175
    else:
 
176
        project_name = '/'.join(parts[:-2])
 
177
    return host, project_name, int(parts[-1])
172
178
 
173
179
 
174
180
class GitLabMergeProposal(MergeProposal):
280
286
    def base_url(self):
281
287
        return self.transport.base
282
288
 
 
289
    @property
 
290
    def base_hostname(self):
 
291
        return urlutils.parse_url(self.base_url)[3]
 
292
 
283
293
    def _api_request(self, method, path, fields=None, body=None):
284
294
        return self.transport.request(
285
295
            method, urlutils.join(self.base_url, 'api', 'v4', path),
374
384
            parameters['owner_id'] = urlutils.quote(owner, '')
375
385
        return self._list_paged(path, parameters, per_page=DEFAULT_PAGE_SIZE)
376
386
 
 
387
    def _get_merge_request(self, project, merge_id):
 
388
        path = 'projects/%s/merge_requests/%d' % (urlutils.quote(str(project), ''), merge_id)
 
389
        response = self._api_request('GET', path)
 
390
        if response.status == 403:
 
391
            raise errors.PermissionDenied(response.text)
 
392
        if response.status != 200:
 
393
            raise errors.InvalidHttpResponse(path, response.text)
 
394
        return json.loads(response.data)
 
395
 
377
396
    def _list_projects(self, owner):
378
397
        path = 'users/%s/projects' % urlutils.quote(str(owner), '')
379
398
        parameters = {}
390
409
    def _create_mergerequest(
391
410
            self, title, source_project_id, target_project_id,
392
411
            source_branch_name, target_branch_name, description,
393
 
            labels=None):
 
412
            labels=None, allow_collaboration=False):
394
413
        path = 'projects/%s/merge_requests' % source_project_id
395
414
        fields = {
396
415
            'title': title,
398
417
            'target_branch': target_branch_name,
399
418
            'target_project_id': target_project_id,
400
419
            'description': description,
 
420
            'allow_collaboration': allow_collaboration,
401
421
            }
402
422
        if labels:
403
423
            fields['labels'] = labels
484
504
            (host, project, branch_name) = parse_gitlab_branch_url(branch)
485
505
        except NotGitLabUrl:
486
506
            return False
487
 
        return (self.base_url == ('https://%s' % host))
 
507
        return self.base_hostname == host
488
508
 
489
509
    def check(self):
490
510
        response = self._api_request('GET', 'user')
539
559
        except NotGitLabUrl:
540
560
            raise UnsupportedHoster(url)
541
561
        except NotMergeRequestUrl as e:
542
 
            if self.base_url == ('https://%s' % e.host):
 
562
            if self.base_hostname == e.host:
543
563
                raise
544
564
            else:
545
565
                raise UnsupportedHoster(url)
546
 
        if self.base_url != ('https://%s' % host):
 
566
        if self.base_hostname != host:
547
567
            raise UnsupportedHoster(url)
548
568
        project = self._get_project(project)
549
 
        mr = project.mergerequests.get(merge_id)
550
 
        return GitLabMergeProposal(mr)
 
569
        mr = self._get_merge_request(project['path_with_namespace'], merge_id)
 
570
        return GitLabMergeProposal(self, mr)
551
571
 
552
572
    def delete_project(self, project):
553
573
        path = 'projects/%s' % urlutils.quote(str(project), '')
623
643
        try:
624
644
            merge_request = self.gl._create_mergerequest(**kwargs)
625
645
        except MergeRequestExists:
626
 
            raise ProposalExists(self.source_branch.user_url)
 
646
            raise MergeProposalExists(self.source_branch.user_url)
627
647
        return GitLabMergeProposal(self.gl, merge_request)
628
648
 
629
649