mirror of
https://github.com/jj-vcs/jj.git
synced 2026-07-03 22:24:35 +08:00
90cf756e6e
This patch adds a global `--no-integrate-operation` flag that prevents integration/publishing of most operations, including the ones created by `snapshot_working_copy()` and `finish_transaction()`. The operations are still created as usual. We provide `jj op integrate` to manually reintegrate operations created by commands with this flag enabled. Closes #2562 Co-authored-by: Martin von Zweigbergk <martinvonz@google.com>
72 lines
2.3 KiB
Rust
72 lines
2.3 KiB
Rust
// Copyright 2020 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test]
|
|
fn test_init_local() {
|
|
let test_env = TestEnvironment::default();
|
|
let output = test_env.run_jj_in(".", ["debug", "init-simple", "repo"]);
|
|
insta::assert_snapshot!(output, @r#"
|
|
------- stderr -------
|
|
Initialized repo in "repo"
|
|
[EOF]
|
|
"#);
|
|
|
|
let workspace_root = test_env.env_root().join("repo");
|
|
let jj_path = workspace_root.join(".jj");
|
|
let repo_path = jj_path.join("repo");
|
|
let store_path = repo_path.join("store");
|
|
assert!(workspace_root.is_dir());
|
|
assert!(jj_path.is_dir());
|
|
assert!(jj_path.join("working_copy").is_dir());
|
|
assert!(repo_path.is_dir());
|
|
assert!(store_path.is_dir());
|
|
assert!(store_path.join("commits").is_dir());
|
|
assert!(store_path.join("trees").is_dir());
|
|
assert!(store_path.join("files").is_dir());
|
|
assert!(store_path.join("symlinks").is_dir());
|
|
assert!(store_path.join("conflicts").is_dir());
|
|
|
|
let output = test_env.run_jj_in(
|
|
".",
|
|
["debug", "init-simple", "--no-integrate-operation", "repo2"],
|
|
);
|
|
insta::assert_snapshot!(output, @"
|
|
------- stderr -------
|
|
Error: --no-integrate-operation is not respected
|
|
[EOF]
|
|
[exit status: 2]
|
|
");
|
|
|
|
let output = test_env.run_jj_in(
|
|
".",
|
|
["debug", "init-simple", "--ignore-working-copy", "repo2"],
|
|
);
|
|
insta::assert_snapshot!(output, @"
|
|
------- stderr -------
|
|
Error: --ignore-working-copy is not respected
|
|
[EOF]
|
|
[exit status: 2]
|
|
");
|
|
|
|
let output = test_env.run_jj_in(".", ["debug", "init-simple", "--at-op=@-", "repo3"]);
|
|
insta::assert_snapshot!(output, @"
|
|
------- stderr -------
|
|
Error: --at-op is not respected
|
|
[EOF]
|
|
[exit status: 2]
|
|
");
|
|
}
|