jj/cli/tests/test_file_show_command.rs
Martin von Zweigbergk 32aee9dbdf
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-24.04) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
cli: deprecate --destination/-d in favor of --onto/-o
As we have discussed many times on Discord and GitHub, `--destination`
is not a great name because `--insert-before` and `--insert-after` are
also destinations. The most popular alternative seems to be
`--onto`. We already use that term in descriptions in several places,
such as in the help text for `rebase -d` where we say "The revision(s)
to rebase onto". This patch therefore renames the `--destination` flag
to `--onto`.

The short name naturally becomes `-o`. That is perhaps a little
unfortunate because it's a common short name for `--output <file>`
arguments, but we don't use that anywhere so it seems fine.

Perhaps we should also rename `--source` (used by `rebase` and `fix`)
to something else. Perhaps the most obvious name is `--descendants`,
but the short form would be `-d`, which is of course already taken by
`--destination` in the case of `rebase`. Either way, I'm leaving that
rename for later. It would be good to do it before next release if we
are going to do it, though.

Closes #7941
2025-11-08 14:56:37 +00:00

145 lines
4.1 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;
#[test]
fn test_show() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "a\n");
work_dir.run_jj(["new"]).success();
work_dir.write_file("file1", "b\n");
work_dir.create_dir("dir");
work_dir.write_file("dir/file2", "c\n");
// Can print the contents of a file in a commit
let output = work_dir.run_jj(["file", "show", "file1", "-r", "@-"]);
insta::assert_snapshot!(output, @r"
a
[EOF]
");
// Defaults to printing the working-copy version
let output = work_dir.run_jj(["file", "show", "file1"]);
insta::assert_snapshot!(output, @r"
b
[EOF]
");
// Can print a file in a subdirectory
let subdir_file = if cfg!(unix) {
"dir/file2"
} else {
"dir\\file2"
};
let output = work_dir.run_jj(["file", "show", subdir_file]);
insta::assert_snapshot!(output, @r"
c
[EOF]
");
// Error if the path doesn't exist
let output = work_dir.run_jj(["file", "show", "nonexistent"]);
insta::assert_snapshot!(output, @r"
------- stderr -------
Error: No such path: nonexistent
[EOF]
[exit status: 1]
");
// Can print files under the specified directory
let output = work_dir.run_jj(["file", "show", "dir"]);
insta::assert_snapshot!(output, @r"
c
[EOF]
");
// Can print a single file with template
let template = r#""--- " ++ path ++ "\n""#;
let output = work_dir.run_jj(["file", "show", "-T", template, "file1"]);
insta::assert_snapshot!(output, @r"
--- file1
b
[EOF]
");
// Can print multiple files with template
let output = work_dir.run_jj(["file", "show", "-T", template, "."]);
insta::assert_snapshot!(output, @r"
--- dir/file2
c
--- file1
b
[EOF]
");
// Unmatched paths should generate warnings
let output = work_dir.run_jj(["file", "show", "file1", "non-existent"]);
insta::assert_snapshot!(output, @r"
b
[EOF]
------- stderr -------
Warning: No matching entries for paths: non-existent
[EOF]
");
// Can print a conflict
work_dir.run_jj(["new"]).success();
work_dir.write_file("file1", "c\n");
work_dir
.run_jj(["rebase", "-r", "@", "-o", "@--"])
.success();
let output = work_dir.run_jj(["file", "show", "file1"]);
insta::assert_snapshot!(output, @r"
<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base to side #1
-b
+a
+++++++ Contents of side #2
c
>>>>>>> Conflict 1 of 1 ends
[EOF]
");
}
#[cfg(unix)]
#[test]
fn test_show_symlink() {
let test_env = TestEnvironment::default();
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
let work_dir = test_env.work_dir("repo");
work_dir.write_file("file1", "a\n");
work_dir.create_dir("dir");
work_dir.write_file("dir/file2", "c\n");
std::os::unix::fs::symlink("symlink1_target", work_dir.root().join("symlink1")).unwrap();
// Can print multiple files with template
let template = r#""--- " ++ path ++ " [" ++ file_type ++ "]\n""#;
let output = work_dir.run_jj(["file", "show", "-T", template, "."]);
insta::assert_snapshot!(output, @r"
--- dir/file2 [file]
c
--- file1 [file]
a
--- symlink1 [symlink]
[EOF]
------- stderr -------
Warning: Path 'symlink1' exists but is not a file
[EOF]
");
}