This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3931

revlog: introduce a isancestorrev() and use it in rebase
ClosedPublic

Authored by martinvonz on Jul 11 2018, 8:09 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa06b2b032557: revlog: introduce a isancestorrev() and use it in rebase
Summary

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

martinvonz created this revision.Jul 11 2018, 8:09 PM
lothiraldan added a subscriber: lothiraldan.Jul 12 2018, 5:29 AM

Having isancestor and isancestorrev taking the arguments in a different order seems confusing, 👎

Closed by commit rHGa06b2b032557: revlog: introduce a isancestorrev() and use it in rebase (authored by martinvonz). · Explain WhyJul 12 2018, 9:11 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Jul 12 2018, 10:26 AM
In D3931#61309, @lothiraldan wrote:

Having isancestor and isancestorrev taking the arguments in a different order seems confusing, 👎

I agree, but they're not in different order, are they?

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)
Mmercurial/revlog.py (6 lines)

Diff 9567

hgext/rebase.py

A A
The new parents of a merge is slightly more complicated. See the comment The new parents of a merge is slightly more complicated. See the comment
block below. block below.
""" """
# use unfiltered changelog since successorrevs may return filtered nodes # use unfiltered changelog since successorrevs may return filtered nodes
assert repo.filtername is None assert repo.filtername is None
cl = repo.changelog cl = repo.changelog
def isancestor(a, b): isancestor = cl.isancestorrev
# take revision numbers instead of nodes
if a == b:
return True
elif a > b:
return False
return cl.isancestor(cl.node(a), cl.node(b))
dest = destmap[rev] dest = destmap[rev]
oldps = repo.changelog.parentrevs(rev) # old parents oldps = repo.changelog.parentrevs(rev) # old parents
newps = [nullrev, nullrev] # new parents newps = [nullrev, nullrev] # new parents
dests = adjustdest(repo, rev, destmap, state, skipped) dests = adjustdest(repo, rev, destmap, state, skipped)
bases = list(oldps) # merge base candidates, initially just old parents bases = list(oldps) # merge base candidates, initially just old parents
if all(r == nullrev for r in oldps[1:]): if all(r == nullrev for r in oldps[1:]):

mercurial/revlog.py

ancs = ancestor.commonancestorsheads(self.parentrevs, *revs) ancs = ancestor.commonancestorsheads(self.parentrevs, *revs)
return ancs return ancs
def isancestor(self, a, b): def isancestor(self, a, b):
"""return True if node a is an ancestor of node b """return True if node a is an ancestor of node b
A revision is considered an ancestor of itself.""" A revision is considered an ancestor of itself."""
a, b = self.rev(a), self.rev(b) a, b = self.rev(a), self.rev(b)
return self.isancestorrev(a, b)
def isancestorrev(self, a, b):
"""return True if revision a is an ancestor of revision b
A revision is considered an ancestor of itself."""
return self.isdescendantrev(b, a) return self.isdescendantrev(b, a)
def ancestor(self, a, b): def ancestor(self, a, b):
"""calculate the "best" common ancestor of nodes a and b""" """calculate the "best" common ancestor of nodes a and b"""
a, b = self.rev(a), self.rev(b) a, b = self.rev(a), self.rev(b)
try: try:
ancs = self.index.ancestors(a, b) ancs = self.index.ancestors(a, b)