annotate tests/test-rawcommit1.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 6f274afc05c7
children dbb8bba48510
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
1 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
2 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
3 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
4 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
5 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
6 changeset: 2:9f827976dae4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
7 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
8 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
9 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
10 summary: 2
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
11
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
12 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
13 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
14 changeset: 3:142428fbbcc5
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
15 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
16 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
17 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
18 summary: 3
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
19
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
20 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
21 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
22 changeset: 4:4d450f9aa680
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
23 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
24 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
25 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
26 summary: 4
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
27
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
28 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
29 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
30 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
31 changeset: 4:4d450f9aa680
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
32 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
33 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
34 summary: 4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
35
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
36 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
37 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
38 changeset: 6:b4b8b9afa8cc
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
39 tag: tip
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
40 parent: 4:4d450f9aa680
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
41 parent: 5:a7925a42d0df
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
42 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
43 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
44 summary: 6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
45
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
46 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
47 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
48 changeset: 7:f84d0b1b024e
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
49 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
50 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
51 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
52 summary: 7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
53