/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: Jelmer Vernooij
  • Date: 2018-05-15 01:20:00 UTC
  • mfrom: (6967 work)
  • mto: This revision was merged to the branch mainline in revision 6968.
  • Revision ID: jelmer@jelmer.uk-20180515012000-q1hmqbh3f3dzufod
Merge trnk.

Show diffs side-by-side

added added

removed removed

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