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

cli: rename restore command's arguments to "from" and "to"

Browse source 
I keep thinking of them as "from" and "to" rather than "source" and
"destination", so it probably makes sense to use those words.
This commit is contained in:
Martin von Zweigbergk 2021-05-16 09:31:16 -07:00
parent 66460477b7
commit bb83c3d509
1 changed files with 19 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/commands.rs
View file

@ -535,16 +535,14 @@ fn get_app<'a, 'b>() -> App<'a, 'b> {
let restore_command = SubCommand::with_name("restore") let restore_command = SubCommand::with_name("restore")
.about("Restore paths from another revision") .about("Restore paths from another revision")
.arg( .arg(
Arg::with_name("source") Arg::with_name("from")
.long("source") .long("from")
.short("s")
.takes_value(true) .takes_value(true)
.default_value(":@"), .default_value(":@"),
) )
.arg( .arg(
Arg::with_name("destination") Arg::with_name("to")
.long("destination") .long("to")
.short("d")
.takes_value(true) .takes_value(true)
.default_value("@"), .default_value("@"),
) )
@ -1647,9 +1645,8 @@ fn cmd_restore(
sub_matches: &ArgMatches, sub_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?; let mut repo_command = command.repo_helper(ui)?;
let source_commit = repo_command.resolve_single_rev(sub_matches.value_of("source").unwrap())?; let from_commit = repo_command.resolve_single_rev(sub_matches.value_of("from").unwrap())?;
let destination_commit = let to_commit = repo_command.resolve_single_rev(sub_matches.value_of("to").unwrap())?;
repo_command.resolve_single_rev(sub_matches.value_of("destination").unwrap())?;
let repo = repo_command.repo(); let repo = repo_command.repo();
let tree_id; let tree_id;
if sub_matches.is_present("interactive") { if sub_matches.is_present("interactive") {
@ -1668,22 +1665,17 @@ fn cmd_restore(
Adjust the right side until it has the changes you wanted from the left\n\ Adjust the right side until it has the changes you wanted from the left\n\
side. If you don't make any changes, then the operation will be aborted.\n", side. If you don't make any changes, then the operation will be aborted.\n",
short_commit_description(&source_commit), short_commit_description(&from_commit),
short_commit_description(&destination_commit) short_commit_description(&to_commit)
); );
tree_id = crate::diff_edit::edit_diff( tree_id =
&source_commit.tree(), crate::diff_edit::edit_diff(&from_commit.tree(), &to_commit.tree(), &instructions)?;
&destination_commit.tree(),
&instructions,
)?;
} else if sub_matches.is_present("paths") { } else if sub_matches.is_present("paths") {
let paths = sub_matches.values_of("paths").unwrap(); let paths = sub_matches.values_of("paths").unwrap();
let mut tree_builder = repo let mut tree_builder = repo.store().tree_builder(to_commit.tree().id().clone());
.store()
.tree_builder(destination_commit.tree().id().clone());
for path in paths { for path in paths {
let repo_path = RepoPath::from(path); let repo_path = RepoPath::from(path);
match source_commit.tree().path_value(&repo_path) { match from_commit.tree().path_value(&repo_path) {
Some(value) => { Some(value) => {
tree_builder.set(repo_path, value); tree_builder.set(repo_path, value);
} }
@ -1694,20 +1686,17 @@ fn cmd_restore(
} }
tree_id = tree_builder.write_tree(); tree_id = tree_builder.write_tree();
} else { } else {
tree_id = source_commit.tree().id().clone(); tree_id = from_commit.tree().id().clone();
} }
if &tree_id == destination_commit.tree().id() { if &tree_id == to_commit.tree().id() {
ui.write("Nothing changed.\n")?; ui.write("Nothing changed.\n")?;
} else { } else {
let mut tx = repo_command.start_transaction(&format!( let mut tx = repo_command
"restore into commit {}", .start_transaction(&format!("restore into commit {}", to_commit.id().hex()));
destination_commit.id().hex()
));
let mut_repo = tx.mut_repo(); let mut_repo = tx.mut_repo();
let new_commit = let new_commit = CommitBuilder::for_rewrite_from(ui.settings(), repo.store(), &to_commit)
CommitBuilder::for_rewrite_from(ui.settings(), repo.store(), &destination_commit) .set_tree(tree_id)
.set_tree(tree_id) .write_to_repo(mut_repo);
.write_to_repo(mut_repo);
ui.write("Created ")?; ui.write("Created ")?;
ui.write_commit_summary(mut_repo.as_repo_ref(), &new_commit)?; ui.write_commit_summary(mut_repo.as_repo_ref(), &new_commit)?;
ui.write("\n")?; ui.write("\n")?;