mirror of
https://github.com/jj-vcs/jj.git
synced 2026-07-03 14:02:54 +08:00
92b7af489d
Color-words diffs use formatter labels to distinguish removed and added tokens. When color is disabled, those labels are invisible, so inline word changes can collapse into unreadable text when stdout is not a TTY. Render color-words hunks as separate before and after lines whenever the formatter cannot emit color. This keeps the default diff format stable while making piped or redirected output readable. Color-words tests that rely on inline display force color output because inlining is only triggered when color is available, ANSI sequences are stripped before snapshotting to keep the snapshots readable. This does not make redirected diffs into git-format patches. Users still need --git for patch exchange or tools that require unified diff input. Fixes #5894. Related to #6972.
829 lines
36 KiB
Rust
829 lines
36 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;
|
||
use crate::common::to_toml_value;
|
||
|
||
#[test]
|
||
fn test_evolog_with_or_without_diff() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.write_file("file1", "foo\n");
|
||
work_dir.run_jj(["new", "-m", "my description"]).success();
|
||
work_dir.write_file("file1", "foo\nbar\n");
|
||
work_dir.write_file("file2", "foo\n");
|
||
work_dir
|
||
.run_jj(["rebase", "-r", "@", "-o", "root()"])
|
||
.success();
|
||
work_dir.write_file("file1", "resolved\n");
|
||
|
||
let output = work_dir.run_jj(["evolog"]);
|
||
insta::assert_snapshot!(output, @"
|
||
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
│ my description
|
||
│ -- operation 2c9e19859343 snapshot working copy
|
||
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
│ my description
|
||
│ -- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
│ my description
|
||
│ -- operation fff45c7cf767 snapshot working copy
|
||
○ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
[EOF]
|
||
");
|
||
|
||
// Color
|
||
let output = work_dir.run_jj(["--color=always", "evolog"]);
|
||
insta::assert_snapshot!(output, @"
|
||
[1m[38;5;2m@[0m [1m[38;5;13mr[38;5;8mlvkpnrz[39m [38;5;3mtest.user@example.com[39m [38;5;14m2001-02-03 08:05:10[39m [38;5;12m3[38;5;8m3c10ace[39m[0m
|
||
│ [1mmy description[0m
|
||
│ [38;5;8m--[39m operation [38;5;4m2c9e19859343[39m snapshot working copy
|
||
[1m[38;5;1m×[0m [1m[39mr[0m[38;5;8mlvkpnrz[1m[39m/1[0m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:09[39m [1m[38;5;4mcd[0m[38;5;8mf175ef[39m (hidden) [38;5;1m(conflict)[39m
|
||
│ my description
|
||
│ [38;5;8m--[39m operation [38;5;4m449a03ec4824[39m rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
○ [1m[39mr[0m[38;5;8mlvkpnrz[1m[39m/2[0m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:09[39m [1m[38;5;4m5[0m[38;5;8m1e08f95[39m (hidden)
|
||
│ my description
|
||
│ [38;5;8m--[39m operation [38;5;4mfff45c7cf767[39m snapshot working copy
|
||
○ [1m[39mr[0m[38;5;8mlvkpnrz[1m[39m/3[0m [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:08[39m [1m[38;5;4mb[0m[38;5;8m955b72e[39m (hidden)
|
||
[38;5;2m(empty)[39m my description
|
||
[38;5;8m--[39m operation [38;5;4mc5d06fd4ff51[39m new empty commit
|
||
[EOF]
|
||
");
|
||
|
||
// There should be no diff caused by the rebase because it was a pure rebase
|
||
// (even even though it resulted in a conflict).
|
||
let output = work_dir.run_jj(["evolog", "-p"]);
|
||
insta::assert_snapshot!(output, @r#"
|
||
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
│ my description
|
||
│ -- operation 2c9e19859343 snapshot working copy
|
||
│ Resolved conflict in file1:
|
||
│ 1 : <<<<<<< conflict 1 of 1
|
||
│ 2 : %%%%%%% diff from: qpvuntsm c664a51b (parents of rebased revision)
|
||
│ 3 : \\\\\\\ to: zzzzzzzz 00000000 (rebase destination)
|
||
│ 4 : -foo
|
||
│ 5 : +++++++ rlvkpnrz 51e08f95 "my description" (rebased revision)
|
||
│ 6 : foo
|
||
│ 7 : bar
|
||
│ 8 : >>>>>>> conflict 1 of 1 ends
|
||
│ 1: resolved
|
||
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
│ my description
|
||
│ -- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
│ my description
|
||
│ -- operation fff45c7cf767 snapshot working copy
|
||
│ Modified regular file file1:
|
||
│ 1 1: foo
|
||
│ 2: bar
|
||
│ Added regular file file2:
|
||
│ 1: foo
|
||
○ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
Modified commit description:
|
||
1: my description
|
||
[EOF]
|
||
"#);
|
||
|
||
// Multiple starting revisions
|
||
let output = work_dir.run_jj(["evolog", "-r.."]);
|
||
insta::assert_snapshot!(output, @"
|
||
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
│ my description
|
||
│ -- operation 2c9e19859343 snapshot working copy
|
||
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
│ my description
|
||
│ -- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
│ my description
|
||
│ -- operation fff45c7cf767 snapshot working copy
|
||
○ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c664a51b
|
||
│ (no description set)
|
||
│ -- operation b243f4039fc9 snapshot working copy
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
|
||
// Test `--limit`
|
||
let output = work_dir.run_jj(["evolog", "--limit=2"]);
|
||
insta::assert_snapshot!(output, @"
|
||
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
│ my description
|
||
│ -- operation 2c9e19859343 snapshot working copy
|
||
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
│ my description
|
||
│ -- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
[EOF]
|
||
");
|
||
|
||
// Test `--no-graph`
|
||
let output = work_dir.run_jj(["evolog", "--no-graph"]);
|
||
insta::assert_snapshot!(output, @"
|
||
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
my description
|
||
-- operation 2c9e19859343 snapshot working copy
|
||
rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
my description
|
||
-- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
my description
|
||
-- operation fff45c7cf767 snapshot working copy
|
||
rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
[EOF]
|
||
");
|
||
|
||
// Test `--git` format, and that it implies `-p`
|
||
let output = work_dir.run_jj(["evolog", "--no-graph", "--git"]);
|
||
insta::assert_snapshot!(output, @r#"
|
||
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
my description
|
||
-- operation 2c9e19859343 snapshot working copy
|
||
diff --git a/file1 b/file1
|
||
index 0000000000..2ab19ae607 100644
|
||
--- a/file1
|
||
+++ b/file1
|
||
@@ -1,8 +1,1 @@
|
||
-<<<<<<< conflict 1 of 1
|
||
-%%%%%%% diff from: qpvuntsm c664a51b (parents of rebased revision)
|
||
-\\\\\\\ to: zzzzzzzz 00000000 (rebase destination)
|
||
--foo
|
||
-+++++++ rlvkpnrz 51e08f95 "my description" (rebased revision)
|
||
-foo
|
||
-bar
|
||
->>>>>>> conflict 1 of 1 ends
|
||
+resolved
|
||
rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
my description
|
||
-- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
my description
|
||
-- operation fff45c7cf767 snapshot working copy
|
||
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
|
||
@@ -0,0 +1,1 @@
|
||
+foo
|
||
rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
diff --git a/JJ-COMMIT-DESCRIPTION b/JJ-COMMIT-DESCRIPTION
|
||
--- JJ-COMMIT-DESCRIPTION
|
||
+++ JJ-COMMIT-DESCRIPTION
|
||
@@ -0,0 +1,1 @@
|
||
+my description
|
||
[EOF]
|
||
"#);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_template() {
|
||
let test_env = TestEnvironment::default();
|
||
|
||
test_env
|
||
.run_jj_in(".", ["git", "init", "--colocate", "origin"])
|
||
.success();
|
||
let origin_dir = test_env.work_dir("origin");
|
||
origin_dir
|
||
.run_jj(["bookmark", "set", "-r@", "main"])
|
||
.success();
|
||
|
||
test_env
|
||
.run_jj_in(".", ["git", "clone", "origin", "local"])
|
||
.success();
|
||
let work_dir = test_env.work_dir("local");
|
||
|
||
// default template with operation
|
||
let output = work_dir.run_jj(["evolog", "-r@"]);
|
||
insta::assert_snapshot!(output, @"
|
||
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 2b17ac71
|
||
(empty) (no description set)
|
||
-- operation 379ad03e4902 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
let output = work_dir.run_jj(["evolog", "-r@", "--color=debug"]);
|
||
insta::assert_snapshot!(output, @"
|
||
[1m[38;5;2m<<evolog commit node working_copy mutable::@>>[0m [1m[38;5;13m<<evolog working_copy mutable commit change_id shortest prefix::k>>[38;5;8m<<evolog working_copy mutable commit change_id shortest rest::kmpptxz>>[39m<<evolog working_copy mutable:: >>[38;5;3m<<evolog working_copy mutable commit author email local::test.user>><<evolog working_copy mutable commit author email::@>><<evolog working_copy mutable commit author email domain::example.com>>[39m<<evolog working_copy mutable:: >>[38;5;14m<<evolog working_copy mutable commit committer timestamp local format::2001-02-03 08:05:09>>[39m<<evolog working_copy mutable:: >>[38;5;12m<<evolog working_copy mutable commit commit_id shortest prefix::2>>[38;5;8m<<evolog working_copy mutable commit commit_id shortest rest::b17ac71>>[39m<<evolog working_copy mutable::>>[0m
|
||
[1m[38;5;10m<<evolog working_copy mutable empty::(empty)>>[39m<<evolog working_copy mutable:: >>[38;5;10m<<evolog working_copy mutable empty description placeholder::(no description set)>>[39m<<evolog working_copy mutable::>>[0m
|
||
[38;5;8m<<evolog separator::-->>[39m<<evolog:: operation >>[38;5;4m<<evolog operation id short::379ad03e4902>>[39m<<evolog:: >><<evolog operation description first_line::add workspace 'default'>><<evolog::>>
|
||
[EOF]
|
||
");
|
||
|
||
// default template without operation
|
||
let output = work_dir.run_jj(["evolog", "-rmain@origin"]);
|
||
insta::assert_snapshot!(output, @"
|
||
◆ qpvuntsm test.user@example.com 2001-02-03 08:05:07 main@origin e8849ae1
|
||
(empty) (no description set)
|
||
[EOF]
|
||
");
|
||
let output = work_dir.run_jj(["evolog", "-rmain@origin", "--color=debug"]);
|
||
insta::assert_snapshot!(output, @"
|
||
[1m[38;5;14m<<evolog commit node immutable::◆>>[0m [1m[38;5;5m<<evolog immutable commit change_id shortest prefix::q>>[0m[38;5;8m<<evolog immutable commit change_id shortest rest::pvuntsm>>[39m<<evolog immutable:: >>[38;5;3m<<evolog immutable commit author email local::test.user>><<evolog immutable commit author email::@>><<evolog immutable commit author email domain::example.com>>[39m<<evolog immutable:: >>[38;5;6m<<evolog immutable commit committer timestamp local format::2001-02-03 08:05:07>>[39m<<evolog immutable:: >>[38;5;5m<<evolog immutable commit bookmarks name::main>><<evolog immutable commit bookmarks::@>><<evolog immutable commit bookmarks remote::origin>>[39m<<evolog immutable:: >>[1m[38;5;4m<<evolog immutable commit commit_id shortest prefix::e>>[0m[38;5;8m<<evolog immutable commit commit_id shortest rest::8849ae1>>[39m<<evolog immutable::>>
|
||
[38;5;2m<<evolog immutable empty::(empty)>>[39m<<evolog immutable:: >>[38;5;2m<<evolog immutable empty description placeholder::(no description set)>>[39m<<evolog immutable::>>
|
||
[EOF]
|
||
");
|
||
|
||
// default template with root commit
|
||
let output = work_dir.run_jj(["evolog", "-rroot()"]);
|
||
insta::assert_snapshot!(output, @"
|
||
◆ zzzzzzzz root() 00000000
|
||
[EOF]
|
||
");
|
||
let output = work_dir.run_jj(["evolog", "-rroot()", "--color=debug"]);
|
||
insta::assert_snapshot!(output, @"
|
||
[1m[38;5;14m<<evolog commit node immutable::◆>>[0m [1m[38;5;5m<<evolog immutable commit change_id shortest prefix::z>>[0m[38;5;8m<<evolog immutable commit change_id shortest rest::zzzzzzz>>[39m<<evolog immutable:: >>[38;5;2m<<evolog immutable root::root()>>[39m<<evolog immutable:: >>[1m[38;5;4m<<evolog immutable commit commit_id shortest prefix::0>>[0m[38;5;8m<<evolog immutable commit commit_id shortest rest::0000000>>[39m<<evolog immutable::>>
|
||
[EOF]
|
||
");
|
||
|
||
// JSON output with operation
|
||
let output = work_dir.run_jj(["evolog", "-r@", "-Tjson(self)", "--no-graph"]);
|
||
insta::assert_snapshot!(output, @r#"{"commit":{"commit_id":"2b17ac719c7db025e2514f5708d2b0328fc6b268","parents":["0000000000000000000000000000000000000000"],"change_id":"kkmpptxzrspxrzommnulwmwkkqwworpl","description":"","author":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:09+07:00"},"committer":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:09+07:00"}},"operation":{"id":"379ad03e4902abe8dddde72816a45f76a8f81e9c8800b498b4808d0e96c5f2b79866003108fd88c9664387c1a2e15d9b2bab18c33ba0d2a9803eb8b8ea1cf81f","parents":["00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"],"time":{"start":"2001-02-03T04:05:09+07:00","end":"2001-02-03T04:05:09+07:00"},"description":"add workspace 'default'","hostname":"host.example.com","username":"test-username","is_snapshot":false,"workspace_name":null,"attributes":{}}}[EOF]"#);
|
||
|
||
// JSON output without operation
|
||
let output = work_dir.run_jj(["evolog", "-rmain@origin", "-Tjson(self)", "--no-graph"]);
|
||
insta::assert_snapshot!(output, @r#"{"commit":{"commit_id":"e8849ae12c709f2321908879bc724fdb2ab8a781","parents":["0000000000000000000000000000000000000000"],"change_id":"qpvuntsmwlqtpsluzzsnyyzlmlwvmlnu","description":"","author":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:07+07:00"},"committer":{"name":"Test User","email":"test.user@example.com","timestamp":"2001-02-03T04:05:07+07:00"}},"operation":null}[EOF]"#);
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_with_custom_symbols() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.write_file("file1", "foo\n");
|
||
work_dir.run_jj(["new", "-m", "my description"]).success();
|
||
work_dir.write_file("file1", "foo\nbar\n");
|
||
work_dir.write_file("file2", "foo\n");
|
||
work_dir
|
||
.run_jj(["rebase", "-r", "@", "-o", "root()"])
|
||
.success();
|
||
work_dir.write_file("file1", "resolved\n");
|
||
|
||
let config = "templates.log_node='if(current_working_copy, \"$\", \"┝\")'";
|
||
let output = work_dir.run_jj(["evolog", "--config", config]);
|
||
|
||
insta::assert_snapshot!(output, @"
|
||
$ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
|
||
│ my description
|
||
│ -- operation 1684911914c1 snapshot working copy
|
||
┝ rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 cdf175ef (hidden) (conflict)
|
||
│ my description
|
||
│ -- operation 449a03ec4824 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
|
||
┝ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
|
||
│ my description
|
||
│ -- operation fff45c7cf767 snapshot working copy
|
||
┝ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
|
||
(empty) my description
|
||
-- operation c5d06fd4ff51 new empty commit
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_word_wrap() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
let render = |args: &[&str], columns: u32, word_wrap: bool| {
|
||
let word_wrap = to_toml_value(word_wrap);
|
||
work_dir.run_jj_with(|cmd| {
|
||
cmd.args(args)
|
||
.arg(format!("--config=ui.log-word-wrap={word_wrap}"))
|
||
.env("COLUMNS", columns.to_string())
|
||
})
|
||
};
|
||
|
||
work_dir.run_jj(["describe", "-m", "first"]).success();
|
||
|
||
// ui.log-word-wrap option applies to both graph/no-graph outputs
|
||
insta::assert_snapshot!(render(&["evolog"], 40, false), @"
|
||
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
|
||
│ (empty) first
|
||
│ -- operation e131aa88d7c9 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
insta::assert_snapshot!(render(&["evolog"], 40, true), @"
|
||
@ qpvuntsm test.user@example.com
|
||
│ 2001-02-03 08:05:08 68a50538
|
||
│ (empty) first
|
||
│ -- operation e131aa88d7c9 describe
|
||
│ commit
|
||
│ e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
○ qpvuntsm/1 test.user@example.com
|
||
2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add
|
||
workspace 'default'
|
||
[EOF]
|
||
");
|
||
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, false), @"
|
||
qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
|
||
(empty) first
|
||
-- operation e131aa88d7c9 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, true), @"
|
||
qpvuntsm test.user@example.com
|
||
2001-02-03 08:05:08 68a50538
|
||
(empty) first
|
||
-- operation e131aa88d7c9 describe
|
||
commit
|
||
e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
qpvuntsm/1 test.user@example.com
|
||
2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace
|
||
'default'
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_squash() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.run_jj(["describe", "-m", "first"]).success();
|
||
work_dir.write_file("file1", "foo\n");
|
||
work_dir.run_jj(["new", "-m", "second"]).success();
|
||
work_dir.write_file("file1", "foo\nbar\n");
|
||
|
||
// not partial
|
||
work_dir.run_jj(["squash", "-m", "squashed 1"]).success();
|
||
|
||
work_dir.run_jj(["describe", "-m", "third"]).success();
|
||
work_dir.write_file("file1", "foo\nbar\nbaz\n");
|
||
work_dir.write_file("file2", "foo2\n");
|
||
work_dir.write_file("file3", "foo3\n");
|
||
|
||
// partial
|
||
work_dir
|
||
.run_jj(["squash", "-m", "squashed 2", "file1"])
|
||
.success();
|
||
|
||
work_dir.run_jj(["new", "-m", "fourth"]).success();
|
||
work_dir.write_file("file4", "foo4\n");
|
||
|
||
work_dir.run_jj(["new", "-m", "fifth"]).success();
|
||
work_dir.write_file("file5", "foo5\n");
|
||
|
||
// multiple sources
|
||
work_dir
|
||
.run_jj([
|
||
"squash",
|
||
"-msquashed 3",
|
||
"--from=subject(fourth)|subject(fifth)",
|
||
"--into=subject(squash*)",
|
||
])
|
||
.success();
|
||
|
||
let output = work_dir.run_jj(["evolog", "-p", "-rsubject(squash*)"]);
|
||
insta::assert_snapshot!(output, @r"
|
||
○ qpvuntsm test.user@example.com 2001-02-03 08:05:15 5f3281c6
|
||
├─┬─╮ squashed 3
|
||
│ │ │ -- operation 834dc47a2691 squash commits into 5ec0619af5cb4f7707a556a71a6f96af0bc294d2
|
||
│ │ │ Modified commit description:
|
||
│ │ │ 1 : <<<<<<< conflict 1 of 1
|
||
│ │ │ 2 : +++++++ side #1
|
||
│ │ │ 3 : squashed 2
|
||
│ │ │ 4 : %%%%%%% diff from: base #1
|
||
│ │ │ 5 : \\\\\\\ to: side #2
|
||
│ │ │ 6 : +fourth
|
||
│ │ │ 7 : %%%%%%% diff from: base #2
|
||
│ │ │ 8 : \\\\\\\ to: side #3
|
||
│ │ │ 9 : +fifth
|
||
│ │ │ 10 : >>>>>>> conflict 1 of 1 ends
|
||
│ │ │ 1: squashed 3
|
||
│ │ ○ vruxwmqv/0 test.user@example.com 2001-02-03 08:05:15 770795d0 (hidden)
|
||
│ │ │ fifth
|
||
│ │ │ -- operation d727647433c1 snapshot working copy
|
||
│ │ │ Added regular file file5:
|
||
│ │ │ 1: foo5
|
||
│ │ ○ vruxwmqv/1 test.user@example.com 2001-02-03 08:05:14 2e0123d1 (hidden)
|
||
│ │ (empty) fifth
|
||
│ │ -- operation 9b66a7792e7b new empty commit
|
||
│ │ Modified commit description:
|
||
│ │ 1: fifth
|
||
│ ○ yqosqzyt/0 test.user@example.com 2001-02-03 08:05:14 ea8161b6 (hidden)
|
||
│ │ fourth
|
||
│ │ -- operation e9387215360e snapshot working copy
|
||
│ │ Added regular file file4:
|
||
│ │ 1: foo4
|
||
│ ○ yqosqzyt/1 test.user@example.com 2001-02-03 08:05:13 1de5fdb6 (hidden)
|
||
│ (empty) fourth
|
||
│ -- operation 4746e5b93ebb new empty commit
|
||
│ Modified commit description:
|
||
│ 1: fourth
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:12 5ec0619a (hidden)
|
||
├─╮ squashed 2
|
||
│ │ -- operation 47521583d5c7 squash commits into 690858846504af0e42fde980fdacf9851559ebb8
|
||
│ │ Modified commit description:
|
||
│ │ 1 : <<<<<<< conflict 1 of 1
|
||
│ │ 2 : +++++++ side #1
|
||
│ │ 3 : squashed 1
|
||
│ │ 4 : %%%%%%% diff from: base
|
||
│ │ 5 : \\\\\\\ to: side #2
|
||
│ │ 6 : +third
|
||
│ │ 7 : >>>>>>> conflict 1 of 1 ends
|
||
│ │ 1: squashed 2
|
||
│ │ Removed regular file file2:
|
||
│ │ 1 : foo2
|
||
│ │ Removed regular file file3:
|
||
│ │ 1 : foo3
|
||
│ ○ zsuskuln/3 test.user@example.com 2001-02-03 08:05:12 cce957f1 (hidden)
|
||
│ │ third
|
||
│ │ -- operation 4406238f2235 snapshot working copy
|
||
│ │ Modified regular file file1:
|
||
│ │ 1 1: foo
|
||
│ │ 2 2: bar
|
||
│ │ 3: baz
|
||
│ │ Added regular file file2:
|
||
│ │ 1: foo2
|
||
│ │ Added regular file file3:
|
||
│ │ 1: foo3
|
||
│ ○ zsuskuln/4 test.user@example.com 2001-02-03 08:05:11 3a2a4253 (hidden)
|
||
│ │ (empty) third
|
||
│ │ -- operation 1ef878808235 describe commit ebec10f449ad7ab92c7293efab5e3db2d8e9fea1
|
||
│ │ Modified commit description:
|
||
│ │ 1: third
|
||
│ ○ zsuskuln/5 test.user@example.com 2001-02-03 08:05:10 ebec10f4 (hidden)
|
||
│ (empty) (no description set)
|
||
│ -- operation c6c228cfffd1 squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
|
||
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:10 69085884 (hidden)
|
||
├─╮ squashed 1
|
||
│ │ -- operation c6c228cfffd1 squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
|
||
│ │ Modified commit description:
|
||
│ │ 1 : <<<<<<< conflict 1 of 1
|
||
│ │ 2 : %%%%%%% diff from: base
|
||
│ │ 3 : \\\\\\\ to: side #1
|
||
│ │ 4 : +first
|
||
│ │ 5 : +++++++ side #2
|
||
│ │ 6 : second
|
||
│ │ 7 : >>>>>>> conflict 1 of 1 ends
|
||
│ │ 1: squashed 1
|
||
│ ○ kkmpptxz/0 test.user@example.com 2001-02-03 08:05:10 a3759c9d (hidden)
|
||
│ │ second
|
||
│ │ -- operation d7409e8bb16e snapshot working copy
|
||
│ │ Modified regular file file1:
|
||
│ │ 1 1: foo
|
||
│ │ 2: bar
|
||
│ ○ kkmpptxz/1 test.user@example.com 2001-02-03 08:05:09 a5b2f625 (hidden)
|
||
│ (empty) second
|
||
│ -- operation 3882a27a689e new empty commit
|
||
│ Modified commit description:
|
||
│ 1: second
|
||
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:09 5878cbe0 (hidden)
|
||
│ first
|
||
│ -- operation 09276dd2e7a3 snapshot working copy
|
||
│ Added regular file file1:
|
||
│ 1: foo
|
||
○ qpvuntsm/4 test.user@example.com 2001-02-03 08:05:08 68a50538 (hidden)
|
||
│ (empty) first
|
||
│ -- operation e131aa88d7c9 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
│ Modified commit description:
|
||
│ 1: first
|
||
○ qpvuntsm/5 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_abandoned_op() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.write_file("file1", "");
|
||
work_dir.run_jj(["describe", "-mfile1"]).success();
|
||
work_dir.write_file("file2", "");
|
||
work_dir.run_jj(["describe", "-mfile2"]).success();
|
||
|
||
insta::assert_snapshot!(work_dir.run_jj(["evolog", "--summary"]), @"
|
||
@ qpvuntsm test.user@example.com 2001-02-03 08:05:09 e1869e5d
|
||
│ file2
|
||
│ -- operation fc77633b6bae describe commit 32cabcfa05c604a36074d74ae59964e4e5eb18e9
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 32cabcfa (hidden)
|
||
│ file1
|
||
│ -- operation b53688d1ffdb snapshot working copy
|
||
│ A file2
|
||
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:08 cb5ebdc6 (hidden)
|
||
│ file1
|
||
│ -- operation da73408c375b describe commit 093c3c9624b6cfe22b310586f5638792aa80e6d7
|
||
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:08 093c3c96 (hidden)
|
||
│ (no description set)
|
||
│ -- operation 7957eae6f36e snapshot working copy
|
||
│ A file1
|
||
○ qpvuntsm/4 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
[EOF]
|
||
");
|
||
|
||
// Truncate up to the last "describe -mfile2" operation
|
||
work_dir.run_jj(["op", "abandon", "..@-"]).success();
|
||
|
||
// Unreachable predecessors are omitted, therefore the bottom commit shows
|
||
// diffs from the empty tree.
|
||
insta::assert_snapshot!(work_dir.run_jj(["evolog", "--summary"]), @"
|
||
@ qpvuntsm test.user@example.com 2001-02-03 08:05:09 e1869e5d
|
||
│ file2
|
||
│ -- operation 05862c165a9d describe commit 32cabcfa05c604a36074d74ae59964e4e5eb18e9
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 32cabcfa (hidden)
|
||
file1
|
||
A file1
|
||
A file2
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_with_no_template() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
let output = work_dir.run_jj(["evolog", "-T"]);
|
||
insta::assert_snapshot!(output, @"
|
||
------- stderr -------
|
||
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_config_list
|
||
- builtin_config_list_detailed
|
||
- builtin_draft_commit_description
|
||
- builtin_draft_commit_description_with_diff
|
||
- builtin_evolog_compact
|
||
- builtin_log_comfortable
|
||
- builtin_log_compact
|
||
- builtin_log_compact_full_description
|
||
- builtin_log_detailed
|
||
- builtin_log_node
|
||
- builtin_log_node_ascii
|
||
- builtin_log_oneline
|
||
- builtin_log_redacted
|
||
- builtin_op_log_comfortable
|
||
- builtin_op_log_compact
|
||
- builtin_op_log_node
|
||
- builtin_op_log_node_ascii
|
||
- builtin_op_log_oneline
|
||
- builtin_op_log_redacted
|
||
- commit_summary_separator
|
||
- default_commit_description
|
||
- description_placeholder
|
||
- email_placeholder
|
||
- empty_commit_marker
|
||
- git_format_patch_email_headers
|
||
- name_placeholder
|
||
[EOF]
|
||
[exit status: 2]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_reversed_no_graph() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.run_jj(["describe", "-m", "a"]).success();
|
||
work_dir.run_jj(["describe", "-m", "b"]).success();
|
||
work_dir.run_jj(["describe", "-m", "c"]).success();
|
||
let output = work_dir.run_jj(["evolog", "--reversed", "--no-graph"]);
|
||
insta::assert_snapshot!(output, @"
|
||
qpvuntsm/3 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
qpvuntsm/2 test.user@example.com 2001-02-03 08:05:08 b86e28cd (hidden)
|
||
(empty) a
|
||
-- operation a595dd82bbc9 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
|
||
(empty) b
|
||
-- operation 185b1ed3ff38 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
|
||
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
|
||
(empty) c
|
||
-- operation 63b6e96eb14e describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
|
||
[EOF]
|
||
");
|
||
|
||
let output = work_dir.run_jj(["evolog", "--limit=2", "--reversed", "--no-graph"]);
|
||
insta::assert_snapshot!(output, @"
|
||
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
|
||
(empty) b
|
||
-- operation 185b1ed3ff38 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
|
||
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
|
||
(empty) c
|
||
-- operation 63b6e96eb14e describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_reverse_with_graph() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
work_dir.run_jj(["describe", "-m", "a"]).success();
|
||
work_dir.run_jj(["describe", "-m", "b"]).success();
|
||
work_dir.run_jj(["describe", "-m", "c"]).success();
|
||
work_dir
|
||
.run_jj(["new", "-r", "subject(c)", "-m", "d"])
|
||
.success();
|
||
work_dir
|
||
.run_jj(["new", "-r", "subject(c)", "-m", "e"])
|
||
.success();
|
||
work_dir
|
||
.run_jj([
|
||
"squash",
|
||
"--from=subject(d)|subject(e)",
|
||
"--to=subject(c)",
|
||
"-m",
|
||
"c+d+e",
|
||
])
|
||
.success();
|
||
let output = work_dir.run_jj(["evolog", "-r", "subject(c+d+e)", "--reversed"]);
|
||
insta::assert_snapshot!(output, @"
|
||
○ qpvuntsm/4 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
│ (empty) (no description set)
|
||
│ -- operation 90267f31f904 add workspace 'default'
|
||
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:08 b86e28cd (hidden)
|
||
│ (empty) a
|
||
│ -- operation a595dd82bbc9 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
|
||
│ (empty) b
|
||
│ -- operation 185b1ed3ff38 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:10 b28cda4b (hidden)
|
||
│ (empty) c
|
||
│ -- operation 63b6e96eb14e describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
|
||
│ ○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:11 6a4ff8aa (hidden)
|
||
├─╯ (empty) d
|
||
│ -- operation 834d3c2b578c new empty commit
|
||
│ ○ royxmykx/0 test.user@example.com 2001-02-03 08:05:12 7dea2d1d (hidden)
|
||
├─╯ (empty) e
|
||
│ -- operation 303ac509f441 new empty commit
|
||
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
|
||
(empty) c+d+e
|
||
-- operation 10809bce2b20 squash commits into b28cda4b118fc50495ca34a24f030abc078d032e
|
||
[EOF]
|
||
");
|
||
|
||
let output = work_dir.run_jj(["evolog", "-rsubject(c+d+e)", "--limit=3", "--reversed"]);
|
||
insta::assert_snapshot!(output, @"
|
||
○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:11 6a4ff8aa (hidden)
|
||
│ (empty) d
|
||
│ -- operation 834d3c2b578c new empty commit
|
||
│ ○ royxmykx/0 test.user@example.com 2001-02-03 08:05:12 7dea2d1d (hidden)
|
||
├─╯ (empty) e
|
||
│ -- operation 303ac509f441 new empty commit
|
||
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
|
||
(empty) c+d+e
|
||
-- operation 10809bce2b20 squash commits into b28cda4b118fc50495ca34a24f030abc078d032e
|
||
[EOF]
|
||
");
|
||
}
|
||
|
||
#[test]
|
||
fn test_evolog_template_predecessors_and_inter_diff() {
|
||
let test_env = TestEnvironment::default();
|
||
test_env.run_jj_in(".", ["git", "init", "repo"]).success();
|
||
let work_dir = test_env.work_dir("repo");
|
||
|
||
// Base change "c".
|
||
work_dir.run_jj(["describe", "-m", "c"]).success();
|
||
|
||
// Two sibling changes to be squashed into "c".
|
||
work_dir
|
||
.run_jj(["new", "-r", "subject(c)", "-m", "d"])
|
||
.success();
|
||
work_dir.write_file("file1", "d\n");
|
||
work_dir.write_file("file2", "d\n");
|
||
|
||
// Test inter_diff with fileset argument before squash.
|
||
let output = work_dir
|
||
.run_jj([
|
||
"evolog",
|
||
"-r@",
|
||
r#"-T=builtin_evolog_compact ++ self.inter_diff("file1").git()"#,
|
||
])
|
||
.success();
|
||
insta::assert_snapshot!(output, @"
|
||
@ kkmpptxz test.user@example.com 2001-02-03 08:05:10 c6106cde
|
||
│ d
|
||
│ -- operation d23cb3c75003 snapshot working copy
|
||
│ diff --git a/file1 b/file1
|
||
│ new file mode 100644
|
||
│ index 0000000000..4bcfe98e64
|
||
│ --- /dev/null
|
||
│ +++ b/file1
|
||
│ @@ -0,0 +1,1 @@
|
||
│ +d
|
||
○ kkmpptxz/1 test.user@example.com 2001-02-03 08:05:09 780d27be (hidden)
|
||
(empty) d
|
||
-- operation 442a733fd961 new empty commit
|
||
[EOF]
|
||
");
|
||
|
||
work_dir
|
||
.run_jj(["new", "-r", "subject(c)", "-m", "e"])
|
||
.success();
|
||
work_dir.write_file("file3", "e\n");
|
||
|
||
// Squash both changes into "c". This should record multiple predecessors
|
||
// for the rewritten commit (previous version of "c" + squashed commits).
|
||
work_dir
|
||
.run_jj([
|
||
"squash",
|
||
"--from=subject(d)|subject(e)",
|
||
"--to=subject(c)",
|
||
"-m",
|
||
"c+d+e",
|
||
])
|
||
.success();
|
||
|
||
// The rewritten commit has multiple predecessors. `inter_diff()` should be
|
||
// empty because it's computed against predecessor trees rebased onto the
|
||
// destination parents.
|
||
let output = work_dir
|
||
.run_jj([
|
||
"evolog",
|
||
"-rsubject(c+d+e)",
|
||
r#"-T=builtin_evolog_compact ++ separate("\n", "predecessors: " ++ predecessors.map(|c| c.commit_id().shortest(8)).join(","), inter_diff.summary())"#,
|
||
])
|
||
.success();
|
||
insta::assert_snapshot!(output, @"
|
||
○ qpvuntsm test.user@example.com 2001-02-03 08:05:12 92850c35
|
||
├─┬─╮ c+d+e
|
||
│ │ │ -- operation a0d2f98ffe2f squash commits into e3ce68f48b53d16111a1310c7f417a39c2934931
|
||
│ │ │ predecessors: e3ce68f4,c6106cde,870e49d7
|
||
│ │ ○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:12 870e49d7 (hidden)
|
||
│ │ │ e
|
||
│ │ │ -- operation 3e23aa680b92 snapshot working copy
|
||
│ │ │ predecessors: 3345e308
|
||
│ │ │ A file3
|
||
│ │ ○ mzvwutvl/1 test.user@example.com 2001-02-03 08:05:11 3345e308 (hidden)
|
||
│ │ (empty) e
|
||
│ │ -- operation d61bdfd0cb90 new empty commit
|
||
│ │ predecessors:
|
||
│ ○ kkmpptxz/0 test.user@example.com 2001-02-03 08:05:10 c6106cde (hidden)
|
||
│ │ d
|
||
│ │ -- operation d23cb3c75003 snapshot working copy
|
||
│ │ predecessors: 780d27be
|
||
│ │ A file1
|
||
│ │ A file2
|
||
│ ○ kkmpptxz/1 test.user@example.com 2001-02-03 08:05:09 780d27be (hidden)
|
||
│ (empty) d
|
||
│ -- operation 442a733fd961 new empty commit
|
||
│ predecessors:
|
||
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:08 e3ce68f4 (hidden)
|
||
│ (empty) c
|
||
│ -- operation ca53c68e9c36 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
|
||
│ predecessors: e8849ae1
|
||
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
|
||
(empty) (no description set)
|
||
-- operation 90267f31f904 add workspace 'default'
|
||
predecessors:
|
||
[EOF]
|
||
");
|
||
}
|