/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-12-23 01:39:21 UTC
  • mfrom: (7424 work)
  • mto: This revision was merged to the branch mainline in revision 7425.
  • Revision ID: jelmer@jelmer.uk-20191223013921-2kzd0wlcoylgxksk
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
 
21
import json
 
22
import os
 
23
import time
 
24
 
21
25
from ... import (
 
26
    bedding,
22
27
    branch as _mod_branch,
23
28
    controldir,
24
29
    errors,
26
31
    )
27
32
from ...git.urls import git_url_to_bzr_url
28
33
from ...sixish import PY3
 
34
from ...trace import mutter
 
35
from ...transport import get_transport
29
36
 
30
37
from .propose import (
31
38
    Hoster,
37
44
    UnsupportedHoster,
38
45
    )
39
46
 
 
47
 
 
48
_DEFAULT_FILES = ['/etc/python-gitlab.cfg', '~/.python-gitlab.cfg']
 
49
DEFAULT_PAGE_SIZE = 50
 
50
 
 
51
 
40
52
def mp_status_to_status(status):
41
53
    return {
42
54
        'all': 'all',
54
66
        self.url = url
55
67
 
56
68
 
 
69
class NotMergeRequestUrl(errors.BzrError):
 
70
 
 
71
    _fmt = "Not a merge proposal URL: %(url)s"
 
72
 
 
73
    def __init__(self, host, url):
 
74
        errors.BzrError.__init__(self)
 
75
        self.host = host
 
76
        self.url = url
 
77
 
 
78
 
57
79
class DifferentGitLabInstances(errors.BzrError):
58
80
 
59
81
    _fmt = ("Can't create merge proposals across GitLab instances: "
69
91
    _fmt = ("Please log into GitLab")
70
92
 
71
93
 
 
94
class GitlabLoginError(errors.BzrError):
 
95
 
 
96
    _fmt = ("Error logging in: %(error)s")
 
97
 
 
98
    def __init__(self, error):
 
99
        self.error = error
 
100
 
 
101
 
72
102
def default_config_path():
73
 
    from breezy.config import config_dir
74
 
    import os
75
 
    return os.path.join(config_dir(), 'gitlab.conf')
 
103
    return os.path.join(bedding.config_dir(), 'gitlab.conf')
76
104
 
77
105
 
78
106
def store_gitlab_token(name, url, private_token):
90
118
 
91
119
def iter_tokens():
92
120
    import configparser
93
 
    from gitlab.config import _DEFAULT_FILES
94
121
    config = configparser.ConfigParser()
95
 
    config.read(_DEFAULT_FILES + [default_config_path()])
 
122
    config.read(
 
123
        [os.path.expanduser(p) for p in _DEFAULT_FILES] +
 
124
        [default_config_path()])
96
125
    for name, section in config.items():
97
126
        yield name, section
98
127
 
99
128
 
100
 
def connect_gitlab(host):
101
 
    from gitlab import Gitlab, GitlabGetError
102
 
    url = 'https://%s' % host
103
 
    for name, section in iter_tokens():
104
 
        if section.get('url') == url:
105
 
            return Gitlab(**section)
 
129
def get_credentials_by_url(url):
 
130
    for name, credentials in iter_tokens():
 
131
        if 'url' not in credentials:
 
132
            continue
 
133
        if credentials['url'].rstrip('/') == url.rstrip('/'):
 
134
            return credentials
106
135
    else:
107
 
        try:
108
 
            return Gitlab(url)
109
 
        except GitlabGetError:
110
 
            raise GitLabLoginMissing()
111
 
 
112
 
 
113
 
def parse_gitlab_url(branch):
114
 
    url = urlutils.split_segment_parameters(branch.user_url)[0]
 
136
        return None
 
137
 
 
138
 
 
139
def parse_gitlab_url(url):
115
140
    (scheme, user, password, host, port, path) = urlutils.parse_url(
116
141
        url)
117
142
    if scheme not in ('git+ssh', 'https', 'http'):
118
 
        raise NotGitLabUrl(branch.user_url)
 
143
        raise NotGitLabUrl(url)
119
144
    if not host:
120
 
        raise NotGitLabUrl(branch.user_url)
 
145
        raise NotGitLabUrl(url)
121
146
    path = path.strip('/')
122
147
    if path.endswith('.git'):
123
148
        path = path[:-4]
 
149
    return host, path
 
150
 
 
151
 
 
152
def parse_gitlab_branch_url(branch):
 
153
    url = urlutils.split_segment_parameters(branch.user_url)[0]
 
154
    host, path = parse_gitlab_url(url)
124
155
    return host, path, branch.name
125
156
 
126
157
 
 
158
def parse_gitlab_merge_request_url(url):
 
159
    (scheme, user, password, host, port, path) = urlutils.parse_url(
 
160
        url)
 
161
    if scheme not in ('git+ssh', 'https', 'http'):
 
162
        raise NotGitLabUrl(url)
 
163
    if not host:
 
164
        raise NotGitLabUrl(url)
 
165
    path = path.strip('/')
 
166
    parts = path.split('/')
 
167
    if parts[-2] != 'merge_requests':
 
168
        raise NotMergeRequestUrl(host, url)
 
169
    return host, '/'.join(parts[:-2]), int(parts[-1])
 
170
 
 
171
 
127
172
class GitLabMergeProposal(MergeProposal):
128
173
 
129
 
    def __init__(self, mr):
 
174
    def __init__(self, gl, mr):
 
175
        self.gl = gl
130
176
        self._mr = mr
131
177
 
 
178
    def _update(self, **kwargs):
 
179
        self.gl._update_merge_request(self._mr['project_id'], self._mr['iid'], kwargs)
 
180
 
 
181
    def __repr__(self):
 
182
        return "<%s at %r>" % (type(self).__name__, self._mr['web_url'])
 
183
 
132
184
    @property
133
185
    def url(self):
134
 
        return self._mr.web_url
 
186
        return self._mr['web_url']
135
187
 
136
188
    def get_description(self):
137
 
        return self._mr.description
 
189
        return self._mr['description']
138
190
 
139
191
    def set_description(self, description):
140
 
        self._mr.description = description
141
 
        self._mr.save()
 
192
        self._update(description=description, title=description.splitlines()[0])
 
193
 
 
194
    def get_commit_message(self):
 
195
        return self._mr.get('merge_commit_message')
 
196
 
 
197
    def set_commit_message(self, message):
 
198
        raise errors.UnsupportedOperation(self.set_commit_message, self)
142
199
 
143
200
    def _branch_url_from_project(self, project_id, branch_name):
144
 
        project = self._mr.manager.gitlab.projects.get(project_id)
145
 
        return gitlab_url_to_bzr_url(project.http_url_to_repo, branch_name)
 
201
        if project_id is None:
 
202
            return None
 
203
        project = self.gl._get_project(project_id)
 
204
        return gitlab_url_to_bzr_url(project['http_url_to_repo'], branch_name)
146
205
 
147
206
    def get_source_branch_url(self):
148
207
        return self._branch_url_from_project(
149
 
            self._mr.source_project_id, self._mr.source_branch)
 
208
            self._mr['source_project_id'], self._mr['source_branch'])
150
209
 
151
210
    def get_target_branch_url(self):
152
211
        return self._branch_url_from_project(
153
 
            self._mr.target_project_id, self._mr.target_branch)
 
212
            self._mr['target_project_id'], self._mr['target_branch'])
