Enum DirectoryRenameMode 

pub enum DirectoryRenameMode {
    Off,
    Apply,
    Conflict,
}

How a three-way merge treats files one side adds inside a directory the other side renamed.

A directory counts as renamed when one side moved all of its files out of it and most of them (the destination with the most files, without a tie) into one other directory. Files the other side added to the old directory, or renamed into it, then most likely belong in the new one. Read from the merge.directoryRenames config with Self::from_config.

Variants

Off

Leave such files where the adding side put them (merge.directoryRenames=false).

Apply

Move them into the renamed directory as a clean merge (true).

Conflict

Move them, but leave each one unmerged at the adding side’s stage so the user confirms the new location (conflict; Git’s default).

Implementations

impl DirectoryRenameMode

pub const CONFIG_KEY: &'static str = "merge.directoryRenames"

Config key holding the mode.

pub fn from_config_value(value: &str) -> Result<Self, ConfigError>

Parse a merge.directoryRenames value: conflict or a Git boolean (true applies the renames, false turns them off).

Errors

ConfigError::InvalidDirectoryRenames for any other value.

pub fn from_config(config: &ConfigSet) -> Result<Self, ConfigError>

The mode set by Self::CONFIG_KEY in config, or Self::Conflict when unset.

Errors

ConfigError::InvalidDirectoryRenames when the value is not recognised.

pub fn from_repo(repo: &Repository) -> Result<Self>

Self::from_config for the configuration of repo.

Errors

Config load failures, and ConfigError::InvalidDirectoryRenames.

Trait Implementations

impl Clone for DirectoryRenameMode

fn clone(&self) -> Self

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for DirectoryRenameMode

impl Debug for DirectoryRenameMode

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

Formats the value using the given formatter.

impl Default for DirectoryRenameMode

fn default() -> Self

Returns the “default value” for a type.

impl Eq for DirectoryRenameMode

impl Hash for DirectoryRenameMode

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl PartialEq for DirectoryRenameMode

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for DirectoryRenameMode