##// END OF EJS Templates
tryimportone: use dirstateguard instead of beginparentchange/endparentchange...
tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

File last commit:

r23840:ddc17eaf default
r24995:0579b0c2 default
Show More
test-rebuildstate.t
30 lines | 406 B | text/troff | Tads3Lexer
/ tests / test-rebuildstate.t
Nicolas Dumazet
tests: unify test-rebuildstate
r12121 basic test for hg debugrebuildstate
$ hg init repo
$ cd repo
$ touch foo bar
$ hg ci -Am 'add foo bar'
adding bar
adding foo
$ touch baz
$ hg add baz
$ hg rm bar
$ hg debugrebuildstate
state dump after
$ hg debugstate --nodates | sort
Mads Kiilerich
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'...
r23840 n 644 -1 set bar
n 644 -1 set foo
Nicolas Dumazet
tests: unify test-rebuildstate
r12121
status
$ hg st -A
! bar
? baz
C foo
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..