154
213
 
155
214
    def is_merged(self):
156
 
        return (self._mr.state == 'merged')
 
215
        return (self._mr['state'] == 'merged')
 
216
 
 
217
    def is_closed(self):
 
218
        return (self._mr['state'] == 'closed')
 
219
 
 
220
    def reopen(self):
 
221
        return self._update(state_event='reopen')
157
222
 
158
223
    def close(self):
159
 
        self._mr.state_event = 'close'
160
 
        self._mr.save()
 
224
        self._update(state_event='close')
 
225
 
 
226
    def merge(self, commit_message=None):
 
227
        # https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
 
228
        self._mr.merge(merge_commit_message=commit_message)
 
229
 
 
230
    def can_be_merged(self):
 
231
        if self._mr['merge_status'] == 'cannot_be_merged':
 
232
            return False
 
233
        elif self._mr['merge_status'] == 'can_be_merged':
 
234
            return True
 
235
        else:
 
236
            raise ValueError(self._mr['merge_status'])
161
237
 
162
238
 
163
239
def gitlab_url_to_bzr_url(url, name):
164
240
    if not PY3:
165
241
        name = name.encode('utf-8')
166
 
    return urlutils.join_segment_parameters(
167
 
        git_url_to_bzr_url(url), {"branch": name})
 
