This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8263

gitlog: fix embarassing bug that prevented log from showing correct parents
ClosedPublic

Authored by durin42 on Mar 7 2020, 5:45 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf19491aae641: gitlog: fix embarassing bug that prevented log from showing correct parents
rHGce0cad6c069f: gitlog: fix embarassing bug that prevented log from showing correct parents
rHG559e31eabc3d: gitlog: fix embarassing bug that prevented log from showing correct parents
Summary

We had the correct parents in the database, but the changelog was
always returning p1 for all parents. Oops.

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.

Revision Contents
Changeset List

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

Diff 20620

hgext/git/gitlog.py

hn = gitutil.togitnode(n) hn = gitutil.togitnode(n)
c = self.gitrepo[hn] c = self.gitrepo[hn]
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[0].id.raw) p2 = self.rev(c.parents[1].id.raw)
return p1, p2 return p1, p2
# Private method is used at least by the tags code. # Private method is used at least by the tags code.
_uncheckedparentrevs = parentrevs _uncheckedparentrevs = parentrevs
def commonancestorsheads(self, a, b): def commonancestorsheads(self, a, b):
# TODO the revlog verson of this has a C path, so we probably # TODO the revlog verson of this has a C path, so we probably
# need to optimize this... # need to optimize this...