| Alphare | |
| pulkit |
| hg-reviewers |
The previous message was quite verbose and hard to understand. The new one
should be friendlier.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| """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 | ||||
| INCONSISTENCY_MESSAGE = b"""%s call to %s | |||||
| inconsistency in nonnormalset | |||||
| result from dirstatemap: %s | |||||
| expected nonnormalset: %s | |||||
| """ | |||||
| 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: | ||||
| b_orig = pycompat.sysbytes(repr(orig)) | 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') | |||||
| b_nonnormal = pycompat.sysbytes(repr(_nonnormalset)) | b_nonnormal = pycompat.sysbytes(repr(_nonnormalset)) | ||||
| ui.develwarn(b"[nonnormalset] %s\n" % b_nonnormal, config=b'dirstate') | |||||
| b_nonnormalcomputed = pycompat.sysbytes(repr(nonnormalcomputedmap)) | b_nonnormalcomputed = pycompat.sysbytes(repr(nonnormalcomputedmap)) | ||||
| ui.develwarn(b"[map] %s\n" % b_nonnormalcomputed, config=b'dirstate') | msg = INCONSISTENCY_MESSAGE % ( | ||||
| label, | |||||
| b_orig, | |||||
| b_nonnormal, | |||||
| b_nonnormalcomputed, | |||||
| ) | |||||
| ui.develwarn(msg, config=b'dirstate') | |||||
| def _checkdirstate(orig, self, *args, **kwargs): | def _checkdirstate(orig, self, *args, **kwargs): | ||||
| """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, *args, **kwargs) | r = orig(self, *args, **kwargs) | ||||