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

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/urls.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from breezy.urlutils import URL, quote
 
21
from .. import urlutils
 
22
from .refs import (
 
23
    ref_to_branch_name,
 
24
    )
22
25
 
23
26
from dulwich.client import parse_rsync_url
24
27
 
26
29
KNOWN_GIT_SCHEMES = ['git+ssh', 'git', 'http', 'https', 'ftp']
27
30
 
28
31
 
29
 
def git_url_to_bzr_url(location):
30
 
    url = URL.from_string(location)
31
 
    if url.scheme not in KNOWN_GIT_SCHEMES and not url.scheme.startswith('chroot-'):
 
32
def git_url_to_bzr_url(location, branch=None, ref=None):
 
33
    if branch is not None and ref is not None:
 
34
        raise ValueError('only specify one of branch or ref')
 
35
    url = urlutils.URL.from_string(location)
 
36
    if (url.scheme not in KNOWN_GIT_SCHEMES and
 
37
            not url.scheme.startswith('chroot-')):
32
38
        try:
33
39
            (username, host, path) = parse_rsync_url(location)
34
40
        except ValueError:
35
41
            return location
36
42
        else:
37
 
            url = URL(
38
 
                    scheme='git+ssh',
39
 
                    quoted_user=(quote(username) if username else None),
40
 
                    quoted_password=None,
41
 
                    quoted_host=quote(host),
42
 
                    port=None,
43
 
                    quoted_path=quote(path, safe="/~"))
44
 
        return str(url)
45
 
    else:
46
 
        return location
 
43
            url = urlutils.URL(
 
44
                scheme='git+ssh',
 
45
                quoted_user=(urlutils.quote(username) if username else None),
 
46
                quoted_password=None,
 
47
                quoted_host=urlutils.quote(host),
 
48
                port=None,
 
49
                quoted_path=urlutils.quote(path, safe="/~"))
 
50
        location = str(url)
 
51
    if ref == b'HEAD':
 
52
        ref = branch = None
 
53
    if ref:
 
54
        try:
 
55
            branch = ref_to_branch_name(ref)
 
56
        except ValueError:
 
57
            branch = None
 
58
        else:
 
59
            ref = None
 
60
    if ref or branch:
 
61
        params = {}
 
62
        if ref:
 
63
            params['ref'] = urlutils.quote_from_bytes(ref, safe='')
 
64
        if branch:
 
65
            params['branch'] = urlutils.escape(branch, safe='')
 
66
        location = urlutils.join_segment_parameters(location, params)
 
67
    return location
 
68
 
 
69
 
 
70
def bzr_url_to_git_url(location):
 
71
    target_url, target_params = urlutils.split_segment_parameters(location)
 
72
    branch = target_params.get('branch')
 
73
    ref = target_params.get('ref')
 
74
    return target_url, branch, ref