changeset 31720:dea2a17cbfd0

hardlink: check directory's st_dev when copying files Previously, when copying a file, copyfiles will compare src's st_dev with dirname(dst)'s st_dev, to decide whether to enable hardlink or not. That could have issues on Linux's overlayfs, where stating directories could result in different st_dev from st_dev of stating files, even if both the directories and the files exist in the overlay's upperdir. This patch fixes it by checking dirname(src) instead. It's more consistent because we are checking directories for both src and dest. That fixes test-hardlinks.t running on common Docker setups.
author Jun Wu <quark@fb.com>
date Wed, 29 Mar 2017 12:37:03 -0700
parents 456efd1b51fd
children be8a866a2c44
files mercurial/util.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Wed Mar 29 12:26:46 2017 -0700
+++ b/mercurial/util.py	Wed Mar 29 12:37:03 2017 -0700
@@ -1144,7 +1144,7 @@
             num += n
     else:
         if hardlink is None:
-            hardlink = (os.stat(src).st_dev ==
+            hardlink = (os.stat(os.path.dirname(src)).st_dev ==
                         os.stat(os.path.dirname(dst)).st_dev)
         topic = gettopic()