# HG changeset patch
# User Nicolas Dumazet <nicdumz.commits@gmail.com>
# Date 1258439769 -32400
# Node ID 97eda2133a9bd2a1f2cafd572e18d6c8053e19dd
# Parent  2c2f7593ffc4604150b6ef0714dee7961f320917
inotify: add a inotify.pidfile configuration possibility

This will mainly help us in our tests to log pids of inotify servers
started implicitely, to make sure that unkilled inotify daemons do not clutter
the output of unrelated tests.

Also desactivate the workaround introduced in 951ec6c7d703

diff -r 2c2f7593ffc4 -r 97eda2133a9b hgext/inotify/server.py
--- a/hgext/inotify/server.py	Tue Nov 17 15:00:00 2009 +0900
+++ b/hgext/inotify/server.py	Tue Nov 17 15:36:09 2009 +0900
@@ -849,9 +849,14 @@
             finally:
                 self.master.shutdown()
 
-    runargs = None
     if 'inserve' not in sys.argv:
         runargs = [sys.argv[0], 'inserve', '-R', root]
+    else:
+        runargs = sys.argv[:]
+
+    pidfile = ui.config('inotify', 'pidfile')
+    if opts['daemon'] and pidfile is not None and 'pid-file' not in runargs:
+        runargs.append("--pid-file=%s" % pidfile)
 
     service = service()
     logfile = ui.config('inotify', 'log')
diff -r 2c2f7593ffc4 -r 97eda2133a9b tests/test-inotify
--- a/tests/test-inotify	Tue Nov 17 15:00:00 2009 +0900
+++ b/tests/test-inotify	Tue Nov 17 15:36:09 2009 +0900
@@ -20,7 +20,11 @@
 cd repo2
 echo b >> a
 # check that daemon started automatically works correctly
-hg status
+# and make sure that inotify.pidfile works
+hg --config "inotify.pidfile=../hg2.pid" status
+
+# make sure that pidfile worked. Output should be silent.
+kill `cat ../hg2.pid`
 
 cd ../repo1
 echo % inserve
diff -r 2c2f7593ffc4 -r 97eda2133a9b tests/test-inotify-dirty-dirstate
--- a/tests/test-inotify-dirty-dirstate	Tue Nov 17 15:00:00 2009 +0900
+++ b/tests/test-inotify-dirty-dirstate	Tue Nov 17 15:36:09 2009 +0900
@@ -20,10 +20,10 @@
 
 cd ..
 
-hg --config "extensions.inotify=!" clone test test2
+hg --config "inotify.pidfile=../hg2.pid" clone test test2
+cat ../hg2.pid >> "$DAEMON_PIDS"
+
 cd test2
-hg inserve -d --pid-file=../hg2.pid
-cat ../hg2.pid >> "$DAEMON_PIDS"
 echo bar > bar
 hg add
 hg ci -m bar