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

feat(cli): Add -f/-t for --from/--to to jj move

Browse source
This commit is contained in:
Alexis (Poliorcetics) Bourget 2024-02-12 23:27:57 +01:00 committed by Poliorcetics
parent 0fc5005b8a
commit b533cdc538
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -55,6 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `--verbose/-v` is now `--debug` (no short option since it's not intended to be used often) * `--verbose/-v` is now `--debug` (no short option since it's not intended to be used often)
* `jj move --from/--to` can now be abbreviated to `jj move -f/-t`
### Fixed bugs ### Fixed bugs
* On Windows, symlinks in the repo are now materialized as regular files in the * On Windows, symlinks in the repo are now materialized as regular files in the

4
cli/src/commands/move.rs
View file

@ -38,10 +38,10 @@ use crate::ui::Ui;
#[command(group(ArgGroup::new("to_move").args(&["from", "to"]).multiple(true).required(true)))] #[command(group(ArgGroup::new("to_move").args(&["from", "to"]).multiple(true).required(true)))]
pub(crate) struct MoveArgs { pub(crate) struct MoveArgs {
/// Move part of this change into the destination /// Move part of this change into the destination
#[arg(long)] #[arg(long, short)]
from: Option<RevisionArg>, from: Option<RevisionArg>,
/// Move part of the source into this change /// Move part of the source into this change
#[arg(long)] #[arg(long, short)]
to: Option<RevisionArg>, to: Option<RevisionArg>,
/// Interactively choose which parts to move /// Interactively choose which parts to move
#[arg(long, short)] #[arg(long, short)]

4
cli/tests/cli-reference@.md.snap
View file

@ -1057,8 +1057,8 @@ If the source became empty and both the source and destination had a non-empty d
###### **Options:** ###### **Options:**
* `--from <FROM>` — Move part of this change into the destination * `-f`, `--from <FROM>` — Move part of this change into the destination
* `--to <TO>` — Move part of the source into this change * `-t`, `--to <TO>` — Move part of the source into this change
* `-i`, `--interactive` — Interactively choose which parts to move * `-i`, `--interactive` — Interactively choose which parts to move
Possible values: `true`, `false` Possible values: `true`, `false`