##// END OF EJS Templates
dirstate: clarify the message in nonnormal checking...
dirstate: clarify the message in nonnormal checking The previous message was quite verbose and hard to understand. The new one should be friendlier. Differential Revision: https://phab.mercurial-scm.org/D11382

File last commit:

r48755:fea24454 default
r48755:fea24454 default
Show More
dirstatenonnormalcheck.py
81 lines | 2.8 KiB | text/x-python | PythonLexer
/ contrib / dirstatenonnormalcheck.py
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 # dirstatenonnormalcheck.py - extension to check the consistency of the
# dirstate's non-normal map
#
# For most operations on dirstate, this extensions checks that the nonnormalset
# contains the right entries.
# It compares the nonnormal file to a nonnormalset built from the map of all
# the files in the dirstate to check that they contain the same files.
from __future__ import absolute_import
from mercurial import (
dirstate,
extensions,
dirstatenonnormalcheck: fix some bytes formating on python3...
r48336 pycompat,
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 )
Augie Fackler
formatting: blacken the codebase...
r43346
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 def nonnormalentries(dmap):
"""Compute nonnormal entries from dirstate's dmap"""
res = set()
for f, e in dmap.iteritems():
dirstate-item: use the properties in `contrib/dirstatenonnormalcheck.py`...
r48335 if e.state != b'n' or e.mtime == -1:
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 res.add(f)
return res
Augie Fackler
formatting: blacken the codebase...
r43346
dirstate: clarify the message in nonnormal checking...
r48755 INCONSISTENCY_MESSAGE = b"""%s call to %s
inconsistency in nonnormalset
result from dirstatemap: %s
expected nonnormalset: %s
"""
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 def checkconsistency(ui, orig, dmap, _nonnormalset, label):
"""Compute nonnormalset from dmap, check that it matches _nonnormalset"""
nonnormalcomputedmap = nonnormalentries(dmap)
if _nonnormalset != nonnormalcomputedmap:
dirstatenonnormalcheck: fix some bytes formating on python3...
r48336 b_orig = pycompat.sysbytes(repr(orig))
b_nonnormal = pycompat.sysbytes(repr(_nonnormalset))
b_nonnormalcomputed = pycompat.sysbytes(repr(nonnormalcomputedmap))
dirstate: clarify the message in nonnormal checking...
r48755 msg = INCONSISTENCY_MESSAGE % (
label,
b_orig,
b_nonnormal,
b_nonnormalcomputed,
)
ui.develwarn(msg, config=b'dirstate')
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591
Augie Fackler
formatting: blacken the codebase...
r43346
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 def _checkdirstate(orig, self, *args, **kwargs):
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 """Check nonnormal set consistency before and after the call to orig"""
Augie Fackler
formatting: blacken the codebase...
r43346 checkconsistency(
self._ui, orig, self._map, self._map.nonnormalset, b"before"
)
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 r = orig(self, *args, **kwargs)
Augie Fackler
formatting: blacken the codebase...
r43346 checkconsistency(
self._ui, orig, self._map, self._map.nonnormalset, b"after"
)
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 return r
Augie Fackler
formatting: blacken the codebase...
r43346
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 def extsetup(ui):
"""Wrap functions modifying dirstate to check nonnormalset consistency"""
dirstatecl = dirstate.dirstate
Augie Fackler
contrib: fix dirstatenonnormalcheck to work in Python 3...
r35896 devel = ui.configbool(b'devel', b'all-warnings')
paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck')
Laurent Charignon
dirstate: add test for non-normal set consistency...
r27591 if devel:
extensions.wrapfunction(dirstatecl, '_writedirstate', _checkdirstate)
if paranoid:
# We don't do all these checks when paranoid is disable as it would
# make the extension run very slowly on large repos
extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
dirstate: also wrap the new method in `dirstatenonnormalcheck`...
r48719 extensions.wrapfunction(dirstatecl, 'set_tracked', _checkdirstate)
extensions.wrapfunction(dirstatecl, 'set_untracked', _checkdirstate)
extensions.wrapfunction(
dirstatecl, 'set_possibly_dirty', _checkdirstate
)
extensions.wrapfunction(
dirstatecl, 'update_file_p1', _checkdirstate
)
extensions.wrapfunction(dirstatecl, 'update_file', _checkdirstate)