Enum NextStep 

pub enum NextStep {
    ResolveConflicts,
    StageResolved,
    Commit,
    Abort(InProgressOperation),
    Continue(InProgressOperation),
    Skip(InProgressOperation),
    ContinueWithGit(InProgressOperation),
}

A suggested follow-up action while an operation is paused.

Variants

ResolveConflicts

Edit conflicted files in the worktree (inspect with grit diff).

StageResolved

Stage resolved paths after editing.

Commit

Record the merge or sequencer result.

Abort(InProgressOperation)

Cancel the in-progress operation.

Continue(InProgressOperation)

Advance a sequencer operation after conflicts are resolved.

Skip(InProgressOperation)

Skip the current sequencer step.

ContinueWithGit(InProgressOperation)

Advance an operation that git started and only git can resume (for example a rebase without grit’s plan).

Implementations

impl NextStep

pub fn command(&self) -> Option<String>

Render the suggested invocation: the Self::grit_command when grit implements the step, otherwise the Self::git_command for operations only git can finish.

pub fn git_command(&self) -> Option<String>

Render the git invocation for Self::ContinueWithGit; None for every other step.

pub fn grit_command(&self) -> Option<String>

Render a non-interactive grit invocation for this step, when one exists.

Trait Implementations

impl Clone for NextStep

fn clone(&self) -> Self

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for NextStep

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Eq for NextStep

impl PartialEq for NextStep

fn eq(&self, other: &Self) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl StructuralPartialEq for NextStep