This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10845

transaction: narrow the error filtering when failing to rename undo file
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd2e0226b511a: transaction: narrow the error filtering when failing to rename undo file
Summary

Having inconsistent "undo" files can be quite serious so we narrow the error
filtering to the intent that the comment explain.

(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.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (5 lines)

Diff 28594

mercurial/localrepo.py

def a(): def a():
for vfs, src, dest in renamefiles: for vfs, src, dest in renamefiles:
# if src and dest refer to a same file, vfs.rename is a no-op, # if src and dest refer to a same file, vfs.rename is a no-op,
# leaving both src and dest on disk. delete dest to make sure # leaving both src and dest on disk. delete dest to make sure
# the rename couldn't be such a no-op. # the rename couldn't be such a no-op.
vfs.tryunlink(dest) vfs.tryunlink(dest)
try: try:
vfs.rename(src, dest) vfs.rename(src, dest)
except OSError: # journal file does not yet exist except OSError as exc: # journal file does not yet exist
pass if exc.errno != errno.ENOENT:
raise
return a return a
def undoname(fn): def undoname(fn):
base, name = os.path.split(fn) base, name = os.path.split(fn)
assert name.startswith(b'journal') assert name.startswith(b'journal')
return os.path.join(base, name.replace(b'journal', b'undo', 1)) return os.path.join(base, name.replace(b'journal', b'undo', 1))