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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-15 00:35:21 UTC
  • mfrom: (6965.1.3 horizon)
  • Revision ID: breezy.the.bot@gmail.com-20180515003521-u1v3c75m5jxi5ts9
Support running 'bzr log' in a shallow git branch.

Revision numbers are not displayed in this case, since they are not known.

Merged from https://code.launchpad.net/~jelmer/brz/horizon-log/+merge/345552

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/mapping.py
410
410
            roundtrip_revid = None
411
411
            verifiers = {}
412
412
        if rev.parent_ids is None:
413
 
            rev.parent_ids = tuple([lookup_parent_revid(p) for p in commit.parents])
 
413
            parents = []
 
414
            for p in commit.parents:
 
415
                try:
 
416
                    parents.append(lookup_parent_revid(p))
 
417
                except KeyError:
 
418
                    parents.append(self.revision_id_foreign_to_bzr(p))
 
419
            rev.parent_ids = tuple(parents)
414
420
        unknown_extra_fields = []
415
421
        extra_lines = []
416
422
        for k, v in commit.extra: