comparison mercurial/commands.py @ 46448:1a7d12c82057

diff: add experimental support for "merge diffs"

The way this works is it re-runs the merge and "stores" conflicts, and then
diffs against the conflicted result. In a normal merge, you should only see
diffs against conflicted regions or in cases where there was a semantic
conflict but not a textual one. This makes it easier to detect "evil merges"
that contain substantial new work embedded in the merge commit.

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

46447:0cb1b02228a6

    bookmarks,
    bundle2,
    bundlecaches,
    changegroup,
    cmdutil,
    copies,
    debugcommands as debugcommandsmod,
    destutil,
    dirstateguard,
    discovery,

    [
        (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
        (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
        (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
        (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
    ]
    + diffopts
    + diffopts2
    + walkopts
    + subrepoopts,

    change = opts.get(b'change')
    from_rev = opts.get(b'from')
    to_rev = opts.get(b'to')
    stat = opts.get(b'stat')
    reverse = opts.get(b'reverse')

    cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
    cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
    if change:
        repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
        ctx2 = scmutil.revsingle(repo, change, None)
        ctx1 = ctx2.p1()
    elif from_rev or to_rev:
        repo = scmutil.unhidehashlikerevs(
            repo, [from_rev] + [to_rev], b'nowarn'
        )
        ctx1 = scmutil.revsingle(repo, from_rev, None)

46448:1a7d12c82057

    bookmarks,
    bundle2,
    bundlecaches,
    changegroup,
    cmdutil,
    context as contextmod,
    copies,
    debugcommands as debugcommandsmod,
    destutil,
    dirstateguard,
    discovery,

    [
        (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
        (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
        (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
        (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
        (
            b'',
            b'merge',
            False,
            _(
                b'show difference between auto-merge and committed '
                b'merge for merge commits (EXPERIMENTAL)'
            ),
            _(b'REV'),
        ),
    ]
    + diffopts
    + diffopts2
    + walkopts
    + subrepoopts,

    change = opts.get(b'change')
    from_rev = opts.get(b'from')
    to_rev = opts.get(b'to')
    stat = opts.get(b'stat')
    reverse = opts.get(b'reverse')
    diffmerge = opts.get(b'merge')

    cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
    cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
    if change:
        repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
        ctx2 = scmutil.revsingle(repo, change, None)
        if diffmerge and ctx2.p2().node() != nullid:
            pctx1 = ctx2.p1()
            pctx2 = ctx2.p2()
            wctx = contextmod.overlayworkingctx(repo)
            wctx.setbase(pctx1)
            with ui.configoverride(
                {
                    (
                        b'ui',
                        b'forcemerge',
                    ): b'internal:merge3-lie-about-conflicts',
                },
                b'diff --merge',
            ):
                mergemod.merge(pctx2, wc=wctx)
            ctx1 = wctx
        else:
            ctx1 = ctx2.p1()
    elif from_rev or to_rev:
        repo = scmutil.unhidehashlikerevs(
            repo, [from_rev] + [to_rev], b'nowarn'
        )
        ctx1 = scmutil.revsingle(repo, from_rev, None)