Enum MergeInfoMessage 

pub enum MergeInfoMessage {
    DirRenameSkippedDueToRerename {
        old_dir: Vec<u8>,
        path: Vec<u8>,
        new_dir: Vec<u8>,
    },
    DirRenameApplied {
        old_path: Vec<u8>,
        new_path: Vec<u8>,
        renamed_from: Option<Vec<u8>>,
        added_in: String,
        dir_renamed_in: String,
    },
    DirRenameLocationConflict {
        old_path: Vec<u8>,
        new_path: Vec<u8>,
        renamed_from: Option<Vec<u8>>,
        added_in: String,
        dir_renamed_in: String,
    },
    RenameDeleteConflict {
        old_path: Vec<u8>,
        new_path: Vec<u8>,
        renamed_in: String,
        deleted_in: String,
    },
}

Non-conflict merge information that porcelain commands may print.

Variants

DirRenameSkippedDueToRerename

A directory rename was skipped because the suggested target directory was itself renamed away on this side.

Fields

old_dir: Vec<u8>

path: Vec<u8>

new_dir: Vec<u8>

DirRenameApplied

A path was updated due to a directory rename in merge.directoryRenames=true mode.

Fields

old_path: Vec<u8>

new_path: Vec<u8>

renamed_from: Option<Vec<u8>>

added_in: String

dir_renamed_in: String

DirRenameLocationConflict

A directory-rename location conflict that overlaps another conflict at the same final path, such as a content conflict. The path’s primary conflict kind remains attached to the path; this carries git’s extra CONFLICT (file location) line.

Fields

old_path: Vec<u8>

new_path: Vec<u8>

renamed_from: Option<Vec<u8>>

added_in: String

dir_renamed_in: String

RenameDeleteConflict

A rename/delete conflict whose conflicted destination was later moved aside by directory/file conflict handling. The primary per-path conflict remains FileDirectory; this preserves git’s extra rename/delete line.

Fields

old_path: Vec<u8>

new_path: Vec<u8>

renamed_in: String

deleted_in: String

Trait Implementations

impl Clone for MergeInfoMessage

fn clone(&self) -> MergeInfoMessage

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeInfoMessage

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

Formats the value using the given formatter.

impl Eq for MergeInfoMessage

impl PartialEq for MergeInfoMessage

fn eq(&self, other: &MergeInfoMessage) -> 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 StructuralPartialEq for MergeInfoMessage