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

Fix URLs from gitlab.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gitlabs.py
17
17
from __future__ import absolute_import
18
18
 
19
19
from ... import (
 
20
    branch as _mod_branch,
20
21
    controldir,
21
22
    errors,
22
23
    urlutils,
154
155
                raise errors.NotBranchError('%s/%s/%s' % (self.gl.url, owner, project))
155
156
            raise
156
157
        remote_repo_url = git_url_to_bzr_url(target_project.attributes['ssh_url_to_repo'])
157
 
        remote_dir = controldir.ControlDir.open(remote_repo_url)
158
 
        return remote_dir.open_branch(name=name)
 
158
        return _mod_branch.Branch.open(urlutils.join_segment_parameters(
 
159
                remote_repo_url, {"branch": name.encode('utf-8')}))
159
160
 
160
161
    def get_proposer(self, source_branch, target_branch):
161
162
        return GitlabMergeProposalBuilder(self.gl, source_branch, target_branch)