This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11800

largefile: use the proper "mtime boundary" logic during fixup
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:13 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc0d88407b7d4: largefile: use the proper "mtime boundary" logic during fixup
rHGa96a5d62141b: largefile: use the proper "mtime boundary" logic during fixup
Summary

This will prevent ambiguous cache entry to be used in racy situation. This fix
flakiness in test and some real live misbehavior.

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

Diff 31262

hgext/largefiles/lfutil.py

fctx = None fctx = None
if not fctx or readasstandin(fctx) != hashfile(repo.wjoin(lfile)): if not fctx or readasstandin(fctx) != hashfile(repo.wjoin(lfile)):
modified.append(lfile) modified.append(lfile)
else: else:
clean.append(lfile) clean.append(lfile)
st = wctx[lfile].lstat() st = wctx[lfile].lstat()
mode = st.st_mode mode = st.st_mode
size = st.st_size size = st.st_size
mtime = timestamp.mtime_of(st) mtime = timestamp.reliable_mtime_of(st, mtime_boundary)
if mtime is not None:
cache_data = (mode, size, mtime) cache_data = (mode, size, mtime)
# We should consider using the mtime_boundary
# logic here, but largefile never actually had
# ambiguity protection before, so this confuse
# the tests and need more thinking.
lfdirstate.set_clean(lfile, cache_data) lfdirstate.set_clean(lfile, cache_data)
return s return s
def listlfiles(repo, rev=None, matcher=None): def listlfiles(repo, rev=None, matcher=None):
"""return a list of largefiles in the working copy or the """return a list of largefiles in the working copy or the
specified changeset""" specified changeset"""
if matcher is None: if matcher is None:

hgext/largefiles/reposetup.py

) != lfutil.hashfile(self.wjoin(lfile)): ) != lfutil.hashfile(self.wjoin(lfile)):
modified.append(lfile) modified.append(lfile)
else: else:
if listclean: if listclean:
clean.append(lfile) clean.append(lfile)
s = wctx[lfile].lstat() s = wctx[lfile].lstat()
mode = s.st_mode mode = s.st_mode
size = s.st_size size = s.st_size
mtime = timestamp.mtime_of(s) mtime = timestamp.reliable_mtime_of(
s, mtime_boundary
)
if mtime is not None:
cache_data = (mode, size, mtime) cache_data = (mode, size, mtime)
# We should consider using the mtime_boundary
# logic here, but largefile never actually had
# ambiguity protection before, so this confuse
# the tests and need more thinking.
lfdirstate.set_clean(lfile, cache_data) lfdirstate.set_clean(lfile, cache_data)
else: else:
tocheck = unsure + modified + added + clean tocheck = unsure + modified + added + clean
modified, added, clean = [], [], [] modified, added, clean = [], [], []
checkexec = self.dirstate._checkexec checkexec = self.dirstate._checkexec
for lfile in tocheck: for lfile in tocheck:
standin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
if standin in ctx1: if standin in ctx1: