comparison hgext/histedit.py @ 48591:f1162b125991

histedit: attempt to make merge labels more helpful

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

48590:7e503eff3c76

        try:
            # ui.forcemerge is an internal variable, do not document
            repo.ui.setconfig(
                b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
            )
            stats = mergemod.graft(repo, ctx, labels=[b'local', b'histedit'])
        finally:
            repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
    return stats

48591:f1162b125991

        try:
            # ui.forcemerge is an internal variable, do not document
            repo.ui.setconfig(
                b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
            )
            stats = mergemod.graft(
                repo,
                ctx,
                labels=[
                    b'already edited',
                    b'current change',
                    b'parent of current change',
                ],
            )
        finally:
            repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
    return stats