/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: Jelmer Vernooij
  • Date: 2019-07-27 22:47:49 UTC
  • mfrom: (7377 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190727224749-rta5fv1sc4ivy6ko
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
252
252
    def _fork_project(self, project_name):
253
253
        path = 'projects/%s/fork' % urlutils.quote(str(project_name), '')
254
254
        response = self._api_request('POST', path)
255
 
        if response != 200:
 
255
        if response != 201:
256
256
            raise InvalidHttpResponse(path, response.text)
257
257
        return json.loads(response.data)
258
258
 
361
361
        source_project = self._get_project(source_project_name)
362
362
        target_project = self._get_project(target_project_name)
363
363
        state = mp_status_to_status(status)
364
 
        for mr in self.gl._list_merge_requests(
 
364
        for mr in self._list_merge_requests(
365
365
                project=target_project['id'], state=state):
366
366
            if (mr['source_project_id'] != source_project['id'] or
367
367
                    mr['source_branch'] != source_branch_name or
423
423
        except NotGitLabUrl:
424
424
            raise UnsupportedHoster(url)
425
425
        except NotMergeRequestUrl as e:
426
 
            if self.gl.url == ('https://%s' % e.host):
 
426
            if self.base_url == ('https://%s' % e.host):
427
427
                raise
428
428
            else:
429
429
                raise UnsupportedHoster(url)
430
 
        if self.gl.url != ('https://%s' % host):
 
430
        if self.base_url != ('https://%s' % host):
431
431
            raise UnsupportedHoster(url)
432
 
        project = self.gl.projects.get(project)
 
432
        project = self._get_project(project)
433
433
        mr = project.mergerequests.get(merge_id)
434
434
        return GitLabMergeProposal(mr)
435
435