ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

resolve: remove --quiet flag, rely on global one

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-03-31 22:32:43 -07:00 committed by Martin von Zweigbergk
parent adf3b50209
commit 7b3f8e8cb6
2 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cli/src/commands/resolve.rs
View file

@ -51,10 +51,6 @@ pub(crate) struct ResolveArgs {
// `diff --summary`, but should be more verbose. // `diff --summary`, but should be more verbose.
#[arg(long, short)] #[arg(long, short)]
list: bool, list: bool,
/// Do not print the list of remaining conflicts (if any) after resolving a
/// conflict
#[arg(long, short, conflicts_with = "list")]
quiet: bool,
/// Specify 3-way merge tool to be used /// Specify 3-way merge tool to be used
#[arg(long, conflicts_with = "list", value_name = "NAME")] #[arg(long, conflicts_with = "list", value_name = "NAME")]
tool: Option<String>, tool: Option<String>,
@ -115,20 +111,17 @@ pub(crate) fn cmd_resolve(
format!("Resolve conflicts in commit {}", commit.id().hex()), format!("Resolve conflicts in commit {}", commit.id().hex()),
)?; )?;
// TODO: Delete local `--quiet` if let Some(mut formatter) = ui.status_formatter() {
if !args.quiet { let new_tree = new_commit.tree()?;
if let Some(mut formatter) = ui.status_formatter() { let new_conflicts = new_tree.conflicts().collect_vec();
let new_tree = new_commit.tree()?; if !new_conflicts.is_empty() {
let new_conflicts = new_tree.conflicts().collect_vec(); writeln!(
if !new_conflicts.is_empty() { formatter,
writeln!( "After this operation, some files at this revision still have conflicts:"
formatter, )?;
"After this operation, some files at this revision still have conflicts:" print_conflicted_paths(&new_conflicts, formatter.as_mut(), &workspace_command)?;
)?;
print_conflicted_paths(&new_conflicts, formatter.as_mut(), &workspace_command)?;
}
} }
}; }
Ok(()) Ok(())
} }

4
cli/tests/cli-reference@.md.snap
View file

@ -1523,10 +1523,6 @@ Note that conflicts can also be resolved without using this command. You may edi
Possible values: `true`, `false` Possible values: `true`, `false`
* `-q`, `--quiet` — Do not print the list of remaining conflicts (if any) after resolving a conflict
Possible values: `true`, `false`
* `--tool <NAME>` — Specify 3-way merge tool to be used * `--tool <NAME>` — Specify 3-way merge tool to be used