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

cli: disallow gc run from non-head operation

Browse source 
It doesn't make sense to do gc from a non-head operation because that means
either the head operation would be corrupted or the --at-op argument is
ignored.
This commit is contained in:
Yuya Nishihara 2024-01-08 11:59:08 +09:00
parent 5894f3dfba
commit 7cfd32bac1
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/src/commands/util.rs
View file

@ -108,6 +108,11 @@ fn cmd_util_gc(
command: &CommandHelper,
_args: &UtilGcArgs,
) -> Result<(), CommandError> {
if command.global_args().at_operation != "@" {
return Err(user_error(
"Cannot garbage collect from a non-head operation",
));
}
let workspace_command = command.workspace_helper(ui)?;
let store = workspace_command.repo().store();
store.gc().map_err(|err| user_error(err.to_string()))?;

19
cli/tests/test_util_command.rs
View file

@ -37,3 +37,22 @@ fn test_util_config_schema() {
"###)
});
}
#[test]
fn test_gc_args() {
let test_env = TestEnvironment::default();
// Use the local backend because GitBackend::gc() depends on the git CLI.
test_env.jj_cmd_ok(
test_env.env_root(),
&["init", "repo", "--config-toml=ui.allow-init-native=true"],
);
let repo_path = test_env.env_root().join("repo");
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["util", "gc"]);
insta::assert_snapshot!(stderr, @"");
let stderr = test_env.jj_cmd_failure(&repo_path, &["util", "gc", "--at-op=@-"]);
insta::assert_snapshot!(stderr, @r###"
Error: Cannot garbage collect from a non-head operation
"###);
}