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 tries to exercise the ssh functionality with a dummy script

     4

     5

cat <<'EOF' > dummyssh

     6

#!/bin/sh

     7

# this attempts to deal with relative pathnames

     8

cd `dirname $0`

     9

    10

# check for proper args

    11

if [ $1 != "user@dummy" ] ; then

    12

	exit -1

    13

fi

    14

    15

# check that we're in the right directory

    16

if [ ! -x dummyssh ] ; then

    17

	exit -1

    18

fi

    19

    20

echo Got arguments 1:$1 2:$2 3:$3 4:$4 5:$5 >> dummylog

    21

$2

    22

EOF

    23

chmod +x dummyssh

    24

    25

echo "# creating 'remote'"

    26

hg init remote

    27

cd remote

    28

echo this > foo

    29

hg ci -A -m "init" -d "0 0" foo

    30

    31

cd ..

    32

    33

echo "# clone remote"

    34

hg clone -e ./dummyssh ssh://user@dummy/remote local

    35

    36

echo "# verify"

    37

cd local

    38

hg verify

    39

    40

echo "# empty default pull"

    41

hg paths

    42

hg pull -e ../dummyssh

    43

    44

echo "# local change"

    45

echo bleah > foo

    46

hg ci -m "add" -d "0 0"

    47

    48

echo "# updating rc"

    49

echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc

    50

echo "[ui]" >> .hg/hgrc

    51

echo "ssh = ../dummyssh" >> .hg/hgrc

    52

    53

echo "# find outgoing"

    54

hg out ssh://user@dummy/remote

    55

    56

echo "# push"

    57

hg push

    58

    59

cd ../remote

    60

    61

echo "# check remote tip"

    62

hg tip

    63

hg verify

    64

hg cat foo

    65

    66

cd ..

    67

cat dummylog