##// END OF EJS Templates
largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

File last commit:

r22046:7a9cbb31 default
r22285:85bded43 default
Show More
test-hup.t
38 lines | 903 B | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require serve fifo
Matt Mackall
tests: unify test-hup
r12413 Test hangup signal in the middle of transaction
$ hg init
$ mkfifo p
Matt Mackall
tests: make test-hup more race-proof...
r16342 $ hg serve --stdio < p 1>out 2>&1 &
Matt Mackall
tests: unify test-hup
r12413 $ P=$!
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299
Do test while holding fifo open
$ (
> echo lock
> echo addchangegroup
Pierre-Yves David
tests: prevent test-hup from hanging forever if the transaction does not start...
r20896 > start=`date +%s`
> # 10 second seems much enough to let the server catch up
> deadline=`expr $start + 10`
> while [ ! -s .hg/store/journal ]; do
> sleep 0;
> if [ `date +%s` -gt $deadline ]; then
> echo "transaction did not start after 10 seconds" >&2;
> exit 1;
> fi
> done
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299 > kill -HUP $P
> ) > p
Matt Mackall
tests: make test-hup more race-proof...
r16342
Matt Mackall
tests: avoid zombie lockup with test-hup...
r16344 $ wait
Matt Mackall
tests: make test-hup more race-proof...
r16342 $ cat out
Matt Mackall
tests: unify test-hup
r12413 0
0
adding changesets
transaction abort!
rollback completed
killed!
Matt Mackall
tests: remove sleep/startup/shutdown races from test-hup
r16299
Matt Mackall
tests: unify test-hup
r12413 $ echo .hg/* .hg/store/*
Pierre-Yves David
phases: add rollback support
r15455 .hg/00changelog.i .hg/journal.bookmarks .hg/journal.branch .hg/journal.desc .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a .hg/store/journal.phaseroots