mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 07:14:38 +00:00
Minimal version of resolve --list
Simply lists conflicted files
This commit is contained in:
Ilya Grigoriev
parent
ea1395ad95
commit
e9952bcf76
2 changed files with 67 additions and 45 deletions
|
|
@ -505,7 +505,6 @@ struct UnsquashArgs {
|
|||
/// edit the conflict markers in the conflicted file directly with a text
|
||||
/// editor.
|
||||
// TODOs:
|
||||
// - `jj resolve --list` to list conflicts
|
||||
// - `jj resolve --editor` to resolve a conflict in the default text editor. Should work for
|
||||
// conflicts with 3+ adds. Useful to resolve conflicts in a commit other than the current one.
|
||||
// - A way to help split commits with conflicts that are too complicated (more than two sides)
|
||||
|
|
@ -516,9 +515,14 @@ struct UnsquashArgs {
|
|||
struct ResolveArgs {
|
||||
#[arg(long, short, default_value = "@")]
|
||||
revision: String,
|
||||
/// Instead of resolving one conflict, list all the conflicts
|
||||
// TODO: Also have a `--summary` option. `--list` currently acts like
|
||||
// `diff --summary`, but should be more verbose.
|
||||
#[arg(long, short)]
|
||||
list: bool,
|
||||
/// Restrict to these paths when searching for a conflict to resolve. We
|
||||
/// will attempt to resolve the first conflict we can find. You can use `jj
|
||||
/// status` to find such files
|
||||
/// will attempt to resolve the first conflict we can find. You can use
|
||||
/// the `--list` argument to find paths to use here.
|
||||
// TODO: Find the conflict we can resolve even if it's not the first one.
|
||||
#[arg(value_hint = clap::ValueHint::AnyPath)]
|
||||
paths: Vec<String>,
|
||||
|
|
@ -2883,6 +2887,26 @@ fn cmd_resolve(
|
|||
}),
|
||||
));
|
||||
}
|
||||
if args.list {
|
||||
let mut formatter = ui.stdout_formatter();
|
||||
let formatter = formatter.as_mut();
|
||||
for (repo_path, _conflict_id) in conflicts {
|
||||
// TODO: Similar to `jj diff --summary`, insert a few letters
|
||||
// before the filename to indicate the kind of conflict.
|
||||
// E.g. we could have a letter per add : `FF` is a usual conflict
|
||||
// between two versions of a file, `FD` is a file vs directory,
|
||||
// `FFF` for a merge of three conflicting versions. Additionally,
|
||||
// if (# removes) + 1 > (# adds), this indicates the file was deleted
|
||||
// in some versions of the conflict. Perhaps that should be `R` for removed.
|
||||
writeln!(
|
||||
formatter,
|
||||
"{}",
|
||||
&workspace_command.format_file_path(&repo_path)
|
||||
)?;
|
||||
}
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let (repo_path, _) = conflicts.get(0).unwrap();
|
||||
workspace_command.check_rewriteable(&commit)?;
|
||||
let mut tx = workspace_command.start_transaction(&format!(
|
||||
|
|
|
|||
|
|
@ -62,6 +62,10 @@ fn test_resolution() {
|
|||
o base
|
||||
o
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
insta::assert_snapshot!(
|
||||
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
||||
, @r###"
|
||||
|
|
@ -89,13 +93,9 @@ fn test_resolution() {
|
|||
6 : b
|
||||
7 : >>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
insta::assert_snapshot!(test_env.jj_cmd_cli_error(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Parent commit: 77c5ed9eda54 a
|
||||
Parent commit: 7c4a3488ba53 b
|
||||
Working copy : 665f83829a6a conflict
|
||||
Working copy changes:
|
||||
M file
|
||||
Error: No conflicts found at this revision
|
||||
"###);
|
||||
|
||||
// Check that the output file starts with conflict markers if
|
||||
|
|
@ -184,14 +184,8 @@ conflict
|
|||
6 6: bconflict
|
||||
7 7: >>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Parent commit: 77c5ed9eda54 a
|
||||
Parent commit: 7c4a3488ba53 b
|
||||
Working copy : cbd3d65d2612 conflict
|
||||
Working copy changes:
|
||||
M file
|
||||
There are unresolved conflicts at these paths:
|
||||
file
|
||||
"###);
|
||||
|
||||
|
|
@ -228,14 +222,9 @@ conflict
|
|||
6 6: bconflict
|
||||
7 7: >>>>>>>
|
||||
"###);
|
||||
// No "there are unresolved conflicts..." message below
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
insta::assert_snapshot!(test_env.jj_cmd_cli_error(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Parent commit: 77c5ed9eda54 a
|
||||
Parent commit: 7c4a3488ba53 b
|
||||
Working copy : d5b735448648 conflict
|
||||
Working copy changes:
|
||||
M file
|
||||
Error: No conflicts found at this revision
|
||||
"###);
|
||||
|
||||
// TODO: Check that running `jj new` and then `jj resolve -r conflict` works
|
||||
|
|
@ -281,6 +270,10 @@ fn test_normal_conflict_input_files() {
|
|||
o base
|
||||
o
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
insta::assert_snapshot!(
|
||||
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
||||
, @r###"
|
||||
|
|
@ -318,6 +311,10 @@ fn test_baseless_conflict_input_files() {
|
|||
o base
|
||||
o
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
insta::assert_snapshot!(
|
||||
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
||||
, @r###"
|
||||
|
|
@ -345,6 +342,10 @@ fn test_too_many_parents() {
|
|||
create_commit(&test_env, &repo_path, "b", &["base"], &[("file", "b\n")]);
|
||||
create_commit(&test_env, &repo_path, "c", &["base"], &[("file", "c\n")]);
|
||||
create_commit(&test_env, &repo_path, "conflict", &["a", "b", "c"], &[]);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
|
||||
let error = test_env.jj_cmd_failure(&repo_path, &["resolve"]);
|
||||
insta::assert_snapshot!(error, @r###"
|
||||
|
|
@ -374,6 +375,10 @@ fn test_edit_delete_conflict_input_files() {
|
|||
o base
|
||||
o
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
insta::assert_snapshot!(
|
||||
std::fs::read_to_string(repo_path.join("file")).unwrap()
|
||||
, @r###"
|
||||
|
|
@ -406,6 +411,10 @@ fn test_file_vs_dir() {
|
|||
std::fs::write(repo_path.join("file").join("placeholder"), "").unwrap();
|
||||
create_commit(&test_env, &repo_path, "conflict", &["a", "b"], &[]);
|
||||
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file
|
||||
"###);
|
||||
let error = test_env.jj_cmd_failure(&repo_path, &["resolve"]);
|
||||
insta::assert_snapshot!(error, @r###"
|
||||
Error: Failed to use external tool to resolve: Only conflicts that involve normal files (not symlinks, not executable, etc.) are supported. Conflict summary for "file":
|
||||
|
|
@ -477,6 +486,11 @@ fn test_multiple_conflicts() {
|
|||
second b
|
||||
>>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
file1
|
||||
file2
|
||||
"###);
|
||||
|
||||
let editor_script = test_env.set_up_fake_editor();
|
||||
|
||||
|
|
@ -494,14 +508,8 @@ fn test_multiple_conflicts() {
|
|||
6 : second b
|
||||
7 : >>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Parent commit: 9a25592b7aee a
|
||||
Working copy : 00dac0bec4b1 conflict
|
||||
Working copy changes:
|
||||
M file1
|
||||
M file2
|
||||
There are unresolved conflicts at these paths:
|
||||
file1
|
||||
"###);
|
||||
|
||||
|
|
@ -527,14 +535,8 @@ fn test_multiple_conflicts() {
|
|||
6 1: firstfor bauto-chosen file
|
||||
7 : >>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Parent commit: 9a25592b7aee a
|
||||
Working copy : f06196060882 conflict
|
||||
Working copy changes:
|
||||
M file1
|
||||
M file2
|
||||
There are unresolved conflicts at these paths:
|
||||
file2
|
||||
"###);
|
||||
std::fs::write(
|
||||
|
|
@ -563,15 +565,11 @@ fn test_multiple_conflicts() {
|
|||
6 1: secondfor bauto-chosen file
|
||||
7 : >>>>>>>
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["status"]),
|
||||
@r###"
|
||||
Parent commit: 9a25592b7aee a
|
||||
Working copy : 0fafecce390d conflict
|
||||
Working copy changes:
|
||||
M file1
|
||||
M file2
|
||||
"###);
|
||||
|
||||
insta::assert_snapshot!(test_env.jj_cmd_cli_error(&repo_path, &["resolve", "--list"]),
|
||||
@r###"
|
||||
Error: No conflicts found at this revision
|
||||
"###);
|
||||
insta::assert_snapshot!(test_env.jj_cmd_cli_error(&repo_path, &["resolve"]),
|
||||
@r###"
|
||||
Error: No conflicts found at this revision
|
||||
|
|
|
|||
Loading…
Reference in a new issue