view tests/test-inotify-dirty-dirstate @ 12382:28ddf67198b2 stable

log: include unmodified-in-merge files in log diff/stat (issue2383)

f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.

This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...

#!/bin/sh

# issues when status queries are issued when dirstate is dirty

"$TESTDIR/hghave" inotify || exit 80

echo "[extensions]" >> $HGRCPATH
echo "inotify=" >> $HGRCPATH
echo "fetch=" >> $HGRCPATH

echo % issue1810: inotify and fetch
mkdir test; cd test
hg init
hg inserve -d --pid-file=../hg.pid
cat ../hg.pid >> "$DAEMON_PIDS"

echo foo > foo
hg add
hg ci -m foo

cd ..

hg --config "inotify.pidfile=../hg2.pid" clone test test2
cat ../hg2.pid >> "$DAEMON_PIDS"

cd test2
echo bar > bar
hg add
hg ci -m bar
cd ../test
echo spam > spam
hg add
hg ci -m spam
cd ../test2
hg st

# abort, outstanding changes
hg fetch -q
hg st
cd ..


echo % issue1719: inotify and mq

echo "mq=" >> $HGRCPATH

hg init test-1719
cd test-1719

echo % inserve
hg inserve -d --pid-file=../hg-test-1719.pid
cat ../hg-test-1719.pid >> "$DAEMON_PIDS"

echo content > file
hg add file

hg qnew -f test.patch

hg status
hg qpop

echo % st should not output anything
hg status

hg qpush

echo % st should not output anything
hg status

hg qrefresh
hg status