This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10853

copyfile: add a option callback for failed hardlinking
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd756fc11cfb9: copyfile: add a option callback for failed hardlinking
Summary

Local clone, adjust its UI depending on the success of using hardlinking, so we
add a small callback making it possible for copyfile to signal if the
requested hardlinking failed.

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:43 PM
This revision is now accepted and ready to land.Jun 14 2021, 4:43 PM
baymax updated this revision to Diff 28575.Jun 15 2021, 10:24 AM

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

baymax updated this revision to Diff 28623.Jun 21 2021, 1:09 AM

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

marmoute added a commit: rHGd756fc11cfb9: copyfile: add a option callback for failed hardlinking.Jun 21 2021, 11:14 AM
Closed by commit rHGd756fc11cfb9: copyfile: add a option callback for failed hardlinking (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (16 lines)

Diff 28653

mercurial/util.py

b'tmpfs', b'tmpfs',
b'ufs', b'ufs',
b'xfs', b'xfs',
b'zfs', b'zfs',
} }
def copyfile( def copyfile(
src, dest, hardlink=False, copystat=False, checkambig=False, nb_bytes=None src,
dest,
hardlink=False,
copystat=False,
checkambig=False,
nb_bytes=None,
no_hardlink_cb=None,
): ):
"""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).
if hardlink: if 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:
no_hardlink_cb()
hardlink = False hardlink = False
if hardlink: if hardlink:
try: try:
oslink(src, dest) oslink(src, dest)
if nb_bytes is not None: if nb_bytes is not None:
m = "the `nb_bytes` argument is incompatible with `hardlink`" m = "the `nb_bytes` argument is incompatible with `hardlink`"
raise error.ProgrammingError(m) raise error.ProgrammingError(m)
return return
except (IOError, OSError): except (IOError, OSError) as exc:
pass # fall back to normal copy if exc.errno != errno.EEXIST and no_hardlink_cb is not None:
no_hardlink_cb()
# fall back to normal copy
if os.path.islink(src): if os.path.islink(src):
os.symlink(os.readlink(src), dest) os.symlink(os.readlink(src), dest)
# copytime is ignored for symlinks, but in general copytime isn't needed # copytime is ignored for symlinks, but in general copytime isn't needed
# for them anyway # for them anyway
if nb_bytes is not None: if nb_bytes is not None:
m = "cannot use `nb_bytes` on a symlink" m = "cannot use `nb_bytes` on a symlink"
raise error.ProgrammingError(m) raise error.ProgrammingError(m)
else: else: