merge with stable

mercurial/util.py

@@ -689,7 +689,7 b' def checklink(path):'
     """check whether the given path is on a symlink-capable filesystem"""
     # mktemp is not racy because symlink creation will fail if the
     # file already exists
-    name = tempfile.mktemp(dir=path)
+    name = tempfile.mktemp(dir=path, prefix='hg-checklink-')
     try:
         os.symlink(".", name)
         os.unlink(name)

tests/run-tests.py

@@ -852,6 +852,11 b' def main():'
     os.environ['GREP_OPTIONS'] = ''
     os.environ['http_proxy'] = ''
 
+    # unset env related to hooks
+    for k in os.environ.keys():
+        if k.startswith('HG_'):
+            del os.environ[k]
+
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
     if options.tmpdir: