##// END OF EJS Templates
graft: do not try to skip rev derived from ancestor more than once (issue6024)...
graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

File last commit:

r34075:7bbc4e11 default
r40692:3bc2e550 stable
Show More
test-revset-dirstate-parents.t
66 lines | 880 B | text/troff | Tads3Lexer
/ tests / test-revset-dirstate-parents.t
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ HGENCODING=utf-8
$ export HGENCODING
$ try() {
> hg debugrevspec --debug $@
> }
$ log() {
> hg log --template '{rev}\n' -r "$1"
> }
$ hg init repo
$ cd repo
$ try 'p1()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'p1')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset []>
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ try 'p2()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'p2')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset []>
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ try 'parents()'
Patrick Mezard
debugrevspec: pretty print output...
r16218 (func
Yuya Nishihara
parser: stabilize output of prettyformat() by using byte-safe repr()...
r34075 (symbol 'parents')
Patrick Mezard
debugrevspec: pretty print output...
r16218 None)
Yuya Nishihara
debugrevspec: show nesting structure of smartsets if verbose...
r24458 * set:
<baseset+ []>
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
null revision
$ log 'p1()'
$ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
working dir with a single parent
$ echo a > a
$ hg ci -Aqm0
$ log 'p1()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p1()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 $ log 'p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
0
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and parents()'
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
merge in progress
$ echo b > b
$ hg ci -Aqm1
$ hg up -q 0
$ echo c > c
$ hg ci -Aqm2
$ hg merge -q
$ log 'p1()'
2
$ log 'p2()'
1
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 $ log 'tag() and p2()'
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 $ log 'parents()'
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 1
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 2
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..