242
    return git_url_to_bzr_url(url, branch=name)
168
243
 
169
244
 
170
245
class GitLab(Hoster):
171
246
    """GitLab hoster implementation."""
172
247
 
173
248
    supports_merge_proposal_labels = True
 
249
    supports_merge_proposal_commit_message = False
174
250
 
175
251
    def __repr__(self):
176
 
        return "<GitLab(%r)>" % self.gl.url
 
252
        return "<GitLab(%r)>" % self.base_url
177
253
 
178
254
    @property
179
255
    def base_url(self):
180
 
        return self.gl.url
181
 
 
182
 
    def __init__(self, gl):
183
 
        self.gl = gl
 
256
        return self.transport.base
 
257
 
 
258
    def _api_request(self, method, path, fields=None):
 
259
        return self.transport.request(
 
260
            method, urlutils.join(self.base_url, 'api', 'v4', path),
 
261
            headers=self.headers, fields=fields)
 
262
 
 
263
    def __init__(self, transport, private_token):
 
264
        self.transport = transport
 
265
        self.headers = {"Private-Token": private_token}
 
266
        self.check()
 
267
 
 
268
    def _get_user(self, username):
 
269
        path = 'users/%s' % urlutils.quote(str(project_name), '')
 
270
        response = self._api_request('GET', path)
 
271
        if response.status == 404:
 
272
            raise KeyError('no such user %s' % username)
 
273
        if response.status == 200:
 
274
            return json.loads(response.data)
 
275
        raise errors.InvalidHttpResponse(path, response.text)
 
276
 
 
277
    def _get_user_by_email(self, username):
 
278
        path = 'users?search=%s' % urlutils.quote(str(project_name), '')
 
279
        response = self._api_request('GET', path)
 
280
        if response.status == 404:
 
281
            raise KeyError('no such user %s' % username)
 
282
        if response.status == 200:
 
283
            ret = json.loads(response.data)
 
284
            if len(ret) != 1:
 
285
                raise ValueError('unexpected number of results; %r' % ret)
 
286
            return ret[0]
 
287
        raise errors.InvalidHttpResponse(path, response.text)
 
288
 
 
289
    def _get_project(self, project_name):
 
290
        path = 'projects/%s' % urlutils.quote(str(project_name), '')
 
291
        response = self._api_request('GET', path)
 
292
        if response.status == 404:
 
293
            raise NoSuchProject(project_name)
 
294
        if response.status == 200:
 
295
            return json.loads(response.data)
 
296
        raise errors.InvalidHttpResponse(path, response.text)
 
297
 
 
298
    def _fork_project(self, project_name, timeout=50, interval=5):
 
299
        path = 'projects/%s/fork' % urlutils.quote(str(project_name), '')
 
300
        response = self._api_request('POST', path)
 
301
        if response.status not in (200, 201):
 
302
            raise errors.InvalidHttpResponse(path, response.text)
 
303
        # The response should be valid JSON, but let's ignore it
 
304
        project = json.loads(response.data)
 
305
        # Spin and wait until import_status for new project
 
306
        # is complete.
 
307
        deadline = time.time() + timeout
 
308
        while project['import_status'] not in ('finished', 'none'):
 
309
            mutter('import status is %s', project['import_status'])
 
310
            if time.time() > deadline:
 
311
                raise Exception('timeout waiting for project to become available')
 
312
            time.sleep(interval)
 
313
            project = self._get_project(project['path_with_namespace'])
 
314
        return project
 
315
 
 
316
    def _get_logged_in_username(self):
 
317
        return self._current_user['username']
 
318
 
 
319
    def _list_paged(self, path, parameters=None, per_page=None):
 
