Struct Opts

pub struct Opts {
    pub dir_diff: bool,
    pub left: PathBuf,
    pub right: PathBuf,
    pub read_only: bool,
    pub dry_run: bool,
    pub base: Option<PathBuf>,
    pub output: Option<PathBuf>,
}

Render a partial commit selector for use as a difftool or mergetool.

This can be used to interactively select changes to include as part of a commit, to resolve merge conflicts, or to simply display a diff in a readable way.

Fields

dir_diff: bool

Instead of comparing two files, compare two directories recursively.

left: PathBuf

The left-hand file to compare (or directory if --dir-diff is passed).

right: PathBuf

The right-hand file to compare (or directory if --dir-diff is passed).

read_only: bool

Disable all editing controls and do not write the selected commit contents to disk.

dry_run: bool

Show what would have been written to disk as part of the commit selection, but do not actually write it.

base: Option<PathBuf>

Render the interface as a mergetool instead of a difftool and use this file as the base of a three-way diff as part of resolving merge conflicts.

output: Option<PathBuf>

Write the resolved merge conflicts to this file.

Trait Implementations

impl Args for Opts

fn group_id() -> Option<Id>

Report the ArgGroup::id for this set of arguments

fn augment_args<'b>(__clap_app: Command) -> Command

Append to Command so it can instantiate Self via FromArgMatches::from_arg_matches_mut

fn augment_args_for_update<'b>(__clap_app: Command) -> Command

Append to Command so it can instantiate self via FromArgMatches::update_from_arg_matches_mut

impl CommandFactory for Opts

fn command<'b>() -> Command

Build a Command that can instantiate Self.

fn command_for_update<'b>() -> Command

Build a Command that can update self.

impl Debug for Opts

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

Formats the value using the given formatter.

impl FromArgMatches for Opts

fn from_arg_matches(__clap_arg_matches: &ArgMatches) -> Result<Self, Error>

Instantiate Self from ArgMatches, parsing the arguments as needed.

fn from_arg_matches_mut( __clap_arg_matches: &mut ArgMatches, ) -> Result<Self, Error>

Instantiate Self from ArgMatches, parsing the arguments as needed.

fn update_from_arg_matches( &mut self, __clap_arg_matches: &ArgMatches, ) -> Result<(), Error>

Assign values from ArgMatches to self.

fn update_from_arg_matches_mut( &mut self, __clap_arg_matches: &mut ArgMatches, ) -> Result<(), Error>

Assign values from ArgMatches to self.

impl Parser for Opts

fn parse() -> Self

Parse from std::env::args_os(), exit on error.

fn try_parse() -> Result<Self, Error>

Parse from std::env::args_os(), return Err on error.

fn parse_from<I, T>(itr: I) -> Self

where I: IntoIterator<Item = T>, T: Into<OsString> + Clone,

Parse from iterator, exit on error.

fn try_parse_from<I, T>(itr: I) -> Result<Self, Error>

where I: IntoIterator<Item = T>, T: Into<OsString> + Clone,

Parse from iterator, return Err on error.

fn update_from<I, T>(&mut self, itr: I)

where I: IntoIterator<Item = T>, T: Into<OsString> + Clone,

Update from iterator, exit on error.

fn try_update_from<I, T>(&mut self, itr: I) -> Result<(), Error>

where I: IntoIterator<Item = T>, T: Into<OsString> + Clone,

Update from iterator, return Err on error.