/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-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

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,
230
224
                        new_stop_revids.append(revid)
231
225
                stop_revids = set()
232
226
                parent_map = graph.get_parent_map(new_stop_revids)
233
 
                for parent_revids in viewvalues(parent_map):
 
227
                for parent_revids in parent_map.values():
234
228
                    stop_revids.update(parent_revids)
235
229
                pb.update("determining revisions to fetch", len(missing))
236
230
        return graph.iter_topo_order(missing)
249
243
                # broken symref?
250
244
                continue
251
245
            revid = None
252
 
            if not v.startswith(SYMREF):
 
246
            if v and not v.startswith(SYMREF):
253
247
                try:
254
248
                    for (kind, type_data) in self.source_store.lookup_git_sha(
255
249
                            v):
273
267
                 for (git_sha, bzr_revid) in new_refs.values()
274
268
                 if git_sha is None or not git_sha.startswith(SYMREF)],
275
269
                lossy=lossy)
276
 
            for name, (gitid, revid) in viewitems(new_refs):
 
270
            for name, (gitid, revid) in new_refs.items():
277
271
                if gitid is None:
278
272
                    try:
279
273
                        gitid = revidmap[revid][0]
315
309
                        try:
316
310
                            self.mapping.revision_id_bzr_to_foreign(old_revid)
317
311
                        except InvalidRevisionId:
318
 
                            refname = self.mapping.revid_as_refname(old_revid)
319
 
                            self.target_refs[refname] = git_sha
 
312
                            pass
320
313
                    revidmap[old_revid] = (git_sha, new_revid)
321
314
                self.target_store.add_objects(object_generator)
322
315
                return revidmap
363
356
        def git_update_refs(old_refs):
364
357
            ret = {}
365
358
            self.old_refs = {
366
 
                k: (v, None) for (k, v) in viewitems(old_refs)}
 
359
                k: (v, None) for (k, v) in old_refs.items()}
367
360
            new_refs = update_refs(self.old_refs)
368
 
            for name, (gitid, revid) in viewitems(new_refs):
 
361
            for name, (gitid, revid) in new_refs.items():
369
362
                if gitid is None:
370
363
                    git_sha = self.source_store._lookup_revision_sha1(revid)
371
364
                    gitid = unpeel_map.re_unpeel_tag(
424
417
 
425
418
        def determine_wants(refs):
426
419
            unpeel_lookup = {}
427
 
            for k, v in viewitems(refs):
 
420
            for k, v in refs.items():
428
421
                if k.endswith(ANNOTATED_TAG_SUFFIX):
429
422
                    unpeel_lookup[v] = refs[k[:-len(ANNOTATED_TAG_SUFFIX)]]
430
423
            potential = set([unpeel_lookup.get(w, w) for w in wants])
431
424
            if include_tags:
432
 
                for k, sha in viewitems(refs):
 
425
                for k, sha in refs.items():
433
426
                    if k.endswith(ANNOTATED_TAG_SUFFIX):
434
427
                        continue
435
428
                    try:
472
465
            if if_present_ids is not None:
473
466
                todo.update(if_present_ids)
474
467
        result_set = todo.difference(self.target.all_revision_ids())
475
 
        result_parents = set(itertools.chain.from_iterable(viewvalues(
476
 
            self.source.get_graph().get_parent_map(result_set))))
 
468
        result_parents = set(itertools.chain.from_iterable(
 
469
            self.source.get_graph().get_parent_map(result_set).values()))
477
470
        included_keys = result_set.intersection(result_parents)
478
471
        start_keys = result_set.difference(included_keys)
479
472
        exclude_keys = result_parents.difference(result_set)
498
491
 
499
492
    def determine_wants_all(self, refs):
500
493
        potential = set()
501
 
        for k, v in viewitems(refs):
 
494
        for k, v in refs.items():
502
495
            # For non-git target repositories, only worry about peeled
503
496
            if v == ZERO_SHA:
504
497
                continue
572
565
        all_revs = self.target.all_revision_ids()
573
566
        parent_map = self.target.get_parent_map(all_revs)
574
567
        all_parents = set()
575
 
        for values in viewvalues(parent_map):
 
568
        for values in parent_map.values():
576
569
            all_parents.update(values)
577
570
        return set(all_revs) - all_parents
578
571
 
656
649
 
657
650
        def determine_wants(heads):
658
651
            old_refs = dict([(k, (v, None))
659
 
                             for (k, v) in viewitems(heads.as_dict())])
 
652
                             for (k, v) in heads.as_dict().items()])
660
653
            new_refs = update_refs(old_refs)
661
654
            ref_changes.update(new_refs)
662
 
            return [sha1 for (sha1, bzr_revid) in viewvalues(new_refs)]
 
655
            return [sha1 for (sha1, bzr_revid) in new_refs.values()]
663
656
        self.fetch_objects(determine_wants, lossy=lossy)
664
 
        for k, (git_sha, bzr_revid) in viewitems(ref_changes):
 
657
        for k, (git_sha, bzr_revid) in ref_changes.items():
665
658
            self.target._git.refs[k] = git_sha
666
659
        new_refs = self.target.controldir.get_refs_container()
667
660
        return None, old_refs, new_refs
715
708
    def get_determine_wants_branches(self, branches, include_tags=False):
716
709
        def determine_wants(refs):
717
710
            ret = []
718
 
            for name, value in viewitems(refs):
 
711
            for name, value in refs.items():
719
712
                if value == ZERO_SHA:
720
713
                    continue
721
714