320
        if parameters is None:
 
321
            parameters = {}
 
322
        else:
 
323
            parameters = dict(parameters.items())
 
324
        if per_page:
 
325
            parameters['per_page'] = str(per_page)
 
326
        page = "1"
 
327
        while page:
 
328
            parameters['page'] = page
 
329
            response = self._api_request(
 
330
                'GET', path + '?' +
 
331
                ';'.join(['%s=%s' % item for item in parameters.items()]))
 
332
            if response.status == 403:
 
333
                raise errors.PermissionDenied(response.text)
 
334
            if response.status != 200:
 
335
                raise errors.InvalidHttpResponse(path, response.text)
 
336
            page = response.getheader("X-Next-Page")
 
337
            for entry in json.loads(response.data):
 
338
                yield entry
 
339
 
 
340
    def _list_merge_requests(self, owner=None, project=None, state=None):
 
341
        if project is not None:
 
342
            path = 'projects/%s/merge_requests' % urlutils.quote(str(project), '')
 
343
        else:
 
344
            path = 'merge_requests'
 
345
        parameters = {}
 
346
        if state:
 
347
            parameters['state'] = state
 
348
        if owner:
 
349
            parameters['owner_id'] = urlutils.quote(owner, '')
 
350
        return self._list_paged(path, parameters, per_page=DEFAULT_PAGE_SIZE)
 
351
 
 
352
    def _update_merge_request(self, project_id, iid, mr):
 
353
        path = 'projects/%s/merge_requests/%s' % (
 
354
            urlutils.quote(str(project_id), ''), iid)
 
355
        response = self._api_request('PUT', path, fields=mr)
 
356
        if response.status == 200:
 
357
            return json.loads(response.data)
 
358
        raise errors.InvalidHttpResponse(path, response.text)
 
359
 
 
360
    def _create_mergerequest(
 
361
            self, title, source_project_id, target_project_id,
 
362
            source_branch_name, target_branch_name, description,
 
363
            labels=None):
 
364
        path = 'projects/%s/merge_requests' % source_project_id
 
365
        fields = {
 
366
            'title': title,
 
367
            'source_branch': source_branch_name,
 
368
            'target_branch': target_branch_name,
 
369
            'target_project_id': target_project_id,
 
370
            'description': description,
 
371
            }
 
372
        if labels:
 
373
            fields['labels'] = labels
 
374
        response = self._api_request('POST', path, fields=fields)
 
375
        if response.status == 403:
 
376
            raise errors.PermissionDenied(response.text)
 
377
        if response.status == 409:
 
378
            raise MergeProposalExists(self.source_branch.user_url)
 
379
        if response.status != 201:
 
380
            raise errors.InvalidHttpResponse(path, response.text)
 
381
        return json.loads(response.data)
184
382
 
185
383
    def get_push_url(self, branch):
186
 
        (host, project_name, branch_name) = parse_gitlab_url(branch)
187
 
        project = self.gl.projects.get(project_name)
 
384
        (host, project_name, branch_name) = parse_gitlab_branch_url(branch)
 
385
        project = self._get_project(project_name)
188
386
        return gitlab_url_to_bzr_url(
189
 
            project.ssh_url_to_repo, branch_name)
 
387
            project['ssh_url_to_repo'], branch_name)
190
388
 
191
389
    def publish_derived(self, local_branch, base_branch, name, project=None,
192
390
                        owner=None, revision_id=None, overwrite=False,
193
391
                        allow_lossy=True):
194
 
        import gitlab
195
 
        (host, base_project, base_branch_name) = parse_gitlab_url(base_branch)
196
 
        self.gl.auth()
197
 
        try:
198
 
            base_project = self.gl.projects.get(base_project)
199
 
        except gitlab.GitlabGetError as e:
200
 
            if e.response_code == 404:
201
 
                raise NoSuchProject(base_project)
202
 
            else:
203
 
                raise
 
