Skip to main content

OperationState

Enum OperationState 

Source
#[non_exhaustive]
pub enum OperationState { Clear, Merge, Rebase, ApplyMailbox, CherryPick, Revert, Bisect, Conflict, }
Expand description

Whether the working copy is mid-operation, unified across the backends’ different models: git exposes an in-progress merge, rebase, am, cherry-pick, revert, or bisect as on-disk state (MERGE_HEAD / a rebase-* dir / CHERRY_PICK_HEAD / REVERT_HEAD / BISECT_LOG), while jj has no multi-step operations — it records a conflict directly on the working-copy change.

The sequencer states are kept distinct because each aborts (and, where it makes sense, continues) with its own git command — dispatching the wrong one on a user’s real repository is exactly what this type exists to prevent. See Repo::abort_in_progress / continue_in_progress.

Variants (Non-exhaustive)§

This enum is marked as non-exhaustive
Non-exhaustive enums could have additional variants added in future. Therefore, when matching against variants of non-exhaustive enums, an extra wildcard arm must be added to account for any future variants.
§

Clear

No operation in progress and no conflict.

§

Merge

A git merge is in progress (MERGE_HEAD present).

§

Rebase

A git rebase is in progress (a rebase-merge dir, or a rebase-apply dir not left by git am — see ApplyMailbox).

§

ApplyMailbox

A git am (mailbox patch apply) is in progress. Distinct from Rebase because it aborts/continues with am --abort / am --continue, not the rebase --* twins (M20). Like the other sequencer states it has a real --continue, so continue_in_progress drives it forward (reporting Conflict if the next patch stops) rather than treating it as nothing to do.

§

CherryPick

A git cherry-pick is in progress (CHERRY_PICK_HEAD present). Distinct from Merge: it aborts/continues with cherry-pick --abort / cherry-pick --continue (a cherry-pick conflict writes CHERRY_PICK_HEAD, not MERGE_HEAD). git only.

§

Revert

A git revert is in progress (REVERT_HEAD present). Aborts/continues with revert --abort / revert --continue. git only.

§

Bisect

A git bisect session is in progress (BISECT_LOG present). Aborts with bisect reset; it has no --continue step (bisect advances by marking commits good/bad), so continue_in_progress reports it as unsupported rather than silently doing nothing. git only.

§

Conflict

The working copy has an unresolved conflict (chiefly jj, which records conflicts on the change rather than pausing an operation).

Trait Implementations§

Source§

impl Clone for OperationState

Source§

fn clone(&self) -> OperationState

Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§

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

Performs copy-assignment from source. Read more
Source§

impl Copy for OperationState

Source§

impl Debug for OperationState

Source§

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

Formats the value using the given formatter. Read more
Source§

impl Eq for OperationState

Source§

impl PartialEq for OperationState

Source§

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

Equality operator ==. Read more
1.0.0 (const: unstable) · Source§

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

Inequality operator !=. Read more
Source§

impl Serialize for OperationState

Source§

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>
where __S: Serializer,

Serialize this value into the given Serde serializer. Read more
Source§

impl StructuralPartialEq for OperationState

Auto Trait Implementations§

Blanket Implementations§

Source§

impl<T> Any for T
where T: 'static + ?Sized,

Source§

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more
Source§

impl<T> Borrow<T> for T
where T: ?Sized,

Source§

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more
Source§

impl<T> BorrowMut<T> for T
where T: ?Sized,

Source§

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more
Source§

impl<T> CloneToUninit for T
where T: Clone,

Source§

unsafe fn clone_to_uninit(&self, dest: *mut u8)

🔬This is a nightly-only experimental API. (clone_to_uninit)
Performs copy-assignment from self to dest. Read more
Source§

impl<T> From<T> for T

Source§

fn from(t: T) -> T

Returns the argument unchanged.

Source§

impl<T> Instrument for T

Source§

fn instrument(self, span: Span) -> Instrumented<Self>

Instruments this type with the provided Span, returning an Instrumented wrapper. Read more
Source§

fn in_current_span(self) -> Instrumented<Self>

Instruments this type with the current Span, returning an Instrumented wrapper. Read more
Source§

impl<T, U> Into<U> for T
where U: From<T>,

Source§

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

Source§

impl<T> ToOwned for T
where T: Clone,

Source§

type Owned = T

The resulting type after obtaining ownership.
Source§

fn to_owned(&self) -> T

Creates owned data from borrowed data, usually by cloning. Read more
Source§

fn clone_into(&self, target: &mut T)

Uses borrowed data to replace owned data, usually by cloning. Read more
Source§

impl<T, U> TryFrom<U> for T
where U: Into<T>,

Source§

type Error = Infallible

The type returned in the event of a conversion error.
Source§

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

Performs the conversion.
Source§

impl<T, U> TryInto<U> for T
where U: TryFrom<T>,

Source§

type Error = <U as TryFrom<T>>::Error

The type returned in the event of a conversion error.
Source§

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Performs the conversion.
Source§

impl<T> WithSubscriber for T

Source§

fn with_subscriber<S>(self, subscriber: S) -> WithDispatch<Self>
where S: Into<Dispatch>,

Attaches the provided Subscriber to this type, returning a WithDispatch wrapper. Read more
Source§

fn with_current_subscriber(self) -> WithDispatch<Self>

Attaches the current default Subscriber to this type, returning a WithDispatch wrapper. Read more