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

jj-vcs · Apr 1, 2024 · 7b3f8e8 · 7b3f8e8
1 parent adf3b50
commit 7b3f8e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/cli/src/commands/resolve.rs b/cli/src/commands/resolve.rs
@@ -51,10 +51,6 @@ pub(crate) struct ResolveArgs {
     // `diff --summary`, but should be more verbose.
     #[arg(long, short)]
     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
     #[arg(long, conflicts_with = "list", value_name = "NAME")]
     tool: Option<String>,
@@ -115,20 +111,17 @@ pub(crate) fn cmd_resolve(
         format!("Resolve conflicts in commit {}", commit.id().hex()),
     )?;
 
-    // TODO: Delete local `--quiet`
-    if !args.quiet {
-        if let Some(mut formatter) = ui.status_formatter() {
-            let new_tree = new_commit.tree()?;
-            let new_conflicts = new_tree.conflicts().collect_vec();
-            if !new_conflicts.is_empty() {
-                writeln!(
-                    formatter,
-                    "After this operation, some files at this revision still have conflicts:"
-                )?;
-                print_conflicted_paths(&new_conflicts, formatter.as_mut(), &workspace_command)?;
-            }
+    if let Some(mut formatter) = ui.status_formatter() {
+        let new_tree = new_commit.tree()?;
+        let new_conflicts = new_tree.conflicts().collect_vec();
+        if !new_conflicts.is_empty() {
+            writeln!(
+                formatter,
+                "After this operation, some files at this revision still have conflicts:"
+            )?;
+            print_conflicted_paths(&new_conflicts, formatter.as_mut(), &workspace_command)?;
         }
-    };
+    }
     Ok(())
 }
 

diff --git a/cli/tests/[email protected] b/cli/tests/[email protected]
@@ -1523,10 +1523,6 @@ Note that conflicts can also be resolved without using this command. You may edi
 
   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