mod git;
use std::io::IsTerminal;
use std::path::PathBuf;
use std::process::ExitCode;
use anyhow::Result;
use clap::Parser;
use move_diff::annotate_diff;
use move_diff::annotate_diff::MoveGap;
#[derive(Parser)]
#[command(
name = "move-diff",
version,
about = "Render a git diff with extra markers for moved and reformatted code",
long_about = "Render a git diff with extra markers for moved and reformatted code.\n\n\
Markers: '+'/'-' for genuine additions/removals (green/red, as in \
`git diff`), '>'/'<' for code that moved away from / arrived at a spot \
(cyan/blue), and 'x' for code that was only reformatted in place — \
reindented, rewrapped, etc. — with no real content change (magenta).\n\n\
Behaves like `git diff`: with no reference it diffs the working tree \
against the index, and a clean tree produces no output and a zero \
exit status. Paths may be given after the reference (or alone) to \
limit the diff, exactly as with `git diff`."
)]
struct Args {
args: Vec<String>,
#[arg(short = 'C', long = "dir", default_value = ".")]
dir: PathBuf,
#[arg(long, default_value = "10%")]
max_move_gap: MoveGap,
#[arg(long)]
no_color: bool,
}
fn main() -> ExitCode {
let args = Args::parse();
let diff = match git::local_diff(&args.dir, &args.args) {
Ok(diff) => diff,
Err(e) => {
eprintln!("move-diff: {e:#}");
return ExitCode::from(128);
}
};
if diff.is_empty() {
return ExitCode::SUCCESS;
}
let color =
!args.no_color && std::env::var_os("NO_COLOR").is_none() && std::io::stdout().is_terminal();
match render(&diff, args.max_move_gap, color) {
Ok(()) => ExitCode::SUCCESS,
Err(e) => {
eprintln!("move-diff: {e:#}");
ExitCode::FAILURE
}
}
}
fn render(diff: &str, max_move_gap: MoveGap, color: bool) -> Result<()> {
use std::io::Write;
let rendered = annotate_diff::render(diff, max_move_gap, color)?;
let stdout = std::io::stdout();
let mut stdout = stdout.lock();
match stdout
.write_all(rendered.as_bytes())
.and_then(|()| stdout.flush())
{
Ok(()) => Ok(()),
Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
Err(e) => Err(e.into()),
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn positionals_are_collected_verbatim() {
let args = Args::try_parse_from(["move-diff", "HEAD", "README.md"]).unwrap();
assert_eq!(args.args, vec!["HEAD", "README.md"]);
assert_eq!(args.dir, PathBuf::from("."));
assert!(!args.no_color);
}
#[test]
fn args_are_optional() {
let args = Args::try_parse_from(["move-diff"]).unwrap();
assert!(args.args.is_empty());
}
#[test]
fn ranges_stay_verbatim() {
let args = Args::try_parse_from(["move-diff", "main...feature"]).unwrap();
assert_eq!(args.args, vec!["main...feature"]);
}
#[test]
fn dir_and_no_color_flags() {
let args = Args::try_parse_from(["move-diff", "-C", "/tmp", "--no-color"]).unwrap();
assert_eq!(args.dir, PathBuf::from("/tmp"));
assert!(args.no_color);
}
#[test]
fn a_lone_path_is_a_positional() {
let args = Args::try_parse_from(["move-diff", "README.md"]).unwrap();
assert_eq!(args.args, vec!["README.md"]);
}
#[test]
fn leading_double_dash_is_forwarded() {
let args = Args::try_parse_from(["move-diff", "--", "-weird"]).unwrap();
assert_eq!(args.args, vec!["-weird"]);
}
#[test]
fn max_move_gap_defaults_to_ten_percent() {
assert_eq!(
Args::try_parse_from(["move-diff"]).unwrap().max_move_gap,
MoveGap::Relative(0.10)
);
}
#[test]
fn max_move_gap_accepts_absolute_and_relative_forms() {
assert_eq!(
Args::try_parse_from(["move-diff", "--max-move-gap", "2"])
.unwrap()
.max_move_gap,
MoveGap::Absolute(2)
);
assert_eq!(
Args::try_parse_from(["move-diff", "--max-move-gap", "0.25"])
.unwrap()
.max_move_gap,
MoveGap::Relative(0.25)
);
}
#[test]
fn invalid_max_move_gap_is_rejected_by_the_parser() {
assert!(Args::try_parse_from(["move-diff", "--max-move-gap", "abc"]).is_err());
}
#[test]
fn empty_diff_produces_no_output() {
assert!(render("", MoveGap::Relative(0.10), false).is_ok());
}
}