view doc/docchecker @ 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

#!/usr/bin/env python
#
# docchecker - look for problematic markup
#
# Copyright 2016 timeless <[e-mail]> and others
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import, print_function

import re
import sys

leadingline = re.compile(r'(^\s*)(\S.*)$')

checks = [
  (r""":hg:`[^`]*'[^`]*`""",
    """warning: please avoid nesting ' in :hg:`...`"""),
  (r'\w:hg:`',
    'warning: please have a space before :hg:'),
  (r"""(?:[^a-z][^'.])hg ([^,;"`]*'(?!hg)){2}""",
    '''warning: please use " instead of ' for hg ... "..."'''),
]

def check(line):
    messages = []
    for match, msg in checks:
        if re.search(match, line):
            messages.append(msg)
    if messages:
        print(line)
        for msg in messages:
            print(msg)

def work(file):
    (llead, lline) = ('', '')

    for line in file:
        # this section unwraps lines
        match = leadingline.match(line)
        if not match:
            check(lline)
            (llead, lline) = ('', '')
            continue

        lead, line = match.group(1), match.group(2)
        if (lead == llead):
            if (lline != ''):
                lline += ' ' + line
            else:
                lline = line
        else:
            check(lline)
            (llead, lline) = (lead, line)
    check(lline)

def main():
    for f in sys.argv[1:]:
        try:
            with open(f) as file:
                work(file)
        except BaseException as e:
            print("failed to process %s: %s" % (f, e))

main()