Skip to content
Snippets Groups Projects
Commit 98b79c892768 authored by Patrick Mezard's avatar Patrick Mezard
Browse files

revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)

- Handle 'subset' argument
- Stop returning the null rev from p1 and parents, as in the non-dirstate case
- Order parents as in the non-dirstate case (ascending revs)
parent 7a2bca0b1e70
No related branches found
No related tags found
No related merge requests found
......@@ -206,7 +206,8 @@
First parent of changesets in set, or the working directory.
"""
if x is None:
return [repo[x].parents()[0].rev()]
p = repo[x].parents()[0].rev()
return [r for r in subset if r == p]
ps = set()
cl = repo.changelog
......@@ -221,7 +222,8 @@
if x is None:
ps = repo[x].parents()
try:
return [ps[1].rev()]
p = ps[1].rev()
return [r for r in subset if r == p]
except IndexError:
return []
......@@ -237,7 +239,8 @@
"""
repo.ui.debug(repr(x), '\n')
if x is None:
return [r.rev() for r in repo[x].parents()]
ps = tuple(p.rev() for p in repo[x].parents())
return [r for r in subset if r in ps]
ps = set()
cl = repo.changelog
......
......@@ -14,6 +14,5 @@
$ try 'p1()'
('func', ('symbol', 'p1'), None)
-1
$ try 'p2()'
('func', ('symbol', 'p2'), None)
......@@ -18,5 +17,8 @@
$ try 'p2()'
('func', ('symbol', 'p2'), None)
$ try 'parents()'
('func', ('symbol', 'parents'), None)
None
null revision
$ log 'p1()'
......@@ -28,6 +30,7 @@
$ hg ci -Aqm0
$ log 'p1()'
0
$ log 'tag() and p1()'
$ log 'p2()'
$ log 'parents()'
0
......@@ -31,6 +34,7 @@
$ log 'p2()'
$ log 'parents()'
0
$ log 'tag() and parents()'
merge in progress
$ echo b > b
......@@ -43,4 +47,5 @@
2
$ log 'p2()'
1
$ log 'tag() and p2()'
$ log 'parents()'
......@@ -46,2 +51,3 @@
$ log 'parents()'
1
2
......@@ -47,2 +53,1 @@
2
1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment