inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
issue1542 description:
Unknown files (?) placed in a directory are still marked as present and unknown
when the containing directory is moved out of the repository scope.
Why 67e59a9886d5 was bad:
* When the problem we're addressing only deals with unknown files, the fix to
updatestatus applies for all statuses
* The only reason to move the call schedule_work(wpath, 'd') seems to be that
it allowed an updatestatus call on the deleted directory, in deleted(). But
deleted() should not be called on directories in the first place.
* After fixing an independant issue (1371), test-inotify-issue1542 was failing
Fix:
When processing a deletion of a directory, walk the tree of the unknown files
and remove the entries from repowatcher.
This step does not need to be added in the generic scan() routine: it is only
necessary on a directory deletion.
#!/bin/sh
# 0-2-4
# \ \ \
# 1-3-5
#
# rename in #1, content change in #4.
hg init t
cd t
touch 1
touch 2
hg commit -Am init # 0
hg rename 1 1a
hg commit -m rename # 1
hg co -C 0
echo unrelated >> 2
hg ci -m unrelated1 # 2
hg merge --debug 1
hg ci -m merge1 # 3
hg co -C 2
echo hello >> 1
hg ci -m unrelated2 # 4
hg co -C 3
hg merge -y --debug 4
hg co -C 4
hg merge -y --debug 3