This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10841

copyfiles: deal with existing file when hardlinking
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9ea525216edb: copyfiles: deal with existing file when hardlinking
Summary

If the hardlinking fails, we fallback to shutil.copy, but do not consider
future hardlinking doomed.

This is a slight improvement from the current situation, we still avoid
hardliking in a case we might be able to do it. However this does not have an
impact of the rest of the operation.

(This is an opportunity improvement while looking at something next to that.)

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:37 AM
pulkit accepted this revision.Jun 14 2021, 4:37 PM
This revision is now accepted and ready to land.Jun 14 2021, 4:37 PM
marmoute added a commit: rHG9ea525216edb: copyfiles: deal with existing file when hardlinking.Jun 17 2021, 9:30 AM
Closed by commit rHG9ea525216edb: copyfiles: deal with existing file when hardlinking (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (6 lines)

Diff 28589

mercurial/util.py

os.stat(os.path.dirname(src)).st_dev os.stat(os.path.dirname(src)).st_dev
== os.stat(os.path.dirname(dst)).st_dev == os.stat(os.path.dirname(dst)).st_dev
) )
settopic() settopic()
if hardlink: if hardlink:
try: try:
oslink(src, dst) oslink(src, dst)
except (IOError, OSError): except (IOError, OSError) as exc:
if exc.errno != errno.EEXIST:
hardlink = False hardlink = False
# XXX maybe try to relink if the file exist ?
shutil.copy(src, dst) shutil.copy(src, dst)
else: else:
shutil.copy(src, dst) shutil.copy(src, dst)
num += 1 num += 1
if progress: if progress:
progress.increment() progress.increment()
return hardlink, num return hardlink, num