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

adding beans/black

     2

adding beans/borlotti

     3

adding beans/kidney

     4

adding beans/navy

     5

adding beans/pinto

     6

adding beans/turtle

     7

adding fennel

     8

adding fenugreek

     9

adding fiddlehead

    10

adding glob:glob

    11

adding mammals/Procyonidae/cacomistle

    12

adding mammals/Procyonidae/coatimundi

    13

adding mammals/Procyonidae/raccoon

    14

adding mammals/skunk

    15

f  beans/black                     beans/black                     

    16

f  beans/borlotti                  beans/borlotti                  

    17

f  beans/kidney                    beans/kidney                    

    18

f  beans/navy                      beans/navy                      

    19

f  beans/pinto                     beans/pinto                     

    20

f  beans/turtle                    beans/turtle                    

    21

f  fennel                          fennel                          

    22

f  fenugreek                       fenugreek                       

    23

f  fiddlehead                      fiddlehead                      

    24

f  glob:glob                       glob:glob                       

    25

f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle  

    26

f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi  

    27

f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon     

    28

f  mammals/skunk                   mammals/skunk                   

    29

f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  

    30

f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  

    31

f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     

    32

f  mammals/skunk                   skunk                   

    33

f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  

    34

f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  

    35

f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     

    36

f  mammals/Procyonidae/cacomistle  cacomistle  

    37

f  mammals/Procyonidae/coatimundi  coatimundi  

    38

f  mammals/Procyonidae/raccoon     raccoon     

    39

f  mammals/Procyonidae/cacomistle  cacomistle  

    40

f  mammals/Procyonidae/coatimundi  coatimundi  

    41

f  mammals/Procyonidae/raccoon     raccoon     

    42

f  mammals/skunk                   ../skunk    

    43

f  beans/black     ../beans/black     

    44

f  beans/borlotti  ../beans/borlotti  

    45

f  beans/kidney    ../beans/kidney    

    46

f  beans/navy      ../beans/navy      

    47

f  beans/pinto     ../beans/pinto     

    48

f  beans/turtle    ../beans/turtle    

    49

f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle  

    50

f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi  

    51

f  mammals/Procyonidae/raccoon     Procyonidae/raccoon     

    52

f  mammals/skunk                   skunk                   

    53

f  beans/black     beans/black     

    54

f  beans/borlotti  beans/borlotti  

    55

f  beans/kidney    beans/kidney    

    56

f  beans/navy      beans/navy      

    57

f  beans/pinto     beans/pinto     

    58

f  beans/turtle    beans/turtle    

    59

f  beans/black     beans/black     

    60

f  beans/borlotti  beans/borlotti  

    61

f  mammals/skunk  mammals/skunk  

    62

f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle  

    63

f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi  

    64

f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon     

    65

f  mammals/skunk                   mammals/skunk                   

    66

abort: .. not under root

    67

abort: beans/../.. not under root

    68

f  fennel      fennel      

    69

f  fenugreek   fenugreek   

    70

f  fiddlehead  fiddlehead  

    71

f  glob:glob   glob:glob   

    72

f  beans/black    beans/black    

    73

f  fenugreek      fenugreek      

    74

f  glob:glob      glob:glob      

    75

f  mammals/skunk  mammals/skunk  

    76

f  beans/black  beans/black  

    77

f  beans/black     beans/black     

    78

f  beans/borlotti  beans/borlotti  

    79

f  beans/kidney    beans/kidney    

    80

f  beans/navy      beans/navy      

    81

f  beans/pinto     beans/pinto     

    82

f  beans/turtle    beans/turtle    

    83

NOEXIST: No such file or directory

    84

fifo: unsupported file type (type is fifo)

    85

m  fenugreek  fenugreek  exact

    86

m  fenugreek  fenugreek  exact

    87

f  new  new  exact