##// END OF EJS Templates
dirstate-v2: actually fix the dirstate-v2 upgrade race...
dirstate-v2: actually fix the dirstate-v2 upgrade race It looks like the previous fix for the dirstate-v2 upgrade race didn't work. The problem is that it only recovers in case the size of the v1 `dirstate` file is smaller than the `v2` one, whereas in real life it's always larger. This commit changes the test to be more realistic, which reveals the crash, and changes the code to fix the crash.

File last commit:

r51616:bfbd84c5 stable
r51616:bfbd84c5 stable
Show More
test-dirstate-version-fallback.t
51 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-dirstate-version-fallback.t
$ cat >> $HGRCPATH << EOF
> [storage]
> dirstate-v2.slow-path=allow
> [format]
> use-dirstate-v2=no
> EOF
Set up a v1 repo
$ hg init repo
$ cd repo
$ echo a > a
$ touch file-with-somewhat-long-name-to-make-dirstate-v1-bigger-than-v2
$ hg commit -Aqm a
$ hg debugrequires | grep dirstate
[1]
$ ls -1 .hg/dirstate*
.hg/dirstate
Copy v1 dirstate
$ cp .hg/dirstate $TESTTMP/dirstate-v1-backup
Upgrade it to v2
$ hg debugupgraderepo -q --config format.use-dirstate-v2=1 --run | egrep 'added:|removed:'
added: dirstate-v2
$ hg debugrequires | grep dirstate
dirstate-v2
$ ls -1 .hg/dirstate*
.hg/dirstate
.hg/dirstate.* (glob)
Manually reset to dirstate v1 to simulate an incomplete dirstate-v2 upgrade
$ rm .hg/dirstate*
$ cp $TESTTMP/dirstate-v1-backup .hg/dirstate
There should be no errors, but a v2 dirstate should be written back to disk
$ hg st
$ ls -1 .hg/dirstate*
.hg/dirstate
.hg/dirstate.* (glob)
Corrupt the dirstate to see how the errors show up to the user
$ echo "I ate your data" > .hg/dirstate
$ hg st
abort: working directory state appears damaged! (no-rhg !)
(falling back to dirstate-v1 from v2 also failed) (no-rhg !)
abort: Too little data for dirstate: 16 bytes. (rhg !)
[255]