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

# hgmerge - default merge helper for Mercurial

     4

#

     5

# This tries to find a way to do three-way merge on the current system.

     6

# The result ought to end up in $1.

     7

     8

set -e # bail out quickly on failure

     9

    10

LOCAL="$1"

    11

BASE="$2"

    12

OTHER="$3"

    13

    14

if [ -z "$EDITOR" ]; then

    15

    EDITOR="vi"

    16

fi

    17

    18

# Back up our file

    19

cp "$LOCAL" "$LOCAL.orig"

    20

    21

# Attempt to do a non-interactive merge

    22

if type merge > /dev/null 2>&1; then

    23

    merge "$LOCAL" "$BASE" "$OTHER" 2> /dev/null && exit 0

    24

    cp "$LOCAL.orig" "$LOCAL"

    25

elif type diff3 > /dev/null 2>&1; then

    26

    diff3 -m "$LOCAL.orig" "$BASE" "$OTHER" > "$LOCAL" && exit 0

    27

    cp "$LOCAL.orig" "$LOCAL"

    28

fi

    29

    30

if [ -n "$DISPLAY" ]; then

    31

    # try using kdiff3, which is fairly nice

    32

    if type kdiff3 > /dev/null 2>&1; then

    33

	kdiff3 --auto "$BASE" "$LOCAL" "$OTHER" -o "$LOCAL" || exit 1

    34

	exit 0

    35

    fi

    36

    37

    # try using tkdiff, which is a bit less sophisticated

    38

    if type tkdiff > /dev/null 2>&1; then

    39

	tkdiff "$LOCAL" "$OTHER" -a "$BASE" -o "$LOCAL" || exit 1

    40

	exit 0

    41

    fi

    42

fi

    43

    44

# Attempt to do a merge with $EDITOR

    45

if type merge > /dev/null 2>&1; then

    46

    echo "conflicts detected in $LOCAL"

    47

    merge "$LOCAL" "$BASE" "$OTHER" 2>/dev/null || $EDITOR "$LOCAL"

    48

    exit 0

    49

fi

    50

    51

if type diff3 > /dev/null 2>&1; then

    52

    echo "conflicts detected in $LOCAL"

    53

    diff3 -m "$LOCAL.orig" "$BASE" "$OTHER" > "$LOCAL" || $EDITOR "$LOCAL"

    54

    exit 0

    55

fi

    56

    57

HGTMP=""

    58

cleanup_exit() {

    59

    rm -rf "$HGTMP"

    60

}

    61

    62

# attempt to manually merge with diff and patch

    63

if type diff > /dev/null 2>&1 && type patch > /dev/null 2>&1; then

    64

    # Remove temporary files even if we get interrupted

    65

    trap "cleanup_exit" 0 # normal exit

    66

    trap "exit 1" 1 2 3 6 15 # HUP INT QUIT ABRT TERM

    67

    68

    HGTMP="${TMPDIR-/tmp}/hgmerge.$RANDOM.$RANDOM.$RANDOM.$$"

    69

    (umask 077 && mkdir "$HGTMP") || {

    70

	echo "Could not create temporary directory! Exiting." 1>&2

    71

	exit 1

    72

    }

    73

    74

    diff -u "$BASE" "$OTHER" > "$HGTMP/diff"

    75

    if patch "$LOCAL" < "$HGTMP/diff"; then

    76

	exit 0

    77

    else

    78

	# If rejects are empty after using the editor, merge was ok

    79

	$EDITOR "$LOCAL" "$LOCAL.rej" && test -s "$LOCAL.rej" || exit 0

    80

    fi

    81

    exit 1

    82

fi

    83

    84

echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"

    85

exit 1