mercurial/commands.py

44250:2b6632d64328

                _(b'cannot abort merge with %s in progress') % (state._opname),
                hint=state.hint(),
            )
        if node:
            raise error.Abort(_(b"cannot specify a node with --abort"))
    if opts.get(b'rev') and node:
        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()

    if not node and not abort:
        if ui.configbool(b'commands', b'merge.require-rev'):
            raise error.Abort(
                _(
                    b'configuration requires specifying revision to merge '
                    b'with'

            repo,
            node,
            force=force,
            mergeforce=force,
            labels=labels,
            abort=abort,
        )


statemod.addunfinished(
    b'merge',

44251:6744859ff3ee

                _(b'cannot abort merge with %s in progress') % (state._opname),
                hint=state.hint(),
            )
        if node:
            raise error.Abort(_(b"cannot specify a node with --abort"))
        return hg.abortmerge(repo.ui, repo)

    if opts.get(b'rev') and node:
        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()

    if not node:
        if ui.configbool(b'commands', b'merge.require-rev'):
            raise error.Abort(
                _(
                    b'configuration requires specifying revision to merge '
                    b'with'

            repo,
            node,
            force=force,
            mergeforce=force,
            labels=labels,
        )


statemod.addunfinished(
    b'merge',