Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy.out @ 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 | 4bfa960f8d2a |
children | 7544700fd931 |
rev | line source |
---|---|
363 | 1 A b |
2 b | |
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
1043 | 4 we should see two history entries |
5 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8 | |
6 tag: tip | |
7 user: test | |
8 date: Thu Jan 1 00:00:00 1970 +0000 | |
9 files: b | |
10 description: | |
11 2 | |
12 | |
13 | |
14 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e | |
15 user: test | |
16 date: Thu Jan 1 00:00:00 1970 +0000 | |
17 files: a | |
18 description: | |
19 1 | |
20 | |
21 | |
22 we should see one log entry for a | |
23 changeset: 0:c19d34741b0a | |
24 user: test | |
25 date: Thu Jan 1 00:00:00 1970 +0000 | |
26 summary: 1 | |
27 | |
28 this should show a revision linked to changeset 0 | |
29 rev offset length base linkrev nodeid p1 p2 | |
30 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000 | |
31 we should see one log entry for b | |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
749
diff
changeset
|
32 changeset: 1:3b5b84850bbe |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
33 tag: tip |
363 | 34 user: test |
967
1f3710636b45
[PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents:
925
diff
changeset
|
35 date: Thu Jan 1 00:00:00 1970 +0000 |
363 | 36 summary: 2 |
37 | |
1043 | 38 this should show a revision linked to changeset 1 |
39 rev offset length base linkrev nodeid p1 p2 | |
40 0 0 65 0 1 9a263dd772e0 000000000000 000000000000 | |
41 this should show the rename information in the metadata | |
42 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 | |
43 copy: a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
793
diff
changeset
|
44 566e338d09a089ba737c21e0d3759980 .hg/data/b.d |
925 | 45 60b725f10c9c85c70d97880dfe8191b3 bsum |
46 60b725f10c9c85c70d97880dfe8191b3 asum | |
363 | 47 checking changesets |
48 checking manifests | |
49 crosschecking files in changesets and manifests | |
50 checking files | |
51 2 files, 2 changesets, 2 total revisions |