392
        (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
204
393
        if owner is None:
205
 
            owner = self.gl.user.username
 
394
            owner = self._get_logged_in_username()
206
395
        if project is None:
207
 
            project = base_project.path
 
396
            project = self._get_project(base_project)['path']
208
397
        try:
209
 
            target_project = self.gl.projects.get('%s/%s' % (owner, project))
210
 
        except gitlab.GitlabGetError as e:
211
 
            if e.response_code == 404:
212
 
                target_project = base_project.forks.create({})
213
 
            else:
214
 
                raise
215
 
        remote_repo_url = git_url_to_bzr_url(target_project.ssh_url_to_repo)
 
398
            target_project = self._get_project('%s/%s' % (owner, project))
 
399
        except NoSuchProject:
 
400
            target_project = self._fork_project(base_project)
 
401
        remote_repo_url = git_url_to_bzr_url(target_project['ssh_url_to_repo'])
216
402
        remote_dir = controldir.ControlDir.open(remote_repo_url)
217
403
        try:
218
404
            push_result = remote_dir.push_branch(
225
411
                local_branch, revision_id=revision_id, overwrite=overwrite,
226
412
                name=name, lossy=True)
227
413
        public_url = gitlab_url_to_bzr_url(
228
 
            target_project.http_url_to_repo, name)
 
414
            target_project['http_url_to_repo'], name)
229
415
        return push_result.target_branch, public_url
230
416
 
231
417
    def get_derived_branch(self, base_branch, name, project=None, owner=None):
232
 
        import gitlab
233
 
        (host, base_project, base_branch_name) = parse_gitlab_url(base_branch)
234
 
        self.gl.auth()
235
 
        try:
236
 
            base_project = self.gl.projects.get(base_project)
237
 
        except gitlab.GitlabGetError as e:
238
 
            if e.response_code == 404:
239
 
                raise NoSuchProject(base_project)
240
 
            else:
241
 
                raise
 
418
        (host, base_project, base_branch_name) = parse_gitlab_branch_url(base_branch)
242
419
        if owner is None:
243
 
            owner = self.gl.user.username
 
420
            owner = self._get_logged_in_username()
244
421
        if project is None:
245
 
            project = base_project.path
 
422
            project = self._get_project(base_project)['path']
246
423
        try:
247
 
            target_project = self.gl.projects.get('%s/%s' % (owner, project))
248
 
        except gitlab.GitlabGetError as e:
249
 
            if e.response_code == 404:
250
 
                raise errors.NotBranchError('%s/%s/%s' % (self.gl.url, owner, project))
251
 
            raise
 
424
            target_project = self._get_project('%s/%s' % (owner, project))
 
425
        except NoSuchProject:
 
426
            raise errors.NotBranchError('%s/%s/%s' % (self.base_url, owner, project))
252
427
        return _mod_branch.Branch.open(gitlab_url_to_bzr_url(
253
 
            target_project.ssh_url_to_repo, name))
 
428
            target_project['ssh_url_to_repo'], name))
254
429
 
255
430
    def get_proposer(self, source_branch, target_branch):
256
 
        return GitlabMergeProposalBuilder(self.gl, source_branch, target_branch)
 
431
        return GitlabMergeProposalBuilder(self, source_branch, target_branch)
257
432
 
258
433
    def iter_proposals(self, source_branch, target_branch, status):
259
 
        import gitlab
260
434
        (source_host, source_project_name, source_branch_name) = (
261
 
            parse_gitlab_url(source_branch))
 
435
            parse_gitlab_branch_url(source_branch))
262
436
        (target_host, target_project_name, target_branch_name) = (
263
 
            parse_gitlab_url(target_branch))
 
437
            parse_gitlab_branch_url(target_branch))
264
438
        if source_host != target_host:
265
439
            raise DifferentGitLabInstances(source_host, target_host)
266
 
        self.gl.auth()
267
 
        source_project = self.gl.projects.get(source_project_name)
268
 
        target_project = self.gl.projects.get(target_project_name)
 
440
        source_project = self._get_project(source_project_name)
 
441
        target_project = self._get_project(target_project_name)
269
442
        state = mp_status_to_status(status)
270
 
        try:
271
 
            for mr in target_project.mergerequests.list(state=state):
272
 
                if (mr.source_project_id != source_project.id or
273
 
                        mr.source_branch != source_branch_name or
274
 
                        mr.target_project_id != target_project.id or
275
 
                        mr.target_branch != target_branch_name):
