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/bash

     2

     3

_hg_commands()

     4

{

     5

    local commands="$(hg -v help | sed -e '1,/^list of commands:/d' \

     6

                                       -e '/^global options:/,$d' \

     7

				       -e '/^ [^ ]/!d; s/[,:]//g;')"

     8

     9

    # hide debug commands from users, but complete them if 

    10

    # specifically asked for

    11

    if [[ "$cur" == de* ]]; then

    12

	commands="$commands debugcheckstate debugstate debugindex"

    13

	commands="$commands debugindexdot debugwalk debugdata"

    14

    fi

    15

    COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W "$commands" -- "$cur") )

    16

}

    17

    18

_hg_paths()

    19

{

    20

    local paths="$(hg paths | sed -e 's/ = .*$//')"

    21

    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -W "$paths" -- "$cur" ))

    22

}

    23

    24

_hg_status()

    25

{

    26

    local files="$( hg status -$1 | cut -b 3- )"

    27

    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -W "$files" -- "$cur" ))

    28

}

    29

    30

_hg_tags()

    31

{

    32

    local tags="$(hg tags | sed -e 's/[0-9]*:[a-f0-9]\{40\}$//; s/ *$//')"

    33

    COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W "$tags" -- "$cur") )

    34

}

    35

    36

# this is "kind of" ugly...

    37

_hg_count_non_option()

    38

{

    39

    local i count=0

    40

    local filters="$1"

    41

    42

    for (( i=1; $i<=$COMP_CWORD; i++ )); do

    43

	if [[ "${COMP_WORDS[i]}" != -* ]]; then

    44

	    if [[ ${COMP_WORDS[i-1]} == @($filters|$global_args) ]]; then

    45

		continue

    46

	    fi

    47

	    count=$(($count + 1))

    48

	fi

    49

    done

    50

    51

    echo $(($count - 1))

    52

}

    53

    54

_hg()

    55

{

    56

    local cur prev cmd opts i

    57

    # global options that receive an argument

    58

    local global_args='--cwd|-R|--repository'

    59

    60

    COMPREPLY=()

    61

    cur="$2"

    62

    prev="$3"

    63

    64

    # searching for the command 

    65

    # (first non-option argument that doesn't follow a global option that

    66

    #  receives an argument)

    67

    for (( i=1; $i<=$COMP_CWORD; i++ )); do

    68

	if [[ ${COMP_WORDS[i]} != -* ]]; then

    69

	    if [[ ${COMP_WORDS[i-1]} != @($global_args) ]]; then

    70

		cmd="${COMP_WORDS[i]}"

    71

		break

    72

	    fi

    73

	fi

    74

    done

    75

    76

    if [[ "$cur" == -* ]]; then

    77

	# this assumes that there are no commands with spaces in the name

    78

	opts=$(hg -v help $cmd | sed -e '/^ *-/!d; s/ [^- ].*//')

    79

    80

	COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -W "$opts" -- "$cur") )

    81

	return

    82

    fi

    83

    84

    # global options

    85

    case "$prev" in

    86

	-R|--repository)

    87

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -d -- "$cur" ))

    88

	    return

    89

	;;

    90

	--cwd)

    91

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -d -- "$cur" ))

    92

	    return

    93

	;;

    94

    esac

    95

    96

    if [ -z "$cmd" ] || [ $COMP_CWORD -eq $i ]; then

    97

	_hg_commands

    98

	return

    99

    fi

   100

   101

    # canonicalize command name

   102

    cmd=$(hg -q help "$cmd" | sed -e 's/^hg //; s/ .*//; 1q')

   103

   104

    if [ "$cmd" != status ] && [ "$prev" = -r ] || [ "$prev" = --rev ]; then

   105

	_hg_tags

   106

	return

   107

    fi

   108

   109

    case "$cmd" in

   110

	help)

   111

	    _hg_commands

   112

	;;

   113

	export|manifest|update)

   114

	    _hg_tags

   115

	;;

   116

	pull|push|outgoing|incoming)

   117

	    _hg_paths

   118

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -d -- "$cur" ))

   119

	;;

   120

	paths)

   121

	    _hg_paths

   122

	;;

   123

	add)

   124

	    _hg_status "u"

   125

	;;

   126

	commit)

   127

	    _hg_status "mra"

   128

	;;

   129

	remove)

   130

	    _hg_status "r"

   131

	;;

   132

	forget)

   133

	    _hg_status "a"

   134

	;;

   135

	diff)

   136

	    _hg_status "mra"

   137

	;;

   138

	revert)

   139

	    _hg_status "mra"

   140

	;;

   141

	clone)

   142

	    local count=$(_hg_count_non_option)

   143

	    if [ $count = 1 ]; then

   144

		_hg_paths

   145

	    fi

   146

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -d -- "$cur" ))

   147

	;;

   148

	debugindex|debugindexdot)

   149

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -X "!*.i" -- "$cur" ))

   150

	;;

   151

	debugdata)

   152

	    COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -X "!*.d" -- "$cur" ))

   153

	;;

   154

	cat)

   155

	    local count=$(_hg_count_non_option '-o|--output')

   156

	    if [ $count = 2 ]; then

   157

		_hg_tags

   158

	    else

   159

		COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" ))

   160

	    fi

   161

	;;

   162

	*) 

   163

            COMPREPLY=(${COMPREPLY[@]:-} $( compgen -f -- "$cur" ))

   164

	;;

   165

    esac

   166

   167

}

   168

   169

complete -o bashdefault -o default -F _hg hg 2> /dev/null \

   170

    || complete -o default -F _hg hg