mercurial/commands.py

44453:f82d2d4e71db

        ui.status(
            _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
        )
        overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
        with ui.configoverride(overrides, b'backout'):
            return hg.merge(repo, hex(repo.changelog.tip()))
    return 0


@command(
    b'bisect',

        raise error.Abort(_(b"please specify just one revision"))
    if not node:
        node = opts.get(b'rev')

    if node:
        node = scmutil.revsingle(repo, node).node()
    else:
        if ui.configbool(b'commands', b'merge.require-rev'):
            raise error.Abort(
                _(
                    b'configuration requires specifying revision to merge '
                    b'with'
                )
            )
        node = repo[destutil.destmerge(repo)].node()

    if node is None:
        raise error.Abort(_(b'merging with the working copy has no effect'))

    if opts.get(b'preview'):
        # find nodes that are ancestors of p2 but not of p1
        p1 = repo[b'.'].node()
        p2 = node
        nodes = repo.changelog.findmissing(common=[p1], heads=[p2])

        displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
        for node in nodes:
            displayer.show(repo[node])

    # ui.forcemerge is an internal variable, do not document
    overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
    with ui.configoverride(overrides, b'merge'):
        force = opts.get(b'force')
        labels = [b'working copy', b'merge rev']
        return hg.merge(repo, node, force=force, labels=labels)


statemod.addunfinished(
    b'merge',
    fname=None,

44454:2f290136b7d6

        ui.status(
            _(b'merging with changeset %s\n') % nice(repo.changelog.tip())
        )
        overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
        with ui.configoverride(overrides, b'backout'):
            return hg.merge(repo[b'tip'])
    return 0


@command(
    b'bisect',

        raise error.Abort(_(b"please specify just one revision"))
    if not node:
        node = opts.get(b'rev')

    if node:
        ctx = scmutil.revsingle(repo, node)
    else:
        if ui.configbool(b'commands', b'merge.require-rev'):
            raise error.Abort(
                _(
                    b'configuration requires specifying revision to merge '
                    b'with'
                )
            )
        ctx = repo[destutil.destmerge(repo)]

    if ctx.node() is None:
        raise error.Abort(_(b'merging with the working copy has no effect'))

    if opts.get(b'preview'):
        # find nodes that are ancestors of p2 but not of p1
        p1 = repo[b'.'].node()
        p2 = ctx.node()
        nodes = repo.changelog.findmissing(common=[p1], heads=[p2])

        displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
        for node in nodes:
            displayer.show(repo[node])

    # ui.forcemerge is an internal variable, do not document
    overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
    with ui.configoverride(overrides, b'merge'):
        force = opts.get(b'force')
        labels = [b'working copy', b'merge rev']
        return hg.merge(ctx, force=force, labels=labels)


statemod.addunfinished(
    b'merge',
    fname=None,