facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Benoit Boissinot 2010-04-14 09:09:43 +02:00
commit 18b2a0f2b6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/util.py
View File

@ -689,7 +689,7 @@ 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)

5
tests/run-tests.py
View File

@ -852,6 +852,11 @@ 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: