From 9ac1ff5be7a21ae566480a6767b83582ad519b9d Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Tue, 29 Aug 2023 23:13:37 +0200 Subject: [PATCH] commands: add `--interactive` flag to `jj split` I am constantly explicitly running `jj split -i` because I expect the interactive flag to be there for consistency. --- cli/src/commands/mod.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 201b46668a..5c7c365295 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -876,10 +876,14 @@ struct DiffeditArgs { /// asked for a description only for the first part. #[derive(clap::Args, Clone, Debug)] struct SplitArgs { + /// Interactively choose which parts to split. This is the default if no + /// paths are provided. + #[arg(long, short)] + interactive: bool, /// The revision to split #[arg(long, short, default_value = "@")] revision: RevisionArg, - /// Put these paths in the first commit and don't run the diff editor + /// Put these paths in the first commit #[arg(value_hint = clap::ValueHint::AnyPath)] paths: Vec, } @@ -3257,7 +3261,7 @@ fn cmd_split(ui: &mut Ui, command: &CommandHelper, args: &SplitArgs) -> Result<( workspace_command.start_transaction(&format!("split commit {}", commit.id().hex())); let end_tree = commit.tree()?; let base_tree = merge_commit_trees(tx.repo(), &commit.parents())?; - let interactive = args.paths.is_empty(); + let interactive = args.interactive || args.paths.is_empty(); let instructions = format!( "\ You are splitting a commit in two: {}