comparison contrib/dirstatenonnormalcheck.py @ 47547:20b37ef33ebc

dirstatenonnormalcheck: fix some bytes formating on python3

Passing any object to `%s` no longer works, we need to explicitely convert the
representation to bytes.

Differential Revision: https://phab.mercurial-scm.org/D10993

47546:35295f5a5b9f

from __future__ import absolute_import

from mercurial import (
    dirstate,
    extensions,
)


def nonnormalentries(dmap):
    """Compute nonnormal entries from dirstate's dmap"""

def checkconsistency(ui, orig, dmap, _nonnormalset, label):
    """Compute nonnormalset from dmap, check that it matches _nonnormalset"""
    nonnormalcomputedmap = nonnormalentries(dmap)
    if _nonnormalset != nonnormalcomputedmap:
        ui.develwarn(b"%s call to %s\n" % (label, orig), config=b'dirstate')
        ui.develwarn(b"inconsistency in nonnormalset\n", config=b'dirstate')
        ui.develwarn(b"[nonnormalset] %s\n" % _nonnormalset, config=b'dirstate')
        ui.develwarn(b"[map] %s\n" % nonnormalcomputedmap, config=b'dirstate')


def _checkdirstate(orig, self, arg):
    """Check nonnormal set consistency before and after the call to orig"""
    checkconsistency(

47547:20b37ef33ebc

from __future__ import absolute_import

from mercurial import (
    dirstate,
    extensions,
    pycompat,
)


def nonnormalentries(dmap):
    """Compute nonnormal entries from dirstate's dmap"""

def checkconsistency(ui, orig, dmap, _nonnormalset, label):
    """Compute nonnormalset from dmap, check that it matches _nonnormalset"""
    nonnormalcomputedmap = nonnormalentries(dmap)
    if _nonnormalset != nonnormalcomputedmap:
        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))
        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):
    """Check nonnormal set consistency before and after the call to orig"""
    checkconsistency(