/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: Jelmer Vernooij
  • Date: 2020-02-21 04:28:46 UTC
  • mfrom: (7494 work)
  • mto: This revision was merged to the branch mainline in revision 7496.
  • Revision ID: jelmer@jelmer.uk-20200221042846-r8lzqu0jetkw772i
Merge trunk.

Show diffs side-by-side

added added

removed removed

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