/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-04-27 15:40:17 UTC
  • mto: This revision was merged to the branch mainline in revision 7317.
  • Revision ID: jelmer@jelmer.uk-20190427154017-6v7fdfooyn389f1r
Add 'brz land' subcommand.

Show diffs side-by-side

added added

removed removed

Lines of Context:
164
164
        self._mr.state_event = 'close'
165
165
        self._mr.save()
166
166
 
 
167
    def merge(self, commit_message=None):
 
168
        # https://docs.gitlab.com/ee/api/merge_requests.html#accept-mr
 
169
        self._mr.merge(merge_commit_message=commit_message)
 
170
 
167
171
 
168
172
def gitlab_url_to_bzr_url(url, name):
169
173
    if not PY3:
330
334
                owner=self.gl.user.username, state=state):
331
335
            yield GitLabMergeProposal(mp)
332
336
 
 
337
    def get_proposal_by_url(self, url):
 
338
        raise UnsupportedHoster(url)
 
339
 
333
340
 
334
341
class GitlabMergeProposalBuilder(MergeProposalBuilder):
335
342