/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/interrepo.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/interrepo.py
48
48
from ...revision import (
49
49
    NULL_REVISION,
50
50
    )
 
51
from ...sixish import (
 
52
    viewitems,
 
53
    )
51
54
from ... import (
52
55
    config,
53
56
    trace,
220
223
                        new_stop_revids.append(revid)
221
224
                stop_revids = set()
222
225
                parent_map = graph.get_parent_map(new_stop_revids)
223
 
                for parent_revids in parent_map.itervalues():
 
226
                for parent_revids in viewvalues(parent_map):
224
227
                    stop_revids.update(parent_revids)
225
228
                pb.update("determining revisions to fetch", len(missing))
226
229
        finally:
260
263
            new_refs = update_refs(old_refs)
261
264
            revidmap = self.fetch_objects(
262
265
                [(git_sha, bzr_revid) for (git_sha, bzr_revid) in new_refs.values() if git_sha is None or not git_sha.startswith(SYMREF)], lossy=lossy)
263
 
            for name, (gitid, revid) in new_refs.iteritems():
 
266
            for name, (gitid, revid) in viewitems(new_refs):
264
267
                if gitid is None:
265
268
                    try:
266
269
                        gitid = revidmap[revid][0]
344
347
        revidmap = {}
345
348
        def determine_wants(old_refs):
346
349
            ret = {}
347
 
            self.old_refs = dict([(k, (v, None)) for (k, v) in old_refs.iteritems()])
 
350
            self.old_refs = dict([(k, (v, None)) for (k, v) in viewitems(old_refs)])
348
351
            self.new_refs = update_refs(self.old_refs)
349
 
            for name, (gitid, revid) in self.new_refs.iteritems():
 
352
            for name, (gitid, revid) in viewitems(self.new_refs):
350
353
                if gitid is None:
351
354
                    git_sha = self.source_store._lookup_revision_sha1(revid)
352
355
                    gitid = unpeel_map.re_unpeel_tag(git_sha, old_refs.get(name))
395
398
        def determine_wants(refs):
396
399
            potential = set(wants)
397
400
            if include_tags:
398
 
                for k, unpeeled in refs.iteritems():
399
 
                    if k.endswith("^{}"):
 
401
                for k, unpeeled in viewitems(refs):
 
402
                    if k.endswith(b"^{}"):
400
403
                        continue
401
404
                    if not is_tag(k):
402
405
                        continue
460
463
 
461
464
    def determine_wants_all(self, refs):
462
465
        potential = set()
463
 
        for k, v in refs.iteritems():
 
466
        for k, v in viewitems(refs):
464
467
            # For non-git target repositories, only worry about peeled
465
468
            if v == ZERO_SHA:
466
469
                continue
472
475
        def determine_wants(refs):
473
476
            potential = set(wants)
474
477
            if include_tags:
475
 
                for k, unpeeled in refs.iteritems():
 
478
                for k, unpeeled in viewitems(refs):
476
479
                    if not is_tag(k):
477
480
                        continue
478
481
                    if unpeeled == ZERO_SHA:
544
547
        all_revs = self.target.all_revision_ids()
545
548
        parent_map = self.target.get_parent_map(all_revs)
546
549
        all_parents = set()
547
 
        map(all_parents.update, parent_map.itervalues())
 
550
        map(all_parents.update, viewvalues(parent_map))
548
551
        return set(all_revs) - all_parents
549
552
 
550
553
    def fetch_objects(self, determine_wants, mapping, limit=None, lossy=False):
632
635
        old_refs = self.target.controldir.get_refs_container()
633
636
        ref_changes = {}
634
637
        def determine_wants(heads):
635
 
            old_refs = dict([(k, (v, None)) for (k, v) in heads.as_dict().iteritems()])
 
638
            old_refs = dict([(k, (v, None)) for (k, v) in viewitems(heads.as_dict())])
636
639
            new_refs = update_refs(old_refs)
637
640
            ref_changes.update(new_refs)
638
 
            return [sha1 for (sha1, bzr_revid) in new_refs.itervalues()]
 
641
            return [sha1 for (sha1, bzr_revid) in viewvalues(new_refs)]
639
642
        self.fetch_objects(determine_wants, lossy=lossy)
640
 
        for k, (git_sha, bzr_revid) in ref_changes.iteritems():
 
643
        for k, (git_sha, bzr_revid) in viewitems(ref_changes):
641
644
            self.target._git.refs[k] = git_sha
642
645
        new_refs = self.target.controldir.get_refs_container()
643
646
        return None, old_refs, new_refs
665
668
        if branches is not None:
666
669
            def determine_wants(refs):
667
670
                ret = []
668
 
                for name, value in refs.iteritems():
 
671
                for name, value in viewitems(refs):
669
672
                    if value == ZERO_SHA:
670
673
                        continue
671
674