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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-01 21:13:21 UTC
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180701211321-dazu15ry3tcvny2l
Fix some git tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/branch.py
44
44
from ...revision import (
45
45
    NULL_REVISION,
46
46
    )
47
 
from ...sixish import text_type
 
47
from ...sixish import (
 
48
    text_type,
 
49
    viewitems,
 
50
    )
48
51
from ...trace import (
49
52
    is_quiet,
50
53
    mutter,
236
239
 
237
240
    def _set_tag_dict(self, to_dict):
238
241
        extra = set(self.refs.allkeys())
239
 
        for k, revid in to_dict.iteritems():
 
242
        for k, revid in viewitems(to_dict):
240
243
            name = tag_name_to_ref(k)
241
244
            if name in extra:
242
245
                extra.remove(name)
688
691
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
689
692
        """
690
693
        refs = self.repository._git.refs
691
 
        for ref_name, unpeeled in refs.as_dict().iteritems():
 
694
        for ref_name, unpeeled in viewitems(refs.as_dict()):
692
695
            try:
693
696
                tag_name = ref_to_tag_name(ref_name)
694
697
            except (ValueError, UnicodeDecodeError):
1013
1016
                    raise errors.DivergedBranches(self.source, self.target)
1014
1017
            refs = { self.target.ref: new_ref }
1015
1018
            result.new_revid = stop_revision
1016
 
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
 
1019
            for name, sha in viewitems(self.source.repository._git.refs.as_dict("refs/tags")):
1017
1020
                refs[tag_name_to_ref(name)] = sha
1018
1021
            return refs
1019
1022
        self.target.repository.send_pack(get_changed_refs,
1159
1162
        if fetch_tags is None:
1160
1163
            c = self.source.get_config_stack()
1161
1164
            fetch_tags = c.get('branch.fetch_tags')
1162
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
1165
        for name, revid in viewitems(self.source.tags.get_tag_dict()):
1163
1166
            if self.source.repository.has_revision(revid):
1164
1167
                ref = tag_name_to_ref(name)
1165
1168
                if not check_ref_format(ref):
1230
1233
            stop_revision = self.source.last_revision()
1231
1234
        ret = []
1232
1235
        if fetch_tags:
1233
 
            for k, v in self.source.tags.get_tag_dict().iteritems():
 
1236
            for k, v in viewitems(self.source.tags.get_tag_dict()):
1234
1237
                ret.append((None, v))
1235
1238
        ret.append((None, stop_revision))
1236
1239
        try: