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

cmd: Allow multiple -b for jj rebase

Browse source 
This also makes `rebase_branch` reuse `rebase_descendants`.

This addresses a portion of #1158
This commit is contained in:
Ilya Grigoriev 2023-02-18 19:31:48 -08:00
parent f04458a245
commit 9c51d74b2c
3 changed files with 76 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -16,8 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `jj restore` without `--from` works correctly even if `@` is a merge
commit.
* `jj rebase` now accepts multiple `-s` arguments. Revsets with multiple commits
are allowed with `--allow-large-revsets`.
* `jj rebase` now accepts multiple `-s` and `-b` arguments. Revsets with
multiple commits are allowed with `--allow-large-revsets`.
### Fixed bugs

46
src/commands/mod.rs
View file

@ -730,9 +730,13 @@ struct SplitArgs {
#[command(verbatim_doc_comment)]
#[command(group(ArgGroup::new("to_rebase").args(&["branch", "source", "revision"])))]
struct RebaseArgs {
/// Rebase the whole branch (relative to destination's ancestors)
/// Rebase the whole branch relative to destination's ancestors (can be
/// repeated)
///
/// `jj rebase -b=br -d=dst` is equivalent to `jj rebase '-s=roots(dst..br)'
/// -d=dst`.
#[arg(long, short)]
branch: Option<RevisionArg>,
branch: Vec<RevisionArg>,
/// Rebase specified revision(s) together their tree of descendants (can be
/// repeated)
@ -2782,13 +2786,21 @@ fn cmd_rebase(ui: &mut Ui, command: &CommandHelper, args: &RebaseArgs) -> Result
&source_commits,
)?;
} else {
let branch_str = args.branch.as_deref().unwrap_or("@");
let branch_commits = if args.branch.is_empty() {
IndexSet::from([workspace_command.resolve_single_rev("@")?])
} else {
resolve_mutliple_nonempty_revsets_flag_guarded(
&workspace_command,
&args.branch,
args.allow_large_revsets,
)?
};
rebase_branch(
ui,
command,
&mut workspace_command,
&new_parents,
branch_str,
&branch_commits,
)?;
}
Ok(())
@ -2799,36 +2811,26 @@ fn rebase_branch(
command: &CommandHelper,
workspace_command: &mut WorkspaceCommandHelper,
new_parents: &[Commit],
branch_str: &str,
branch_commits: &IndexSet<Commit>,
) -> Result<(), CommandError> {
let branch_commit = workspace_command.resolve_single_rev(branch_str)?;
check_rebase_destinations(workspace_command.repo(), new_parents, &branch_commit)?;
let parent_ids = new_parents
.iter()
.map(|commit| commit.id().clone())
.collect_vec();
let branch_commit_ids = branch_commits
.iter()
.map(|commit| commit.id().clone())
.collect_vec();
let roots_expression = RevsetExpression::commits(parent_ids)
.range(&RevsetExpression::commit(branch_commit.id().clone()))
.range(&RevsetExpression::commits(branch_commit_ids))
.roots();
let root_commits: Vec<_> = workspace_command
let root_commits: IndexSet<_> = workspace_command
.evaluate_revset(&roots_expression)
.unwrap()
.iter()
.commits(workspace_command.repo().store())
.try_collect()?;
let mut tx = workspace_command
.start_transaction(&format!("rebase branch at {}", branch_commit.id().hex()));
let mut num_rebased = 0;
for root_commit in &root_commits {
tx.base_workspace_helper().check_rewritable(root_commit)?;
rebase_commit(command.settings(), tx.mut_repo(), root_commit, new_parents)?;
num_rebased += 1;
}
num_rebased += tx.mut_repo().rebase_descendants(command.settings())?;
writeln!(ui, "Rebased {num_rebased} commits")?;
tx.finish(ui)?;
Ok(())
rebase_descendants(ui, command, workspace_command, new_parents, &root_commits)
}
fn rebase_descendants(

50
tests/test_rebase_command.rs
View file

@ -121,6 +121,56 @@ fn test_rebase_branch() {
o a
o
"###);
// Test rebasing multiple branches at once
test_env.jj_cmd_success(&repo_path, &["undo"]);
let stdout = test_env.jj_cmd_success(&repo_path, &["rebase", "-b=e", "-b=d", "-d=b"]);
insta::assert_snapshot!(stdout, @r###"
Rebased 2 commits
Working copy now at: 9ca2a1544e5d e
Added 1 files, modified 0 files, removed 0 files
"###);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
o d
│ @ e
├─╯
│ o c
├─╯
o b
o a
o
"###);
// Same test but with more than one revision per argument and same revision
// repeated in more than one argument
test_env.jj_cmd_success(&repo_path, &["undo"]);
let stderr = test_env.jj_cmd_failure(&repo_path, &["rebase", "-b=e|d", "-b=d", "-d=b"]);
insta::assert_snapshot!(stderr, @r###"
Error: Revset "e|d" resolved to more than one revision
Hint: The revset "e|d" resolved to these revisions:
e52756c82985 e
514fa6b265d4 d
If this was intentional, specify the `--allow-large-revsets` argument
"###);
let stdout = test_env.jj_cmd_success(
&repo_path,
&["rebase", "-b=e|d", "-b=d", "-d=b", "--allow-large-revsets"],
);
insta::assert_snapshot!(stdout, @r###"
Rebased 2 commits
Working copy now at: 817e3fb0dc64 e
Added 1 files, modified 0 files, removed 0 files
"###);
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
o d
│ @ e
├─╯
│ o c
├─╯
o b
o a
o
"###);
}
#[test]