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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-30 17:30:52 UTC
  • mfrom: (7464.3.2 drop-roundtripping)
  • Revision ID: breezy.the.bot@gmail.com-20200130173052-fedd479i21ci93dr
Drop more roundtripping support in Git.

Merged from https://code.launchpad.net/~jelmer/brz/drop-roundtripping/+merge/378336

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/repository.py
348
348
            o = self._git.object_store[sha]
349
349
            if not isinstance(o, Commit):
350
350
                continue
351
 
            revid = mapping.revision_id_foreign_to_bzr(o)
352
 
            roundtrip_revid = mapping.get_revision_id(o)
353
 
            yield o.id, revid, (roundtrip_revid if revid != roundtrip_revid else None)
 
351
            revid = mapping.revision_id_foreign_to_bzr(o.id)
 
352
            yield o.id, revid
354
353
 
355
354
    def all_revision_ids(self):
356
355
        ret = set()
357
 
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
358
 
            if roundtrip_revid:
359
 
                ret.add(roundtrip_revid)
360
 
            else:
361
 
                ret.add(revid)
 
356
        for git_sha, revid in self._iter_revision_ids():
 
357
            ret.add(revid)
362
358
        return list(ret)
363
359
 
364
360
    def _get_parents(self, revid, no_alternates=False):
508
504
            (git_sha, mapping) = mapping_registry.revision_id_bzr_to_foreign(
509
505
                bzr_revid)
510
506
        except errors.InvalidRevisionId:
511
 
            if mapping is None:
512
 
                mapping = self.get_mapping()
513
 
            try:
514
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
515
 
                        mapping)
516
 
            except KeyError:
517
 
                # Update refs from Git commit objects
518
 
                # FIXME: Hitting this a lot will be very inefficient...
519
 
                with ui.ui_factory.nested_progress_bar() as pb:
520
 
                    for i, (git_sha, revid, roundtrip_revid) in enumerate(
521
 
                            self._iter_revision_ids()):
522
 
                        if not roundtrip_revid:
523
 
                            continue
524
 
                        pb.update("resolving revision id", i)
525
 
                        refname = mapping.revid_as_refname(roundtrip_revid)
526
 
                        self._git.refs[refname] = git_sha
527
 
                        if roundtrip_revid == bzr_revid:
528
 
                            return git_sha, mapping
529
 
                raise errors.NoSuchRevision(self, bzr_revid)
 
507
            raise errors.NoSuchRevision(self, bzr_revid)
530
508
        else:
531
509
            return (git_sha, mapping)
532
510