Mercurial > hg
view tests/test-inotify-issue1556.t @ 16101:20ad8f0512a2 stable
mq: restore _branchtags() fast path (issue3223)
Since a5917346c72e, mq saves the nodeid of the first applied patch to
cache/branchheads, which breaks the optimized cache handling introduced in
fbf8320f25c8. The problem is the revision being committed is appended to
mqrepo.applied after the commit succeeds, which means mqrepo._branchtags()
performs a regular update and write the first applied patch to the branch
cache.
One solution is to set a context variable _committingpatch on the mqrepo while
it is committing a patch and to take it in account when deciding to fast-path
mqrepo._branchtags(). Not really elegant but it works.
The changes to test-mq-caches.t reverse changes introduced by a5917346c72e. The
cache should not have been updated with mq records.
The changes to test-keyword.t are indirectly caused by a5917346c72e.
Reported and analyzed by Yuya Nishihara <yuya@tcha.org>
Notes:
- qpush still makes a slow path _branchtags() call when checking heads. Maybe
this can be optimized.
- be careful when merging this patch in default as secretcommit() was renamed
newcommit() right after the end of the code freeze.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Tue, 07 Feb 2012 18:47:16 +0100 |
parents | 1f74b0d0f485 |
children | 895d65364570 |
line wrap: on
line source
$ "$TESTDIR/hghave" inotify || exit 80 $ hg init $ touch a b $ hg add a b $ rm b status without inotify $ hg st A a ! b $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH inserve $ hg inserve -d --pid-file=hg.pid 2>&1 $ cat hg.pid >> "$DAEMON_PIDS" status $ hg st A a ! b ? hg.pid $ sleep 1 Are we able to kill the service? if not, the service died on some error $ kill `cat hg.pid`