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

abandon: accept multiple revisions

Browse source
This commit is contained in:
Waleed Khan 2022-06-05 20:31:01 -07:00 committed by Martin von Zweigbergk
parent de1c8f0f37
commit 84cb0858ad
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/commands.rs
View file

@ -1376,7 +1376,7 @@ struct DuplicateArgs {
struct AbandonArgs {
/// The revision(s) to abandon
#[clap(default_value = "@")]
revisions: String,
revisions: Vec<String>,
}
/// Create a new, empty change and check it out
@ -3352,11 +3352,18 @@ fn cmd_abandon(
args: &AbandonArgs,
) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?;
let to_abandon = workspace_command.resolve_revset(ui, &args.revisions)?;
workspace_command.check_non_empty(&to_abandon)?;
for commit in &to_abandon {
workspace_command.check_rewriteable(commit)?;
}
let to_abandon = {
let mut acc = Vec::new();
for revset in &args.revisions {
let revisions = workspace_command.resolve_revset(ui, revset)?;
workspace_command.check_non_empty(&revisions)?;
for commit in &revisions {
workspace_command.check_rewriteable(commit)?;
}
acc.extend(revisions);
}
acc
};
let transaction_description = if to_abandon.len() == 1 {
format!("abandon commit {}", to_abandon[0].id().hex())
} else {