| Alphare |
| hg-reviewers |
Passing any object to %s no longer works, we need to explicitely convert the
representation to bytes.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | contrib/dirstatenonnormalcheck.py (10 lines) |
| # dirstatenonnormalcheck.py - extension to check the consistency of the | # dirstatenonnormalcheck.py - extension to check the consistency of the | ||||
| # dirstate's non-normal map | # dirstate's non-normal map | ||||
| # | # | ||||
| # For most operations on dirstate, this extensions checks that the nonnormalset | # For most operations on dirstate, this extensions checks that the nonnormalset | ||||
| # contains the right entries. | # contains the right entries. | ||||
| # It compares the nonnormal file to a nonnormalset built from the map of all | # 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. | # the files in the dirstate to check that they contain the same files. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial import ( | from mercurial import ( | ||||
| dirstate, | dirstate, | ||||
| extensions, | extensions, | ||||
| pycompat, | |||||
| ) | ) | ||||
| def nonnormalentries(dmap): | def nonnormalentries(dmap): | ||||
| """Compute nonnormal entries from dirstate's dmap""" | """Compute nonnormal entries from dirstate's dmap""" | ||||
| res = set() | res = set() | ||||
| for f, e in dmap.iteritems(): | for f, e in dmap.iteritems(): | ||||
| if e.state != b'n' or e.mtime == -1: | if e.state != b'n' or e.mtime == -1: | ||||
| res.add(f) | res.add(f) | ||||
| return res | return res | ||||
| def checkconsistency(ui, orig, dmap, _nonnormalset, label): | def checkconsistency(ui, orig, dmap, _nonnormalset, label): | ||||
| """Compute nonnormalset from dmap, check that it matches _nonnormalset""" | """Compute nonnormalset from dmap, check that it matches _nonnormalset""" | ||||
| nonnormalcomputedmap = nonnormalentries(dmap) | nonnormalcomputedmap = nonnormalentries(dmap) | ||||
| if _nonnormalset != nonnormalcomputedmap: | if _nonnormalset != nonnormalcomputedmap: | ||||
| ui.develwarn(b"%s call to %s\n" % (label, orig), config=b'dirstate') | b_orig = pycompat.sysbytes(repr(orig)) | ||||
| ui.develwarn(b"%s call to %s\n" % (label, b_orig), config=b'dirstate') | |||||
| ui.develwarn(b"inconsistency in nonnormalset\n", config=b'dirstate') | ui.develwarn(b"inconsistency in nonnormalset\n", config=b'dirstate') | ||||
| ui.develwarn(b"[nonnormalset] %s\n" % _nonnormalset, config=b'dirstate') | b_nonnormal = pycompat.sysbytes(repr(_nonnormalset)) | ||||
| ui.develwarn(b"[map] %s\n" % nonnormalcomputedmap, config=b'dirstate') | ui.develwarn(b"[nonnormalset] %s\n" % b_nonnormal, config=b'dirstate') | ||||
| b_nonnormalcomputed = pycompat.sysbytes(repr(nonnormalcomputedmap)) | |||||
| ui.develwarn(b"[map] %s\n" % b_nonnormalcomputed, config=b'dirstate') | |||||
| def _checkdirstate(orig, self, arg): | def _checkdirstate(orig, self, arg): | ||||
| """Check nonnormal set consistency before and after the call to orig""" | """Check nonnormal set consistency before and after the call to orig""" | ||||
| checkconsistency( | checkconsistency( | ||||
| self._ui, orig, self._map, self._map.nonnormalset, b"before" | self._ui, orig, self._map, self._map.nonnormalset, b"before" | ||||
| ) | ) | ||||
| r = orig(self, arg) | r = orig(self, arg) | ||||