mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-28 15:26:25 +00:00
885c780642
This adds a `jj sparse` command with options to list and manage the set of paths to include in the working copy. It only supports includes (postive matches) for now. I'm not sure "sparse" is the best name for the feature. Perhaps it would make sense as a subcommand under `jj workspace` - maybe `jj workspace track`? However, there's also `jj untrack` for removing a file from the working copy and leaving it in the working copy. I'm happy to hear suggestions, or we can get back to the naming later.
105 lines
4 KiB
Rust
105 lines
4 KiB
Rust
// Copyright 2022 Google LLC
|
|
//
|
|
// 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;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_sparse_manage_patterns() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
// Write some files to the working copy
|
|
std::fs::write(repo_path.join("file1"), "contents").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "contents").unwrap();
|
|
std::fs::write(repo_path.join("file3"), "contents").unwrap();
|
|
|
|
// By default, all files are tracked
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @".
|
|
");
|
|
|
|
// Can stop tracking all files
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--remove", "."]);
|
|
insta::assert_snapshot!(stdout, @"Added 0 files, modified 0 files, removed 3 files
|
|
");
|
|
// The list is now empty
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
// They're removed from the working copy
|
|
assert!(!repo_path.join("file1").exists());
|
|
assert!(!repo_path.join("file2").exists());
|
|
assert!(!repo_path.join("file3").exists());
|
|
// But they're still in the commit
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["files"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
file1
|
|
file2
|
|
file3
|
|
"###);
|
|
|
|
// Can `--add` a few files
|
|
let stdout =
|
|
test_env.jj_cmd_success(&repo_path, &["sparse", "--add", "file2", "--add", "file3"]);
|
|
insta::assert_snapshot!(stdout, @"Added 2 files, modified 0 files, removed 0 files
|
|
");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
file2
|
|
file3
|
|
"###);
|
|
assert!(!repo_path.join("file1").exists());
|
|
assert!(repo_path.join("file2").exists());
|
|
assert!(repo_path.join("file3").exists());
|
|
|
|
// Can combine `--add` and `--remove`
|
|
let stdout = test_env.jj_cmd_success(
|
|
&repo_path,
|
|
&[
|
|
"sparse", "--add", "file1", "--remove", "file2", "--remove", "file3",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stdout, @"Added 1 files, modified 0 files, removed 2 files
|
|
");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @"file1
|
|
");
|
|
assert!(repo_path.join("file1").exists());
|
|
assert!(!repo_path.join("file2").exists());
|
|
assert!(!repo_path.join("file3").exists());
|
|
|
|
// Can use `--clear` and `--add`
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--clear", "--add", "file2"]);
|
|
insta::assert_snapshot!(stdout, @"Added 1 files, modified 0 files, removed 1 files
|
|
");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @"file2
|
|
");
|
|
assert!(!repo_path.join("file1").exists());
|
|
assert!(repo_path.join("file2").exists());
|
|
assert!(!repo_path.join("file3").exists());
|
|
|
|
// Can reset back to all files
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--reset"]);
|
|
insta::assert_snapshot!(stdout, @"Added 2 files, modified 0 files, removed 0 files
|
|
");
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["sparse", "--list"]);
|
|
insta::assert_snapshot!(stdout, @".
|
|
");
|
|
assert!(repo_path.join("file1").exists());
|
|
assert!(repo_path.join("file2").exists());
|
|
assert!(repo_path.join("file3").exists());
|
|
}
|