/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/interrepo.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-03 23:21:15 UTC
  • mfrom: (7290.42.6 paramiko-compat)
  • Revision ID: breezy.the.bot@gmail.com-20200203232115-g7k11bhsfeiqcprv
Fix compatibility with newer versions of paramiko, which break on noise before keys in pem files.

Merged from https://code.launchpad.net/~jelmer/brz/paramiko-compat/+merge/378480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/interrepo.py
52
52
from ..revision import (
53
53
    NULL_REVISION,
54
54
    )
 
55
from ..sixish import (
 
56
    viewitems,
 
57
    viewvalues,
 
58
    )
55
59
from .. import (
56
60
    config,
57
61
    trace,
224
228
                        new_stop_revids.append(revid)
225
229
                stop_revids = set()
226
230
                parent_map = graph.get_parent_map(new_stop_revids)
227
 
                for parent_revids in parent_map.values():
 
231
                for parent_revids in viewvalues(parent_map):
228
232
                    stop_revids.update(parent_revids)
229
233
                pb.update("determining revisions to fetch", len(missing))
230
234
        return graph.iter_topo_order(missing)
267
271
                 for (git_sha, bzr_revid) in new_refs.values()
268
272
                 if git_sha is None or not git_sha.startswith(SYMREF)],
269
273
                lossy=lossy)
270
 
            for name, (gitid, revid) in new_refs.items():
 
274
            for name, (gitid, revid) in viewitems(new_refs):
271
275
                if gitid is None:
272
276
                    try:
273
277
                        gitid = revidmap[revid][0]
357
361
        def git_update_refs(old_refs):
358
362
            ret = {}
359
363
            self.old_refs = {
360
 
                k: (v, None) for (k, v) in old_refs.items()}
 
364
                k: (v, None) for (k, v) in viewitems(old_refs)}
361
365
            new_refs = update_refs(self.old_refs)
362
 
            for name, (gitid, revid) in new_refs.items():
 
366
            for name, (gitid, revid) in viewitems(new_refs):
363
367
                if gitid is None:
364
368
                    git_sha = self.source_store._lookup_revision_sha1(revid)
365
369
                    gitid = unpeel_map.re_unpeel_tag(
410
414
 
411
415
        def determine_wants(refs):
412
416
            unpeel_lookup = {}
413
 
            for k, v in refs.items():
 
417
            for k, v in viewitems(refs):
414
418
                if k.endswith(ANNOTATED_TAG_SUFFIX):
415
419
                    unpeel_lookup[v] = refs[k[:-len(ANNOTATED_TAG_SUFFIX)]]
416
420
            potential = set([unpeel_lookup.get(w, w) for w in wants])
417
421
            if include_tags:
418
 
                for k, sha in refs.items():
 
422
                for k, sha in viewitems(refs):
419
423
                    if k.endswith(ANNOTATED_TAG_SUFFIX):
420
424
                        continue
421
425
                    if not is_tag(k):
454
458
            if if_present_ids is not None:
455
459
                todo.update(if_present_ids)
456
460
        result_set = todo.difference(self.target.all_revision_ids())
457
 
        result_parents = set(itertools.chain.from_iterable(
458
 
            self.source.get_graph().get_parent_map(result_set).values()))
 
461
        result_parents = set(itertools.chain.from_iterable(viewvalues(
 
462
            self.source.get_graph().get_parent_map(result_set))))
459
463
        included_keys = result_set.intersection(result_parents)
460
464
        start_keys = result_set.difference(included_keys)
461
465
        exclude_keys = result_parents.difference(result_set)
480
484
 
481
485
    def determine_wants_all(self, refs):
482
486
        potential = set()
483
 
        for k, v in refs.items():
 
487
        for k, v in viewitems(refs):
484
488
            # For non-git target repositories, only worry about peeled
485
489
            if v == ZERO_SHA:
486
490
                continue
553
557
        all_revs = self.target.all_revision_ids()
554
558
        parent_map = self.target.get_parent_map(all_revs)
555
559
        all_parents = set()
556
 
        for values in parent_map.values():
 
560
        for values in viewvalues(parent_map):
557
561
            all_parents.update(values)
558
562
        return set(all_revs) - all_parents
559
563
 
637
641
 
638
642
        def determine_wants(heads):
639
643
            old_refs = dict([(k, (v, None))
640
 
                             for (k, v) in heads.as_dict().items()])
 
644
                             for (k, v) in viewitems(heads.as_dict())])
641
645
            new_refs = update_refs(old_refs)
642
646
            ref_changes.update(new_refs)
643
 
            return [sha1 for (sha1, bzr_revid) in new_refs.values()]
 
647
            return [sha1 for (sha1, bzr_revid) in viewvalues(new_refs)]
644
648
        self.fetch_objects(determine_wants, lossy=lossy)
645
 
        for k, (git_sha, bzr_revid) in ref_changes.items():
 
649
        for k, (git_sha, bzr_revid) in viewitems(ref_changes):
646
650
            self.target._git.refs[k] = git_sha
647
651
        new_refs = self.target.controldir.get_refs_container()
648
652
        return None, old_refs, new_refs
696
700
    def get_determine_wants_branches(self, branches, include_tags=False):
697
701
        def determine_wants(refs):
698
702
            ret = []
699
 
            for name, value in refs.items():
 
703
            for name, value in viewitems(refs):
700
704
                if value == ZERO_SHA:
701
705
                    continue
702
706