mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-01 11:49:01 +00:00
d8feed9be4
Let's acknowledge everyone's contributions by replacing "Google LLC" in the copyright header by "The Jujutsu Authors". If I understand correctly, it won't have any legal effect, but maybe it still helps reduce concerns from contributors (though I haven't heard any concerns). Google employees can read about Google's policy at go/releasing/contributions#copyright.
67 lines
2.4 KiB
Rust
67 lines
2.4 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 std::io::Write;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_gitignores() {
|
|
let test_env = TestEnvironment::default();
|
|
let workspace_root = test_env.env_root().join("repo");
|
|
git2::Repository::init(&workspace_root).unwrap();
|
|
test_env.jj_cmd_success(&workspace_root, &["init", "--git-repo", "."]);
|
|
|
|
// Say in core.excludesFiles that we don't want file1, file2, or file3
|
|
let mut file = std::fs::OpenOptions::new()
|
|
.append(true)
|
|
.open(workspace_root.join(".git").join("config"))
|
|
.unwrap();
|
|
// Put the file in "~/my-ignores" so we also test that "~" expands to "$HOME"
|
|
file.write_all(b"[core]\nexcludesFile=~/my-ignores\n")
|
|
.unwrap();
|
|
drop(file);
|
|
std::fs::write(
|
|
test_env.home_dir().join("my-ignores"),
|
|
"file1\nfile2\nfile3",
|
|
)
|
|
.unwrap();
|
|
|
|
// Say in .git/info/exclude that we actually do want file2 and file3
|
|
let mut file = std::fs::OpenOptions::new()
|
|
.append(true)
|
|
.open(workspace_root.join(".git").join("info").join("exclude"))
|
|
.unwrap();
|
|
file.write_all(b"!file2\n!file3").unwrap();
|
|
drop(file);
|
|
|
|
// Say in .gitignore (in the working copy) that we actually do not want file2
|
|
// (again)
|
|
std::fs::write(workspace_root.join(".gitignore"), "file2").unwrap();
|
|
|
|
// Writes some files to the working copy
|
|
std::fs::write(workspace_root.join("file0"), "contents").unwrap();
|
|
std::fs::write(workspace_root.join("file1"), "contents").unwrap();
|
|
std::fs::write(workspace_root.join("file2"), "contents").unwrap();
|
|
std::fs::write(workspace_root.join("file3"), "contents").unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&workspace_root, &["diff", "-s"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
A .gitignore
|
|
A file0
|
|
A file3
|
|
"###);
|
|
}
|