comparison hgext/histedit.py @ 44212:cb8b67016110

graft: default `base` argument to common case of `ctx.p1()`

I also updated the callers that wanted that, partly to simplify and
partly to show that it works.

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

44211:fc7175df6359

        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, ctx.p1(), [b'local', b'histedit'])
        finally:
            repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
    return stats

44212:cb8b67016110

        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