1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
|
// 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::to_toml_value;
use crate::common::TestEnvironment;
#[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", "@", "-d", "root()"])
.success();
work_dir.write_file("file1", "resolved\n");
let output = work_dir.run_jj(["evolog"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 3499115d3831 (2001-02-03 08:05:10) snapshot working copy
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
│ -- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
│ -- operation 18a971ce330a (2001-02-03 08:05:09) snapshot working copy
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
-- operation e0f8e58b3800 (2001-02-03 08:05:08) new empty commit
[EOF]
");
// Color
let output = work_dir.run_jj(["--color=always", "evolog"]);
insta::assert_snapshot!(output, @r"
[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;4m3499115d3831[39m ([38;5;6m2001-02-03 08:05:10[39m) snapshot working copy
[1m[38;5;1m×[0m [1m[39mr[0m[38;5;8mlvkpnrz[39m hidden [38;5;3mtest.user@example.com[39m [38;5;6m2001-02-03 08:05:09[39m [1m[38;5;4m7[0m[38;5;8mf56b2a0[39m [38;5;1mconflict[39m
│ my description
│ [38;5;8m--[39m operation [38;5;4meb87ec366530[39m ([38;5;6m2001-02-03 08:05:09[39m) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ [1m[39mr[0m[38;5;8mlvkpnrz[39m hidden [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
│ my description
│ [38;5;8m--[39m operation [38;5;4m18a971ce330a[39m ([38;5;6m2001-02-03 08:05:09[39m) snapshot working copy
○ [1m[39mr[0m[38;5;8mlvkpnrz[39m hidden [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
[38;5;2m(empty)[39m my description
[38;5;8m--[39m operation [38;5;4me0f8e58b3800[39m ([38;5;6m2001-02-03 08:05:08[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 3499115d3831 (2001-02-03 08:05:10) snapshot working copy
│ Resolved conflict in file1:
│ 1 : <<<<<<< Conflict 1 of 1
│ 2 : %%%%%%% Changes from base to side #1
│ 3 : -foo
│ 4 : +++++++ Contents of side #2
│ 5 : foo
│ 6 : bar
│ 7 1: >>>>>>> Conflict 1 of 1 endsresolved
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
│ -- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
│ -- operation 18a971ce330a (2001-02-03 08:05:09) snapshot working copy
│ Modified regular file file1:
│ 1 1: foo
│ 2: bar
│ Added regular file file2:
│ 1: foo
○ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
-- operation e0f8e58b3800 (2001-02-03 08:05:08) new empty commit
[EOF]
");
// Test `--limit`
let output = work_dir.run_jj(["evolog", "--limit=2"]);
insta::assert_snapshot!(output, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 3499115d3831 (2001-02-03 08:05:10) snapshot working copy
× rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
│ -- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
[EOF]
");
// Test `--no-graph`
let output = work_dir.run_jj(["evolog", "--no-graph"]);
insta::assert_snapshot!(output, @r"
rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
my description
-- operation 3499115d3831 (2001-02-03 08:05:10) snapshot working copy
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
my description
-- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
my description
-- operation 18a971ce330a (2001-02-03 08:05:09) snapshot working copy
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
-- operation e0f8e58b3800 (2001-02-03 08:05:08) 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 3499115d3831 (2001-02-03 08:05:10) snapshot working copy
diff --git a/file1 b/file1
index 0000000000..2ab19ae607 100644
--- a/file1
+++ b/file1
@@ -1,7 +1,1 @@
-<<<<<<< Conflict 1 of 1
-%%%%%%% Changes from base to side #1
--foo
-+++++++ Contents of side #2
-foo
-bar
->>>>>>> Conflict 1 of 1 ends
+resolved
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
my description
-- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
my description
-- operation 18a971ce330a (2001-02-03 08:05:09) 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 hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
-- operation e0f8e58b3800 (2001-02-03 08:05:08) new empty commit
[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", "@", "-d", "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, @r"
$ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 3622beb20303 (2001-02-03 08:05:10) snapshot working copy
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 7f56b2a0 conflict
│ my description
│ -- operation eb87ec366530 (2001-02-03 08:05:09) rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:09 51e08f95
│ my description
│ -- operation 18a971ce330a (2001-02-03 08:05:09) snapshot working copy
┝ rlvkpnrz hidden test.user@example.com 2001-02-03 08:05:08 b955b72e
(empty) my description
-- operation e0f8e58b3800 (2001-02-03 08:05:08) 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), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
│ (empty) first
│ -- operation 75545f7ff2df (2001-02-03 08:05:08) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(render(&["evolog"], 40, true), @r"
@ qpvuntsm test.user@example.com
│ 2001-02-03 08:05:08 68a50538
│ (empty) first
│ -- operation 75545f7ff2df (2001-02-03
│ 08:05:08) describe commit
│ e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm hidden test.user@example.com
2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03
08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, false), @r"
qpvuntsm test.user@example.com 2001-02-03 08:05:08 68a50538
(empty) first
-- operation 75545f7ff2df (2001-02-03 08:05:08) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[EOF]
");
insta::assert_snapshot!(render(&["evolog", "--no-graph"], 40, true), @r"
qpvuntsm test.user@example.com
2001-02-03 08:05:08 68a50538
(empty) first
-- operation 75545f7ff2df (2001-02-03
08:05:08) describe commit
e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm hidden test.user@example.com
2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03
08:05:07) 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=description('fourth')|description('fifth')",
"--into=description('squash')",
])
.success();
let output = work_dir.run_jj(["evolog", "-p", "-r", "description('squash')"]);
insta::assert_snapshot!(output, @r"
○ qpvuntsm test.user@example.com 2001-02-03 08:05:15 5f3281c6
├─┬─╮ squashed 3
│ │ │ -- operation 838e6d867fda (2001-02-03 08:05:15) squash commits into 5ec0619af5cb4f7707a556a71a6f96af0bc294d2
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:15 770795d0
│ │ │ fifth
│ │ │ -- operation 1d38c000b52d (2001-02-03 08:05:15) snapshot working copy
│ │ │ Added regular file file5:
│ │ │ 1: foo5
│ │ ○ vruxwmqv hidden test.user@example.com 2001-02-03 08:05:14 2e0123d1
│ │ (empty) fifth
│ │ -- operation fc852ed87801 (2001-02-03 08:05:14) new empty commit
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:14 ea8161b6
│ │ fourth
│ │ -- operation 3b09d55dfa6e (2001-02-03 08:05:14) snapshot working copy
│ │ Added regular file file4:
│ │ 1: foo4
│ ○ yqosqzyt hidden test.user@example.com 2001-02-03 08:05:13 1de5fdb6
│ (empty) fourth
│ -- operation 9404a551035a (2001-02-03 08:05:13) new empty commit
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:12 5ec0619a
├─╮ squashed 2
│ │ -- operation fa9796d12627 (2001-02-03 08:05:12) squash commits into 690858846504af0e42fde980fdacf9851559ebb8
│ │ Removed regular file file2:
│ │ 1 : foo2
│ │ Removed regular file file3:
│ │ 1 : foo3
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:12 cce957f1
│ │ third
│ │ -- operation de96267cd621 (2001-02-03 08:05:12) 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 hidden test.user@example.com 2001-02-03 08:05:11 3a2a4253
│ │ (empty) third
│ │ -- operation 4611a6121e8a (2001-02-03 08:05:11) describe commit ebec10f449ad7ab92c7293efab5e3db2d8e9fea1
│ ○ zsuskuln hidden test.user@example.com 2001-02-03 08:05:10 ebec10f4
│ (empty) (no description set)
│ -- operation 65c81703100d (2001-02-03 08:05:10) squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 69085884
├─╮ squashed 1
│ │ -- operation 65c81703100d (2001-02-03 08:05:10) squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:10 a3759c9d
│ │ second
│ │ -- operation a7b202f56742 (2001-02-03 08:05:10) snapshot working copy
│ │ Modified regular file file1:
│ │ 1 1: foo
│ │ 2: bar
│ ○ kkmpptxz hidden test.user@example.com 2001-02-03 08:05:09 a5b2f625
│ (empty) second
│ -- operation 26f649a0cdfa (2001-02-03 08:05:09) new empty commit
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 5878cbe0
│ first
│ -- operation af15122a5868 (2001-02-03 08:05:09) snapshot working copy
│ Added regular file file1:
│ 1: foo
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 68a50538
│ (empty) first
│ -- operation 75545f7ff2df (2001-02-03 08:05:08) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
[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, @r"
------- 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_log_comfortable
- builtin_log_compact
- builtin_log_compact_full_description
- builtin_log_detailed
- builtin_log_node
- builtin_log_node_ascii
- builtin_log_oneline
- builtin_op_log_comfortable
- builtin_op_log_compact
- builtin_op_log_node
- builtin_op_log_node_ascii
- builtin_op_log_oneline
- commit_summary_separator
- default_commit_description
- description_placeholder
- email_placeholder
- 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, @r"
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
(empty) (no description set)
-- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 b86e28cd
(empty) a
-- operation ab34d1de4875 (2001-02-03 08:05:08) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
(empty) b
-- operation 3851e9877d51 (2001-02-03 08:05:09) describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
-- operation 5f4c7b5cb177 (2001-02-03 08:05:10) describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
[EOF]
");
let output = work_dir.run_jj(["evolog", "--limit=2", "--reversed", "--no-graph"]);
insta::assert_snapshot!(output, @r"
qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
(empty) b
-- operation 3851e9877d51 (2001-02-03 08:05:09) describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
-- operation 5f4c7b5cb177 (2001-02-03 08:05:10) 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", "description(c)", "-m", "d"])
.success();
work_dir
.run_jj(["new", "-r", "description(c)", "-m", "e"])
.success();
work_dir
.run_jj([
"squash",
"--from",
"description(d)|description(e)",
"--to",
"description(c)",
"-m",
"c+d+e",
])
.success();
let output = work_dir.run_jj(["evolog", "-r", "description(c+d+e)", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:07 e8849ae1
│ (empty) (no description set)
│ -- operation 8f47435a3990 (2001-02-03 08:05:07) add workspace 'default'
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:08 b86e28cd
│ (empty) a
│ -- operation ab34d1de4875 (2001-02-03 08:05:08) describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:09 9f43967b
│ (empty) b
│ -- operation 3851e9877d51 (2001-02-03 08:05:09) describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
○ qpvuntsm hidden test.user@example.com 2001-02-03 08:05:10 b28cda4b
│ (empty) c
│ -- operation 5f4c7b5cb177 (2001-02-03 08:05:10) describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
│ ○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 6a4ff8aa
├─╯ (empty) d
│ -- operation 774accf68695 (2001-02-03 08:05:11) new empty commit
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 7dea2d1d
├─╯ (empty) e
│ -- operation 4c2c3012e2c3 (2001-02-03 08:05:12) new empty commit
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
-- operation 2c736b66cd16 (2001-02-03 08:05:13) squash commits into b28cda4b118fc50495ca34a24f030abc078d032e
[EOF]
");
let output = work_dir.run_jj(["evolog", "-rdescription(c+d+e)", "--limit=3", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ mzvwutvl hidden test.user@example.com 2001-02-03 08:05:11 6a4ff8aa
│ (empty) d
│ -- operation 774accf68695 (2001-02-03 08:05:11) new empty commit
│ ○ royxmykx hidden test.user@example.com 2001-02-03 08:05:12 7dea2d1d
├─╯ (empty) e
│ -- operation 4c2c3012e2c3 (2001-02-03 08:05:12) new empty commit
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
-- operation 2c736b66cd16 (2001-02-03 08:05:13) squash commits into b28cda4b118fc50495ca34a24f030abc078d032e
[EOF]
");
}
|