276
 
                    continue
277
 
                yield GitLabMergeProposal(mr)
278
 
        except gitlab.GitlabListError as e:
279
 
            if e.response_code == 403:
280
 
                raise errors.PermissionDenied(e.error_message)
 
443
        for mr in self._list_merge_requests(
 
444
                project=target_project['id'], state=state):
 
445
            if (mr['source_project_id'] != source_project['id'] or
 
446
                    mr['source_branch'] != source_branch_name or
 
447
                    mr['target_project_id'] != target_project['id'] or
 
448
                    mr['target_branch'] != target_branch_name):
 
449
                continue
 
450
            yield GitLabMergeProposal(self, mr)
281
451
 
282
452
    def hosts(self, branch):
283
453
        try:
284
 
            (host, project, branch_name) = parse_gitlab_url(branch)
 
454
            (host, project, branch_name) = parse_gitlab_branch_url(branch)
285
455
        except NotGitLabUrl:
286
456
            return False
287
 
        return (self.gl.url == ('https://%s' % host))
 
457
        return (self.base_url == ('https://%s' % host))
288
458
 
289
 
    @classmethod
290
 
    def probe(cls, branch):
291
 
        try:
292
 
            (host, project, branch_name) = parse_gitlab_url(branch)
293
 
        except NotGitLabUrl:
294
 
            raise UnsupportedHoster(branch)
295
 
        import gitlab
296
 
        import requests.exceptions
297
 
        try:
298
 
            gl = connect_gitlab(host)
299
 
            gl.auth()
300
 
        except requests.exceptions.SSLError:
301
 
            # Well, I guess it could be..
302
 
            raise UnsupportedHoster(branch)
303
 
        except gitlab.GitlabGetError:
304
 
            raise UnsupportedHoster(branch)
305
 
        except gitlab.GitlabHttpError as e:
306
 
            if e.response_code in (404, 405, 503):
307
 
                raise UnsupportedHoster(branch)
 
459
    def check(self):
 
460
        response = self._api_request('GET', 'user')
 
461
        if response.status == 200:
 
462
            self._current_user = json.loads(response.data)
 
463
            return
 
464
        if response == 401:
 
465
            if json.loads(response.data) == {"message": "401 Unauthorized"}:
 
466
                raise GitLabLoginMissing()
308
467
            else:
309
 
                raise
310
 
        return cls(gl)
 
468
                raise GitlabLoginError(response.text)
 
469
        raise UnsupportedHoster(url)
 
470
 
 
471
    @classmethod
 
472
    def probe_from_url(cls, url, possible_transports=None):
 
473
        try:
 
474
            (host, project) = parse_gitlab_url(url)
 
475
        except NotGitLabUrl:
 
476
            raise UnsupportedHoster(url)
 
477
        transport = get_transport(
 
478
            'https://%s' % host, possible_transports=possible_transports)
 
479
        credentials = get_credentials_by_url(transport.base)
 
480
        if credentials is not None:
 
481
            return cls(transport, credentials.get('private_token'))
 
482
        raise UnsupportedHoster(url)
311
483
 
312
484
    @classmethod
313
485
    def iter_instances(cls):
314
 
        from gitlab import Gitlab
315
486
        for name, credentials in iter_tokens():
316
487
            if 'url' not in credentials:
317
488
                continue
318
 
            gl = Gitlab(**credentials)
319
 
            yield cls(gl)
 
489
            yield cls(
 
490
                get_transport(credentials['url']),
 
491
                private_token=credentials.get('private_token'))
320
492
 
321
493
    def iter_my_proposals(self, status='open'):
322
494
        state = mp_status_to_status(status)
323
 
        self.gl.auth()
324
 
        for mp in self.gl.mergerequests.list(
325
 
                owner=self.gl.user.username, state=state):
326
 
            yield GitLabMergeProposal(mp)
 
495
        for mp in self._list_merge_requests(
 
496
                owner=self._get_logged_in_username(), state=state):
 
497
            yield GitLabMergeProposal(self, mp)
 
498
 
 
499
    def get_proposal_by_url(self, url):
 
500
        try:
 
