cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-30 19:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: split: make local variable names shorter

Browse Source
This commit is contained in:
Yuya Nishihara 2024-07-20 16:40:50 +09:00
parent 4e234c1a18
commit 0208e60358
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cli/src/commands/split.rs
View File

@ -123,7 +123,7 @@ the operation will be aborted.
// Create the first commit, which includes the changes selected by the user. // Create the first commit, which includes the changes selected by the user.
let selected_tree = tx.repo().store().get_root_tree(&selected_tree_id)?; let selected_tree = tx.repo().store().get_root_tree(&selected_tree_id)?;
let first_commit = { let first_commit = {
let first_template = description_template_for_commit( let template = description_template_for_commit(
ui, ui,
command.settings(), command.settings(),
tx.base_workspace_helper(), tx.base_workspace_helper(),
@ -132,19 +132,18 @@ the operation will be aborted.
&base_tree, &base_tree,
&selected_tree, &selected_tree,
)?; )?;
let first_description = let description = edit_description(tx.base_repo(), &template, command.settings())?;
edit_description(tx.base_repo(), &first_template, command.settings())?;
tx.mut_repo() tx.mut_repo()
.rewrite_commit(command.settings(), &commit) .rewrite_commit(command.settings(), &commit)
.set_tree_id(selected_tree_id) .set_tree_id(selected_tree_id)
.set_description(first_description) .set_description(description)
.write()? .write()?
}; };
// Create the second commit, which includes everything the user didn't // Create the second commit, which includes everything the user didn't
// select. // select.
let second_commit = { let second_commit = {
let (second_tree, second_base_tree) = if args.parallel { let (new_tree, base_tree) = if args.parallel {
// Merge the original commit tree with its parent using the tree // Merge the original commit tree with its parent using the tree
// containing the user selected changes as the base for the merge. // containing the user selected changes as the base for the merge.
// This results in a tree with the changes the user didn't select. // This results in a tree with the changes the user didn't select.
@ -152,35 +151,35 @@ the operation will be aborted.
} else { } else {
(end_tree, &selected_tree) (end_tree, &selected_tree)
}; };
let second_commit_parents = if args.parallel { let parents = if args.parallel {
commit.parent_ids().to_vec() commit.parent_ids().to_vec()
} else { } else {
vec![first_commit.id().clone()] vec![first_commit.id().clone()]
}; };
let second_description = if commit.description().is_empty() { let description = if commit.description().is_empty() {
// If there was no description before, don't ask for one for the // If there was no description before, don't ask for one for the
// second commit. // second commit.
"".to_string() "".to_string()
} else { } else {
let second_template = description_template_for_commit( let template = description_template_for_commit(
ui, ui,
command.settings(), command.settings(),
tx.base_workspace_helper(), tx.base_workspace_helper(),
"Enter a description for the second commit.", "Enter a description for the second commit.",
commit.description(), commit.description(),
second_base_tree, base_tree,
&second_tree, &new_tree,
)?; )?;
edit_description(tx.base_repo(), &second_template, command.settings())? edit_description(tx.base_repo(), &template, command.settings())?
}; };
tx.mut_repo() tx.mut_repo()
.rewrite_commit(command.settings(), &commit) .rewrite_commit(command.settings(), &commit)
.set_parents(second_commit_parents) .set_parents(parents)
.set_tree_id(second_tree.id()) .set_tree_id(new_tree.id())
// Generate a new change id so that the commit being split doesn't // Generate a new change id so that the commit being split doesn't
// become divergent. // become divergent.
.generate_new_change_id() .generate_new_change_id()
.set_description(second_description) .set_description(description)
.write()? .write()?
}; };