forked from mirrors/jj
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:
218 lines
8.3 KiB
Rust
218 lines
8.3 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 common::{get_stdout_string, TestEnvironment};
|
|
|
|
pub mod common;
|
|
|
|
#[test]
|
|
fn test_obslog_with_or_without_diff() {
|
|
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("file1"), "foo\n").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "my description"]);
|
|
std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap();
|
|
std::fs::write(repo_path.join("file2"), "foo\n").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["rebase", "-r", "@", "-d", "root"]);
|
|
std::fs::write(repo_path.join("file1"), "resolved\n").unwrap();
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad36073
|
|
│ my description
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5af67e conflict
|
|
│ my description
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bcb590
|
|
│ my description
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0dae082
|
|
(empty) my description
|
|
"###);
|
|
|
|
// There should be no diff caused by the rebase because it was a pure rebase
|
|
// (even even though it resulted in a conflict).
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
@ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad36073
|
|
│ my description
|
|
│ Resolved conflict in file1:
|
|
│ 1 1: <<<<<<<resolved
|
|
│ 2 : %%%%%%%
|
|
│ 3 : foo
|
|
│ 4 : +bar
|
|
│ 5 : +++++++
|
|
│ 6 : >>>>>>>
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5af67e conflict
|
|
│ my description
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bcb590
|
|
│ my description
|
|
│ Modified regular file file1:
|
|
│ 1 1: foo
|
|
│ 2: bar
|
|
│ Added regular file file2:
|
|
│ 1: foo
|
|
◉ rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0dae082
|
|
(empty) my description
|
|
"###);
|
|
|
|
// Test `--no-graph`
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--no-graph"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad36073
|
|
my description
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5af67e conflict
|
|
my description
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bcb590
|
|
my description
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0dae082
|
|
(empty) my description
|
|
"###);
|
|
|
|
// Test `--git` format, and that it implies `-p`
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "--no-graph", "--git"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:10.000 +07:00 66b42ad36073
|
|
my description
|
|
diff --git a/file1 b/file1
|
|
index e155302a24...2ab19ae607 100644
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,6 +1,1 @@
|
|
-<<<<<<<
|
|
-%%%%%%%
|
|
- foo
|
|
-+bar
|
|
-+++++++
|
|
->>>>>>>
|
|
+resolved
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 af536e5af67e conflict
|
|
my description
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:09.000 +07:00 6fbba7bcb590
|
|
my description
|
|
diff --git a/file1 b/file1
|
|
index 257cc5642c...3bd1f0e297 100644
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,1 +1,2 @@
|
|
foo
|
|
+bar
|
|
diff --git a/file2 b/file2
|
|
new file mode 100644
|
|
index 0000000000..257cc5642c
|
|
--- /dev/null
|
|
+++ b/file2
|
|
@@ -1,0 +1,1 @@
|
|
+foo
|
|
rlvkpnrzqnoo test.user@example.com 2001-02-03 04:05:08.000 +07:00 eac0d0dae082
|
|
(empty) my description
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_obslog_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)
|
|
};
|
|
|
|
test_env.jj_cmd_success(&repo_path, &["describe", "-m", "first"]);
|
|
|
|
// ui.log-word-wrap option applies to both graph/no-graph outputs
|
|
insta::assert_snapshot!(render(&["obslog"], 40, false), @r###"
|
|
@ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c1984c1
|
|
│ (empty) first
|
|
◉ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059e1b0
|
|
(empty) (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(render(&["obslog"], 40, true), @r###"
|
|
@ qpvuntsmwlqt test.user@example.com
|
|
│ 2001-02-03 04:05:08.000 +07:00
|
|
│ 69542c1984c1
|
|
│ (empty) first
|
|
◉ qpvuntsmwlqt test.user@example.com
|
|
2001-02-03 04:05:07.000 +07:00
|
|
230dd059e1b0
|
|
(empty) (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(render(&["obslog", "--no-graph"], 40, false), @r###"
|
|
qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c1984c1
|
|
(empty) first
|
|
qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059e1b0
|
|
(empty) (no description set)
|
|
"###);
|
|
insta::assert_snapshot!(render(&["obslog", "--no-graph"], 40, true), @r###"
|
|
qpvuntsmwlqt test.user@example.com
|
|
2001-02-03 04:05:08.000 +07:00
|
|
69542c1984c1
|
|
(empty) first
|
|
qpvuntsmwlqt test.user@example.com
|
|
2001-02-03 04:05:07.000 +07:00
|
|
230dd059e1b0
|
|
(empty) (no description set)
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_obslog_squash() {
|
|
let mut 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"]);
|
|
std::fs::write(repo_path.join("file1"), "foo\n").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["new", "-m", "second"]);
|
|
std::fs::write(repo_path.join("file1"), "foo\nbar\n").unwrap();
|
|
|
|
let edit_script = test_env.set_up_fake_editor();
|
|
std::fs::write(edit_script, "write\nsquashed").unwrap();
|
|
test_env.jj_cmd_success(&repo_path, &["squash"]);
|
|
|
|
let stdout = test_env.jj_cmd_success(&repo_path, &["obslog", "-p", "-r", "@-"]);
|
|
insta::assert_snapshot!(stdout, @r###"
|
|
◉ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:10.000 +07:00 27e721a5ba72
|
|
├─╮ squashed
|
|
│ │ Modified regular file file1:
|
|
│ │ 1 1: foo
|
|
│ │ 2: bar
|
|
◉ │ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:09.000 +07:00 9764e503e1a9
|
|
│ │ first
|
|
│ │ Added regular file file1:
|
|
│ │ 1: foo
|
|
◉ │ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:08.000 +07:00 69542c1984c1
|
|
│ │ (empty) first
|
|
◉ │ qpvuntsmwlqt test.user@example.com 2001-02-03 04:05:07.000 +07:00 230dd059e1b0
|
|
│ (empty) (no description set)
|
|
◉ kkmpptxzrspx test.user@example.com 2001-02-03 04:05:10.000 +07:00 f09a38899f2b
|
|
│ second
|
|
│ Modified regular file file1:
|
|
│ 1 1: foo
|
|
│ 2: bar
|
|
◉ kkmpptxzrspx test.user@example.com 2001-02-03 04:05:09.000 +07:00 579965369703
|
|
(empty) second
|
|
"###);
|
|
}
|