--- a/tests/test-show-work.t Thu Aug 03 21:51:34 2017 -0700
+++ b/tests/test-show-work.t Wed Sep 13 21:15:46 2017 -0700
@@ -16,20 +16,20 @@
$ hg -q commit -A -m 'commit 0'
$ hg show work
- @ 9f171 commit 0
+ @ 9f17 commit 0
Even when it isn't the wdir
$ hg -q up null
$ hg show work
- o 9f171 commit 0
+ o 9f17 commit 0
Single changeset is still there when public because it is a head
$ hg phase --public -r 0
$ hg show work
- o 9f171 commit 0
+ o 9f17 commit 0
A draft child will show both it and public parent
@@ -38,8 +38,8 @@
$ hg commit -m 'commit 1'
$ hg show work
- @ 181cc commit 1
- o 9f171 commit 0
+ @ 181c commit 1
+ o 9f17 commit 0
Multiple draft children will be shown
@@ -47,16 +47,16 @@
$ hg commit -m 'commit 2'
$ hg show work
- @ 128c8 commit 2
- o 181cc commit 1
- o 9f171 commit 0
+ @ 128c commit 2
+ o 181c commit 1
+ o 9f17 commit 0
Bumping first draft changeset to public will hide its parent
$ hg phase --public -r 1
$ hg show work
- @ 128c8 commit 2
- o 181cc commit 1
+ @ 128c commit 2
+ o 181c commit 1
|
~
@@ -68,10 +68,10 @@
created new head
$ hg show work
- @ f0abc commit 3
- | o 128c8 commit 2
+ @ f0ab commit 3
+ | o 128c commit 2
|/
- o 181cc commit 1
+ o 181c commit 1
|
~
@@ -80,10 +80,10 @@
$ hg -q up null
$ hg show work
- o f0abc commit 3
- | o 128c8 commit 2
+ o f0ab commit 3
+ | o 128c commit 2
|/
- o 181cc commit 1
+ o 181c commit 1
|
~
@@ -95,13 +95,13 @@
created new head
$ hg show work
- @ 668ca commit 4
- | o f0abc commit 3
- | | o 128c8 commit 2
+ @ 668c commit 4
+ | o f0ab commit 3
+ | | o 128c commit 2
| |/
- | o 181cc commit 1
+ | o 181c commit 1
|/
- o 9f171 commit 0
+ o 9f17 commit 0
$ cd ..
@@ -126,11 +126,11 @@
$ hg commit -m 'commit 4'
$ hg show work
- @ f8dd3 (mybranch) commit 4
- o 90cfc (mybranch) commit 3
- | o 128c8 commit 2
+ @ f8dd (mybranch) commit 4
+ o 90cf (mybranch) commit 3
+ | o 128c commit 2
|/
- o 181cc commit 1
+ o 181c commit 1
|
~
@@ -157,11 +157,11 @@
$ hg bookmark mybook
$ hg show work
- @ cac82 (mybook) commit 4
- o f0abc commit 3
- | o 128c8 (@) commit 2
+ @ cac8 (mybook) commit 4
+ o f0ab commit 3
+ | o 128c (@) commit 2
|/
- o 181cc commit 1
+ o 181c commit 1
|
~
@@ -182,9 +182,9 @@
$ hg tag 0.2
$ hg show work
- @ 37582 Added tag 0.2 for changeset 6379c25b76f1
- o 6379c (0.2) commit 3
- o a2ad9 Added tag 0.1 for changeset 6a75536ea0b1
+ @ 3758 Added tag 0.2 for changeset 6379c25b76f1
+ o 6379 (0.2) commit 3
+ o a2ad Added tag 0.1 for changeset 6a75536ea0b1
|
~
@@ -205,15 +205,15 @@
$ hg commit -m 'commit 2'
$ hg show work
- @ 34834 (mybook) (mybranch) commit 2
- o 97fcc commit 1
+ @ 3483 (mybook) (mybranch) commit 2
+ o 97fc commit 1
Multiple bookmarks on same changeset render properly
$ hg book mybook2
$ hg show work
- @ 34834 (mybook mybook2) (mybranch) commit 2
- o 97fcc commit 1
+ @ 3483 (mybook mybook2) (mybranch) commit 2
+ o 97fc commit 1
$ cd ..
@@ -230,8 +230,38 @@
$ hg commit -m 'commit 3'
$ hg --config extensions.revnames=$TESTDIR/revnamesext.py show work
- @ 32f3e (r2) commit 3
- o 6a755 (r1) commit 2
- o 97fcc (r0) commit 1
+ @ 32f3 (r2) commit 3
+ o 6a75 (r1) commit 2
+ o 97fc (r0) commit 1
$ cd ..
+
+Prefix collision on hashes increases shortest node length
+
+ $ hg init hashcollision
+ $ cd hashcollision
+ $ echo 0 > a
+ $ hg -q commit -Am 0
+ $ for i in 17 1057 2857 4025; do
+ > hg -q up 0
+ > echo $i > a
+ > hg -q commit -m $i
+ > echo 0 > a
+ > hg commit -m "$i commit 2"
+ > done
+
+ $ hg show work
+ @ cfd04 4025 commit 2
+ o c562d 4025
+ | o 08048 2857 commit 2
+ | o c5623 2857
+ |/
+ | o 6a6b6 1057 commit 2
+ | o c5625 1057
+ |/
+ | o 96b4e 17 commit 2
+ | o 11424 17
+ |/
+ o b4e73 0
+
+ $ cd ..