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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-08-12 19:51:40 UTC
  • mfrom: (7380.1.2 more-git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20190812195140-guyldqnadc30atyj
Several more fixes for git merge proposals.

Merged from https://code.launchpad.net/~jelmer/brz/more-git-fixes/+merge/371172

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/github.py
117
117
        return self._pr['html_url']
118
118
 
119
119
    def _branch_from_part(self, part):
 
120
        if part['repo'] is None:
 
121
            return None
120
122
        return github_url_to_bzr_url(part['repo']['html_url'], part['ref'])
121
123
 
122
124
    def get_source_branch_url(self):
137
139
    def _patch(self, data):
138
140
        response = self._gh._api_request(
139
141
            'PATCH', self._pr['url'], body=json.dumps(data).encode('utf-8'))
140
 
        if response != 200:
 
142
        if response.status != 200:
141
143
            raise InvalidHttpResponse(self._pr['url'], response.text)
142
144
        self._pr = json.loads(response.text)
143
145
 
153
155
    def close(self):
154
156
        self._patch({'state': 'closed'})
155
157
 
 
158
    def can_be_merged(self):
 
159
        return self._pr['mergeable']
 
160
 
156
161
    def merge(self, commit_message=None):
157
162
        # https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
158
163
        self._pr.merge(commit_message=commit_message)
199
204
            headers['Authorization'] = 'token %s' % self._token
200
205
        response = self.transport.request(
201
206
            method, urlutils.join(self.transport.base, path),
202
 
            headers=headers, body=body)
 
207
            headers=headers, body=body, retries=3)
203
208
        if response.status == 401:
204
209
            raise GitHubLoginRequired(self)
205
210
        return response