comparison hgext/rebase.py @ 43930:412f199b4092

rebase: use cmdutil.check_incompatible_arguments() for --auto-orphans

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

43929:08b8bf4a8516

        # (Or if it is run within a transaction, since the restart logic can
        # fail the entire transaction.)
        inmemory = False

    if opts.get(b'auto_orphans'):
        for key in opts:
            if key != b'auto_orphans' and opts.get(key):
                raise error.Abort(
                    _(b'--auto-orphans is incompatible with %s') % (b'--' + key)
                )
        userrevs = list(repo.revs(opts.get(b'auto_orphans')))
        opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
        opts[b'dest'] = b'_destautoorphanrebase(SRC)'

    if opts.get(b'dry_run') or opts.get(b'confirm'):

43930:412f199b4092

        # (Or if it is run within a transaction, since the restart logic can
        # fail the entire transaction.)
        inmemory = False

    if opts.get(b'auto_orphans'):
        disallowed_opts = set(opts) - {b'auto_orphans'}
        cmdutil.check_incompatible_arguments(
            opts, b'auto_orphans', *disallowed_opts
        )

        userrevs = list(repo.revs(opts.get(b'auto_orphans')))
        opts[b'rev'] = [revsetlang.formatspec(b'%ld and orphan()', userrevs)]
        opts[b'dest'] = b'_destautoorphanrebase(SRC)'

    if opts.get(b'dry_run') or opts.get(b'confirm'):