martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-22 03:07:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: allow using --at-op=@ to refer to head operation

Browse Source 
We already support using "@" to refer to the head operation when doing
e.g. `jj op undo -o @`. This patch adds support for `--at-op=@`. It
also makes that the default.
This commit is contained in:
Martin von Zweigbergk 2021-05-28 22:34:02 -07:00
parent 082b34206e
commit 4a3ba5b8e4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/commands.rs
View File

@ -140,11 +140,12 @@ fn get_repo(ui: &Ui, matches: &ArgMatches) -> Result<Arc<ReadonlyRepo>, CommandE
return Err(CommandError::UserError(message)); return Err(CommandError::UserError(message));
} }
}; };
if let Some(op_str) = matches.value_of("at_op") { let op_str = matches.value_of("at_op").unwrap();
if op_str == "@" {
Ok(loader.load_at_head())
} else {
let op = resolve_single_op_from_store(loader.op_store(), loader.op_heads_store(), op_str)?; let op = resolve_single_op_from_store(loader.op_store(), loader.op_heads_store(), op_str)?;
Ok(loader.load_at(&op)) Ok(loader.load_at(&op))
} else {
Ok(loader.load_at_head())
} }
} }
@ -193,7 +194,7 @@ impl RepoCommandHelper {
root_matches: &ArgMatches, root_matches: &ArgMatches,
) -> Result<Self, CommandError> { ) -> Result<Self, CommandError> {
let repo = get_repo(ui, &root_matches)?; let repo = get_repo(ui, &root_matches)?;
let may_update_working_copy = root_matches.value_of("at_op").is_none(); let may_update_working_copy = root_matches.value_of("at_op").unwrap() == "@";
Ok(RepoCommandHelper { Ok(RepoCommandHelper {
string_args, string_args,
settings: ui.settings().clone(), settings: ui.settings().clone(),
@ -416,6 +417,8 @@ fn op_arg<'a, 'b>() -> Arg<'a, 'b> {
fn resolve_single_op(repo: &ReadonlyRepo, op_str: &str) -> Result<Operation, CommandError> { fn resolve_single_op(repo: &ReadonlyRepo, op_str: &str) -> Result<Operation, CommandError> {
if op_str == "@" { if op_str == "@" {
// Get it from the repo to make sure that it refers to the operation the repo
// was loaded at
Ok(repo.operation().clone()) Ok(repo.operation().clone())
} else { } else {
resolve_single_op_from_store(&repo.op_store(), &repo.op_heads_store(), op_str) resolve_single_op_from_store(&repo.op_store(), &repo.op_heads_store(), op_str)
@ -821,7 +824,8 @@ fn get_app<'a, 'b>() -> App<'a, 'b> {
.long("at-operation") .long("at-operation")
.alias("at-op") .alias("at-op")
.global(true) .global(true)
.takes_value(true), .takes_value(true)
.default_value("@"),
) )
.subcommand(init_command) .subcommand(init_command)
.subcommand(checkout_command) .subcommand(checkout_command)