util_win32: make os_link more robust (issue 761)
authorPatrick Mezard <pmezard@gmail.com>
Fri, 18 Jan 2008 23:56:51 +0100
changeset 5879 cacfeee38870
parent 5852 03ce5a919ae3
child 5880 b32a0596b2d7
child 5895 f1ac41359b36
util_win32: make os_link more robust (issue 761) On mapped drives, os_link() manages to create links but nlink() does not report them.
mercurial/util_win32.py
--- a/mercurial/util_win32.py	Sat Jan 12 19:35:11 2008 +0100
+++ b/mercurial/util_win32.py	Fri Jan 18 23:56:51 2008 +0100
@@ -146,9 +146,18 @@
                          self.win_strerror)
 
 def os_link(src, dst):
-    # NB will only succeed on NTFS
     try:
         win32file.CreateHardLink(dst, src)
+        # CreateHardLink sometimes succeeds on mapped drives but
+        # following nlinks() returns 1. Check it now and bail out.
+        if nlinks(src) < 2:
+            try:
+                win32file.DeleteFile(dst)
+            except:
+                pass
+            # Fake hardlinking error
+            raise WinOSError((18, 'CreateHardLink', 'The system cannot '
+                              'move the file to a different disk drive'))
     except pywintypes.error, details:
         raise WinOSError(details)