Struct ConflictedFile 

pub struct ConflictedFile {
    pub path: String,
    pub base: Option<String>,
    pub ours: Option<String>,
    pub theirs: Option<String>,
}

一个处于冲突状态的文件及其在 index 中的 stage 分布。

各 stage 记录 blob oid(缺失该 stage 时为 None), 供 Git::read_blobs 单进程批量读取内容。

Fields

path: String

相对仓库根目录的路径

base: Option<String>

stage 1(base)的 blob oid;add/add 冲突时缺失

ours: Option<String>

stage 2(ours)的 blob oid;对方删除本方修改时才缺失本方

theirs: Option<String>

stage 3(theirs)的 blob oid

Trait Implementations

impl Clone for ConflictedFile

fn clone(&self) -> ConflictedFile

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictedFile

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

Formats the value using the given formatter.

impl Eq for ConflictedFile

impl PartialEq for ConflictedFile

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for ConflictedFile