Show More
@@ -1481,7 +1481,7 b' def parents(repo, subset, x):' | |||
|
1481 | 1481 | up = ps.update |
|
1482 | 1482 | parentrevs = cl.parentrevs |
|
1483 | 1483 | for r in getset(repo, fullreposet(repo), x): |
|
1484 |
if r |
|
|
1484 | if r == node.wdirrev: | |
|
1485 | 1485 | up(p.rev() for p in repo[r].parents()) |
|
1486 | 1486 | else: |
|
1487 | 1487 | up(parentrevs(r)) |
@@ -1986,8 +1986,8 b' def user(repo, subset, x):' | |||
|
1986 | 1986 | def wdir(repo, subset, x): |
|
1987 | 1987 | # i18n: "wdir" is a keyword |
|
1988 | 1988 | getargs(x, 0, 0, _("wdir takes no arguments")) |
|
1989 |
if |
|
|
1990 |
return baseset([ |
|
|
1989 | if node.wdirrev in subset or isinstance(subset, fullreposet): | |
|
1990 | return baseset([node.wdirrev]) | |
|
1991 | 1991 | return baseset() |
|
1992 | 1992 | |
|
1993 | 1993 | # for internal use |
@@ -2392,4 +2392,12 b' should not draw line down to null due to' | |||
|
2392 | 2392 | summary: add a |
|
2393 | 2393 | |
|
2394 | 2394 | |
|
2395 | working-directory revision | |
|
2396 | ||
|
2397 | $ hg log -G -qr '. + wdir()' | |
|
2398 | o 2147483647:ffffffffffff | |
|
2399 | | | |
|
2400 | @ 3:5918b8d165d1 | |
|
2401 | | | |
|
2402 | ||
|
2395 | 2403 | $ cd .. |
@@ -721,11 +721,19 b" BROKEN: should be '-1'" | |||
|
721 | 721 | |
|
722 | 722 | Test working-directory revision |
|
723 | 723 | $ hg debugrevspec 'wdir()' |
|
724 | None | |
|
724 | 2147483647 | |
|
725 | 725 | $ hg debugrevspec 'tip or wdir()' |
|
726 | 726 | 9 |
|
727 | None | |
|
727 | 2147483647 | |
|
728 | 728 | $ hg debugrevspec '0:tip and wdir()' |
|
729 | $ log '(all() + wdir()) & min(. + wdir())' | |
|
730 | 9 | |
|
731 | $ log '(all() + wdir()) & max(. + wdir())' | |
|
732 | 2147483647 | |
|
733 | $ log '(all() + wdir()) & first(wdir() + .)' | |
|
734 | 2147483647 | |
|
735 | $ log '(all() + wdir()) & last(. + wdir())' | |
|
736 | 2147483647 | |
|
729 | 737 | |
|
730 | 738 | $ log 'outgoing()' |
|
731 | 739 | 8 |
General Comments 0
You need to be logged in to leave comments.
Login now