Struct ConflictReport 

pub struct ConflictReport {
    pub inside: Vec<String>,
    pub outside: Vec<String>,
}

Conflicts in one commit, split by whether the reader’s cone covers them (D50).

The split is the point. inside names paths whose content the reader may fetch; outside names paths and nothing else – no base, left or right address, no size, no message. The type is the enforcement: outside is a list of strings, so there is no field a later change could accidentally start populating with content.

This is a capability the partial-clone story alone does not have. Withholding content is ordinary; git does it, and so does every system with a sparse checkout. What is unusual is being able to say that a collision happened at a path the reader cannot read, which choir can do only because the op log is separate from the content it orders. A reader who never receives docs/guide.md still learns that their merge collided there, and can go ask the person who owns it. Elsewhere that collision is simply invisible until someone else trips over it.

Fields

inside: Vec<String>

Conflicted paths the cone covers, readable in full.

outside: Vec<String>

Conflicted paths the cone does not cover. Paths only.

Implementations

impl ConflictReport

pub fn is_empty(&self) -> bool

Whether the commit conflicts anywhere, in or out of the cone.

Trait Implementations

impl Clone for ConflictReport

fn clone(&self) -> ConflictReport

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictReport

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

Formats the value using the given formatter.

impl Default for ConflictReport

fn default() -> ConflictReport

Returns the “default value” for a type.

impl PartialEq for ConflictReport

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

Tests for self and other values to be equal, and is used by ==.

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

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Eq for ConflictReport

impl StructuralPartialEq for ConflictReport