2023-01-08 17:22:08 +00:00
|
|
|
|
// Copyright 2023 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 common::TestEnvironment;
|
|
|
|
|
use regex::Regex;
|
|
|
|
|
|
|
|
|
|
pub mod common;
|
|
|
|
|
|
2023-03-06 12:02:57 +00:00
|
|
|
|
#[test]
|
2023-03-19 12:13:47 +00:00
|
|
|
|
fn test_log_parents() {
|
2023-03-06 12:02:57 +00:00
|
|
|
|
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.jj_cmd_success(&repo_path, &["new"]);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "@-"]);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "@", "@-"]);
|
|
|
|
|
|
2023-03-19 12:13:47 +00:00
|
|
|
|
let template = r#"commit_id ++ "\nP: " ++ parents.map(|c| c.commit_id()) ++ "\n""#;
|
2023-03-06 12:02:57 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", template]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
@ c067170d4ca1bc6162b64f7550617ec809647f84
|
|
|
|
|
├─╮ P: 4db490c88528133d579540b6900b8098f0c17701 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● │ 4db490c88528133d579540b6900b8098f0c17701
|
2023-03-06 12:02:57 +00:00
|
|
|
|
├─╯ P: 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-06 12:02:57 +00:00
|
|
|
|
│ P: 0000000000000000000000000000000000000000
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● 0000000000000000000000000000000000000000
|
2023-03-06 12:02:57 +00:00
|
|
|
|
P:
|
|
|
|
|
"###);
|
2023-03-07 10:55:28 +00:00
|
|
|
|
|
2023-03-19 12:13:47 +00:00
|
|
|
|
let template = r#"parents.map(|c| c.commit_id().shortest(4))"#;
|
2023-03-07 10:55:28 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&["log", "-T", template, "-r@", "--color=always"],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-19 12:13:47 +00:00
|
|
|
|
@ [1m[38;5;4m4[0m[38;5;8mdb4[39m [1m[38;5;4m2[0m[38;5;8m30d[39m
|
2023-03-07 10:55:28 +00:00
|
|
|
|
│
|
|
|
|
|
~
|
|
|
|
|
"###);
|
2023-03-19 12:13:47 +00:00
|
|
|
|
|
|
|
|
|
// Commit object isn't printable
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", "parents"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Failed to parse template: --> 1:1
|
|
|
|
|
|
|
|
|
|
|
1 | parents
|
|
|
|
|
| ^-----^
|
|
|
|
|
|
|
|
|
|
|
= Expected expression of type "Template"
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Redundant argument passed to keyword method
|
|
|
|
|
let template = r#"parents.map(|c| c.commit_id(""))"#;
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["log", "-T", template]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Failed to parse template: --> 1:29
|
|
|
|
|
|
|
|
|
|
|
1 | parents.map(|c| c.commit_id(""))
|
|
|
|
|
| ^^
|
|
|
|
|
|
|
|
|
|
|
= Function "commit_id": Expected 0 arguments
|
|
|
|
|
"###);
|
2023-03-06 12:02:57 +00:00
|
|
|
|
}
|
|
|
|
|
|
2023-01-08 17:22:08 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_log_author_timestamp() {
|
|
|
|
|
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.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "second"]);
|
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "-T", "author.timestamp()"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 2001-02-03 04:05:09.000 +07:00
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
● 1970-01-01 00:00:00.000 +00:00
|
2023-01-08 17:22:08 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_log_author_timestamp_ago() {
|
|
|
|
|
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.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "second"]);
|
|
|
|
|
|
2023-02-28 11:30:57 +00:00
|
|
|
|
let template = r#"author.timestamp().ago() ++ "\n""#;
|
2023-02-28 10:43:14 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--no-graph", "-T", template]);
|
2023-02-09 10:53:59 +00:00
|
|
|
|
let line_re = Regex::new(r"[0-9]+ years ago").unwrap();
|
2023-01-08 17:22:08 +00:00
|
|
|
|
assert!(
|
|
|
|
|
stdout.lines().all(|x| line_re.is_match(x)),
|
|
|
|
|
"expected every line to match regex"
|
|
|
|
|
);
|
|
|
|
|
}
|
2023-01-07 23:09:07 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
2023-01-10 06:16:47 +00:00
|
|
|
|
fn test_log_default() {
|
2023-01-07 23:09:07 +00:00
|
|
|
|
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-10 06:16:47 +00:00
|
|
|
|
std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "add a file"]);
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "description 1"]);
|
2023-01-07 23:09:07 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["branch", "create", "my-branch"]);
|
2023-01-10 06:16:47 +00:00
|
|
|
|
|
|
|
|
|
// Test default log output format
|
2023-01-22 06:50:58 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-12 20:07:28 +00:00
|
|
|
|
@ kkmpptxzrspx test.user@example.com 2001-02-03 04:05:09.000 +07:00 my-branch 9de54178d59d
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ (empty) description 1
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:08.000 +07:00 4291e264ae97
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ add a file
|
2023-03-11 07:10:31 +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)
|
2023-01-10 06:16:47 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Color
|
2023-01-07 23:09:07 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-13 04:53:04 +00:00
|
|
|
|
@ [1m[38;5;13mk[38;5;8mkmpptxzrspx[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 04:05:09.000 +07:00[39m [38;5;13mmy-branch[39m [38;5;12m9[38;5;8mde54178d59d[39m[0m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ [1m[38;5;10m(empty)[39m description 1[0m
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[38;5;5mq[0m[38;5;8mpvuntsmwlqt[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 04:05:08.000 +07:00[39m [1m[38;5;4m4[0m[38;5;8m291e264ae97[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ add a file
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[38;5;5mz[0m[38;5;8mzzzzzzzzzzz[39m [38;5;6m1970-01-01 00:00:00.000 +00:00[39m [1m[38;5;4m0[0m[38;5;8m00000000000[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
[38;5;2m(empty)[39m (no description set)
|
2023-01-07 23:09:07 +00:00
|
|
|
|
"###);
|
2023-01-11 00:42:03 +00:00
|
|
|
|
|
|
|
|
|
// Color without graph
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always", "--no-graph"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-13 04:53:04 +00:00
|
|
|
|
[1m[38;5;13mk[38;5;8mkmpptxzrspx[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 04:05:09.000 +07:00[39m [38;5;13mmy-branch[39m [38;5;12m9[38;5;8mde54178d59d[39m[0m
|
2023-02-03 06:11:25 +00:00
|
|
|
|
[1m[38;5;10m(empty)[39m description 1[0m
|
2023-02-13 04:53:04 +00:00
|
|
|
|
[1m[38;5;5mq[0m[38;5;8mpvuntsmwlqt[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 04:05:08.000 +07:00[39m [1m[38;5;4m4[0m[38;5;8m291e264ae97[39m
|
2023-01-11 00:42:03 +00:00
|
|
|
|
add a file
|
2023-02-12 20:07:28 +00:00
|
|
|
|
[1m[38;5;5mz[0m[38;5;8mzzzzzzzzzzz[39m [38;5;6m1970-01-01 00:00:00.000 +00:00[39m [1m[38;5;4m0[0m[38;5;8m00000000000[39m
|
2023-02-03 06:11:25 +00:00
|
|
|
|
[38;5;2m(empty)[39m (no description set)
|
2023-01-11 00:42:03 +00:00
|
|
|
|
"###);
|
2023-01-07 23:09:07 +00:00
|
|
|
|
}
|
2023-01-10 06:26:19 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_log_default_divergence() {
|
|
|
|
|
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");
|
|
|
|
|
|
|
|
|
|
std::fs::write(repo_path.join("file"), "foo\n").unwrap();
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "description 1"]);
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
|
|
|
|
|
// No divergence
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-12 20:07:28 +00:00
|
|
|
|
@ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e633c
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ description 1
|
2023-03-11 07:10:31 +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)
|
2023-01-10 06:26:19 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Create divergence
|
|
|
|
|
test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&["describe", "-m", "description 2", "--at-operation", "@-"],
|
|
|
|
|
);
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
Concurrent modification detected, resolving automatically.
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● qpvuntsmwlqt?? test.user@example.com 2001-02-03 04:05:10.000 +07:00 8979953d4c67
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ description 2
|
2023-02-12 20:07:28 +00:00
|
|
|
|
│ @ qpvuntsmwlqt?? test.user@example.com 2001-02-03 04:05:08.000 +07:00 7a17d52e633c
|
2023-02-09 02:53:47 +00:00
|
|
|
|
├─╯ description 1
|
2023-03-11 07:10:31 +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)
|
2023-01-10 06:26:19 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Color
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[4m[38;5;1mq[0m[38;5;1mpvuntsmwlqt??[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 04:05:10.000 +07:00[39m [1m[38;5;4m8[0m[38;5;8m979953d4c67[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ description 2
|
2023-02-12 20:07:28 +00:00
|
|
|
|
│ @ [1m[4m[38;5;1mq[24mpvuntsmwlqt[38;5;9m??[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 04:05:08.000 +07:00[39m [38;5;12m7[38;5;8ma17d52e633c[39m[0m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
├─╯ [1mdescription 1[0m
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[38;5;5mz[0m[38;5;8mzzzzzzzzzzz[39m [38;5;6m1970-01-01 00:00:00.000 +00:00[39m [1m[38;5;4m0[0m[38;5;8m00000000000[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
[38;5;2m(empty)[39m (no description set)
|
2023-01-10 06:26:19 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
2023-01-10 07:43:27 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_log_git_head() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
git2::Repository::init(&repo_path).unwrap();
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["init", "--git-repo=."]);
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m=initial"]);
|
|
|
|
|
std::fs::write(repo_path.join("file"), "foo\n").unwrap();
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["log", "--color=always"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-12 20:07:28 +00:00
|
|
|
|
@ [1m[38;5;13mr[38;5;8mlvkpnrzqnoo[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 04:05:09.000 +07:00[39m [38;5;12m5[38;5;8m0aaf4754c1e[39m[0m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ [1minitial[0m
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[38;5;5mq[0m[38;5;8mpvuntsmwlqt[39m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 04:05:07.000 +07:00[39m [38;5;5mmaster[39m [38;5;5mHEAD@git[39m [1m[38;5;4m23[0m[38;5;8m0dd059e1b0[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ [38;5;2m(empty)[39m (no description set)
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● [1m[38;5;5mz[0m[38;5;8mzzzzzzzzzzz[39m [38;5;6m1970-01-01 00:00:00.000 +00:00[39m [1m[38;5;4m0[0m[38;5;8m00000000000[39m
|
2023-02-09 02:53:47 +00:00
|
|
|
|
[38;5;2m(empty)[39m (no description set)
|
2023-01-10 07:43:27 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
2023-02-14 14:35:40 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_log_customize_short_id() {
|
|
|
|
|
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.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
|
|
|
|
|
|
2023-02-21 04:38:52 +00:00
|
|
|
|
// Customize both the commit and the change id
|
2023-02-14 14:35:40 +00:00
|
|
|
|
let decl = "template-aliases.'format_short_id(id)'";
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
2023-02-21 04:38:52 +00:00
|
|
|
|
&[
|
|
|
|
|
"log",
|
|
|
|
|
"--config-toml",
|
2023-02-28 11:30:57 +00:00
|
|
|
|
&format!(r#"{decl}='id.shortest(5).prefix().upper() ++ "_" ++ id.shortest(5).rest()'"#),
|
2023-02-21 04:38:52 +00:00
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
@ Q_pvun test.user@example.com 2001-02-03 04:05:08.000 +07:00 6_9542
|
|
|
|
|
│ (empty) first
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● Z_zzzz 1970-01-01 00:00:00.000 +00:00 0_0000
|
2023-02-21 04:38:52 +00:00
|
|
|
|
(empty) (no description set)
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Customize only the change id
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"log",
|
|
|
|
|
"--config-toml",
|
|
|
|
|
r#"
|
|
|
|
|
[template-aliases]
|
|
|
|
|
'format_short_change_id(id)'='format_short_id(id).upper()'
|
|
|
|
|
"#,
|
|
|
|
|
],
|
2023-02-14 14:35:40 +00:00
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2023-02-21 04:38:52 +00:00
|
|
|
|
@ QPVUNTSMWLQT test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c1984c1
|
2023-02-14 14:35:40 +00:00
|
|
|
|
│ (empty) first
|
2023-03-11 07:10:31 +00:00
|
|
|
|
● ZZZZZZZZZZZZ 1970-01-01 00:00:00.000 +00:00 000000000000
|
2023-02-14 14:35:40 +00:00
|
|
|
|
(empty) (no description set)
|
|
|
|
|
"###);
|
|
|
|
|
}
|