# HG changeset patch # User Siddharth Agarwal # Date 1431125448 25200 # Node ID db308eba525101c0864f6799c707ea3693c30c7c # Parent 11ca21820a955c6fd05d820896d2ec0f9dddca5c overlaychangectx: use overlayrevlog logic to determine parents The old logic was broken -- it didn't work at the boundary between hg and git commits. The logic in overlayrevlog.parents handles that correctly. This is the last fix required for Mercurial 3.4. diff -r 11ca21820a95 -r db308eba5251 hggit/overlay.py --- a/hggit/overlay.py Fri May 08 16:00:45 2015 -0700 +++ b/hggit/overlay.py Fri May 08 15:50:48 2015 -0700 @@ -202,10 +202,13 @@ return self.commit.message def parents(self): - parents = self.commit.parents + cl = self.repo.changelog + parents = cl.parents(cl.node(self._rev)) if not parents: return [self.repo['null']] - return [overlaychangectx(self.repo, sha) for sha in parents] + if parents[1] == nullid: + parents = parents[:-1] + return [self.repo[sha] for sha in parents] def manifestnode(self): return bin(self.commit.tree)