2022-11-26 23:57:50 +00:00
|
|
|
|
// Copyright 2022 The Jujutsu Authors
|
2022-04-23 18:34:40 +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.
|
|
|
|
|
|
|
|
|
|
use std::path::Path;
|
|
|
|
|
|
2023-05-21 07:17:39 +00:00
|
|
|
|
use itertools::Itertools;
|
2023-01-07 03:43:46 +00:00
|
|
|
|
use regex::Regex;
|
|
|
|
|
|
2023-03-05 04:10:02 +00:00
|
|
|
|
use crate::common::{get_stdout_string, TestEnvironment};
|
2022-04-23 18:34:40 +00:00
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2022-04-23 18:34:40 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
2023-10-10 11:59:18 +00:00
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 0"]);
|
2022-04-23 18:34:40 +00:00
|
|
|
|
|
2023-02-16 03:19:41 +00:00
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
2023-02-16 03:26:31 +00:00
|
|
|
|
&[
|
|
|
|
|
"op",
|
|
|
|
|
"log",
|
|
|
|
|
"--config-toml",
|
2023-02-19 08:05:50 +00:00
|
|
|
|
"template-aliases.'format_time_range(x)' = 'x'",
|
2023-02-16 03:26:31 +00:00
|
|
|
|
],
|
2023-02-16 03:19:41 +00:00
|
|
|
|
);
|
2022-11-22 17:11:40 +00:00
|
|
|
|
insta::assert_snapshot!(&stdout, @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ c1851f1c3d90 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
|
|
|
│ args: jj describe -m 'description 0'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2023-02-09 02:53:47 +00:00
|
|
|
|
│ add workspace 'default'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ 9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2024-01-07 18:32:31 +00:00
|
|
|
|
│ initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2022-04-23 18:34:40 +00:00
|
|
|
|
"###);
|
2023-05-21 07:17:39 +00:00
|
|
|
|
let op_log_lines = stdout.lines().collect_vec();
|
|
|
|
|
let add_workspace_id = op_log_lines[3].split(' ').nth(2).unwrap();
|
|
|
|
|
let initialize_repo_id = op_log_lines[5].split(' ').nth(2).unwrap();
|
2022-04-23 18:34:40 +00:00
|
|
|
|
|
|
|
|
|
// Can load the repo at a specific operation ID
|
2022-12-12 11:43:28 +00:00
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, initialize_repo_id), @r###"
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-04-28 23:32:18 +00:00
|
|
|
|
"###);
|
2022-12-12 11:43:28 +00:00
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, add_workspace_id), @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-04-23 18:34:40 +00:00
|
|
|
|
"###);
|
|
|
|
|
// "@" resolves to the head operation
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, "@"), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 19611c995a342c01f525583e5fcafdd211f6d009
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-04-23 18:34:40 +00:00
|
|
|
|
"###);
|
2022-04-20 05:51:52 +00:00
|
|
|
|
// "@-" resolves to the parent of the head operation
|
|
|
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, "@-"), @r###"
|
2023-02-09 02:53:47 +00:00
|
|
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
2023-03-15 03:37:56 +00:00
|
|
|
|
◉ 0000000000000000000000000000000000000000
|
2022-04-20 05:51:52 +00:00
|
|
|
|
"###);
|
2022-12-12 11:18:06 +00:00
|
|
|
|
insta::assert_snapshot!(
|
2024-01-07 18:32:31 +00:00
|
|
|
|
test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "@----"]), @r###"
|
|
|
|
|
Error: The "@----" expression resolved to no operations
|
2022-12-12 11:18:06 +00:00
|
|
|
|
"###);
|
2022-04-23 18:34:40 +00:00
|
|
|
|
|
|
|
|
|
// We get a reasonable message if an invalid operation ID is specified
|
2022-04-28 23:32:18 +00:00
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "foo"]), @r###"
|
|
|
|
|
Error: Operation ID "foo" is not a valid hexadecimal prefix
|
|
|
|
|
"###);
|
2022-04-20 05:51:52 +00:00
|
|
|
|
|
2023-10-10 11:59:18 +00:00
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 1"]);
|
|
|
|
|
test_env.jj_cmd_ok(
|
2022-04-20 05:51:52 +00:00
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"describe",
|
|
|
|
|
"-m",
|
|
|
|
|
"description 2",
|
|
|
|
|
"--at-op",
|
2022-12-12 11:43:28 +00:00
|
|
|
|
add_workspace_id,
|
2022-04-20 05:51:52 +00:00
|
|
|
|
],
|
|
|
|
|
);
|
2022-04-28 23:32:18 +00:00
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "@-"]), @r###"
|
2023-12-30 13:56:50 +00:00
|
|
|
|
Error: The "@" expression resolved to more than one operation
|
2022-04-28 23:32:18 +00:00
|
|
|
|
"###);
|
2022-04-23 18:34:40 +00:00
|
|
|
|
}
|
|
|
|
|
|
2024-03-11 22:16:24 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_with_custom_symbols() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2024-03-11 22:16:24 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 0"]);
|
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"op",
|
|
|
|
|
"log",
|
|
|
|
|
"--config-toml",
|
|
|
|
|
concat!(
|
|
|
|
|
"template-aliases.'format_time_range(x)' = 'x'\n",
|
|
|
|
|
"templates.op_log_node = 'if(current_operation, \"$\", if(root, \"┴\", \"┝\"))'",
|
|
|
|
|
),
|
|
|
|
|
],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(&stdout, @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
$ c1851f1c3d90 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
2024-03-11 22:16:24 +00:00
|
|
|
|
│ describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
|
|
|
│ args: jj describe -m 'description 0'
|
|
|
|
|
┝ b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
│ add workspace 'default'
|
|
|
|
|
┝ 9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
│ initialize repo
|
|
|
|
|
┴ 000000000000 root()
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2024-03-03 06:04:59 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_with_no_template() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2024-03-03 06:04:59 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
let stderr = test_env.jj_cmd_cli_error(&repo_path, &["op", "log", "-T"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
error: a value is required for '--template <TEMPLATE>' but none was supplied
|
|
|
|
|
|
|
|
|
|
For more information, try '--help'.
|
|
|
|
|
Hint: The following template aliases are defined:
|
|
|
|
|
- builtin_log_comfortable
|
|
|
|
|
- builtin_log_compact
|
|
|
|
|
- builtin_log_detailed
|
2024-04-13 19:12:16 +00:00
|
|
|
|
- builtin_log_node
|
|
|
|
|
- builtin_log_node_ascii
|
2024-03-03 06:04:59 +00:00
|
|
|
|
- builtin_log_oneline
|
|
|
|
|
- builtin_op_log_comfortable
|
|
|
|
|
- builtin_op_log_compact
|
2024-04-13 19:12:16 +00:00
|
|
|
|
- builtin_op_log_node
|
|
|
|
|
- builtin_op_log_node_ascii
|
2024-03-03 06:04:59 +00:00
|
|
|
|
- commit_summary_separator
|
|
|
|
|
- description_placeholder
|
|
|
|
|
- email_placeholder
|
|
|
|
|
- name_placeholder
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2023-08-10 09:14:54 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_limit() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-08-10 09:14:54 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log", "-Tdescription", "--limit=1"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
|
|
|
@ add workspace 'default'
|
|
|
|
|
"###);
|
2023-09-10 16:34:30 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_no_graph() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-09-10 16:34:30 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
let stdout =
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["op", "log", "--no-graph", "--color=always"]);
|
|
|
|
|
insta::assert_snapshot!(stdout, @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
[1m[38;5;12mb51416386f26[39m [38;5;3mtest-username@host.example.com[39m [38;5;14m2001-02-03 04:05:07.000 +07:00[39m - [38;5;14m2001-02-03 04:05:07.000 +07:00[39m[0m
|
2023-09-10 16:34:30 +00:00
|
|
|
|
[1madd workspace 'default'[0m
|
2024-02-18 22:57:09 +00:00
|
|
|
|
[38;5;4m9a7d829846af[39m [38;5;3mtest-username@host.example.com[39m [38;5;6m2001-02-03 04:05:07.000 +07:00[39m - [38;5;6m2001-02-03 04:05:07.000 +07:00[39m
|
2023-09-10 16:34:30 +00:00
|
|
|
|
initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
[38;5;4m000000000000[39m [38;5;2mroot()[39m
|
2023-09-10 16:34:30 +00:00
|
|
|
|
"###);
|
2023-08-10 09:14:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2023-09-13 17:50:12 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_no_graph_null_terminated() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-09-13 17:50:12 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
2023-10-10 11:59:18 +00:00
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "message1"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "message2"]);
|
2023-09-13 17:50:12 +00:00
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&[
|
|
|
|
|
"op",
|
|
|
|
|
"log",
|
|
|
|
|
"--no-graph",
|
|
|
|
|
"--template",
|
|
|
|
|
r#"id.short(4) ++ "\0""#,
|
|
|
|
|
],
|
|
|
|
|
);
|
2024-06-23 22:20:33 +00:00
|
|
|
|
insta::assert_debug_snapshot!(stdout, @r###""8a30\05cec\0b514\09a7d\00000\0""###);
|
2023-09-13 17:50:12 +00:00
|
|
|
|
}
|
|
|
|
|
|
2023-02-19 09:15:54 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_template() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-02-19 09:15:54 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
let render = |template| test_env.jj_cmd_success(&repo_path, &["op", "log", "-T", template]);
|
|
|
|
|
|
2023-02-28 11:30:57 +00:00
|
|
|
|
insta::assert_snapshot!(render(r#"id ++ "\n""#), @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
@ b51416386f2685fd5493f2b20e8eec3c24a1776d9e1a7cb5ed7e30d2d9c88c0c1e1fe71b0b7358cba60de42533d1228ed9878f2f89817d892c803395ccf9fe92
|
|
|
|
|
◉ 9a7d829846af88a2f7a1e348fb46ff58729e49632bc9c6a052aec8501563cb0d10f4a4e6010ffde529f84a2b9b5b3a4c211a889106a41f6c076dfdacc79f6af7
|
2024-01-07 18:32:31 +00:00
|
|
|
|
◉ 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
2023-02-19 09:15:54 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(
|
|
|
|
|
render(r#"separate(" ", id.short(5), current_operation, user,
|
2023-02-28 11:30:57 +00:00
|
|
|
|
time.start(), time.end(), time.duration()) ++ "\n""#), @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
@ b5141 true test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 2001-02-03 04:05:07.000 +07:00 less than a microsecond
|
|
|
|
|
◉ 9a7d8 false test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 2001-02-03 04:05:07.000 +07:00 less than a microsecond
|
2024-01-07 18:32:31 +00:00
|
|
|
|
◉ 00000 false @ 1970-01-01 00:00:00.000 +00:00 1970-01-01 00:00:00.000 +00:00 less than a microsecond
|
2023-02-19 09:15:54 +00:00
|
|
|
|
"###);
|
2023-08-25 10:04:54 +00:00
|
|
|
|
|
2024-02-27 11:37:00 +00:00
|
|
|
|
// Negative length shouldn't cause panic.
|
2023-08-25 10:04:54 +00:00
|
|
|
|
insta::assert_snapshot!(render(r#"id.short(-1) ++ "|""#), @r###"
|
2024-02-27 11:37:00 +00:00
|
|
|
|
@ <Error: out of range integral type conversion attempted>|
|
|
|
|
|
◉ <Error: out of range integral type conversion attempted>|
|
|
|
|
|
◉ <Error: out of range integral type conversion attempted>|
|
2023-08-25 10:04:54 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
2023-04-08 00:34:12 +00:00
|
|
|
|
// Test the default template, i.e. with relative start time and duration. We
|
|
|
|
|
// don't generally use that template because it depends on the current time,
|
|
|
|
|
// so we need to reset the time range format here.
|
|
|
|
|
test_env.add_config(
|
|
|
|
|
r#"
|
|
|
|
|
[template-aliases]
|
|
|
|
|
'format_time_range(time_range)' = 'time_range.start().ago() ++ ", lasted " ++ time_range.duration()'
|
|
|
|
|
"#,
|
|
|
|
|
);
|
|
|
|
|
let regex = Regex::new(r"\d\d years").unwrap();
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
|
|
|
|
|
insta::assert_snapshot!(regex.replace_all(&stdout, "NN years"), @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
@ b51416386f26 test-username@host.example.com NN years ago, lasted less than a microsecond
|
2023-04-08 00:34:12 +00:00
|
|
|
|
│ add workspace 'default'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ 9a7d829846af test-username@host.example.com NN years ago, lasted less than a microsecond
|
2024-01-07 18:32:31 +00:00
|
|
|
|
│ initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-04-08 00:34:12 +00:00
|
|
|
|
"###);
|
2023-02-19 09:15:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2023-04-13 17:30:48 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_builtin_templates() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-04-13 17:30:48 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
2024-03-13 13:36:03 +00:00
|
|
|
|
// Render without graph and append "[EOF]" marker to test line ending
|
|
|
|
|
let render = |template| {
|
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["op", "log", "-T", template, "--no-graph"])
|
|
|
|
|
+ "[EOF]\n"
|
|
|
|
|
};
|
2023-10-10 11:59:18 +00:00
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "description 0"]);
|
2023-04-13 17:30:48 +00:00
|
|
|
|
|
|
|
|
|
insta::assert_snapshot!(render(r#"builtin_op_log_compact"#), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
c1851f1c3d90 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
2024-03-13 13:36:03 +00:00
|
|
|
|
describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
|
|
|
args: jj describe -m 'description 0'
|
|
|
|
|
b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
add workspace 'default'
|
|
|
|
|
9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
initialize repo
|
|
|
|
|
000000000000 root()
|
|
|
|
|
[EOF]
|
2023-04-13 17:30:48 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
insta::assert_snapshot!(render(r#"builtin_op_log_comfortable"#), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
c1851f1c3d90 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
2024-03-13 13:36:03 +00:00
|
|
|
|
describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
|
|
|
args: jj describe -m 'description 0'
|
|
|
|
|
|
|
|
|
|
b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
add workspace 'default'
|
|
|
|
|
|
|
|
|
|
9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
initialize repo
|
|
|
|
|
|
|
|
|
|
000000000000 root()
|
|
|
|
|
|
|
|
|
|
[EOF]
|
2023-04-13 17:30:48 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2023-03-05 04:10:02 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_word_wrap() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-03-05 04:10:02 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
let render = |args: &[&str], columns: u32, word_wrap: bool| {
|
|
|
|
|
let mut args = args.to_vec();
|
|
|
|
|
if word_wrap {
|
|
|
|
|
args.push("--config-toml=ui.log-word-wrap=true");
|
|
|
|
|
}
|
|
|
|
|
let assert = test_env
|
|
|
|
|
.jj_cmd(&repo_path, &args)
|
|
|
|
|
.env("COLUMNS", columns.to_string())
|
|
|
|
|
.assert()
|
|
|
|
|
.success()
|
|
|
|
|
.stderr("");
|
|
|
|
|
get_stdout_string(&assert)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// ui.log-word-wrap option works
|
|
|
|
|
insta::assert_snapshot!(render(&["op", "log"], 40, false), @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
@ b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2023-03-05 04:10:02 +00:00
|
|
|
|
│ add workspace 'default'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ 9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2024-01-07 18:32:31 +00:00
|
|
|
|
│ initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-03-05 04:10:02 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(render(&["op", "log"], 40, true), @r###"
|
2024-02-18 22:57:09 +00:00
|
|
|
|
@ b51416386f26
|
2023-04-08 00:34:12 +00:00
|
|
|
|
│ test-username@host.example.com
|
|
|
|
|
│ 2001-02-03 04:05:07.000 +07:00 -
|
|
|
|
|
│ 2001-02-03 04:05:07.000 +07:00
|
2023-03-05 04:10:02 +00:00
|
|
|
|
│ add workspace 'default'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ 9a7d829846af
|
2024-01-07 18:32:31 +00:00
|
|
|
|
│ test-username@host.example.com
|
|
|
|
|
│ 2001-02-03 04:05:07.000 +07:00 -
|
|
|
|
|
│ 2001-02-03 04:05:07.000 +07:00
|
|
|
|
|
│ initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-03-05 04:10:02 +00:00
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-11-13 06:29:06 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_log_configurable() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
|
|
|
|
test_env.add_config(
|
2023-01-26 19:26:18 +00:00
|
|
|
|
r#"operation.hostname = "my-hostname"
|
2022-11-13 06:29:06 +00:00
|
|
|
|
operation.username = "my-username"
|
|
|
|
|
"#,
|
|
|
|
|
);
|
2022-11-14 07:41:11 +00:00
|
|
|
|
test_env
|
2024-05-17 19:49:25 +00:00
|
|
|
|
.jj_cmd(test_env.env_root(), &["git", "init", "repo"])
|
2022-11-14 07:41:11 +00:00
|
|
|
|
.env_remove("JJ_OP_HOSTNAME")
|
|
|
|
|
.env_remove("JJ_OP_USERNAME")
|
|
|
|
|
.assert()
|
|
|
|
|
.success();
|
2022-11-13 06:29:06 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
|
|
|
|
|
assert!(stdout.contains("my-username@my-hostname"));
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-29 07:02:56 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_abandon_ancestors() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2023-12-29 07:02:56 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 1"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 2"]);
|
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ c2878c428b1c test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
|
|
|
|
|
│ commit 81a4ef3dd421f3184289df1c58bd3a16ea1e3d8e
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj commit -m 'commit 2'
|
2024-06-23 22:20:33 +00:00
|
|
|
|
◉ 5d0ab09ab0fa test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
|
|
|
│ args: jj commit -m 'commit 1'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ b51416386f26 test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ add workspace 'default'
|
2024-02-18 22:57:09 +00:00
|
|
|
|
◉ 9a7d829846af test-username@host.example.com 2001-02-03 04:05:07.000 +07:00 - 2001-02-03 04:05:07.000 +07:00
|
2024-01-07 18:32:31 +00:00
|
|
|
|
│ initialize repo
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Abandon old operations. The working-copy operation id should be updated.
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "abandon", "..@-"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
2024-01-07 18:32:31 +00:00
|
|
|
|
Abandoned 3 operations and reparented 1 descendant operations.
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
2024-01-10 08:30:10 +00:00
|
|
|
|
insta::assert_snapshot!(
|
2024-06-28 02:53:20 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
Current operation: OperationId("8545e013752445fd845c84eb961dbfbce47e1deb628e4ef20df10f6dc9aae2ef9e47200b0fcc70ca51f050aede05d0fa6dd1db40e20ae740876775738a07d02e")
|
2024-05-26 18:17:12 +00:00
|
|
|
|
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 8545e0137524 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
|
|
|
|
|
│ commit 81a4ef3dd421f3184289df1c58bd3a16ea1e3d8e
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj commit -m 'commit 2'
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Abandon operation range.
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 3"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 4"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 5"]);
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "abandon", "@---..@-"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Abandoned 2 operations and reparented 1 descendant operations.
|
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ d92d0753399f test-username@host.example.com 2001-02-03 04:05:16.000 +07:00 - 2001-02-03 04:05:16.000 +07:00
|
|
|
|
|
│ commit c5f7dd51add0046405055336ef443f882a0a8968
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj commit -m 'commit 5'
|
2024-06-23 22:20:33 +00:00
|
|
|
|
◉ 8545e0137524 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
|
|
|
|
|
│ commit 81a4ef3dd421f3184289df1c58bd3a16ea1e3d8e
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj commit -m 'commit 2'
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Can't abandon the current operation.
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["op", "abandon", "..@"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: Cannot abandon the current operation
|
|
|
|
|
Hint: Run `jj undo` to revert the current operation, then use `jj op abandon`
|
|
|
|
|
"###);
|
|
|
|
|
|
2024-01-10 08:20:06 +00:00
|
|
|
|
// Can't create concurrent abandoned operations explicitly.
|
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["op", "abandon", "--at-op=@-", "@"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Error: --at-op is not respected
|
|
|
|
|
"###);
|
|
|
|
|
|
2023-12-29 07:02:56 +00:00
|
|
|
|
// Abandon the current operation by undoing it first.
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["undo"]);
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "abandon", "@-"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Abandoned 1 operations and reparented 1 descendant operations.
|
|
|
|
|
"###);
|
2024-01-10 08:30:10 +00:00
|
|
|
|
insta::assert_snapshot!(
|
2024-06-28 02:53:20 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
Current operation: OperationId("0699d720d0cecd80fb7d765c45955708c61b12feb1d7ed9ff2777ae719471f04ffed3c1dc24efdbf94bdb74426065d6fa9a4f0862a89db2c8c8e359eefc45462")
|
2024-05-26 18:17:12 +00:00
|
|
|
|
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 0699d720d0ce test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
|
|
|
|
|
│ undo operation d92d0753399f732e438bdd88fa7e5214cba2a310d120ec1714028a514c7116bcf04b4a0b26c04dbecf0a917f1d4c8eb05571b8816dd98b0502aaf321e92500b3
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj undo
|
2024-06-23 22:20:33 +00:00
|
|
|
|
◉ 8545e0137524 test-username@host.example.com 2001-02-03 04:05:09.000 +07:00 - 2001-02-03 04:05:09.000 +07:00
|
|
|
|
|
│ commit 81a4ef3dd421f3184289df1c58bd3a16ea1e3d8e
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj commit -m 'commit 2'
|
2024-01-14 01:02:15 +00:00
|
|
|
|
◉ 000000000000 root()
|
2023-12-29 07:02:56 +00:00
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// Abandon empty range.
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "abandon", "@-..@-"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Nothing changed.
|
|
|
|
|
"###);
|
2024-06-14 23:24:09 +00:00
|
|
|
|
insta::assert_snapshot!(test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 0699d720d0ce test-username@host.example.com 2001-02-03 04:05:21.000 +07:00 - 2001-02-03 04:05:21.000 +07:00
|
|
|
|
|
│ undo operation d92d0753399f732e438bdd88fa7e5214cba2a310d120ec1714028a514c7116bcf04b4a0b26c04dbecf0a917f1d4c8eb05571b8816dd98b0502aaf321e92500b3
|
2023-12-29 07:02:56 +00:00
|
|
|
|
│ args: jj undo
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-10 08:20:06 +00:00
|
|
|
|
#[test]
|
|
|
|
|
fn test_op_abandon_without_updating_working_copy() {
|
|
|
|
|
let test_env = TestEnvironment::default();
|
2024-05-17 19:49:25 +00:00
|
|
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["git", "init", "repo"]);
|
2024-01-10 08:20:06 +00:00
|
|
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
|
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 1"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 2"]);
|
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "commit 3"]);
|
|
|
|
|
|
|
|
|
|
// Abandon without updating the working copy.
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(
|
|
|
|
|
&repo_path,
|
|
|
|
|
&["op", "abandon", "@-", "--ignore-working-copy"],
|
|
|
|
|
);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Abandoned 1 operations and reparented 1 descendant operations.
|
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(
|
2024-06-28 02:53:20 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
Current operation: OperationId("cd2b4690faf20cdc477e90c224f15a1f4d62b4d16d0d515fc0f9c998ff91a971cb114d82075c9a7331f3f94d7188c1f93628b7b93e4ca77ac89435a7b536de1e")
|
2024-05-26 18:17:12 +00:00
|
|
|
|
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
|
2024-01-10 08:20:06 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(
|
2024-06-14 23:24:09 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 467d42715f00 test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
|
|
|
|
|
│ commit 220cb0b1b5d1c03cc0d351139d824598bb3c1967
|
2024-01-10 08:20:06 +00:00
|
|
|
|
│ args: jj commit -m 'commit 3'
|
|
|
|
|
"###);
|
|
|
|
|
|
|
|
|
|
// The working-copy operation id isn't updated if it differs from the repo.
|
|
|
|
|
// It could be updated if the tree matches, but there's no extra logic for
|
|
|
|
|
// that.
|
|
|
|
|
let (_stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["op", "abandon", "@-"]);
|
|
|
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
|
|
|
Abandoned 1 operations and reparented 1 descendant operations.
|
2024-06-23 22:20:33 +00:00
|
|
|
|
Warning: The working copy operation cd2b4690faf2 is not updated because it differs from the repo 467d42715f00.
|
2024-01-10 08:20:06 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(
|
2024-06-28 02:53:20 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["debug", "local-working-copy", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
Current operation: OperationId("cd2b4690faf20cdc477e90c224f15a1f4d62b4d16d0d515fc0f9c998ff91a971cb114d82075c9a7331f3f94d7188c1f93628b7b93e4ca77ac89435a7b536de1e")
|
2024-05-26 18:17:12 +00:00
|
|
|
|
Current tree: Merge(Resolved(TreeId("4b825dc642cb6eb9a060e54bf8d69288fbee4904")))
|
2024-01-10 08:20:06 +00:00
|
|
|
|
"###);
|
|
|
|
|
insta::assert_snapshot!(
|
2024-06-14 23:24:09 +00:00
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["op", "log", "-n1", "--ignore-working-copy"]), @r###"
|
2024-06-23 22:20:33 +00:00
|
|
|
|
@ 050b33d674ff test-username@host.example.com 2001-02-03 04:05:10.000 +07:00 - 2001-02-03 04:05:10.000 +07:00
|
|
|
|
|
│ commit 220cb0b1b5d1c03cc0d351139d824598bb3c1967
|
2024-01-10 08:20:06 +00:00
|
|
|
|
│ args: jj commit -m 'commit 3'
|
|
|
|
|
"###);
|
|
|
|
|
}
|
|
|
|
|
|
2022-04-23 18:34:40 +00:00
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path, op_id: &str) -> String {
|
2022-10-19 05:21:25 +00:00
|
|
|
|
test_env.jj_cmd_success(
|
|
|
|
|
repo_path,
|
|
|
|
|
&["log", "-T", "commit_id", "--at-op", op_id, "-r", "all()"],
|
|
|
|
|
)
|
2022-04-23 18:34:40 +00:00
|
|
|
|
}
|