Skip to content

Add options which allows us to use difft as Apache Subversion's external diff tool #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
futatuki wants to merge 3 commits into
base: master
Choose a base branch
from
+39 −1
Open

Add options which allows us to use difft as Apache Subversion's external diff tool #562

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a402892
Implement diff compatible -L (--label) option.
futatuki Aug 26, 2023
a16aed1
Implement -u option with no effect
futatuki Aug 26, 2023
50f3c90
options-for-svn: Migrate to clap4
futatuki Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion src/options.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,22 @@ fn app() -> clap::Command {
.value_parser(clap::value_parser!(u32))
.required(false),
)
.arg(
// Dummy 'unified' flag of POSIX/GNU diff utility for svn support:
// This takes no effect.
Arg::new("nop_unified")
.short('u')
.action(ArgAction::SetTrue)
.hide(true)
)
.arg(
Arg::new("label").short('L')
.long("label")
.value_name("LABEL")
.action(ArgAction::Append)
.value_parser(value_parser!(OsString))
.help("Label of file(s) which should be used for printing instead of PATH(s).")
)
.arg(
Arg::new("width")
.long("width")
Expand Down Expand Up @@ -791,7 +807,29 @@ pub(crate) fn parse_args() -> Mode {
[lhs_path, rhs_path] => {
let lhs_arg = FileArgument::from_cli_argument(lhs_path);
let rhs_arg = FileArgument::from_cli_argument(rhs_path);
let display_path = build_display_path(&lhs_arg, &rhs_arg);
let display_path = if matches.contains_id("label") {
let labels: Vec<_> = matches
.get_many::<OsString>("label")
.unwrap_or_default()
.collect();
let (_lhs_display_path, rhs_display_path) = match &labels[..] {
[lhs_display_path, rhs_display_path] => (
lhs_display_path.to_string_lossy().to_string(),
rhs_display_path.to_string_lossy().to_string(),
),
[display_path] => (
display_path.to_string_lossy().to_string(),
display_path.to_string_lossy().to_string(),
),
_ => {
eprintln!("More than 2 labels specified");
std::process::exit(EXIT_BAD_ARGUMENTS);
}
};
rhs_display_path
} else {
build_display_path(&lhs_arg, &rhs_arg)
};

let lhs_permissions = lhs_arg.permissions();
let rhs_permissions = rhs_arg.permissions();
Expand Down