/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 03:20:44 UTC
  • mfrom: (7018.3.10 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180703032044-t5a5w5y0tmzrbezc
Port a few more bits of the git plugin to python 3.

Merged from https://code.launchpad.net/~jelmer/brz/git-fixes2/+merge/348803

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,
689
692
        :return: iterator over (ref_name, tag_name, peeled_sha1, unpeeled_sha1)
690
693
        """
691
694
        refs = self.repository._git.refs
692
 
        for ref_name, unpeeled in refs.as_dict().iteritems():
 
695
        for ref_name, unpeeled in viewitems(refs.as_dict()):
693
696
            try:
694
697
                tag_name = ref_to_tag_name(ref_name)
695
698
            except (ValueError, UnicodeDecodeError):
1014
1017
                    raise errors.DivergedBranches(self.source, self.target)
1015
1018
            refs = { self.target.ref: new_ref }
1016
1019
            result.new_revid = stop_revision
1017
 
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
 
1020
            for name, sha in viewitems(self.source.repository._git.refs.as_dict(b"refs/tags")):
1018
1021
                refs[tag_name_to_ref(name)] = sha
1019
1022
            return refs
1020
1023
        self.target.repository.send_pack(get_changed_refs,
1160
1163
        if fetch_tags is None:
1161
1164
            c = self.source.get_config_stack()
1162
1165
            fetch_tags = c.get('branch.fetch_tags')
1163
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
1166
        for name, revid in viewitems(self.source.tags.get_tag_dict()):
1164
1167
            if self.source.repository.has_revision(revid):
1165
1168
                ref = tag_name_to_ref(name)
1166
1169
                if not check_ref_format(ref):
1196
1199
            # that hasn't actually been updated.
1197
1200
            return False
1198
1201
        # FIXME: Check for diverged branches
1199
 
        for ref, (git_sha, revid) in new_refs.iteritems():
 
1202
        for ref, (git_sha, revid) in viewitems(new_refs):
1200
1203
            if ref_equals(ret, ref, git_sha, revid):
1201
1204
                # Already up to date
1202
1205
                if git_sha is None:
1231
1234
            stop_revision = self.source.last_revision()
1232
1235
        ret = []
1233
1236
        if fetch_tags:
1234
 
            for k, v in self.source.tags.get_tag_dict().iteritems():
 
1237
            for k, v in viewitems(self.source.tags.get_tag_dict()):
1235
1238
                ret.append((None, v))
1236
1239
        ret.append((None, stop_revision))
1237
1240
        try: