##// 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:

r40377:d916ed3c default
r40692:3bc2e550 stable
Show More
test-revisions.t
45 lines | 656 B | text/troff | Tads3Lexer
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878 $ hg init repo
$ cd repo
$ echo 0 > a
$ hg ci -qAm 0
Martin von Zweigbergk
shortest: don't include nullid in disambigution revset...
r39104 $ for i in 5 8 14 43 167; do
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878 > hg up -q 0
> echo $i > a
> hg ci -qm $i
> done
$ cat <<EOF >> .hg/hgrc
> [alias]
> l = log -T '{rev}:{shortest(node,1)}\n'
> EOF
$ hg l
Martin von Zweigbergk
shortest: don't include nullid in disambigution revset...
r39104 5:00f
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878 4:7ba5d
3:7ba57
2:72
1:9
0:b
$ cat <<EOF >> .hg/hgrc
> [experimental]
Martin von Zweigbergk
shortest: don't include nullid in disambigution revset...
r39104 > revisions.disambiguatewithin=not 4
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878 > EOF
Martin von Zweigbergk
scmutil: make shortest() respect disambiguation revset...
r38879 $ hg l
Kyle Lippincott
revisions: when using prefixhexnode, ensure we prefix "0"...
r40377 5:00
Martin von Zweigbergk
scmutil: make shortest() respect disambiguation revset...
r38879 4:7ba5d
3:7b
2:72
1:9
0:b
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878 9 was unambiguous and still is
$ hg l -r 9
1:9
7 was ambiguous and still is
$ hg l -r 7
abort: 00changelog.i@7: ambiguous identifier!
[255]
7b is no longer ambiguous
$ hg l -r 7b
Martin von Zweigbergk
scmutil: make shortest() respect disambiguation revset...
r38879 3:7b
Martin von Zweigbergk
lookup: add option to disambiguate prefix within revset...
r38878
$ cd ..