# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1393953884 0
# Node ID 9dcd045229b427da50a71d3dd7b2ee5b0c1ff3a4
# Parent  42b428c5fcd895bb72ff67b4e861896afd70938b# Parent  49bef9bfeb50826ac631db1912d1a092150bb802
Merge with stable

diff -r 42b428c5fcd8 -r 9dcd045229b4 tests/hghave.py
--- a/tests/hghave.py	Sun Mar 02 13:53:07 2014 +0000
+++ b/tests/hghave.py	Tue Mar 04 17:24:44 2014 +0000
@@ -1,4 +1,4 @@
-import os, stat, socket
+import os, stat
 import re
 import sys
 import tempfile
@@ -96,21 +96,6 @@
     finally:
         os.remove(path)
 
-def has_inotify():
-    try:
-        import hgext.inotify.linux.watcher
-    except ImportError:
-        return False
-    name = tempfile.mktemp(dir='.', prefix=tempprefix)
-    sock = socket.socket(socket.AF_UNIX)
-    try:
-        sock.bind(name)
-    except socket.error:
-        return False
-    sock.close()
-    os.unlink(name)
-    return True
-
 def has_fifo():
     if getattr(os, "mkfifo", None) is None:
         return False
@@ -315,7 +300,6 @@
     "gpg": (has_gpg, "gpg client"),
     "hardlink": (has_hardlink, "hardlinks"),
     "icasefs": (has_icasefs, "case insensitive file system"),
-    "inotify": (has_inotify, "inotify extension support"),
     "killdaemons": (has_killdaemons, 'killdaemons.py support'),
     "lsprof": (has_lsprof, "python lsprof module"),
     "mtn": (has_mtn, "monotone client (>= 1.0)"),
diff -r 42b428c5fcd8 -r 9dcd045229b4 tests/run-tests.py
--- a/tests/run-tests.py	Sun Mar 02 13:53:07 2014 +0000
+++ b/tests/run-tests.py	Tue Mar 04 17:24:44 2014 +0000
@@ -152,8 +152,6 @@
         help="exit on the first test failure")
     parser.add_option("-H", "--htmlcov", action="store_true",
         help="create an HTML report of the coverage of the files")
-    parser.add_option("--inotify", action="store_true",
-        help="enable inotify extension when running tests")
     parser.add_option("-i", "--interactive", action="store_true",
         help="prompt to accept changed output")
     parser.add_option("-j", "--jobs", type="int",
@@ -344,12 +342,6 @@
     hgrc.write('commit = -d "0 0"\n')
     hgrc.write('shelve = --date "0 0"\n')
     hgrc.write('tag = -d "0 0"\n')
-    if options.inotify:
-        hgrc.write('[extensions]\n')
-        hgrc.write('inotify=\n')
-        hgrc.write('[inotify]\n')
-        hgrc.write('pidfile=daemon.pids')
-        hgrc.write('appendpid=True\n')
     if options.extra_config_opt:
         for opt in options.extra_config_opt:
             section, key = opt.split('.', 1)