diff tests/hghave @ 6998:ddfcefab8b97

merge with -stable

--- a/tests/hghave	Fri Sep 05 11:04:36 2008 +0200
+++ b/tests/hghave	Sat Sep 06 17:04:01 2008 +0200
@@ -73,7 +73,14 @@
         except:
             return False
     finally:
-        os.remove(path)  
+        os.remove(path)
+
+def has_inotify():
+    try:
+        import hgext.inotify.linux.watcher
+        return True
+    except ImportError:
+        return False
 
 def has_fifo():
     return hasattr(os, "mkfifo")
@@ -148,14 +155,15 @@
     "git": (has_git, "git command line client"),
     "hotshot": (has_hotshot, "python hotshot module"),
     "icasefs": (has_icasefs, "case insensitive file system"),
+    "inotify": (has_inotify, "inotify extension support"),
     "lsprof": (has_lsprof, "python lsprof module"),
     "mtn": (has_mtn, "monotone client (> 0.31)"),
+    "pygments": (has_pygments, "Pygments source highlighting library"),
     "svn": (has_svn, "subversion client and admin tools"),
     "svn-bindings": (has_svn_bindings, "subversion python bindings"),
     "symlink": (has_symlink, "symbolic links"),
     "tla": (has_tla, "GNU Arch tla client"),
     "unix-permissions": (has_unix_permissions, "unix-style permissions"),
-    "pygments": (has_pygments, "Pygments source highlighting library"),
 }
 
 def list_features():