util: don't overwrite os-specific functions with general ones

mercurial/util.py

@@ -776,6 +776,19 b' class path_auditor(object):'
         # want to add "foo/bar/baz" before checking if there's a "foo/.hg"
         self.auditeddir.update(prefixes)
 
+def nlinks(pathname):
+    """Return number of hardlinks for the given file."""
+    return os.lstat(pathname).st_nlink
+
+if hasattr(os, 'link'):
+    os_link = os.link
+else:
+    def os_link(src, dst):
+        raise OSError(0, _("Hardlinks not supported"))
+
+def lookup_reg(key, name=None, scope=None):
+    return None
+
 if os.name == 'nt':
     from windows import *
     def expand_glob(pats):
@@ -817,16 +830,6 b' def readlock(pathname):'
         pass
     return posixfile(pathname).read()
 
-def nlinks(pathname):
-    """Return number of hardlinks for the given file."""
-    return os.lstat(pathname).st_nlink
-
-if hasattr(os, 'link'):
-    os_link = os.link
-else:
-    def os_link(src, dst):
-        raise OSError(0, _("Hardlinks not supported"))
-
 def fstat(fp):
     '''stat file object that may not have fileno method.'''
     try:
@@ -962,9 +965,6 b' def gui():'
     '''Are we running in a GUI?'''
     return os.name == "nt" or os.name == "mac" or os.environ.get("DISPLAY")
 
-def lookup_reg(key, name=None, scope=None):
-    return None
-
 def mktempcopy(name, emptyok=False, createmode=None):
     """Create a temporary file with the same contents from name