This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10854

copyfiles: add a way to relax the file system checking for hardlink
ClosedPublic

Authored by marmoute on Jun 9 2021, 10:38 AM.

Details

Reviewers
pulkit
Alphare
Group Reviewers
hg-reviewers
Commits
rHG09ff5d532a25: copyfiles: add a way to relax the file system checking for hardlink
Summary

This is critical for transaction file, less for hardlink/copy clone as we are
about to do. Since pure build does not have a getfstype implementation this
would disable hardlink clone for all pure build. So we add a parameter to
control that extra check.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jun 9 2021, 10:38 AM
pulkit accepted this revision.Jun 14 2021, 4:44 PM
This revision is now accepted and ready to land.Jun 14 2021, 4:44 PM
baymax updated this revision to Diff 28576.Jun 15 2021, 10:24 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Jun 16 2021, 4:16 AM
baymax updated this revision to Diff 28624.Jun 21 2021, 1:09 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (3 lines)

Diff 28654

mercurial/util.py

def copyfile( def copyfile(
src, src,
dest, dest,
hardlink=False, hardlink=False,
copystat=False, copystat=False,
checkambig=False, checkambig=False,
nb_bytes=None, nb_bytes=None,
no_hardlink_cb=None, no_hardlink_cb=None,
check_fs_hardlink=True,
): ):
"""copy a file, preserving mode and optionally other stat info like """copy a file, preserving mode and optionally other stat info like
atime/mtime atime/mtime
checkambig argument is used with filestat, and is useful only if checkambig argument is used with filestat, and is useful only if
destination file is guarded by any lock (e.g. repo.lock or destination file is guarded by any lock (e.g. repo.lock or
repo.wlock). repo.wlock).
copystat and checkambig should be exclusive. copystat and checkambig should be exclusive.
nb_bytes: if set only copy the first `nb_bytes` of the source file. nb_bytes: if set only copy the first `nb_bytes` of the source file.
""" """
assert not (copystat and checkambig) assert not (copystat and checkambig)
oldstat = None oldstat = None
if os.path.lexists(dest): if os.path.lexists(dest):
if checkambig: if checkambig:
oldstat = checkambig and filestat.frompath(dest) oldstat = checkambig and filestat.frompath(dest)
unlink(dest) unlink(dest)
if hardlink: if hardlink and check_fs_hardlink:
# Hardlinks are problematic on CIFS (issue4546), do not allow hardlinks # Hardlinks are problematic on CIFS (issue4546), do not allow hardlinks
# unless we are confident that dest is on a whitelisted filesystem. # unless we are confident that dest is on a whitelisted filesystem.
try: try:
fstype = getfstype(os.path.dirname(dest)) fstype = getfstype(os.path.dirname(dest))
except OSError: except OSError:
fstype = None fstype = None
if fstype not in _hardlinkfswhitelist: if fstype not in _hardlinkfswhitelist:
if no_hardlink_cb is not None: if no_hardlink_cb is not None: