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

     1

#!/bin/sh

     2

     3

# This test makes sure that we don't mark a file as merged with its ancestor

     4

# when we do a merge.

     5

     6

cat <<'EOF' > merge

     7

#!/bin/sh

     8

echo merging for `basename $1`

     9

EOF

    10

chmod +x merge

    11

    12

echo creating base

    13

hg init a

    14

cd a

    15

echo 1 > foo

    16

echo 1 > bar

    17

echo 1 > baz

    18

echo 1 > quux

    19

hg add foo bar baz quux

    20

hg commit -m "base" -d "0 0"

    21

    22

cd ..

    23

hg clone a b

    24

    25

echo creating branch a

    26

cd a

    27

echo 2a > foo

    28

echo 2a > bar

    29

hg commit -m "branch a" -d "0 0"

    30

    31

echo creating branch b

    32

    33

cd ..

    34

cd b

    35

echo 2b > foo

    36

echo 2b > baz

    37

hg commit -m "branch b" -d "0 0"

    38

    39

echo "we shouldn't have anything but n state here"

    40

hg debugstate | cut -b 1-16,35-

    41

    42

echo merging

    43

hg pull ../a

    44

env HGMERGE=../merge hg update -vm

    45

    46

echo 2m > foo

    47

echo 2b > baz

    48

echo new > quux

    49

    50

echo "we shouldn't have anything but foo in merge state here"

    51

hg debugstate | cut -b 1-16,35- | grep "^m"

    52

    53

hg ci -m "merge" -d "0 0"

    54

    55

echo "main: we should have a merge here"

    56

hg debugindex .hg/00changelog.i

    57

    58

echo "log should show foo and quux changed"

    59

hg log -v -r tip

    60

    61

echo "foo: we should have a merge here"

    62

hg debugindex .hg/data/foo.i

    63

    64

echo "bar: we shouldn't have a merge here"

    65

hg debugindex .hg/data/bar.i

    66

    67

echo "baz: we shouldn't have a merge here"

    68

hg debugindex .hg/data/baz.i

    69

    70

echo "quux: we shouldn't have a merge here"

    71

hg debugindex .hg/data/quux.i

    72

    73

echo "manifest entries should match tips of all files"

    74

hg manifest

    75

    76

echo "everything should be clean now"

    77

hg status

    78

    79

hg verify