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
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "nodates=true" >> $HGRCPATH
catlog() {
cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /"
hg log --template "{rev}: {desc} - {author}\n"
}
echo ==== init
hg init a
cd a
hg qinit
echo ==== qnew -U
hg qnew -U 1.patch
catlog 1
echo ==== qref
echo "1" >1
hg add
hg qref
catlog 1
echo ==== qref -u
hg qref -u mary
catlog 1
echo ==== qnew
hg qnew 2.patch
echo "2" >2
hg add
hg qref
catlog 2
echo ==== qref -u
hg qref -u jane
catlog 2
echo ==== qnew -U -m
hg qnew -U -m "Three" 3.patch
catlog 3
echo ==== qref
echo "3" >3
hg add
hg qref
catlog 3
echo ==== qref -m
hg qref -m "Drei"
catlog 3
echo ==== qref -u
hg qref -u mary
catlog 3
echo ==== qref -u -m
hg qref -u maria -m "Three (again)"
catlog 3
echo ==== qnew -m
hg qnew -m "Four" 4.patch
echo "4" >4
hg add
hg qref
catlog 4
echo ==== qref -u
hg qref -u jane
catlog 4
echo ==== qnew with HG header
hg qnew 5.patch
hg qpop
echo "# HG changeset patch" >>.hg/patches/5.patch
echo "# User johndoe" >>.hg/patches/5.patch
hg qpush 2>&1 | grep 'now at'
catlog 5
echo ==== hg qref
echo "5" >5
hg add
hg qref
catlog 5
echo ==== hg qref -U
hg qref -U
catlog 5
echo ==== hg qref -u
hg qref -u johndeere
catlog 5
echo ==== "qpop -a / qpush -a"
hg qpop -a
hg qpush -a
hg log --template "{rev}: {desc} - {author}\n"