pub struct Plan {
pub base: String,
pub ours: String,
pub theirs: String,
pub units: Vec<Unit>,
pub not_text: Vec<FileReport>,
pub not_examined: Vec<String>,
pub stages: BTreeMap<String, [Option<(String, String)>; 3]>,
}Expand description
The merge to land, read out of git.
Fields§
§base: String§ours: String§theirs: String§units: Vec<Unit>§not_text: Vec<FileReport>Files git could not merge that are not text weave can read (binary, symlink, submodule, unreadable blob): refused before anything runs.
not_examined: Vec<String>Files both sides changed that git’s line merge merges cleanly, and
whose merge — the answer in the tree, else git’s — is git’s own and
passes weave’s merge check (weave_core::verify::verify).
stages: BTreeMap<String, [Option<(String, String)>; 3]>Each conflicted path’s index entries at base / ours / theirs, for restoring a refused file’s unmerged stages.
Auto Trait Implementations§
impl Freeze for Plan
impl RefUnwindSafe for Plan
impl Send for Plan
impl Sync for Plan
impl Unpin for Plan
impl UnsafeUnpin for Plan
impl UnwindSafe for Plan
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more
impl<ST, DT> CastableFrom<ST, Initialized, Initialized> for DT
impl<ST, DT> CastableFrom<ST, Uninit, Uninit> for DT
Source§impl<T> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self> ⓘ
fn into_either(self, into_left: bool) -> Either<Self, Self> ⓘ
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self> ⓘ
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self> ⓘ
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read more