/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/remote.py
16
16
 
17
17
"""Remote dirs, repositories and branches."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
import gzip
20
22
from io import BytesIO
21
23
import re
48
50
    )
49
51
from ..revision import NULL_REVISION
50
52
from ..revisiontree import RevisionTree
 
53
from ..sixish import (
 
54
    text_type,
 
55
    viewitems,
 
56
    )
51
57
from ..transport import (
52
58
    Transport,
53
59
    register_urlparse_netloc_protocol,
117
123
import select
118
124
import tempfile
119
125
 
120
 
import urllib.parse as urlparse
121
 
from urllib.parse import splituser
 
126
try:
 
127
    import urllib.parse as urlparse
 
128
    from urllib.parse import splituser
 
129
except ImportError:
 
130
    import urlparse
 
131
    from urllib import splituser
122
132
 
123
133
# urlparse only supports a limited number of schemes by default
124
134
register_urlparse_netloc_protocol('git')
589
599
                        source, self.open_branch(name, nascent_ok=True))
590
600
            ret[actual_refname] = new_sha
591
601
            if fetch_tags:
592
 
                for tagname, revid in source.tags.get_tag_dict().items():
 
602
                for tagname, revid in viewitems(source.tags.get_tag_dict()):
593
603
                    if tag_selector and not tag_selector(tagname):
594
604
                        continue
595
605
                    if lossy:
999
1009
            if peeled is None:
1000
1010
                # Let's just hope it's a commit
1001
1011
                peeled = unpeeled
1002
 
            if not isinstance(tag_name, str):
 
1012
            if not isinstance(tag_name, text_type):
1003
1013
                raise TypeError(tag_name)
1004
1014
            yield (ref_name, tag_name, peeled, unpeeled)
1005
1015