← Back to branch summary

~jelmer/brz/byov-trunk

« 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-03-22 02:17:16 UTC
  • mfrom: (7498.1.1 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200322021716-zt9rlebq0z6asuad
Merge lp:brz/3.1.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/gitlabs.py
97
97
        self.error = error
98
98
 
99
99
 
 
100
class MergeRequestExists(Exception):
 
101
    """Raised when a merge requests already exists."""
 
102
 
 
103
 
100
104
def default_config_path():
101
105
    return os.path.join(bedding.config_dir(), 'gitlab.conf')
102
106
 
401
405
        if response.status == 403:
402
406
            raise errors.PermissionDenied(response.text)
403
407
        if response.status == 409:
404
 
            raise MergeProposalExists(self.source_branch.user_url)
 
408
            raise MergeRequestExists()
405
409
        if response.status != 201:
406
410
            raise errors.InvalidHttpResponse(path, response.text)
407
411
        return json.loads(response.data)
616
620
                else:
617
621
                    user = self.gl._get_user(reviewer)
618
622
                kwargs['assignee_ids'].append(user['id'])
619
 
        merge_request = self.gl._create_mergerequest(**kwargs)
 
623
        try:
 
624
            merge_request = self.gl._create_mergerequest(**kwargs)
 
625
        except MergeRequestExists:
 
626
            raise ProposalExists(self.source_branch.user_url)
620
627
        return GitLabMergeProposal(self.gl, merge_request)
621
628
 
622
629