Mercurial > hg

changeset 31594:4a1bf30f5438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: use util.getfstype
author Jun Wu <quark@fb.com>
date Thu, 23 Mar 2017 12:01:18 -0700
parents ae02cc1f5369
children e8bd005c0af7
files mercurial/util.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/util.py	Thu Mar 23 11:58:45 2017 -0700
+++ b/mercurial/util.py	Thu Mar 23 12:01:18 2017 -0700
@@ -1086,8 +1086,7 @@
     if hardlink:
         # Hardlinks are problematic on CIFS (issue4546), do not allow hardlinks
         # unless we are confident that dest is on a whitelisted filesystem.
-        destdir = os.path.dirname(dest)
-        fstype = getattr(osutil, 'getfstype', lambda x: None)(destdir)
+        fstype = getfstype(os.path.dirname(dest))
         if fstype not in _hardlinkfswhitelist:
             hardlink = False
     if hardlink: