This is an archive of the discontinued Mercurial Phabricator instance.

Differential D352

chgserver: special handle __version__ in mtimehash (issue5653)
AbandonedPublic

Authored by quark on Aug 11 2017, 2:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

It seems version__.py may have content change without mtime change. Since
reading version__.py is usually cheap, check its content instead of
stating it. This should make chg able to detect version change when the
package manager upgrades files with mtime preserved and size happens to be
unchanged.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 11 2017, 2:27 PM
yuja added a subscriber: yuja.Aug 15 2017, 3:09 AM

I doubt the issue5653 had this scenario. Waiting for more detailed bug report.

quark added a comment.Aug 15 2017, 7:30 PM

I will test it on a Mac tomorrow. I think this patch is optional (nice to have).

FB also has some weird reports that suggest demandimport is causing chg to load a mix of old and new modules. So the first two patches are more important in terms of correctness.

yuja added a comment.Aug 17 2017, 8:44 AM

I'll drop this per your comment on the issue5653. Thanks for investigating it further.

https://bz.mercurial-scm.org/show_bug.cgi?id=5653#c4

quark abandoned this revision.Aug 17 2017, 11:13 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (11 lines)

Diff 788

mercurial/chgserver.py

considered outdated immediately and should no longer provide service. considered outdated immediately and should no longer provide service.
mtimehash is not included in confighash because we only know the paths of mtimehash is not included in confighash because we only know the paths of
extensions after importing them (there is imp.find_module but that faces extensions after importing them (there is imp.find_module but that faces
race conditions). We need to calculate confighash without importing. race conditions). We need to calculate confighash without importing.
""" """
def trystat(path): def trystat(path):
try: try:
# sometimes __version__.py may change without stat change
# (issue5653), check its content instead.
if '__version__' in path:
return util.readfile(path)
else:
st = os.stat(path) st = os.stat(path)
return (st.st_mtime, st.st_size) return (st.st_mtime, st.st_size)
except OSError: except (OSError, IOError):
# could be ENOENT, EPERM etc. not fatal in any case # could be ENOENT, EPERM etc. not fatal in any case
pass pass
return _hashlist(map(trystat, paths))[:12] return _hashlist(map(trystat, paths))[:12]
class hashstate(object): class hashstate(object):
"""a structure storing confighash, mtimehash, paths used for mtimehash""" """a structure storing confighash, mtimehash, paths used for mtimehash"""
def __init__(self, confighash, mtimehash, mtimepaths): def __init__(self, confighash, mtimehash, mtimepaths):
self.confighash = confighash self.confighash = confighash