mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-27 14:57:14 +00:00
40f94b0d4b
`jj cat` better matches `hg cat` and, of course, `cat`. I apparently
called it `jj print` when I added it in 7a013a59ae because I haven't
found `hg cat` useful for actually concatenating files. That's still
true, and I don't know if we will ever bother to teach `jj cat` to
actually concatenate files, but I think the familiarity of `cat` is
more important.
For reference, Git calls it `git show <rev>:<file>`.
I kept `print` as an alias and added a test for it. I also documented
the test better.
By the way, I've considered adding a command for writing from stdin
directly to a specific commit. If we ever do, it might make sense to
call that command `write` (e.g. `echo foo | jj write -r @-
README.md`). Then it would make sense to add `read` as an alias to
`cat`. I'm not sure that's a good idea, but let's leave that for later
anyway.
86 lines
2.7 KiB
Rust
86 lines
2.7 KiB
Rust
// 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;
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_cat() {
|
|
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");
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file1"), "b\n").unwrap();
|
|
std::fs::create_dir(repo_path.join("dir")).unwrap();
|
|
std::fs::write(repo_path.join("dir").join("file2"), "c\n").unwrap();
|
|
|
|
// Can print the contents of a file in a commit
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
a
|
|
"###);
|
|
|
|
// Defaults to printing the working-copy version
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
b
|
|
"###);
|
|
|
|
// `print` is an alias for `cat`
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["print", "file1"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
b
|
|
"###);
|
|
|
|
// Can print a file in a subdirectory
|
|
let subdir_file = if cfg!(unix) {
|
|
"dir/file2"
|
|
} else {
|
|
"dir\\file2"
|
|
};
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", subdir_file]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
c
|
|
"###);
|
|
|
|
// Error if the path doesn't exist
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["cat", "nonexistent"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No such path
|
|
"###);
|
|
|
|
// Error if the path is not a file
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["cat", "dir"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Path exists but is not a file
|
|
"###);
|
|
|
|
// Can print a conflict
|
|
test_env.jj_cmd_success(&repo_path, &["new"]);
|
|
std::fs::write(repo_path.join("file1"), "c\n").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["rebase", "-r", "@", "-d", "@--"]);
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["cat", "file1"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
<<<<<<<
|
|
%%%%%%%
|
|
-b
|
|
+a
|
|
+++++++
|
|
c
|
|
>>>>>>>
|
|
"###);
|
|
}
|