mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 16:09: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:
216 lines
8.6 KiB
Rust
216 lines
8.6 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 std::path::Path;
|
|
|
|
use regex::Regex;
|
|
|
|
use crate::common::{get_stdout_string, TestEnvironment};
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_op_log() {
|
|
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", "description 0"]);
|
|
|
|
let stdout = test_env.jj_cmd_success(
|
|
&repo_path,
|
|
&[
|
|
"op",
|
|
"log",
|
|
"--config-toml",
|
|
"template-aliases.'format_time_range(x)' = 'x'",
|
|
],
|
|
);
|
|
insta::assert_snapshot!(&stdout, @r###"
|
|
@ 45108169c0f8 test-username@host.example.com 2001-02-03 04:05:08.000 +07:00 - 2001-02-03 04:05:08.000 +07:00
|
|
│ describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
│ args: jj describe -m 'description 0'
|
|
◉ a99a3fd5c51e 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'
|
|
◉ 56b94dfc38e7 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
|
|
"###);
|
|
// Test op log with relative dates
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["op", "log"]);
|
|
let regex = Regex::new(r"\d\d years").unwrap();
|
|
insta::assert_snapshot!(regex.replace_all(&stdout, "NN years"), @r###"
|
|
@ 45108169c0f8 test-username@host.example.com NN years ago, lasted less than a microsecond
|
|
│ describe commit 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
│ args: jj describe -m 'description 0'
|
|
◉ a99a3fd5c51e test-username@host.example.com NN years ago, lasted less than a microsecond
|
|
│ add workspace 'default'
|
|
◉ 56b94dfc38e7 test-username@host.example.com NN years ago, lasted less than a microsecond
|
|
initialize repo
|
|
"###);
|
|
let add_workspace_id = "a99a3fd5c51e";
|
|
let initialize_repo_id = "56b94dfc38e7";
|
|
|
|
// Can load the repo at a specific operation ID
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, initialize_repo_id), @r###"
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, add_workspace_id), @r###"
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
// "@" resolves to the head operation
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, "@"), @r###"
|
|
@ bc8f18aa6f396a93572811632313cbb5625d475d
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
// "@-" resolves to the parent of the head operation
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, "@-"), @r###"
|
|
@ 230dd059e1b059aefc0da06a2e5a7dbf22362f22
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path, "@--"), @r###"
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "@---"]), @r###"
|
|
Error: The "@---" expression resolved to no operations
|
|
"###);
|
|
// "ID-" also resolves to the parent.
|
|
insta::assert_snapshot!(
|
|
get_log_output(&test_env, &repo_path, &format!("{add_workspace_id}-")), @r###"
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// We get a reasonable message if an invalid operation ID is specified
|
|
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
|
|
"###);
|
|
// Odd length
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "123456789"]), @r###"
|
|
Error: No operation ID matching "123456789"
|
|
"###);
|
|
// Even length
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "0123456789"]), @r###"
|
|
Error: No operation ID matching "0123456789"
|
|
"###);
|
|
// Empty ID
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", ""]), @r###"
|
|
Error: Operation ID "" is not a valid hexadecimal prefix
|
|
"###);
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "description 1"]);
|
|
test_env.jj_cmd_success(
|
|
&repo_path,
|
|
&[
|
|
"describe",
|
|
"-m",
|
|
"description 2",
|
|
"--at-op",
|
|
add_workspace_id,
|
|
],
|
|
);
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "@-"]), @r###"
|
|
Error: The "@-" expression resolved to more than one operation
|
|
"###);
|
|
test_env.jj_cmd_success(&repo_path, &["st"]);
|
|
insta::assert_snapshot!(test_env.jj_cmd_failure(&repo_path, &["log", "--at-op", "@-"]), @r###"
|
|
Error: The "@-" expression resolved to more than one operation
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_op_log_template() {
|
|
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 render = |template| test_env.jj_cmd_success(&repo_path, &["op", "log", "-T", template]);
|
|
|
|
insta::assert_snapshot!(render(r#"id ++ "\n""#), @r###"
|
|
@ a99a3fd5c51e8f7ccb9ae2f9fb749612a23f0a7cf25d8c644f36c35c077449ce3c66f49d098a5a704ca5e47089a7f019563a5b8cbc7d451619e0f90c82241ceb
|
|
◉ 56b94dfc38e7d54340377f566e96ab97dc6163ea7841daf49fb2e1d1ceb27e26274db1245835a1a421fb9d06e6e0fe1e4f4aa1b0258c6e86df676ad9111d0dab
|
|
"###);
|
|
insta::assert_snapshot!(
|
|
render(r#"separate(" ", id.short(5), current_operation, user,
|
|
time.start(), time.end(), time.duration()) ++ "\n""#), @r###"
|
|
@ a99a3 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
|
|
◉ 56b94 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
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_op_log_word_wrap() {
|
|
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 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###"
|
|
@ a99a3fd5c51e test-username@host.example.com 22 years ago, lasted less than a microsecond
|
|
│ add workspace 'default'
|
|
◉ 56b94dfc38e7 test-username@host.example.com 22 years ago, lasted less than a microsecond
|
|
initialize repo
|
|
"###);
|
|
insta::assert_snapshot!(render(&["op", "log"], 40, true), @r###"
|
|
@ a99a3fd5c51e
|
|
│ test-username@host.example.com 22
|
|
│ years ago, lasted less than a
|
|
│ microsecond
|
|
│ add workspace 'default'
|
|
◉ 56b94dfc38e7
|
|
test-username@host.example.com 22
|
|
years ago, lasted less than a
|
|
microsecond
|
|
initialize repo
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_op_log_configurable() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.add_config(
|
|
r#"operation.hostname = "my-hostname"
|
|
operation.username = "my-username"
|
|
"#,
|
|
);
|
|
test_env
|
|
.jj_cmd(test_env.env_root(), &["init", "repo", "--git"])
|
|
.env_remove("JJ_OP_HOSTNAME")
|
|
.env_remove("JJ_OP_USERNAME")
|
|
.assert()
|
|
.success();
|
|
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"));
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, repo_path: &Path, op_id: &str) -> String {
|
|
test_env.jj_cmd_success(
|
|
repo_path,
|
|
&["log", "-T", "commit_id", "--at-op", op_id, "-r", "all()"],
|
|
)
|
|
}
|