/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: Jelmer Vernooij
  • Date: 2019-11-01 00:38:34 UTC
  • mto: This revision was merged to the branch mainline in revision 7411.
  • Revision ID: jelmer@jelmer.uk-20191101003834-v7fid0lgqjj17gkc
Fix fork creation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/github.py
333
333
        return self._list_paged(path, {'q': query}, per_page=DEFAULT_PER_PAGE)
334
334
 
335
335
    def _create_fork(self, repo, owner=None):
336
 
        (orig_owner, orig_repo) = repo.split('/')
337
 
        path = '/repos/:%s/:%s/forks' % (orig_owner, orig_repo)
338
 
        if owner:
 
336
        path = '/repos/%s/forks' % (repo, )
 
337
        if owner and owner != self._current_user['login']:
339
338
            path += '?organization=%s' % owner
340
339
        response = self._api_request('POST', path)
341
340
        if response.status != 202:
342
 
            raise InvalidHttpResponse(path, response.text)
 
341
            raise InvalidHttpResponse(path, 'status: %d, %r' % (response.status, response.text))
343
342
        return json.loads(response.text)
344
343
 
345
344
    @property
363
362
        try:
364
363
            remote_repo = self._get_repo('%s/%s' % (owner, project))
365
364
        except NoSuchProject:
366
 
            base_repo = self._get_repo('%s/%s' % (base_owner, base_project))
367
 
            remote_repo = self._create_fork(base_repo, owner)
 
365
            base_repo_path = '%s/%s' % (base_owner, base_project)
 
366
            base_repo = self._get_repo(base_repo_path)
 
367
            remote_repo = self._create_fork(base_repo_path, owner)
368
368
            note(gettext('Forking new repository %s from %s') %
369
369
                 (remote_repo['html_url'], base_repo['html_url']))
370
370
        else: