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

Refactor and rename rewrite_multiple_rewriteable_revsets to be more general

Browse source 
We'll soon need that functionality without the checking for rewriteable
part.
This commit is contained in:
Ilya Grigoriev 2023-02-04 15:55:03 -08:00
parent 159c474e2c
commit 4268c80c84
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cli_util.rs
View file

@ -1396,7 +1396,7 @@ fn load_revset_aliases(
Ok(aliases_map)
}
pub fn resolve_multiple_rewritable_revsets(
pub fn resolve_multiple_nonempty_revsets(
revision_args: &[RevisionArg],
workspace_command: &WorkspaceCommandHelper,
) -> Result<IndexSet<Commit>, CommandError> {
@ -1404,9 +1404,6 @@ pub fn resolve_multiple_rewritable_revsets(
for revset in revision_args {
let revisions = workspace_command.resolve_revset(revset)?;
workspace_command.check_non_empty(&revisions)?;
for commit in &revisions {
workspace_command.check_rewritable(commit)?;
}
acc.extend(revisions);
}
Ok(acc)

14
src/commands/mod.rs
View file

@ -46,7 +46,7 @@ use pest::Parser;
use crate::cli_util::{
self, check_stale_working_copy, print_checkout_stats, resolve_base_revs,
resolve_multiple_rewritable_revsets, run_ui_editor, serialize_config_value, short_commit_hash,
resolve_multiple_nonempty_revsets, run_ui_editor, serialize_config_value, short_commit_hash,
user_error, user_error_with_hint, Args, CommandError, CommandHelper, DescriptionArg,
RevisionArg, WorkspaceCommandHelper, DESCRIPTION_PLACEHOLDER_TEMPLATE,
};
@ -1870,7 +1870,11 @@ fn cmd_duplicate(
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let to_duplicate: IndexSet<Commit> =
resolve_multiple_rewritable_revsets(&args.revisions, &workspace_command)?;
resolve_multiple_nonempty_revsets(&args.revisions, &workspace_command)?;
to_duplicate
.iter()
.map(|commit| workspace_command.check_rewritable(commit))
.try_collect()?;
let mut duplicated_old_to_new: IndexMap<Commit, Commit> = IndexMap::new();
let mut tx = workspace_command
@ -1923,7 +1927,11 @@ fn cmd_abandon(
args: &AbandonArgs,
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let to_abandon = resolve_multiple_rewritable_revsets(&args.revisions, &workspace_command)?;
let to_abandon = resolve_multiple_nonempty_revsets(&args.revisions, &workspace_command)?;
to_abandon
.iter()
.map(|commit| workspace_command.check_rewritable(commit))
.try_collect()?;
let transaction_description = if to_abandon.len() == 1 {
format!("abandon commit {}", to_abandon[0].id().hex())
} else {