2022-11-26 23:57:50 +00:00
|
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-03-02 23:09:32 +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.
|
|
|
|
|
|
2022-05-07 23:16:27 +00:00
|
|
|
|
use std::ffi::OsString;
|
|
|
|
|
|
2023-02-26 21:50:11 +00:00
|
|
|
|
use itertools::Itertools;
|
|
|
|
|
|
2022-05-07 23:16:27 +00:00
|
|
|
|
use crate::common::{get_stderr_string, TestEnvironment};
|
2022-03-30 17:47:11 +00:00
|
|
|
|
|
|
|
|
|
pub mod common;
|
2022-03-02 23:09:32 +00:00
|
|
|
|
|
2022-05-07 23:16:27 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_non_utf8_arg() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
#[cfg(unix)]
|
|
|
|
|
let invalid_utf = {
|
|
|
|
|
use std::os::unix::ffi::OsStringExt;
|
|
|
|
|
OsString::from_vec(vec![0x66, 0x6f, 0x80, 0x6f])
|
|
|
|
|
};
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
|
let invalid_utf = {
|
|
|
|
|
use std::os::windows::prelude::*;
|
|
|
|
|
OsString::from_wide(&[0x0066, 0x006f, 0xD800, 0x006f])
|
|
|
|
|
};
|
|
|
|
|
let assert = test_env
|
|
|
|
|
.jj_cmd(test_env.env_root(), &[])
|
|
|
|
|
.args(&[invalid_utf])
|
|
|
|
|
.assert()
|
|
|
|
|
.code(2);
|
|
|
|
|
let stderr = get_stderr_string(&assert);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Non-utf8 argument
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-11-20 07:42:50 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_no_subcommand() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2022-11-21 03:01:35 +00:00
|
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_cli_error(test_env.env_root(), &[]);
|
|
|
|
|
insta::assert_snapshot!(stderr.lines().next().unwrap(), @"Jujutsu (An experimental VCS)");
|
|
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_cli_error(test_env.env_root(), &["-R."]);
|
|
|
|
|
insta::assert_snapshot!(stderr.lines().next().unwrap(), @"error: 'jj' requires a subcommand but one was not provided");
|
2022-11-20 07:42:50 +00:00
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--version"]);
|
2023-04-07 13:07:12 +00:00
|
|
|
|
let sanitized = stdout.replace(|c: char| c.is_ascii_hexdigit(), "?");
|
|
|
|
|
assert!(
|
|
|
|
|
sanitized == "jj ?.?.?\n"
|
|
|
|
|
|| sanitized == "jj ?.?.?-????????????????????????????????????????\n",
|
|
|
|
|
"{sanitized}"
|
|
|
|
|
);
|
2022-11-20 07:42:50 +00:00
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--help"]);
|
|
|
|
|
insta::assert_snapshot!(stdout.lines().next().unwrap(), @"Jujutsu (An experimental VCS)");
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-02 23:09:32 +00:00
|
|
|
|
#[test]
|
2023-02-02 23:11:18 +00:00
|
|
|
|
fn test_ignore_working_copy() {
|
2022-03-02 23:09:32 +00:00
|
|
|
|
let test_env = TestEnvironment::default();
|
2022-03-26 21:06:48 +00:00
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
2022-03-02 23:09:32 +00:00
|
|
|
|
|
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file"), "initial").unwrap();
|
2022-03-26 21:06:48 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 438471f3fbf1004298d8fb01eeb13663a051a643
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-03-06 03:32:20 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
2023-02-02 23:11:18 +00:00
|
|
|
|
// Modify the file. With --ignore-working-copy, we still get the same commit
|
2022-03-02 23:09:32 +00:00
|
|
|
|
// ID.
|
|
|
|
|
std::fs::write(repo_path.join("file"), "modified").unwrap();
|
2022-03-26 21:06:48 +00:00
|
|
|
|
let stdout_again = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
2023-02-02 23:11:18 +00:00
|
|
|
|
&["log", "-T", "commit_id", "--ignore-working-copy"],
|
2022-03-26 21:06:48 +00:00
|
|
|
|
);
|
|
|
|
|
assert_eq!(stdout_again, stdout);
|
2022-03-05 06:33:15 +00:00
|
|
|
|
|
2023-02-02 23:11:18 +00:00
|
|
|
|
// But without --ignore-working-copy, we get a new commit ID.
|
2022-03-26 21:06:48 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ fab22d1acf5bb9c5aa48cb2c3dd2132072a359ca
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-03-06 03:32:20 +00:00
|
|
|
|
"###);
|
2022-03-02 23:09:32 +00:00
|
|
|
|
}
|
2022-03-02 21:14:06 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_repo_arg_with_init() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2022-04-07 06:25:01 +00:00
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["init", "-R=.", "repo"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: '--repository' cannot be used with 'init'
|
|
|
|
|
"###);
|
2022-03-02 21:14:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_repo_arg_with_git_clone() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2022-04-07 06:25:01 +00:00
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["git", "clone", "-R=.", "remote"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: '--repository' cannot be used with 'git clone'
|
|
|
|
|
"###);
|
2022-03-02 21:14:06 +00:00
|
|
|
|
}
|
2022-03-19 17:37:13 +00:00
|
|
|
|
|
2023-01-10 03:52:06 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_resolve_workspace_directory() {
|
|
|
|
|
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");
|
|
|
|
|
let subdir = repo_path.join("dir").join("subdir");
|
|
|
|
|
std::fs::create_dir_all(&subdir).unwrap();
|
|
|
|
|
|
|
|
|
|
// Ancestor of cwd
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&subdir, &["status"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
Parent commit: 000000000000 (no description set)
|
|
|
|
|
Working copy : 230dd059e1b0 (no description set)
|
|
|
|
|
The working copy is clean
|
|
|
|
|
"###);
|
2023-01-10 03:52:06 +00:00
|
|
|
|
|
|
|
|
|
// Explicit subdirectory path
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&subdir, &["status", "-R", "."]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: There is no jj repo in "."
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Valid explicit path
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&subdir, &["status", "-R", "../.."]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
Parent commit: 000000000000 (no description set)
|
|
|
|
|
Working copy : 230dd059e1b0 (no description set)
|
|
|
|
|
The working copy is clean
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// "../../..".ancestors() contains "../..", but it should never be looked up.
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&subdir, &["status", "-R", "../../.."]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: There is no jj repo in "../../.."
|
|
|
|
|
"###);
|
2023-01-10 03:52:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
2023-01-10 00:53:22 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_no_workspace_directory() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
std::fs::create_dir(&repo_path).unwrap();
|
|
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["status"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: There is no jj repo in "."
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["status", "-R", "repo"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: There is no jj repo in "repo"
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
std::fs::create_dir(repo_path.join(".git")).unwrap();
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["status"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: There is no jj repo in "."
|
|
|
|
|
Hint: It looks like this is a git repo. You can create a jj repo backed by it by running this:
|
|
|
|
|
jj init --git-repo=.
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2023-02-26 21:50:11 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_broken_repo_structure() {
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
let store_type_path = repo_path
|
|
|
|
|
.join(".jj")
|
|
|
|
|
.join("repo")
|
|
|
|
|
.join("store")
|
|
|
|
|
.join("type");
|
|
|
|
|
|
|
|
|
|
// Test the error message when the commit backend is of unknown type.
|
|
|
|
|
std::fs::write(&store_type_path, "unknown").unwrap();
|
|
|
|
|
let stderr = test_env.jj_cmd_internal_error(&repo_path, &["log"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Internal error: This version of the jj binary doesn't support this type of repo: Unsupported commit backend type 'unknown'
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Test the error message when the file indicating the commit backend type
|
|
|
|
|
// cannot be read.
|
|
|
|
|
std::fs::remove_file(&store_type_path).unwrap();
|
|
|
|
|
std::fs::create_dir(&store_type_path).unwrap();
|
|
|
|
|
let stderr = test_env.jj_cmd_internal_error(&repo_path, &["log"]);
|
|
|
|
|
// Trim off the OS-specific error message.
|
|
|
|
|
let stderr = stderr.split(':').take(3).join(":");
|
|
|
|
|
insta::assert_snapshot!(stderr, @"Internal error: The repository appears broken or inaccessible: Failed to read commit backend type");
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-19 17:37:13 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_color_config() {
|
2022-04-02 16:16:52 +00:00
|
|
|
|
let mut test_env = TestEnvironment::default();
|
2022-03-19 17:00:13 +00:00
|
|
|
|
|
2022-06-09 04:16:34 +00:00
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["init", "repo", "--git"]);
|
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
// Test that --color=always is respected.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["--color=always", "log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ [38;5;4m230dd059e1b059aefc0da06a2e5a7dbf22362f22[39m
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ [38;5;4m0000000000000000000000000000000000000000[39m
|
2022-06-09 04:16:34 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
2022-03-19 17:00:13 +00:00
|
|
|
|
// Test that color is used if it's requested in the config file
|
2023-01-26 19:26:18 +00:00
|
|
|
|
test_env.add_config(r#"ui.color="always""#);
|
2022-03-26 21:06:48 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ [38;5;4m230dd059e1b059aefc0da06a2e5a7dbf22362f22[39m
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ [38;5;4m0000000000000000000000000000000000000000[39m
|
2022-03-19 17:37:13 +00:00
|
|
|
|
"###);
|
2022-03-19 17:00:13 +00:00
|
|
|
|
|
2022-06-09 04:16:34 +00:00
|
|
|
|
// Test that --color=never overrides the config.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["--color=never", "log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-06-09 04:16:34 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
2022-10-31 01:29:26 +00:00
|
|
|
|
// Test that --color=auto overrides the config.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["--color=auto", "log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-10-31 01:29:26 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Test that --config-toml 'ui.color="never"' overrides the config.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"--config-toml",
|
|
|
|
|
"ui.color=\"never\"",
|
|
|
|
|
"log",
|
|
|
|
|
"-T",
|
|
|
|
|
"commit_id",
|
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-10-31 01:29:26 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// --color overrides --config-toml 'ui.color=...'.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"--color",
|
|
|
|
|
"never",
|
|
|
|
|
"--config-toml",
|
|
|
|
|
"ui.color=\"always\"",
|
|
|
|
|
"log",
|
|
|
|
|
"-T",
|
|
|
|
|
"commit_id",
|
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-10-31 01:29:26 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
2022-06-10 02:42:15 +00:00
|
|
|
|
// Test that NO_COLOR does NOT override the request for color in the config file
|
2022-04-02 16:16:52 +00:00
|
|
|
|
test_env.add_env_var("NO_COLOR", "");
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ [38;5;4m230dd059e1b059aefc0da06a2e5a7dbf22362f22[39m
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ [38;5;4m0000000000000000000000000000000000000000[39m
|
2022-03-19 17:00:13 +00:00
|
|
|
|
"###);
|
2023-01-02 05:18:38 +00:00
|
|
|
|
|
|
|
|
|
// Test that per-repo config overrides the user config.
|
|
|
|
|
std::fs::write(
|
|
|
|
|
repo_path.join(".jj/repo/config.toml"),
|
|
|
|
|
r#"ui.color = "never""#,
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "commit_id"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2023-01-02 05:18:38 +00:00
|
|
|
|
"###);
|
2022-03-19 17:37:13 +00:00
|
|
|
|
}
|
2022-03-27 19:49:04 +00:00
|
|
|
|
|
2022-11-22 04:46:50 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_early_args() {
|
|
|
|
|
// Test that help output parses early args
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
|
|
|
|
|
// The default is no color.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["help"]);
|
|
|
|
|
insta::assert_snapshot!(stdout.lines().next().unwrap(), @"Jujutsu (An experimental VCS)");
|
|
|
|
|
|
|
|
|
|
// Check that output is colorized.
|
|
|
|
|
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["--color=always", "help"]);
|
|
|
|
|
insta::assert_snapshot!(stdout.lines().next().unwrap(), @"[0mJujutsu (An experimental VCS)");
|
|
|
|
|
|
|
|
|
|
// Early args are parsed with clap's ignore_errors(), but there is a known
|
|
|
|
|
// bug that causes defaults to be unpopulated. Test that the early args are
|
|
|
|
|
// tolerant of this bug and don't cause a crash.
|
|
|
|
|
test_env.jj_cmd_success(test_env.env_root(), &["--no-pager", "help"]);
|
|
|
|
|
test_env.jj_cmd_success(
|
|
|
|
|
test_env.env_root(),
|
|
|
|
|
&["--config-toml", "ui.color = 'always'", "help"],
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-27 19:49:04 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_invalid_config() {
|
|
|
|
|
// Test that we get a reasonable error if the config is invalid (#55)
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
|
2023-01-26 19:26:18 +00:00
|
|
|
|
test_env.add_config("[section]key = value-missing-quotes");
|
2022-04-07 06:25:01 +00:00
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["init", "repo"]);
|
2022-04-28 23:32:18 +00:00
|
|
|
|
insta::assert_snapshot!(stderr.replace('\\', "/"), @r###"
|
2023-04-08 00:34:12 +00:00
|
|
|
|
Config error: expected newline, found an identifier at line 1 column 10 in config/config0002.toml
|
2023-03-31 03:23:49 +00:00
|
|
|
|
For help, see https://github.com/martinvonz/jj/blob/main/docs/config.md.
|
2022-04-28 23:32:18 +00:00
|
|
|
|
"###);
|
2022-03-27 19:49:04 +00:00
|
|
|
|
}
|
2022-04-02 21:10:52 +00:00
|
|
|
|
|
2022-10-10 00:22:20 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_no_user_configured() {
|
|
|
|
|
// Test that the user is reminded if they haven't configured their name or email
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
let assert = test_env
|
|
|
|
|
.jj_cmd(&repo_path, &["describe", "-m", "without name"])
|
|
|
|
|
.env_remove("JJ_USER")
|
|
|
|
|
.assert()
|
|
|
|
|
.success();
|
|
|
|
|
insta::assert_snapshot!(get_stderr_string(&assert), @r###"
|
2023-03-30 18:18:13 +00:00
|
|
|
|
Name and email not configured. Until configured, your commits will be created with the empty identity, and can't be pushed to remotes. To configure, add something like the following to $HOME/.jjconfig.toml:
|
2022-10-10 00:22:20 +00:00
|
|
|
|
user.name = "Some One"
|
|
|
|
|
user.email = "someone@example.com"
|
|
|
|
|
"###);
|
|
|
|
|
let assert = test_env
|
|
|
|
|
.jj_cmd(&repo_path, &["describe", "-m", "without email"])
|
|
|
|
|
.env_remove("JJ_EMAIL")
|
|
|
|
|
.assert()
|
|
|
|
|
.success();
|
|
|
|
|
insta::assert_snapshot!(get_stderr_string(&assert), @r###"
|
2023-03-30 18:18:13 +00:00
|
|
|
|
Name and email not configured. Until configured, your commits will be created with the empty identity, and can't be pushed to remotes. To configure, add something like the following to $HOME/.jjconfig.toml:
|
2022-10-10 00:22:20 +00:00
|
|
|
|
user.name = "Some One"
|
|
|
|
|
user.email = "someone@example.com"
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-02 21:10:52 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_help() {
|
|
|
|
|
// Test that global options are separated out in the help output
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
|
2022-12-18 03:56:21 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(test_env.env_root(), &["diffedit", "-h"]);
|
2022-11-18 20:50:39 +00:00
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2022-12-08 06:01:58 +00:00
|
|
|
|
Touch up the content changes in a revision with a diff editor
|
2022-04-02 21:10:52 +00:00
|
|
|
|
|
2022-12-18 03:56:21 +00:00
|
|
|
|
Usage: jj diffedit [OPTIONS]
|
2022-04-02 21:10:52 +00:00
|
|
|
|
|
2022-09-29 16:12:16 +00:00
|
|
|
|
Options:
|
2022-12-08 06:01:58 +00:00
|
|
|
|
-r, --revision <REVISION> The revision to touch up. Defaults to @ if --to/--from are not specified
|
|
|
|
|
--from <FROM> Show changes from this revision. Defaults to @ if --to is specified
|
|
|
|
|
--to <TO> Edit changes in this revision. Defaults to @ if --from is specified
|
2023-03-17 23:14:20 +00:00
|
|
|
|
-h, --help Print help (see more with '--help')
|
2022-04-02 21:10:52 +00:00
|
|
|
|
|
2022-09-29 16:12:16 +00:00
|
|
|
|
Global Options:
|
|
|
|
|
-R, --repository <REPOSITORY> Path to repository to operate on
|
2023-02-02 23:11:18 +00:00
|
|
|
|
--ignore-working-copy Don't snapshot the working copy, and don't update it
|
2022-09-29 16:12:16 +00:00
|
|
|
|
--at-operation <AT_OPERATION> Operation to load the repo at [default: @] [aliases: at-op]
|
2022-11-22 04:46:50 +00:00
|
|
|
|
-v, --verbose Enable verbose logging
|
2022-09-29 16:12:16 +00:00
|
|
|
|
--color <WHEN> When to colorize output (always, never, auto)
|
2022-11-01 00:31:30 +00:00
|
|
|
|
--no-pager Disable the pager
|
2022-10-31 01:29:26 +00:00
|
|
|
|
--config-toml <TOML> Additional configuration options
|
2022-04-02 21:10:52 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
2022-11-20 03:38:25 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_verbose_logging_enabled() {
|
|
|
|
|
// Test that the verbose flag enabled verbose logging
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
|
|
|
|
|
let assert = test_env
|
|
|
|
|
.jj_cmd(test_env.env_root(), &["version", "-v"])
|
|
|
|
|
.assert()
|
|
|
|
|
.success();
|
|
|
|
|
|
|
|
|
|
let stderr = get_stderr_string(&assert);
|
|
|
|
|
// Split the first log line into a timestamp and the rest.
|
|
|
|
|
// The timestamp is constant sized so this is a robust operation.
|
|
|
|
|
// Example timestamp: 2022-11-20T06:24:05.477703Z
|
|
|
|
|
let (_timestamp, log_line) = stderr
|
|
|
|
|
.lines()
|
|
|
|
|
.next()
|
|
|
|
|
.expect("verbose logging on first line")
|
|
|
|
|
.split_at(36);
|
|
|
|
|
// The log format is currently Pretty so we include the terminal markup.
|
|
|
|
|
// Luckily, insta will print this in colour when reviewing.
|
2023-01-03 07:24:44 +00:00
|
|
|
|
insta::assert_snapshot!(log_line, @"[34mDEBUG[0m [2mjujutsu::cli_util[0m[2m:[0m verbose logging enabled");
|
2022-11-20 03:38:25 +00:00
|
|
|
|
}
|