501
            (host, project, merge_id) = parse_gitlab_merge_request_url(url)
 
502
        except NotGitLabUrl:
 
503
            raise UnsupportedHoster(url)
 
504
        except NotMergeRequestUrl as e:
 
505
            if self.base_url == ('https://%s' % e.host):
 
506
                raise
 
507
            else:
 
508
                raise UnsupportedHoster(url)
 
509
        if self.base_url != ('https://%s' % host):
 
510
            raise UnsupportedHoster(url)
 
511
        project = self._get_project(project)
 
512
        mr = project.mergerequests.get(merge_id)
 
513
        return GitLabMergeProposal(mr)
327
514
 
328
515
 
329
516
class GitlabMergeProposalBuilder(MergeProposalBuilder):
332
519
        self.gl = gl
333
520
        self.source_branch = source_branch
334
521
        (self.source_host, self.source_project_name, self.source_branch_name) = (
335
 
            parse_gitlab_url(source_branch))
 
522
            parse_gitlab_branch_url(source_branch))
336
523
        self.target_branch = target_branch
337
524
        (self.target_host, self.target_project_name, self.target_branch_name) = (
338
 
            parse_gitlab_url(target_branch))
 
525
            parse_gitlab_branch_url(target_branch))
339
526
        if self.source_host != self.target_host:
340
527
            raise DifferentGitLabInstances(self.source_host, self.target_host)
341
528
 
355
542
        return None
356
543
 
357
544
    def create_proposal(self, description, reviewers=None, labels=None,
358
 
                        prerequisite_branch=None):
 
545
                        prerequisite_branch=None, commit_message=None):
359
546
        """Perform the submission."""
 
547
        # https://docs.gitlab.com/ee/api/merge_requests.html#create-mr
360
548
        if prerequisite_branch is not None:
361
549
            raise PrerequisiteBranchUnsupported(self)
362
 
        import gitlab
363
 
        # TODO(jelmer): Support reviewers
364
 
        self.gl.auth()
365
 
        source_project = self.gl.projects.get(self.source_project_name)
366
 
        target_project = self.gl.projects.get(self.target_project_name)
 
550
        # Note that commit_message is ignored, since Gitlab doesn't support it.
 
551
        source_project = self.gl._get_project(self.source_project_name)
 
552
        target_project = self.gl._get_project(self.target_project_name)
367
553
        # TODO(jelmer): Allow setting title explicitly
368
554
        title = description.splitlines()[0]
369
555
        # TODO(jelmer): Allow setting allow_collaboration field
371
557
        # TODO(jelmer): Allow setting squash field
372
558
        kwargs = {
373
559
            'title': title,
374
 
            'target_project_id': target_project.id,
375
 
            'source_branch': self.source_branch_name,
376
 
            'target_branch': self.target_branch_name,
 
560
            'source_project_id': source_project['id'],
 
561
            'target_project_id': target_project['id'],
 
562
            'source_branch_name': self.source_branch_name,
 
563
            'target_branch_name': self.target_branch_name,
377
564
            'description': description}
378
565
        if labels:
379
566
            kwargs['labels'] = ','.join(labels)
380
 
        try:
381
 
            merge_request = source_project.mergerequests.create(kwargs)
382
 
        except gitlab.GitlabCreateError as e:
383
 
            if e.response_code == 403:
384
 
                raise errors.PermissionDenied(e.error_message)
385
 
            if e.response_code == 409:
386
 
                raise MergeProposalExists(self.source_branch.user_url)
387
 
            raise
388
 
        return GitLabMergeProposal(merge_request)
 
567
        if reviewers:
 
568
            kwargs['assignee_ids'] = []
 
569
            for reviewer in reviewers:
 
570
                if '@' in reviewer:
 
571
                    user = self.gl._get_user_by_email(reviewer)
 
572
                else:
 
573
                    user = self.gl._get_user(reviewer)
 
574
                kwargs['assignee_ids'].append(user['id'])
 
575
        merge_request = self.gl._create_mergerequest(**kwargs)
 
576
        return GitLabMergeProposal(self.gl, merge_request)
389
577
 
390
578
 
391
579
def register_gitlab_instance(shortname, url):