/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/git/remote.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-12 15:16:27 UTC
  • mfrom: (7441.1.2 strip-segment-parameters)
  • Revision ID: breezy.the.bot@gmail.com-20200112151627-meh6feoulbz777ns
Add strip_segment_parameters function.

Merged from https://code.launchpad.net/~jelmer/brz/strip-segment-parameters/+merge/377479

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/remote.py
201
201
                message.endswith(' not found.'))):
202
202
        return NotBranchError(url, message)
203
203
    if message == "HEAD failed to update":
204
 
        base_url, _ = urlutils.split_segment_parameters(url)
 
204
        base_url = urlutils.strip_segment_parameters(url)
205
205
        return HeadUpdateFailed(base_url)
206
206
    if message.startswith('access denied or repository not exported:'):
207
207
        extra, path = message.split(':', 1)
677
677
        url = urlutils.URL.from_string(transport.external_url())
678
678
        url.user = url.quoted_user = None
679
679
        url.password = url.quoted_password = None
680
 
        url = urlutils.split_segment_parameters(str(url))[0]
 
680
        url = urlutils.strip_segment_parameters(str(url))
681
681
        super(BzrGitHttpClient, self).__init__(url, *args, **kwargs)
682
682
 
683
683
    def _http_request(self, url, headers=None, data=None,
741
741
 
742
742
 
743
743
def _git_url_and_path_from_transport(external_url):
744
 
    url, _ = urlutils.split_segment_parameters(external_url)
 
744
    url = urlutils.strip_segment_parameters(external_url)
745
745
    return urlparse.urlsplit(url)
746
746
 
747
747