Skip to content
Snippets Groups Projects
Commit 9555f3b9489d authored by Patrick Mezard's avatar Patrick Mezard
Browse files

Merge with crew-stable

No related branches found
No related tags found
No related merge requests found
......@@ -8,6 +8,8 @@
import sys
import tempfile
tempprefix = 'hg-hghave-'
def has_symlink():
return hasattr(os, "symlink")
......@@ -15,7 +17,7 @@
return hasattr(os, "mkfifo")
def has_executablebit():
fd, path = tempfile.mkstemp()
fd, path = tempfile.mkstemp(prefix=tempprefix)
os.close(fd)
try:
s = os.lstat(path).st_mode
......@@ -26,7 +28,7 @@
def has_eol_in_paths():
try:
fd, path = tempfile.mkstemp(suffix='\n\r')
fd, path = tempfile.mkstemp(prefix=tempprefix, suffix='\n\r')
os.close(fd)
os.remove(path)
return True
......
......@@ -12,9 +12,9 @@
# ln -s a a.lnk
# ln -s d/b d/b.lnk
# hg ci -Am t
# hg bundle --base null ../test-no-symlinks.bundle
# hg bundle --base null ../test-no-symlinks.hg
# Extract a symlink on a platform not supporting them
echo % unbundle
hg init t
cd t
......@@ -16,9 +16,9 @@
# Extract a symlink on a platform not supporting them
echo % unbundle
hg init t
cd t
hg pull "$TESTDIR/test-no-symlinks.bundle"
hg pull "$TESTDIR/test-no-symlinks.hg"
hg update
cat a.lnk && echo
......@@ -34,8 +34,8 @@
# Bundle and extract again
echo % bundle
hg bundle --base null ../symlinks.bundle
hg bundle --base null ../symlinks.hg
cd ..
hg init t2
cd t2
......@@ -38,8 +38,8 @@
cd ..
hg init t2
cd t2
hg pull ../symlinks.bundle
hg pull ../symlinks.hg
hg update
cat a.lnk && echo
......
No preview for this file type
% unbundle
pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.bundle
pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.hg
requesting all changes
adding changesets
adding manifests
......@@ -13,7 +13,7 @@
a
d/b
% bundle
pulling from ../symlinks.bundle
pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment