comparison mercurial/commands.py @ 32131:35a69efbf190

bisect: allow resetting with unfinished graft/rebase/etc

"hg bisect --reset" just deletes the state file (it doesn't move back
to the starting point like rebase does); it can not conflict with an
ongoing rebase etc.

checkunfinished() has this documentation:

  It's probably good to check this right before bailifchanged().

So that's where I moved it.

32130:c3dcec6cbc1b

        else:
            reset = True
    elif extra or good + bad + skip + reset + extend + bool(command) > 1:
        raise error.Abort(_('incompatible arguments'))

    cmdutil.checkunfinished(repo)

    if reset:
        hbisect.resetstate(repo)
        return

    state = hbisect.load_state(repo)

    def mayupdate(repo, node, show_stats=True):
        """common used update sequence"""
        if noupdate:
            return
        cmdutil.bailifchanged(repo)
        return hg.clean(repo, node, show_stats=show_stats)

    displayer = cmdutil.show_changeset(ui, repo, {})

32131:35a69efbf190

        else:
            reset = True
    elif extra or good + bad + skip + reset + extend + bool(command) > 1:
        raise error.Abort(_('incompatible arguments'))

    if reset:
        hbisect.resetstate(repo)
        return

    state = hbisect.load_state(repo)

    def mayupdate(repo, node, show_stats=True):
        """common used update sequence"""
        if noupdate:
            return
        cmdutil.checkunfinished(repo)
        cmdutil.bailifchanged(repo)
        return hg.clean(repo, node, show_stats=show_stats)

    displayer = cmdutil.show_changeset(ui, repo, {})