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

commands: add command for editing contents of a commit

Browse source 
This adds `jj edit`, which lets the user edit the content changes in a
commit. It behaves similar to `jj restore` when restoring the parent
commit, except that it edits the change compared to the re-merged
parents if the commit is a merge commit.
This commit is contained in:
Martin von Zweigbergk 2020-12-26 11:01:23 -08:00
parent 3280d75ff4
commit a39b44f5cc
1 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/commands.rs
View file

@ -411,6 +411,11 @@ fn get_app<'a, 'b>() -> App<'a, 'b> {
.multiple(true),
),
)
.subcommand(
SubCommand::with_name("edit")
.about("edit the content changes in a revision")
.arg(rev_arg()),
)
.subcommand(
SubCommand::with_name("merge")
.about("merge work from multiple branches")
@ -1382,6 +1387,38 @@ fn cmd_restore(
Ok(())
}
fn cmd_edit(
ui: &mut Ui,
matches: &ArgMatches,
sub_matches: &ArgMatches,
) -> Result<(), CommandError> {
let mut repo = get_repo(ui, &matches)?;
let owned_wc = repo.working_copy().clone();
let mut_repo = Arc::get_mut(&mut repo).unwrap();
let commit = resolve_revision_arg(ui, mut_repo, sub_matches)?;
let base_tree = merge_commit_trees(repo.store(), &commit.parents());
let tree_id = crate::diff_edit::edit_diff(&base_tree, &commit.tree())?;
if &tree_id == commit.tree().id() {
ui.write("Nothing changed.\n");
} else {
let mut tx = repo.start_transaction(&format!("edit commit {}", commit.id().hex()));
let new_commit = CommitBuilder::for_rewrite_from(ui.settings(), repo.store(), &commit)
.set_tree(tree_id)
.write_to_transaction(&mut tx);
ui.write("Created ");
ui.write_commit_summary(tx.as_repo(), &new_commit);
ui.write("\n");
update_checkout_after_rewrite(ui, &mut tx);
tx.commit();
update_working_copy(
ui,
Arc::get_mut(&mut repo).unwrap(),
&owned_wc.lock().unwrap(),
)?;
}
Ok(())
}
fn cmd_merge(
ui: &mut Ui,
matches: &ArgMatches,
@ -1894,6 +1931,8 @@ where
cmd_discard(&mut ui, &matches, &sub_matches)
} else if let Some(sub_matches) = matches.subcommand_matches("restore") {
cmd_restore(&mut ui, &matches, &sub_matches)
} else if let Some(sub_matches) = matches.subcommand_matches("edit") {
cmd_edit(&mut ui, &matches, &sub_matches)
} else if let Some(sub_matches) = matches.subcommand_matches("merge") {
cmd_merge(&mut ui, &matches, &sub_matches)
} else if let Some(sub_matches) = matches.subcommand_matches("rebase") {