facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

revset: fix nth ancestor revset w/ multiple bases

Browse Source 
Summary: The nth ancestor revset was crashing with multiple base revisions, e.g. "(. + .^)~". Fix variable shadowing issue in revset.ancestorspec.

Differential Revision: D30375233

fbshipit-source-id: 37a78bf1000a40872600e587733a84029f68343b
This commit is contained in:
Muir Manders 2021-08-20 12:26:08 -07:00 committed by Facebook GitHub Bot
parent 50cf59e766
commit a75c3e60e3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eden/scm/edenscm/mercurial/revset.py
View File

@ -576,9 +576,9 @@ def ancestorspec(repo, subset, x, n, order):
nullrev = node.nullrev
for r in s:
if r != nullrev:
n = firstancestornth(tonode(r), n)
if n is not None:
psadd(torev(n))
ancestor = firstancestornth(tonode(r), n)
if ancestor is not None:
psadd(torev(ancestor))
return subset & baseset(ps, repo=repo)

6
eden/scm/tests/test-revset-t.py
View File

@ -2680,3 +2680,9 @@ sh % "hg log -r '\n. +\n.^ +'" == r"""
( . + .^ +
^ here)
[255]"""
# test ancestorspec with multiple base revisions
sh % "log '(. + .^)~1'" == r"""
4
8"""