/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: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/remote.py
49
49
    UninitializableFormat,
50
50
    )
51
51
from ..revisiontree import RevisionTree
52
 
from ..sixish import (
53
 
    text_type,
54
 
    viewitems,
55
 
    )
56
52
from ..transport import (
57
53
    Transport,
58
54
    register_urlparse_netloc_protocol,
122
118
import select
123
119
import tempfile
124
120
 
125
 
try:
126
 
    import urllib.parse as urlparse
127
 
    from urllib.parse import splituser
128
 
except ImportError:
129
 
    import urlparse
130
 
    from urllib import splituser
 
121
import urllib.parse as urlparse
 
122
from urllib.parse import splituser
131
123
 
132
124
# urlparse only supports a limited number of schemes by default
133
125
register_urlparse_netloc_protocol('git')
594
586
                        source, self.open_branch(name, nascent_ok=True))
595
587
            ret[refname] = new_sha
596
588
            if fetch_tags:
597
 
                for tagname, revid in viewitems(source.tags.get_tag_dict()):
 
589
                for tagname, revid in source.tags.get_tag_dict().items():
598
590
                    if lossy:
599
591
                        new_sha = source_store._lookup_revision_sha1(revid)
600
592
                    else:
998
990
            if peeled is None:
999
991
                # Let's just hope it's a commit
1000
992
                peeled = unpeeled
1001
 
            if not isinstance(tag_name, text_type):
 
993
            if not isinstance(tag_name, str):
1002
994
                raise TypeError(tag_name)
1003
995
            yield (ref_name, tag_name, peeled, unpeeled)
1004
996