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

set -e

     4

set -x

     5

     6

# skip commit logs

     7

HGMERGE=tkmerge; export HGMERGE

     8

EDITOR=true; export EDITOR

     9

    10

rm -rf m m1 m2

    11

mkdir m

    12

cd m

    13

    14

echo "m     this  that"

    15

echo "this" > a

    16

echo "that" > b

    17

hg init

    18

hg addremove

    19

hg commit

    20

echo "a:" `hg dump a` "b:" `hg dump b`

    21

echo

    22

    23

cd ..

    24

echo "m2    this  that "

    25

mkdir m2

    26

cd m2

    27

hg branch ../m

    28

hg checkout

    29

echo "a:" `hg dump a` "b:" `hg dump b`

    30

echo

    31

    32

cd ../m

    33

echo "m     this1 that "

    34

echo "this1" > a

    35

hg commit

    36

echo "a:" `hg dump a` "b:" `hg dump b`

    37

echo

    38

    39

cd ..

    40

echo "m1    this1 that "

    41

mkdir m1

    42

cd m1

    43

hg branch ../m

    44

hg checkout

    45

echo "a:" `hg dump a` "b:" `hg dump b`

    46

echo

    47

    48

cd ../m1

    49

echo "m1    this1 that1"

    50

echo "that1" > b

    51

hg commit

    52

echo "a:" `hg dump a` "b:" `hg dump b`

    53

echo

    54

    55

cd ../m2

    56

echo "m2    this  that2"

    57

echo "that2" > b

    58

hg commit

    59

echo "a:" `hg dump a` "b:" `hg dump b`

    60

echo

    61

    62

cd ../m1

    63

echo "m1:m2 this1 that1 that2"

    64

hg merge ../m2 # b should conflict, a should be fine

    65

echo "a:" `hg dump a` "b:" `hg dump b`

    66

echo

    67

    68

cd ../m2

    69

echo "m2    this2 that2"

    70

echo "this2" > a

    71

hg commit

    72

echo "a:" `hg dump a` "b:" `hg dump b`

    73

echo

    74

    75

cd ../m2

    76

echo "m2:m this12 that2"

    77

hg merge ../m # a should conflict, b should be fine

    78

echo "a:" `hg dump a` "b:" `hg dump b`

    79

echo

    80

    81

# now here's the interesting bit

    82

# if we choose ancestor by file, no conflicts

    83

# otherwise we've got two equally close ancestors, each with a conflict

    84

# if we go back to the root, we'll have both conflicts again

    85

echo "m2:m1 this12 that12"

    86

hg merge ../m1 # should be clean

    87

echo "a:" `hg dump a` "b:" `hg dump b`

    88

echo