mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-07 21:27:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

cli: make jj move nonexistent succeed

Browse source 
I think `jj move nonexistent` should not be an error. That matches how
`jj squash` works. I added tests for both commands.
This commit is contained in:
Martin von Zweigbergk 2023-04-29 08:56:31 -07:00 committed by Martin von Zweigbergk
parent 9230fd93bb
commit b6b3703800
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands/mod.rs
View file

@ -2220,7 +2220,7 @@ from the source will be moved into the destination.
args.interactive, args.interactive,
matcher.as_ref(), matcher.as_ref(),
)?; )?;
if &new_parent_tree_id == parent_tree.id() { if args.interactive && &new_parent_tree_id == parent_tree.id() {
return Err(user_error("No changes to move")); return Err(user_error("No changes to move"));
} }
let new_parent_tree = tx let new_parent_tree = tx

8
tests/test_move_command.rs
View file

@ -317,6 +317,14 @@ fn test_move_partial() {
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
a a
"###); "###);
// If we specify only a non-existent file, then the move still succeeds and
// creates unchanged commits.
test_env.jj_cmd_success(&repo_path, &["undo"]);
let stdout = test_env.jj_cmd_success(&repo_path, &["move", "--from", "c", "nonexistent"]);
insta::assert_snapshot!(stdout, @r###"
Working copy now at: b670567d9438 (no description set)
"###);
} }
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String { fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {

9
tests/test_squash_command.rs
View file

@ -230,6 +230,15 @@ fn test_squash_partial() {
insta::assert_snapshot!(stdout, @r###" insta::assert_snapshot!(stdout, @r###"
b b
"###); "###);
// If we specify only a non-existent file, then the squash still succeeds and
// creates unchanged commits.
test_env.jj_cmd_success(&repo_path, &["undo"]);
let stdout = test_env.jj_cmd_success(&repo_path, &["squash", "-r", "b", "nonexistent"]);
insta::assert_snapshot!(stdout, @r###"
Rebased 1 descendant commits
Working copy now at: 5e297967f76c (no description set)
"###);
} }
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String { fn get_log_output(test_env: &TestEnvironment, repo_path: &Path) -> String {