Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-walk @ 1241:3b4f05ff3130
Add support for cloning with hardlinks on windows.
In order to use hardlinks, the win32file module is needed, and this is
present in ActivePython. If it isn't present, or hardlinks are not supported
on the underlying filesystem, a regular copy is used.
When using hardlinks the biggest benefit is probably the saving in space,
but cloning can be much quicker. For example cloning the Xen tree
(non trivial) without an update goes from about 95s to 15s.
Unix-like platforms should be unaffected, although should be more tolerant on
filesystems that don't support hard links.
(tweaked by mpm to deal with new copyfiles function)
--- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500
+++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500
@@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts)
if other.dev() != -1:
abspath = os.path.abspath(source)
- copyfile = (os.stat(dest).st_dev == other.dev()
- and getattr(os, 'link', None) or shutil.copy2)
- if copyfile is not shutil.copy2:
- ui.note("cloning by hardlink\n")
# we use a lock here because if we race with commit, we can
# end up with extra data in the cloned revlogs that's not
@@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts)
for f in files.split():
src = os.path.join(source, ".hg", f)
dst = os.path.join(dest, ".hg", f)
- util.copyfiles(src, dst, copyfile)
+ util.copyfiles(src, dst)
repo = hg.repository(ui, dest)
Index: hg/mercurial/util.py
===================================================================
--- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500
+++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500
@@ -12,7 +12,7 @@ platform-specific details from the core.
import os, errno
from demandload import *
-demandload(globals(), "re cStringIO")
+demandload(globals(), "re cStringIO shutil")
def binary(s):
"""return true if a string is binary data using diff's heuristic"""
@@ -217,17 +217,28 @@ def rename(src, dst):
os.unlink(dst)
os.rename(src, dst)
-def copyfiles(src, dst, copyfile):
- """Copy a directory tree, files are copied using 'copyfile'."""
+def copyfiles(src, dst, hardlink=None):
+ """Copy a directory tree using hardlinks if possible"""
+
+ if hardlink is None:
+ hardlink = (os.stat(src).st_dev ==
+ os.stat(os.path.dirname(dst)).st_dev)
if os.path.isdir(src):
os.mkdir(dst)
for name in os.listdir(src):
srcname = os.path.join(src, name)
dstname = os.path.join(dst, name)
- copyfiles(srcname, dstname, copyfile)
+ copyfiles(srcname, dstname, hardlink)
else:
- copyfile(src, dst)
+ if hardlink:
+ try:
+ os_link(src, dst)
+ except:
+ hardlink = False
+ shutil.copy2(src, dst)
+ else:
+ shutil.copy2(src, dst)
def opener(base):
"""
@@ -244,13 +255,13 @@ def opener(base):
if mode[0] != "r":
try:
- s = os.stat(f)
+ nlink = nlinks(f)
except OSError:
d = os.path.dirname(f)
if not os.path.isdir(d):
os.makedirs(d)
else:
- if s.st_nlink > 1:
+ if nlink > 1:
file(f + ".tmp", "wb").write(file(f, "rb").read())
rename(f+".tmp", f)
@@ -266,10 +277,41 @@ def _makelock_file(info, pathname):
def _readlock_file(pathname):
return file(pathname).read()
+def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ return os.stat(pathname).st_nlink
+
+if hasattr(os, 'link'):
+ os_link = os.link
+else:
+ def os_link(src, dst):
+ raise OSError(0, "Hardlinks not supported")
+
# Platform specific variants
if os.name == 'nt':
nulldev = 'NUL:'
+ try: # ActivePython can create hard links using win32file module
+ import win32file
+
+ def os_link(src, dst): # NB will only succeed on NTFS
+ win32file.CreateHardLink(dst, src)
+
+ def nlinks(pathname):
+ """Return number of hardlinks for the given file."""
+ try:
+ fh = win32file.CreateFile(pathname,
+ win32file.GENERIC_READ, win32file.FILE_SHARE_READ,
+ None, win32file.OPEN_EXISTING, 0, None)
+ res = win32file.GetFileInformationByHandle(fh)
+ fh.Close()
+ return res[7]
+ except:
+ return os.stat(pathname).st_nlink
+
+ except ImportError:
+ pass
+
def is_exec(f, last):
return last
author | Stephen Darnell |
---|---|
date | Wed, 14 Sep 2005 12:22:20 -0500 |
parents | 01215ad04283 |
children | 1c64c628d15f |
rev | line source |
---|---|
889
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 #!/bin/sh |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 mkdir t |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 cd t |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 hg init |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 mkdir -p beans |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
7 for b in kidney navy turtle borlotti black pinto; do |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 echo $b > beans/$b |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 done |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 mkdir -p mammals/Procyonidae |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 for m in cacomistle coatimundi raccoon; do |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 echo $m > mammals/Procyonidae/$m |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 done |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 echo skunk > mammals/skunk |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 echo fennel > fennel |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 echo fenugreek > fenugreek |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 echo fiddlehead > fiddlehead |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 echo glob:glob > glob:glob |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 hg addremove |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 hg commit -m "commit #0" -d "0 0" |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
21 hg debugwalk |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 cd mammals |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 hg debugwalk |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 hg debugwalk Procyonidae |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 cd Procyonidae |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 hg debugwalk |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 hg debugwalk .. |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
28 cd .. |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 hg debugwalk ../beans |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 hg debugwalk |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 cd .. |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
32 hg debugwalk -Ibeans |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
33 hg debugwalk 'mammals/../beans/b*' |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
34 hg debugwalk '-X*/Procyonidae' mammals |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
35 hg debugwalk path:mammals |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
36 hg debugwalk .. |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
37 hg debugwalk beans/../.. |
893
36c991554ebb
Turn off testing of absolute paths for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
889
diff
changeset
|
38 # Don't know how to test absolute paths without always getting a false |
36c991554ebb
Turn off testing of absolute paths for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
889
diff
changeset
|
39 # error. |
36c991554ebb
Turn off testing of absolute paths for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
889
diff
changeset
|
40 #hg debugwalk `pwd`/beans |
36c991554ebb
Turn off testing of absolute paths for now.
Bryan O'Sullivan <bos@serpentine.com>
parents:
889
diff
changeset
|
41 #hg debugwalk `pwd`/.. |
889
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
42 hg debugwalk glob:\* |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
43 hg debugwalk 're:.*[kb]$' |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
44 hg debugwalk path:beans/black |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
45 hg debugwalk beans 'beans/*' |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
46 hg debugwalk 'j*' |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
47 hg debugwalk NOEXIST |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
48 mkfifo fifo |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
49 hg debugwalk fifo |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
50 rm fenugreek |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
51 hg debugwalk fenugreek |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
52 hg rm fenugreek |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
53 hg debugwalk fenugreek |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
54 touch new |
0a06d9d373c3
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
55 hg debugwalk new |