Struct ConflictLog 

pub struct ConflictLog { /* private fields */ }

Log of conflicts and warnings encountered during merge.

Implementations

impl ConflictLog

pub fn new() -> Self

Creates a new empty conflict log.

pub fn push_path(&mut self, component: &str)

Pushes a path component onto the current path.

pub fn pop_path(&mut self)

Pops a path component from the current path.

pub fn path_string(&self) -> String

Returns the current path as a string.

pub fn add_list_conflict( &mut self, conflict_type: ConflictType, text: &str, base: Option<NodeRef>, branch_a: Option<NodeRef>, branch_b: Option<NodeRef>, )

Adds a list-level conflict.

pub fn add_list_warning( &mut self, conflict_type: ConflictType, text: &str, base: Option<NodeRef>, branch_a: Option<NodeRef>, branch_b: Option<NodeRef>, )

Adds a list-level warning.

pub fn add_node_conflict( &mut self, conflict_type: ConflictType, text: &str, base: Option<NodeRef>, branch_a: Option<NodeRef>, branch_b: Option<NodeRef>, )

Adds a node-level conflict.

pub fn add_node_warning( &mut self, conflict_type: ConflictType, text: &str, base: Option<NodeRef>, branch_a: Option<NodeRef>, branch_b: Option<NodeRef>, )

Adds a node-level warning.

pub fn has_conflicts(&self) -> bool

Returns true if there are any conflicts.

pub fn conflict_count(&self) -> usize

Returns the number of conflicts.

pub fn warning_count(&self) -> usize

Returns the number of warnings.

pub fn conflicts(&self) -> &[ConflictEntry]

Returns a reference to the conflicts.

pub fn warnings(&self) -> &[ConflictEntry]

Returns a reference to the warnings.

pub fn write_xml<W: Write>(&self, writer: &mut W) -> Result<()>

Writes the conflict log as XML.

Trait Implementations

impl Debug for ConflictLog

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

Formats the value using the given formatter.

impl Default for ConflictLog

fn default() -> ConflictLog

Returns the “default value” for a type.