2022-11-26 23:57:50 +00:00
|
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-05-07 13:57:13 +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-12-14 02:47:52 +00:00
|
|
|
|
use itertools::Itertools as _;
|
|
|
|
|
|
2022-05-07 13:57:13 +00:00
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
|
|
|
|
|
|
pub mod common;
|
|
|
|
|
|
2022-05-01 15:54:35 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_basic() {
|
|
|
|
|
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");
|
|
|
|
|
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.b = ["log", "-r", "@", "-T", "branches"]"#);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "my-branch"]);
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["b"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ my-branch
|
|
|
|
|
│
|
2023-01-26 22:26:05 +00:00
|
|
|
|
~
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_legacy_section() {
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
// Can define aliases in [alias] section
|
2023-01-26 19:26:18 +00:00
|
|
|
|
test_env.add_config(r#"alias.b = ["log", "-r", "@", "-T", "branches"]"#);
|
2022-06-06 03:23:01 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "my-branch"]);
|
2022-05-01 15:54:35 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["b"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ my-branch
|
|
|
|
|
│
|
2022-06-06 03:23:01 +00:00
|
|
|
|
~
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
2023-01-26 22:26:05 +00:00
|
|
|
|
|
|
|
|
|
// The same alias (name) in both [alias] and [aliases] sections is an error
|
|
|
|
|
test_env.add_config(r#"aliases.b = ["branch", "list"]"#);
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["b"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Alias "b" is defined in both [aliases] and [alias]
|
|
|
|
|
Hint: [aliases] is the preferred section for aliases. Please remove the alias from [alias].
|
|
|
|
|
"###);
|
2022-05-01 15:54:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2022-12-07 10:16:29 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_bad_name() {
|
|
|
|
|
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 stderr = test_env.jj_cmd_cli_error(&repo_path, &["foo."]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-03-17 23:14:20 +00:00
|
|
|
|
error: unrecognized subcommand 'foo.'
|
2022-12-07 10:16:29 +00:00
|
|
|
|
|
|
|
|
|
Usage: jj [OPTIONS] <COMMAND>
|
|
|
|
|
|
2023-03-17 23:14:20 +00:00
|
|
|
|
For more information, try '--help'.
|
2022-12-07 10:16:29 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-01 15:54:35 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_calls_unknown_command() {
|
|
|
|
|
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");
|
|
|
|
|
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.foo = ["nonexistent"]"#);
|
2022-11-18 20:50:39 +00:00
|
|
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["foo"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-03-17 23:14:20 +00:00
|
|
|
|
error: unrecognized subcommand 'nonexistent'
|
2022-11-18 20:50:39 +00:00
|
|
|
|
|
2022-11-21 03:01:35 +00:00
|
|
|
|
Usage: jj [OPTIONS] <COMMAND>
|
2022-11-18 20:50:39 +00:00
|
|
|
|
|
2023-03-17 23:14:20 +00:00
|
|
|
|
For more information, try '--help'.
|
2022-11-18 20:50:39 +00:00
|
|
|
|
"###);
|
2022-05-01 15:54:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
2022-12-14 02:47:52 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_calls_command_with_invalid_option() {
|
|
|
|
|
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");
|
|
|
|
|
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.foo = ["log", "--nonexistent"]"#);
|
2022-12-14 02:47:52 +00:00
|
|
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["foo"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2023-03-17 23:14:20 +00:00
|
|
|
|
error: unexpected argument '--nonexistent' found
|
2022-12-14 02:47:52 +00:00
|
|
|
|
|
2023-03-17 23:14:20 +00:00
|
|
|
|
note: to pass '--nonexistent' as a value, use '-- --nonexistent'
|
2022-12-14 02:47:52 +00:00
|
|
|
|
|
|
|
|
|
Usage: jj log [OPTIONS] [PATHS]...
|
|
|
|
|
|
2023-03-17 23:14:20 +00:00
|
|
|
|
For more information, try '--help'.
|
2022-12-14 02:47:52 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_calls_help() {
|
|
|
|
|
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");
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.h = ["--help"]"#);
|
2022-12-14 02:47:52 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["h"]);
|
|
|
|
|
insta::assert_snapshot!(stdout.lines().take(5).join("\n"), @r###"
|
|
|
|
|
Jujutsu (An experimental VCS)
|
|
|
|
|
|
|
|
|
|
To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/docs/tutorial.md.
|
|
|
|
|
|
|
|
|
|
Usage: jj [OPTIONS] <COMMAND>
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-01 15:54:35 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_cannot_override_builtin() {
|
|
|
|
|
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");
|
|
|
|
|
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.log = ["rebase"]"#);
|
2022-05-01 15:54:35 +00:00
|
|
|
|
// Alias should be ignored
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "root"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ zzzzzzzzzzzz 1970-01-01 00:00:00.000 +00:00 000000000000
|
2023-02-09 02:53:47 +00:00
|
|
|
|
(empty) (no description set)
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_recursive() {
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
test_env.add_config(
|
2023-01-26 22:26:05 +00:00
|
|
|
|
r#"[aliases]
|
2022-05-01 15:54:35 +00:00
|
|
|
|
foo = ["foo"]
|
|
|
|
|
bar = ["baz"]
|
|
|
|
|
baz = ["bar"]
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
// Alias should not cause infinite recursion or hang
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["foo"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Recursive alias definition involving "foo"
|
|
|
|
|
"###);
|
|
|
|
|
// Also test with mutual recursion
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["bar"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Recursive alias definition involving "bar"
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_global_args_before_and_after() {
|
|
|
|
|
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");
|
2023-01-26 22:26:05 +00:00
|
|
|
|
test_env.add_config(r#"aliases.l = ["log", "-T", "commit_id", "-r", "all()"]"#);
|
2022-05-01 15:54:35 +00:00
|
|
|
|
// Test the setup
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["l"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Can pass global args before
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["l", "--at-op", "@-"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
// Can pass global args after
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["--at-op", "@-", "l"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
// Test passing global args both before and after
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["--at-op", "abc123", "l", "--at-op", "@-"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["-R", "../nonexistent", "l", "-R", "."]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_global_args_in_definition() {
|
|
|
|
|
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");
|
2023-01-26 19:26:18 +00:00
|
|
|
|
test_env.add_config(
|
2023-01-26 22:26:05 +00:00
|
|
|
|
r#"aliases.l = ["log", "-T", "commit_id", "--at-op", "@-", "-r", "all()", "--color=always"]"#,
|
2022-05-01 15:54:35 +00:00
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// The global argument in the alias is respected
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["l"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ [38;5;4m0000000000000000000000000000000000000000[39m
|
2022-05-01 15:54:35 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-05-07 13:57:13 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_alias_invalid_definition() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
|
|
|
|
|
test_env.add_config(
|
2023-01-26 22:26:05 +00:00
|
|
|
|
r#"[aliases]
|
2022-05-07 13:57:13 +00:00
|
|
|
|
non-list = 5
|
2022-12-07 10:26:37 +00:00
|
|
|
|
non-string-list = [[]]
|
2022-05-07 13:57:13 +00:00
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["non-list"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Alias definition for "non-list" must be a string list
|
|
|
|
|
"###);
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(test_env.env_root(), &["non-string-list"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Alias definition for "non-string-list" must be a string list
|
|
|
|
|
"###);
|
|
|
|
|
}
|