This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8541

git: avoid looking-up parents for the null commit
ClosedPublic

Authored by rom1dep on May 17 2020, 1:41 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG8bfc6cc8e480: git: avoid looking-up parents for the null commit

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

rom1dep created this revision.May 17 2020, 1:41 PM
rom1dep added a commit: rHG8bfc6cc8e480: git: avoid looking-up parents for the null commit.May 17 2020, 9:27 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8bfc6cc8e480: git: avoid looking-up parents for the null commit (authored by rom1dep). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (5 lines)

Diff 21412

hgext/git/gitlog.py

return True return True
elif a > b: elif a > b:
return False return False
return bool(self.reachableroots(a, [b], [a], includepath=False)) return bool(self.reachableroots(a, [b], [a], includepath=False))
def parentrevs(self, rev): def parentrevs(self, rev):
n = self.node(rev) n = self.node(rev)
hn = gitutil.togitnode(n) hn = gitutil.togitnode(n)
if hn != gitutil.nullgit:
c = self.gitrepo[hn] c = self.gitrepo[hn]
else:
return nodemod.nullrev, nodemod.nullrev
p1 = p2 = nodemod.nullrev p1 = p2 = nodemod.nullrev
if c.parents: if c.parents:
p1 = self.rev(c.parents[0].id.raw) p1 = self.rev(c.parents[0].id.raw)
if len(c.parents) > 2: if len(c.parents) > 2:
raise error.Abort(b'TODO octopus merge handling') raise error.Abort(b'TODO octopus merge handling')
if len(c.parents) == 2: if len(c.parents) == 2:
p2 = self.rev(c.parents[1].id.raw) p2 = self.rev(c.parents[1].id.raw)
return p1, p2 return p1, p2