forked from mirrors/jj
de1e4a39f4
This seems more useful if aliases are nested. The innermost error usually contains the problem, and the outer errors are contexts where aliases are expanded.
439 lines
13 KiB
Rust
439 lines
13 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_syntax_error() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", ":x"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:1
|
|
|
|
|
1 | :x
|
|
| ^
|
|
|
|
|
= ':' is not a prefix operator
|
|
Hint: Did you mean '::' for ancestors?
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "x &"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:4
|
|
|
|
|
1 | x &
|
|
| ^---
|
|
|
|
|
= expected `::`, `..`, `~`, or <primary>
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "x - y"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:3
|
|
|
|
|
1 | x - y
|
|
| ^
|
|
|
|
|
= '-' is not an infix operator
|
|
Hint: Did you mean '~' for difference?
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "HEAD^"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:5
|
|
|
|
|
1 | HEAD^
|
|
| ^
|
|
|
|
|
= '^' is not a postfix operator
|
|
Hint: Did you mean '-' for parents?
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_bad_function_call() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "all(or::nothing)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:5
|
|
|
|
|
1 | all(or::nothing)
|
|
| ^---------^
|
|
|
|
|
= Invalid arguments to revset function "all": Expected 0 arguments
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "parents()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:9
|
|
|
|
|
1 | parents()
|
|
| ^
|
|
|
|
|
= Invalid arguments to revset function "parents": Expected 1 arguments
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "parents(foo, bar)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:9
|
|
|
|
|
1 | parents(foo, bar)
|
|
| ^------^
|
|
|
|
|
= Invalid arguments to revset function "parents": Expected 1 arguments
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "heads(foo, bar)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:7
|
|
|
|
|
1 | heads(foo, bar)
|
|
| ^------^
|
|
|
|
|
= Invalid arguments to revset function "heads": Expected 1 arguments
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "latest(a, not_an_integer)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:11
|
|
|
|
|
1 | latest(a, not_an_integer)
|
|
| ^------------^
|
|
|
|
|
= Invalid arguments to revset function "latest": Expected function argument of type integer
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "file()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:6
|
|
|
|
|
1 | file()
|
|
| ^
|
|
|
|
|
= Invalid arguments to revset function "file": Expected at least 1 argument
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "file(a, not:a-string)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:9
|
|
|
|
|
1 | file(a, not:a-string)
|
|
| ^----------^
|
|
|
|
|
= Invalid arguments to revset function "file": Expected function argument of type string
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", r#"file(a, "../out")"#]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:9
|
|
|
|
|
1 | file(a, "../out")
|
|
| ^------^
|
|
|
|
|
= Invalid file pattern: Path "../out" is not in the repo
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "branches(bad:pattern)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:10
|
|
|
|
|
1 | branches(bad:pattern)
|
|
| ^---------^
|
|
|
|
|
= Invalid arguments to revset function "branches": Invalid string pattern kind "bad"
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "root()::whatever()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:9
|
|
|
|
|
1 | root()::whatever()
|
|
| ^------^
|
|
|
|
|
= Revset function "whatever" doesn't exist
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&["log", "-r", "remote_branches(a, b, remote=c)"],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:23
|
|
|
|
|
1 | remote_branches(a, b, remote=c)
|
|
| ^------^
|
|
|
|
|
= Invalid arguments to revset function "remote_branches": Got multiple values for keyword "remote"
|
|
"###);
|
|
|
|
let stderr =
|
|
test_env.jj_cmd_failure(&repo_path, &["log", "-r", "remote_branches(remote=a, b)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:27
|
|
|
|
|
1 | remote_branches(remote=a, b)
|
|
| ^
|
|
|
|
|
= Invalid arguments to revset function "remote_branches": Positional argument follows keyword argument
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "remote_branches(=foo)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:17
|
|
|
|
|
1 | remote_branches(=foo)
|
|
| ^---
|
|
|
|
|
= expected <identifier> or <expression>
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "remote_branches(remote=)"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:24
|
|
|
|
|
1 | remote_branches(remote=)
|
|
| ^---
|
|
|
|
|
= expected <expression>
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_function_name_hint() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
let evaluate_err = |expr| test_env.jj_cmd_failure(&repo_path, &["log", "-r", expr]);
|
|
|
|
test_env.add_config(
|
|
r###"
|
|
[revset-aliases]
|
|
'branches(x)' = 'x' # override builtin function
|
|
'my_author(x)' = 'author(x)' # similar name to builtin function
|
|
'author_sym' = 'x' # not a function alias
|
|
'my_branches' = 'branch()' # typo in alias
|
|
"###,
|
|
);
|
|
|
|
// The suggestion "branches" shouldn't be duplicated
|
|
insta::assert_snapshot!(evaluate_err("branch()"), @r###"
|
|
Error: Failed to parse revset: --> 1:1
|
|
|
|
|
1 | branch()
|
|
| ^----^
|
|
|
|
|
= Revset function "branch" doesn't exist
|
|
Hint: Did you mean "branches"?
|
|
"###);
|
|
|
|
// Both builtin function and function alias should be suggested
|
|
insta::assert_snapshot!(evaluate_err("author_()"), @r###"
|
|
Error: Failed to parse revset: --> 1:1
|
|
|
|
|
1 | author_()
|
|
| ^-----^
|
|
|
|
|
= Revset function "author_" doesn't exist
|
|
Hint: Did you mean "author", "my_author"?
|
|
"###);
|
|
|
|
insta::assert_snapshot!(evaluate_err("my_branches"), @r###"
|
|
Error: Failed to parse revset: --> 1:1
|
|
|
|
|
1 | my_branches
|
|
| ^---------^
|
|
|
|
|
= Alias "my_branches" cannot be expanded
|
|
--> 1:1
|
|
|
|
|
1 | branch()
|
|
| ^----^
|
|
|
|
|
= Revset function "branch" doesn't exist
|
|
Hint: Did you mean "branches"?
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_alias() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.add_config(
|
|
r###"
|
|
[revset-aliases]
|
|
'my-root' = 'root()'
|
|
'syntax-error' = 'whatever &'
|
|
'recurse' = 'recurse1'
|
|
'recurse1' = 'recurse2()'
|
|
'recurse2()' = 'recurse'
|
|
'identity(x)' = 'x'
|
|
'my_author(x)' = 'author(x)'
|
|
"###,
|
|
);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "my-root"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-r", "identity(my-root)"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "root() & syntax-error"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:10
|
|
|
|
|
1 | root() & syntax-error
|
|
| ^----------^
|
|
|
|
|
= Alias "syntax-error" cannot be expanded
|
|
--> 1:11
|
|
|
|
|
1 | whatever &
|
|
| ^---
|
|
|
|
|
= expected `::`, `..`, `~`, or <primary>
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "identity()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:10
|
|
|
|
|
1 | identity()
|
|
| ^
|
|
|
|
|
= Invalid arguments to revset function "identity": Expected 1 arguments
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "my_author(none())"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:1
|
|
|
|
|
1 | my_author(none())
|
|
| ^---------------^
|
|
|
|
|
= Alias "my_author()" cannot be expanded
|
|
--> 1:8
|
|
|
|
|
1 | author(x)
|
|
| ^
|
|
|
|
|
= Invalid arguments to revset function "author": Expected function argument of string pattern
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-r", "root() & recurse"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Failed to parse revset: --> 1:10
|
|
|
|
|
1 | root() & recurse
|
|
| ^-----^
|
|
|
|
|
= Alias "recurse" cannot be expanded
|
|
--> 1:1
|
|
|
|
|
1 | recurse1
|
|
| ^------^
|
|
|
|
|
= Alias "recurse1" cannot be expanded
|
|
--> 1:1
|
|
|
|
|
1 | recurse2()
|
|
| ^--------^
|
|
|
|
|
= Alias "recurse2()" cannot be expanded
|
|
--> 1:1
|
|
|
|
|
1 | recurse
|
|
| ^-----^
|
|
|
|
|
= Alias "recurse" expanded recursively
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_alias_override() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.add_config(
|
|
r###"
|
|
[revset-aliases]
|
|
'f(x)' = 'user'
|
|
"###,
|
|
);
|
|
|
|
// 'f(x)' should be overridden by --config-toml 'f(a)'. If aliases were sorted
|
|
// purely by name, 'f(a)' would come first.
|
|
let stderr = test_env.jj_cmd_failure(
|
|
&repo_path,
|
|
&[
|
|
"log",
|
|
"-r",
|
|
"f(_)",
|
|
"--config-toml",
|
|
"revset-aliases.'f(a)' = 'arg'",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: Revision "arg" doesn't exist
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_bad_alias_decl() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.add_config(
|
|
r#"
|
|
[revset-aliases]
|
|
'my-root' = 'root()'
|
|
'"bad"' = 'root()'
|
|
'badfn(a, a)' = 'root()'
|
|
"#,
|
|
);
|
|
|
|
// Invalid declaration should be warned and ignored.
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["log", "-r", "my-root"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ zzzzzzzz root() 00000000
|
|
"###);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Failed to load "revset-aliases."bad"": --> 1:1
|
|
|
|
|
1 | "bad"
|
|
| ^---
|
|
|
|
|
= expected <identifier> or <function_name>
|
|
Failed to load "revset-aliases.badfn(a, a)": --> 1:7
|
|
|
|
|
1 | badfn(a, a)
|
|
| ^--^
|
|
|
|
|
= Redefinition of function parameter
|
|
"###);
|
|
}
|