2022-11-26 23:57:50 +00:00
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-04-06 18:00:27 +00:00
|
|
|
//
|
|
|
|
// 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]
|
2024-06-14 14:34:17 +00:00
|
|
|
fn test_print() {
|
2022-04-06 18:00:27 +00:00
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2022-04-06 18:00:27 +00:00
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
2022-04-06 18:00:27 +00:00
|
|
|
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();
|
|
|
|
|
2023-01-18 06:56:09 +00:00
|
|
|
// Can print the contents of a file in a commit
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", "file1", "-r", "@-"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
a
|
|
|
|
"###);
|
2023-01-18 06:56:09 +00:00
|
|
|
|
|
|
|
// Defaults to printing the working-copy version
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", "file1"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
b
|
|
|
|
"###);
|
2023-01-18 06:56:09 +00:00
|
|
|
|
|
|
|
// Can print a file in a subdirectory
|
2022-04-06 18:00:27 +00:00
|
|
|
let subdir_file = if cfg!(unix) {
|
|
|
|
"dir/file2"
|
|
|
|
} else {
|
|
|
|
"dir\\file2"
|
|
|
|
};
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", subdir_file]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
c
|
|
|
|
"###);
|
2023-01-18 06:56:09 +00:00
|
|
|
|
|
|
|
// Error if the path doesn't exist
|
2024-06-14 14:34:17 +00:00
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["file", "print", "nonexistent"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-04-09 14:00:24 +00:00
|
|
|
Error: No such path: nonexistent
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2023-01-18 06:56:09 +00:00
|
|
|
|
2024-04-09 09:41:53 +00:00
|
|
|
// Can print files under the specified directory
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", "dir"]);
|
2024-04-09 09:41:53 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
c
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Can print multiple files
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", "."]);
|
2024-04-09 09:41:53 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
c
|
|
|
|
b
|
|
|
|
"###);
|
|
|
|
|
|
|
|
// Unmatched paths should generate warnings
|
2024-06-14 14:34:17 +00:00
|
|
|
let (stdout, stderr) =
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["file", "print", "file1", "non-existent"]);
|
2024-04-09 09:41:53 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
b
|
|
|
|
"###);
|
2022-04-28 23:32:18 +00:00
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-04-09 09:41:53 +00:00
|
|
|
Warning: No matching entries for paths: non-existent
|
2022-04-28 23:32:18 +00:00
|
|
|
"###);
|
2022-04-06 18:00:27 +00:00
|
|
|
|
|
|
|
// Can print a conflict
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["new"]);
|
2022-04-06 18:00:27 +00:00
|
|
|
std::fs::write(repo_path.join("file1"), "c\n").unwrap();
|
2023-10-10 11:59:18 +00:00
|
|
|
test_env.jj_cmd_ok(&repo_path, &["rebase", "-r", "@", "-d", "@--"]);
|
2024-06-14 14:34:17 +00:00
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["file", "print", "file1"]);
|
2022-04-06 18:00:27 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
conflicts.rs: label conflict number and sides next to conflict markers
For example,
```
<<<<<<< Conflict 1 of 3
+++++++ Contents of side #1
left 3.1
left 3.2
left 3.3
%%%%%%% Changes from base to side #2
-line 3
+right 3.1
>>>>>>>
```
or
```
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-line 3
+right 3.1
+++++++ Contents of side #2
left 3.1
left 3.2
left 3.3
>>>>>>>
```
Currently, there is no way to disable these, this is TODO for a future
PR. Other TODOs for future PRs: make these labels configurable. After
that, we could support a `diff3/git`-like conflict format as well, in
principle.
Counting conflicts helps with knowing whether you fixed all the
conflicts while you are in the editor.
While labeling "side #1", etc, does not tell you the commit id or
description as requested in #1176, I still think it's an improvement.
Most importantly, I hope this will make `jj`'s conflict format less
scary-looking for new users.
I've used this for a bit, and I like it. Without the labels, I would see
that the two conflicts have a different order of conflict markers, but I
wouldn't be able to remember what that means. For longer diffs, it can
be tricky for me to quickly tell that it's a diff as opposed to one of
the sides. This also creates some hope of being able to navigate a
conflict with more than 2 sides.
Another not-so-secret goal for this is explained in
https://github.com/martinvonz/jj/pull/3109#issuecomment-2014140627. The
idea is a little weird, but I *think* it could be helpful, and I'd like
to experiment with it.
2024-03-23 22:16:28 +00:00
|
|
|
<<<<<<< Conflict 1 of 1
|
|
|
|
%%%%%%% Changes from base to side #1
|
2022-04-06 18:00:27 +00:00
|
|
|
-b
|
|
|
|
+a
|
conflicts.rs: label conflict number and sides next to conflict markers
For example,
```
<<<<<<< Conflict 1 of 3
+++++++ Contents of side #1
left 3.1
left 3.2
left 3.3
%%%%%%% Changes from base to side #2
-line 3
+right 3.1
>>>>>>>
```
or
```
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-line 3
+right 3.1
+++++++ Contents of side #2
left 3.1
left 3.2
left 3.3
>>>>>>>
```
Currently, there is no way to disable these, this is TODO for a future
PR. Other TODOs for future PRs: make these labels configurable. After
that, we could support a `diff3/git`-like conflict format as well, in
principle.
Counting conflicts helps with knowing whether you fixed all the
conflicts while you are in the editor.
While labeling "side #1", etc, does not tell you the commit id or
description as requested in #1176, I still think it's an improvement.
Most importantly, I hope this will make `jj`'s conflict format less
scary-looking for new users.
I've used this for a bit, and I like it. Without the labels, I would see
that the two conflicts have a different order of conflict markers, but I
wouldn't be able to remember what that means. For longer diffs, it can
be tricky for me to quickly tell that it's a diff as opposed to one of
the sides. This also creates some hope of being able to navigate a
conflict with more than 2 sides.
Another not-so-secret goal for this is explained in
https://github.com/martinvonz/jj/pull/3109#issuecomment-2014140627. The
idea is a little weird, but I *think* it could be helpful, and I'd like
to experiment with it.
2024-03-23 22:16:28 +00:00
|
|
|
+++++++ Contents of side #2
|
2022-04-06 18:00:27 +00:00
|
|
|
c
|
2024-05-16 01:00:50 +00:00
|
|
|
>>>>>>> Conflict 1 of 1 ends
|
2022-04-06 18:00:27 +00:00
|
|
|
"###);
|
|
|
|
}
|
2024-04-09 09:41:53 +00:00
|
|
|
|
|
|
|
#[cfg(unix)]
|
|
|
|
#[test]
|
2024-06-14 14:34:17 +00:00
|
|
|
fn test_print_symlink() {
|
2024-04-09 09:41:53 +00:00
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file1"), "a\n").unwrap();
|
|
|
|
std::fs::create_dir(repo_path.join("dir")).unwrap();
|
|
|
|
std::fs::write(repo_path.join("dir").join("file2"), "c\n").unwrap();
|
|
|
|
std::os::unix::fs::symlink("symlink1_target", repo_path.join("symlink1")).unwrap();
|
|
|
|
|
|
|
|
// Can print multiple files
|
2024-06-14 14:34:17 +00:00
|
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["file", "print", "."]);
|
2024-04-09 09:41:53 +00:00
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
c
|
|
|
|
a
|
|
|
|
"###);
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-05-30 22:53:43 +00:00
|
|
|
Warning: Path 'symlink1' exists but is not a file
|
2024-04-09 09:41:53 +00:00
|
|
|
"###);
|
|
|
|
}
|