view contrib/dirstatenonnormalcheck.py @ 38573:050fbd9d103a

test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg

It looks like the manifest value changing is the only difference, but I'm not
sure why it's happening.  I've got a similar divergence in a production repo
that was also converted from bzr and has an octopus merge[1].  Unlike here, the
manifest values for the destination merge commits reflect the initial merge
only, instead of all four merges agreeing like this test.

    $ hg -R src_repo manifest -r 310 --debug | grep file  # octopus fixup merge
    2d8775bc2481bd28ac87038ecdf33e1dbddc80e9 644   file1
    6adb9353a55bb8be76e71382efc724ec3ccf7ed5 644   file2

    $ hg -R src_repo manifest -r 309 --debug | grep file  # first merge
    362e7cb5163153c4989daad1a834871ae849f205 644   file1
    2c65d947191938c3ea616b7ceb7648ff3843261f 644   file2

    $ hg -R dst_repo manifest -r 273 --debug | grep file  # octopus fixup merge
    362e7cb5163153c4989daad1a834871ae849f205 644   file1
    2c65d947191938c3ea616b7ceb7648ff3843261f 644   file2

    $ hg -R dst_repo manifest -r 272 --debug | grep file  # first merge
    362e7cb5163153c4989daad1a834871ae849f205 644   file1
    2c65d947191938c3ea616b7ceb7648ff3843261f 644   file2

This divergence is espcially annoying because unlike changelog differences, I
haven't figured out a way to fix this in code.  The only way I found to work
around it is to convert up to the point of divergence, `hg bundle` the bad
revision in the source, apply it to the destination, add a line to the shamap,
and fire off the conversion again.

But I suspect that there's more to it than just the octopus merge because
I also have a commit in the same repo, done in Mercurial (well after the
conversion) that is exhibiting a similar issue (and it's not a merge commit).
I'm almost positive that it was created with 4.4 or later.  Any ideas?

[1] https://www.mercurial-scm.org/pipermail/mercurial/2018-June/050924.html

# 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,
)

def nonnormalentries(dmap):
    """Compute nonnormal entries from dirstate's dmap"""
    res = set()
    for f, e in dmap.iteritems():
        if e[0] != b'n' or e[3] == -1:
            res.add(f)
    return res

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(self._ui, orig, self._map, self._map.nonnormalset,
                     b"before")
    r = orig(self, arg)
    checkconsistency(self._ui, orig, self._map, self._map.nonnormalset,
                     b"after")
    return r

def extsetup(ui):
    """Wrap functions modifying dirstate to check nonnormalset consistency"""
    dirstatecl = dirstate.dirstate
    devel = ui.configbool(b'devel', b'all-warnings')
    paranoid = ui.configbool(b'experimental', b'nonnormalparanoidcheck')
    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, 'normallookup', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'otherparent', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'normal', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'write', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'add', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'remove', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'merge', _checkdirstate)
            extensions.wrapfunction(dirstatecl, 'drop', _checkdirstate)