mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-15 16:53:25 +00:00
0b9d23c3ad
This is basic implementation. There's no config knob to enable the external diff command by default. It reuses the merge-tools table because that's how external diff/merge commands are currently configured. We might want to reorganize them in #1285. If you run "jj diff --tool meld", GUI diff will open and jj will wait for meld to quit. This also applies to "jj log -p". The "diff --tool gui" behavior is somewhat useful, but "log -p --tool gui" wouldn't. We might want some flag to mark the tool output can't be streamed. Another thing to consider is tools that can't generate directory diffs. Git executes ext-diff tool per file, but we don't. Difftastic can compare directories, and doing that should be more efficient since diffs can be computed in parallel (at the expense of unsorted output.) Closes #1886
115 lines
4.2 KiB
Rust
115 lines
4.2 KiB
Rust
// Copyright 2022 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::collections::HashSet;
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::exit;
|
|
|
|
use clap::Parser;
|
|
use itertools::Itertools;
|
|
|
|
/// A fake diff-editor, useful for testing
|
|
#[derive(Parser, Debug)]
|
|
#[clap()]
|
|
struct Args {
|
|
/// Path to the "before" directory
|
|
before: PathBuf,
|
|
|
|
/// Path to the "after" directory
|
|
after: PathBuf,
|
|
}
|
|
|
|
fn files_recursively(dir: &Path) -> HashSet<String> {
|
|
let mut files = HashSet::new();
|
|
for dir_entry in std::fs::read_dir(dir).unwrap() {
|
|
let dir_entry = dir_entry.unwrap();
|
|
let base_name = dir_entry.file_name().to_str().unwrap().to_string();
|
|
if dir_entry.path().is_dir() {
|
|
for sub_path in files_recursively(&dir_entry.path()) {
|
|
files.insert(format!("{base_name}/{sub_path}"));
|
|
}
|
|
} else {
|
|
files.insert(base_name);
|
|
}
|
|
}
|
|
files
|
|
}
|
|
|
|
fn main() {
|
|
let args: Args = Args::parse();
|
|
let edit_script_path = PathBuf::from(std::env::var_os("DIFF_EDIT_SCRIPT").unwrap());
|
|
let edit_script = String::from_utf8(std::fs::read(edit_script_path).unwrap()).unwrap();
|
|
for instruction in edit_script.split('\0') {
|
|
let (command, payload) = instruction.split_once('\n').unwrap_or((instruction, ""));
|
|
let parts = command.split(' ').collect_vec();
|
|
match parts.as_slice() {
|
|
[""] => {}
|
|
["fail"] => exit(1),
|
|
["files-before", ..] => {
|
|
let expected = parts[1..].iter().copied().map(str::to_string).collect();
|
|
let actual = files_recursively(&args.before);
|
|
if actual != expected {
|
|
eprintln!(
|
|
"fake-diff-editor: unexpected files before. EXPECTED: {:?} ACTUAL: {:?}",
|
|
expected.iter().sorted().collect_vec(),
|
|
actual.iter().sorted().collect_vec(),
|
|
);
|
|
exit(1)
|
|
}
|
|
}
|
|
["files-after", ..] => {
|
|
let expected = parts[1..].iter().copied().map(str::to_string).collect();
|
|
let actual = files_recursively(&args.after);
|
|
if actual != expected {
|
|
eprintln!(
|
|
"fake-diff-editor: unexpected files after. EXPECTED: {:?} ACTUAL: {:?}",
|
|
expected.iter().sorted().collect_vec(),
|
|
actual.iter().sorted().collect_vec(),
|
|
);
|
|
exit(1)
|
|
}
|
|
}
|
|
["print", message] => {
|
|
println!("{message}");
|
|
}
|
|
["print-files-before"] => {
|
|
for base_name in files_recursively(&args.before).iter().sorted() {
|
|
println!("{base_name}");
|
|
}
|
|
}
|
|
["print-files-after"] => {
|
|
for base_name in files_recursively(&args.after).iter().sorted() {
|
|
println!("{base_name}");
|
|
}
|
|
}
|
|
["rm", file] => {
|
|
std::fs::remove_file(args.after.join(file)).unwrap();
|
|
}
|
|
["reset", file] => {
|
|
if args.before.join(file).exists() {
|
|
std::fs::copy(args.before.join(file), args.after.join(file)).unwrap();
|
|
} else {
|
|
std::fs::remove_file(args.after.join(file)).unwrap();
|
|
}
|
|
}
|
|
["write", file] => {
|
|
std::fs::write(args.after.join(file), payload).unwrap();
|
|
}
|
|
_ => {
|
|
eprintln!("fake-diff-editor: unexpected command: {command}");
|
|
exit(1)
|
|
}
|
|
}
|
|
}
|
|
}
|