64 lines · 2.5 KB · Rust
RawDownload
// Copyright 2022 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_status_merge() {    let test_env = TestEnvironment::default();    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);    let repo_path = test_env.env_root().join("repo");     std::fs::write(repo_path.join("file"), "base").unwrap();    test_env.jj_cmd_ok(&repo_path, &["new", "-m=left"]);    test_env.jj_cmd_ok(&repo_path, &["branch", "create", "left"]);    test_env.jj_cmd_ok(&repo_path, &["new", "@-", "-m=right"]);    std::fs::write(repo_path.join("file"), "right").unwrap();    test_env.jj_cmd_ok(&repo_path, &["new", "left", "@"]);     // The output should mention each parent, and the diff should be empty (compared    // to the auto-merged parents)    let stdout = test_env.jj_cmd_success(&repo_path, &["status"]);    insta::assert_snapshot!(stdout, @r###"    The working copy is clean    Working copy : mzvwutvl c965365c (empty) (no description set)    Parent commit: rlvkpnrz 9ae48ddb left | (empty) left    Parent commit: zsuskuln 29b991e9 right    "###);} // See https://github.com/martinvonz/jj/issues/2051.#[test]fn test_status_ignored_gitignore() {    let test_env = TestEnvironment::default();    test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);    let repo_path = test_env.env_root().join("repo");     std::fs::create_dir(repo_path.join("untracked")).unwrap();    std::fs::write(repo_path.join("untracked").join("inside_untracked"), "test").unwrap();    std::fs::write(        repo_path.join("untracked").join(".gitignore"),        "!inside_untracked\n",    )    .unwrap();    std::fs::write(repo_path.join(".gitignore"), "untracked/\n!dummy\n").unwrap();     let stdout = test_env.jj_cmd_success(&repo_path, &["status"]);    insta::assert_snapshot!(stdout, @r###"    Working copy changes:    A .gitignore    Working copy : qpvuntsm 88a40909 (no description set)    Parent commit: zzzzzzzz 00000000 (empty) (no description set)    "###);}