From 455daa4d679ed12e732ad85bdeb9239f23aef585 Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Wed, 3 Jul 2024 20:08:56 +0900 Subject: [PATCH] cli: remove deprecated --allow-large-revsets flag at all It's been deprecated since v0.9.0 (2023-09-06). This patch doesn't add changelog entry because the use of --allow-large-revsets was hard error. --- cli/src/commands/new.rs | 9 --------- cli/src/commands/rebase.rs | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/cli/src/commands/new.rs b/cli/src/commands/new.rs index 19a4df8dc..ddd7a9c16 100644 --- a/cli/src/commands/new.rs +++ b/cli/src/commands/new.rs @@ -51,9 +51,6 @@ pub(crate) struct NewArgs { /// The change description to use #[arg(long = "message", short, value_name = "MESSAGE")] message_paragraphs: Vec, - /// Deprecated. Please prefix the revset with `all:` instead. - #[arg(long, short = 'L', hide = true)] - allow_large_revsets: bool, /// Do not edit the newly created change #[arg(long, conflicts_with = "_edit")] no_edit: bool, @@ -84,12 +81,6 @@ pub(crate) fn cmd_new( command: &CommandHelper, args: &NewArgs, ) -> Result<(), CommandError> { - if args.allow_large_revsets { - return Err(user_error( - "--allow-large-revsets has been deprecated. -Please use `jj new 'all:x|y'` instead of `jj new --allow-large-revsets x y`.", - )); - } let mut workspace_command = command.workspace_helper(ui)?; let parent_commits; diff --git a/cli/src/commands/rebase.rs b/cli/src/commands/rebase.rs index bd92e4feb..06d63d6ac 100644 --- a/cli/src/commands/rebase.rs +++ b/cli/src/commands/rebase.rs @@ -194,10 +194,6 @@ pub(crate) struct RebaseArgs { /// parents. #[arg(long, conflicts_with = "revisions")] skip_empty: bool, - - /// Deprecated. Please prefix the revset with `all:` instead. - #[arg(long, short = 'L', hide = true)] - allow_large_revsets: bool, } #[instrument(skip_all)] @@ -206,13 +202,6 @@ pub(crate) fn cmd_rebase( command: &CommandHelper, args: &RebaseArgs, ) -> Result<(), CommandError> { - if args.allow_large_revsets { - return Err(user_error( - "--allow-large-revsets has been deprecated. -Please use `jj rebase -d 'all:x|y'` instead of `jj rebase --allow-large-revsets -d x -d y`.", - )); - } - let rebase_options = RebaseOptions { empty: match args.skip_empty { true => EmptyBehaviour::AbandonNewlyEmpty,