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

  • Committer: Jelmer Vernooij
  • Date: 2018-05-15 10:20:16 UTC
  • mfrom: (6967 work)
  • mto: (6973.5.1 python3-c)
  • mto: This revision was merged to the branch mainline in revision 6984.
  • Revision ID: jelmer@jelmer.uk-20180515102016-tnlhsl574pfpplin
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/repository.py
390
390
            commit = self._git.object_store[hexsha]
391
391
        except KeyError:
392
392
            return None
393
 
        return [
394
 
            self.lookup_foreign_revision_id(p, mapping)
395
 
            for p in commit.parents]
 
393
        ret = []
 
394
        for p in commit.parents:
 
395
            try:
 
396
                ret.append(self.lookup_foreign_revision_id(p, mapping))
 
397
            except KeyError:
 
398
                ret.append(mapping.revision_id_foreign_to_bzr(p))
 
399
        return ret
396
400
 
397
401
    def _get_parent_map_no_fallbacks(self, revids):
398
402
        return self.get_parent_map(revids, no_alternates=True)