mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-23 20:43:56 +00:00
0e2579ee6a
This follows up on 5c703aeb03.
The only reason for this change is that, subjectively, the result looks better to me. I'm not sure why, but I couldn't get used to the old symbol in spite of its seeming reasonableness. It felt really bold and heavy.
If people agree, we can wait until we need to update the screenshots for some other reason before merging this. Sorry I didn't figure this out while the discussion about the referenced commit was going on.
I'm not 100% certain how many fonts support each symbol. Please try it out and let me know if it doesn't work for you.
Compare after:
and before:
239 lines
8.2 KiB
Rust
239 lines
8.2 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 itertools::Itertools as _;
|
||
|
||
use crate::common::TestEnvironment;
|
||
|
||
pub mod common;
|
||
|
||
#[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");
|
||
|
||
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###"
|
||
@ my-branch
|
||
│
|
||
~
|
||
"###);
|
||
}
|
||
|
||
#[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
|
||
test_env.add_config(r#"alias.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###"
|
||
@ my-branch
|
||
│
|
||
~
|
||
"###);
|
||
|
||
// 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].
|
||
"###);
|
||
}
|
||
|
||
#[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###"
|
||
error: unrecognized subcommand 'foo.'
|
||
|
||
Usage: jj [OPTIONS] <COMMAND>
|
||
|
||
For more information, try '--help'.
|
||
"###);
|
||
}
|
||
|
||
#[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");
|
||
|
||
test_env.add_config(r#"aliases.foo = ["nonexistent"]"#);
|
||
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["foo"]);
|
||
insta::assert_snapshot!(stderr, @r###"
|
||
error: unrecognized subcommand 'nonexistent'
|
||
|
||
Usage: jj [OPTIONS] <COMMAND>
|
||
|
||
For more information, try '--help'.
|
||
"###);
|
||
}
|
||
|
||
#[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");
|
||
|
||
test_env.add_config(r#"aliases.foo = ["log", "--nonexistent"]"#);
|
||
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["foo"]);
|
||
insta::assert_snapshot!(stderr, @r###"
|
||
error: unexpected argument '--nonexistent' found
|
||
|
||
note: to pass '--nonexistent' as a value, use '-- --nonexistent'
|
||
|
||
Usage: jj log [OPTIONS] [PATHS]...
|
||
|
||
For more information, try '--help'.
|
||
"###);
|
||
}
|
||
|
||
#[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");
|
||
test_env.add_config(r#"aliases.h = ["--help"]"#);
|
||
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>
|
||
"###);
|
||
}
|
||
|
||
#[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");
|
||
|
||
test_env.add_config(r#"aliases.log = ["rebase"]"#);
|
||
// Alias should be ignored
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "root"]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
◉ zzzzzzzzzzzz 1970-01-01 00:00:00.000 +00:00 000000000000
|
||
(empty) (no description set)
|
||
"###);
|
||
}
|
||
|
||
#[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(
|
||
r#"[aliases]
|
||
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");
|
||
test_env.add_config(r#"aliases.l = ["log", "-T", "commit_id", "-r", "all()"]"#);
|
||
// Test the setup
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["l"]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
||
◉ 0000000000000000000000000000000000000000
|
||
"###);
|
||
|
||
// Can pass global args before
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["l", "--at-op", "@-"]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
◉ 0000000000000000000000000000000000000000
|
||
"###);
|
||
// Can pass global args after
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["--at-op", "@-", "l"]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
◉ 0000000000000000000000000000000000000000
|
||
"###);
|
||
// 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###"
|
||
◉ 0000000000000000000000000000000000000000
|
||
"###);
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["-R", "../nonexistent", "l", "-R", "."]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
||
◉ 0000000000000000000000000000000000000000
|
||
"###);
|
||
}
|
||
|
||
#[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");
|
||
test_env.add_config(
|
||
r#"aliases.l = ["log", "-T", "commit_id", "--at-op", "@-", "-r", "all()", "--color=always"]"#,
|
||
);
|
||
|
||
// The global argument in the alias is respected
|
||
let stdout = test_env.jj_cmd_success(&repo_path, &["l"]);
|
||
insta::assert_snapshot!(stdout, @r###"
|
||
◉ [38;5;4m0000000000000000000000000000000000000000[39m
|
||
"###);
|
||
}
|
||
|
||
#[test]
|
||
fn test_alias_invalid_definition() {
|
||
let test_env = TestEnvironment::default();
|
||
|
||
test_env.add_config(
|
||
r#"[aliases]
|
||
non-list = 5
|
||
non-string-list = [[]]
|
||
"#,
|
||
);
|
||
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
|
||
"###);
|
||
}
|