Enum InFlightOp 

pub enum InFlightOp {
    Merge,
    Rebase,
    CherryPick,
    Revert,
    ApplyPatch,
}

A multi-commit operation stopped mid-flight.

Ordered by specificity in InFlightOp::detect: git am and rebase share the rebase-apply directory, so the more specific marker is tested first.

Variants

Merge

A merge stopped with conflicts — MERGE_HEAD.

Rebase

A rebase stopped at a conflict or an edit stop — rebase-merge/ (the default backend) or rebase-apply/ (the legacy --apply backend).

CherryPick

A cherry-pick sequence stopped — CHERRY_PICK_HEAD.

Revert

A revert sequence stopped — REVERT_HEAD.

ApplyPatch

git am stopped applying a patch — rebase-apply/applying.

Implementations

impl InFlightOp

pub const ALL: [Self; 5]

Every variant, for exhaustive tests and label tables.

pub fn label(self) -> &'static str

The headerline alert for this state, in the wording git itself uses when it tells the user what to do next.

pub fn ours_is_local(self) -> bool

Which side of a conflict “us” and “them” name during this operation — and they INVERT between the two families.

In a merge, “us” is the branch you are on and “them” is the branch being merged in, which is what everyone expects. In a rebase, cherry-pick, revert or am, git replays your work ONTO the other side, so “us” is the upstream being replayed onto and “them” is your own commit.

This is the single most confusing thing about resolving a conflict mid-rebase, and it is why the unmerged labels (“added by us”, “deleted by them”) are ambiguous without knowing which operation produced them.

pub fn detect(repo: &Repository) -> Option<Self>

Detect the operation in flight, or None when the repository is idle.

At most one is reported. They are not strictly exclusive in git’s data model — a rebase that hits a conflict while cherry-picking a commit writes CHERRY_PICK_HEAD too — so the order matters: the outer operation is the one the user has to finish, and the one whose --continue they need.

pub fn detect_in(gitdir: &Path) -> Option<Self>

Self::detect against a gitdir path directly, so it is testable without a live repository.

Trait Implementations

impl Clone for InFlightOp

fn clone(&self) -> InFlightOp

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for InFlightOp

impl Debug for InFlightOp

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

Formats the value using the given formatter.

impl Eq for InFlightOp

impl Hash for InFlightOp

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl PartialEq for InFlightOp

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for InFlightOp