Mercurial > hg
view tests/test-pending.t @ 25757:4d1382fd96ff
context: write dirstate out explicitly at the end of markcommitted
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
* *** ***
- 'hg transplant REV1 REV2 ...'
- transplanting REV1
....
N
- change "f", but keep size N
(via 'patch.patch()')
- 'dirstate.normal("f")' N ***
(via 'repo.commit()')
- transplanting REV2
- change "f", but keep size N
(via 'patch.patch()')
- aborted while patching
N+1
- release wlock
- 'dirstate.write()' N N N
- 'hg status' shows "r1" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
This issue can occur when 'hg transplant' satisfies conditions below:
- multiple revisions to be transplanted change the same file
- those revisions don't change mode and size of the file, and
- the 2nd or later revision of them fails after changing the file
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on files changed by 'patch.patch()'
for efficiency also causes this issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'committablectx.markcommitted()', which is invoked via
'repo.commit()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
* *** ***
- 'hg transplant REV1 REV2 ...'
- transplanting REV1
....
N
- change "f", but keep size N
(via 'patch.patch()')
- 'dirstate.normal("f")' N ***
(via 'repo.commit()')
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- transplanting REV2
- change "f", but keep size N
(via 'patch.patch()')
- aborted while patching
N+1
- release wlock
- 'dirstate.write()' -1 -1 N
- 'hg status' shows "r1" as "clean" -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- change "f" at N
'patch.patch()' with 'fakepatchtime.py' explicitly changes mtime
of patched files to "2000-01-01 00:00" (= N).
- 'dirstate.write()' via 'repo.commit()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'committablectx.markcommitted()'.
- 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch doesn't test cases below, even though 'patch.patch()'
is used similarly in these cases:
1. failure of 'hg import' or 'hg qpush'
2. success of 'hg import', 'hg qpush' or 'hg transplant'
Case (1) above doesn't cause this kind of issue, because:
- if patching is aborted by conflicts, changed files are committed
changed files are marked as CLEAN, even though they are partially
patched.
- otherwise, dirstate are fully restored by 'dirstateguard'
For example in timetable above, timestamp of "f" in .hg/dirstate
is restored to -1 (or less than N), and subsequent 'hg status' can
detect changes correctly.
Case (2) always causes 'repo.status()' invocation via 'repo.commit()'
just after changing files inside same wlock scope.
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N *** ***
- make file "f" clean N
- execute 'hg foobar'
....
- 'dirstate.normal("f")' N ***
(e.g. via dirty check
or previous 'repo.commit()')
- change "f", but keep size N
- 'repo.status()' (*1)
(via 'repo.commit()')
---- ----------------------------------- ---- ----- -----
At a glance, 'repo.status()' at (*1) seems to cause similar issue (=
"changed files are treated as clean"), but actually doesn't.
'dirstate._lastnormaltime' should be N at (*1) above, because
'dirstate.normal()' via dirty check is finished at N.
Therefore, "f" changed at N (= 'dirstate._lastnormaltime') is forcibly
treated as "unsure" at (*1), and changes are detected as expected (see
'dirstate.status()' for detail).
If 'hg import' is executed with '--no-commit', 'repo.status()' isn't
invoked just after changing files inside same wlock scope.
But preceding 'dirstate.normal()' is invoked inside another wlock
scope via 'cmdutil.bailifchanged()', and in-memory changes should be
flushed at the end of that scope.
Therefore, timestamp N of clean "f" should be replaced by -1, if
'dirstate.write()' is invoked at N. It means that condition of this
issue isn't satisfied.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 08 Jul 2015 17:01:09 +0900 |
parents | b2c1ff96c1e1 |
children | f14879f61cd8 |
line wrap: on
line source
Verify that pending changesets are seen by pretxn* hooks but not by other processes that access the destination repo while the hooks are running. The hooks (python and external) both reject changesets after some think time, during which another process runs pull. Each hook creates a file ('notify') to indicate to the controlling process that it is running; the process removes the file to indicate the hook can terminate. init env vars $ d=`pwd` $ maxwait=20 utility to run the test - start a push in the background and run pull $ dotest() { > rm -f notify > printf 'push '; hg -R child-push tip --template '{node}\n' > hg -R child-push -q push > push.out 2>&1 & > > # wait for hook to create the notify file > i=$maxwait > while [ ! -f notify -a $i != 0 ]; do > sleep 1 > i=`expr $i - 1` > done > > # run pull > hg -R child-pull -q pull > rc=$? > > # tell hook to finish; notify should exist. > rm notify > wait > > cat push.out > printf 'pull '; hg -R child-pull tip --template '{node}\n' > return $rc > } python hook $ cat <<EOF > reject.py > import os, time > from mercurial import ui, localrepo > def rejecthook(ui, repo, hooktype, node, **opts): > ui.write('hook %s\\n' % repo['tip'].hex()) > # create the notify file so caller knows we're running > fpath = os.path.join('$d', 'notify') > f = open(fpath, 'w') > f.close() > # wait for ack - caller should delete the notify file > i = $maxwait > while os.path.exists(fpath) and i > 0: > time.sleep(1) > i -= 1 > return True # reject the changesets > EOF external hook $ cat <<EOF > reject.sh > printf 'hook '; hg tip --template '{node}\\n' > # create the notify file so caller knows we're running > fpath=$d/notify > touch \$fpath > # wait for ack - caller should delete the notify file > i=$maxwait > while [ -f \$fpath -a \$i != 0 ]; do > sleep 1 > i=\`expr \$i - 1\` > done > exit 1 # reject the changesets > EOF create repos $ hg init parent $ hg clone -q parent child-push $ hg clone -q parent child-pull $ echo a > child-push/a $ hg -R child-push add child-push/a $ hg -R child-push commit -m a -d '1000000 0' test python hook $ cat <<EOF > parent/.hg/hgrc > [extensions] > reject = $d/reject.py > [hooks] > pretxnchangegroup = python:reject.rejecthook > EOF $ dotest push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b transaction abort! rollback completed abort: pretxnchangegroup hook failed pull 0000000000000000000000000000000000000000 test external hook $ cat <<EOF > parent/.hg/hgrc > [hooks] > pretxnchangegroup = sh $d/reject.sh > EOF $ dotest push 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b hook 29b62aeb769fdf78d8d9c5f28b017f76d7ef824b transaction abort! rollback completed abort: pretxnchangegroup hook exited with status 1 pull 0000000000000000000000000000000000000000 Test that pending on transaction without changegroup see the normal changegroup( (issue4609) $ cat <<EOF > parent/.hg/hgrc > [hooks] > pretxnchangegroup= > pretxnclose = hg tip -T "tip: {node|short}\n" > [phases] > publishing=False > EOF setup $ cd parent $ echo a > a $ hg add a $ hg commit -m a tip: cb9a9f314b8b actual test $ hg phase --public . tip: cb9a9f314b8b