Struct DiffEditor

pub struct DiffEditor { /* private fields */ }

Configured diff editor.

Implementations

impl DiffEditor

pub fn with_name( name: &str, settings: &UserSettings, base_ignores: Arc<GitIgnoreFile>, conflict_marker_style: ConflictMarkerStyle, ) -> Result<Self, MergeToolConfigError>

Creates diff editor of the given name, and loads parameters from the settings.

pub fn from_settings( ui: &Ui, settings: &UserSettings, base_ignores: Arc<GitIgnoreFile>, conflict_marker_style: ConflictMarkerStyle, ) -> Result<Self, MergeToolConfigError>

Loads the default diff editor from the settings.

pub fn edit( &self, left_tree: &MergedTree, right_tree: &MergedTree, matcher: &dyn Matcher, format_instructions: impl FnOnce() -> String, ) -> Result<MergedTreeId, DiffEditError>

Starts a diff editor on the two directories.

Trait Implementations

impl Clone for DiffEditor

fn clone(&self) -> DiffEditor

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for DiffEditor

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

Formats the value using the given formatter.