Show More
@@ -11,6 +11,7 b' from __future__ import absolute_import' | |||||
11 | from mercurial import ( |
|
11 | from mercurial import ( | |
12 | dirstate, |
|
12 | dirstate, | |
13 | extensions, |
|
13 | extensions, | |
|
14 | pycompat, | |||
14 | ) |
|
15 | ) | |
15 |
|
16 | |||
16 |
|
17 | |||
@@ -27,10 +28,13 b' def checkconsistency(ui, orig, dmap, _no' | |||||
27 | """Compute nonnormalset from dmap, check that it matches _nonnormalset""" |
|
28 | """Compute nonnormalset from dmap, check that it matches _nonnormalset""" | |
28 | nonnormalcomputedmap = nonnormalentries(dmap) |
|
29 | nonnormalcomputedmap = nonnormalentries(dmap) | |
29 | if _nonnormalset != nonnormalcomputedmap: |
|
30 | if _nonnormalset != nonnormalcomputedmap: | |
30 | ui.develwarn(b"%s call to %s\n" % (label, orig), config=b'dirstate') |
|
31 | b_orig = pycompat.sysbytes(repr(orig)) | |
|
32 | ui.develwarn(b"%s call to %s\n" % (label, b_orig), config=b'dirstate') | |||
31 | ui.develwarn(b"inconsistency in nonnormalset\n", config=b'dirstate') |
|
33 | ui.develwarn(b"inconsistency in nonnormalset\n", config=b'dirstate') | |
32 | ui.develwarn(b"[nonnormalset] %s\n" % _nonnormalset, config=b'dirstate') |
|
34 | b_nonnormal = pycompat.sysbytes(repr(_nonnormalset)) | |
33 |
ui.develwarn(b"[ |
|
35 | ui.develwarn(b"[nonnormalset] %s\n" % b_nonnormal, config=b'dirstate') | |
|
36 | b_nonnormalcomputed = pycompat.sysbytes(repr(nonnormalcomputedmap)) | |||
|
37 | ui.develwarn(b"[map] %s\n" % b_nonnormalcomputed, config=b'dirstate') | |||
34 |
|
38 | |||
35 |
|
39 | |||
36 | def _checkdirstate(orig, self, arg): |
|
40 | def _checkdirstate(orig, self, arg): |
General Comments 0
You need to be logged in to leave comments.
Login now