Mercurial > hg
comparison tests/test-annotate.t @ 31998:83527d9f1f13
revset: properly parse "descend" argument of followlines()
We parse "descend" symbol as a Boolean using getboolean (prior extraction by
getargsdict already checked that it is a symbol).
In tests, check for error cases and vary Boolean values here and there.
author | Denis Laxalde <denis@laxalde.org> |
---|---|
date | Sat, 15 Apr 2017 11:29:42 +0200 |
parents | 3e47a40d7a7a |
children | befefdd34cf8 |
comparison
equal
deleted
inserted
replaced
31997:11f501f0a213 | 31998:83527d9f1f13 |
---|---|
507 $ hg ci -m 'added two lines with 0' | 507 $ hg ci -m 'added two lines with 0' |
508 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' | 508 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' |
509 16: baz:0 | 509 16: baz:0 |
510 19: baz:3 | 510 19: baz:3 |
511 20: baz:4 | 511 20: baz:4 |
512 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=True, startrev=19)' | 512 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=true, startrev=19)' |
513 19: baz:3 | 513 19: baz:3 |
514 20: baz:4 | 514 20: baz:4 |
515 $ echo 6 >> baz | 515 $ echo 6 >> baz |
516 $ hg ci -m 'added line 8' | 516 $ hg ci -m 'added line 8' |
517 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' | 517 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' |
518 16: baz:0 | 518 16: baz:0 |
519 19: baz:3 | 519 19: baz:3 |
520 20: baz:4 | 520 20: baz:4 |
521 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=True)' | 521 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=1)' |
522 19: baz:3 | 522 19: baz:3 |
523 20: baz:4 | 523 20: baz:4 |
524 $ sed 's/3/3+/' baz > baz.new | 524 $ sed 's/3/3+/' baz > baz.new |
525 $ mv baz.new baz | 525 $ mv baz.new baz |
526 $ hg ci -m 'baz:3->3+' | 526 $ hg ci -m 'baz:3->3+' |
527 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' | 527 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, descend=0)' |
528 16: baz:0 | 528 16: baz:0 |
529 19: baz:3 | 529 19: baz:3 |
530 20: baz:4 | 530 20: baz:4 |
531 23: baz:3->3+ | 531 23: baz:3->3+ |
532 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)' | 532 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)' |
533 19: baz:3 | 533 19: baz:3 |
534 20: baz:4 | 534 20: baz:4 |
535 23: baz:3->3+ | 535 23: baz:3->3+ |
536 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2)' | 536 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2, descend=false)' |
537 21: added two lines with 0 | 537 21: added two lines with 0 |
538 | 538 |
539 file patterns are okay | 539 file patterns are okay |
540 $ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)' | 540 $ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)' |
541 21: added two lines with 0 | 541 21: added two lines with 0 |
659 $ hg log -r 'followlines(baz, 0:4)' | 659 $ hg log -r 'followlines(baz, 0:4)' |
660 hg: parse error: fromline must be strictly positive | 660 hg: parse error: fromline must be strictly positive |
661 [255] | 661 [255] |
662 $ hg log -r 'followlines(baz, 2:40)' | 662 $ hg log -r 'followlines(baz, 2:40)' |
663 abort: line range exceeds file size | 663 abort: line range exceeds file size |
664 [255] | |
665 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])' | |
666 hg: parse error at 43: syntax error in revset 'followlines(baz, 2:4, startrev=20, descend=[1])' | |
667 [255] | |
668 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)' | |
669 hg: parse error: 'descend' argument must be a boolean | |
664 [255] | 670 [255] |
665 | 671 |
666 Test annotate with whitespace options | 672 Test annotate with whitespace options |
667 | 673 |
668 $ cd .. | 674 $ cd .. |