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 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820
|
// 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, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 29abe568fb5a snapshot working copy
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
│ my description
│ -- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
│ my description
│ -- operation 826347115e2d snapshot working copy
○ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
(empty) my description
-- operation e0f8e58b3800 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;4m29abe568fb5a[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;4m9[0m[38;5;8m84f03b9[39m (hidden) [38;5;1m(conflict)[39m
│ my description
│ [38;5;8m--[39m operation [38;5;4m863adc9ab542[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;4m826347115e2d[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;4me0f8e58b3800[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 29abe568fb5a 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 1: >>>>>>> conflict 1 of 1 endsresolved
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
│ my description
│ -- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
│ my description
│ -- operation 826347115e2d 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 e0f8e58b3800 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, @r"
@ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 29abe568fb5a snapshot working copy
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
│ my description
│ -- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
○ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
│ my description
│ -- operation 826347115e2d snapshot working copy
○ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
(empty) my description
-- operation e0f8e58b3800 new empty commit
○ qpvuntsm test.user@example.com 2001-02-03 08:05:08 c664a51b
│ (no description set)
│ -- operation ca1226de0084 snapshot working copy
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 add workspace 'default'
[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 29abe568fb5a snapshot working copy
× rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
│ my description
│ -- operation 863adc9ab542 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 29abe568fb5a snapshot working copy
rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
my description
-- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
my description
-- operation 826347115e2d snapshot working copy
rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
(empty) my description
-- operation e0f8e58b3800 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 29abe568fb5a 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 984f03b9 (hidden) (conflict)
my description
-- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
my description
-- operation 826347115e2d 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 e0f8e58b3800 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, @r"
@ kkmpptxz test.user@example.com 2001-02-03 08:05:09 2b17ac71
(empty) (no description set)
-- operation 2931515731a6 add workspace 'default'
[EOF]
");
let output = work_dir.run_jj(["evolog", "-r@", "--color=debug"]);
insta::assert_snapshot!(output, @r"
[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::2931515731a6>>[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, @r"
◆ 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, @r"
[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, @r"
◆ zzzzzzzz root() 00000000
[EOF]
");
let output = work_dir.run_jj(["evolog", "-rroot()", "--color=debug"]);
insta::assert_snapshot!(output, @r"
[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":"2931515731a6903101194e8e889efb13f7494077d8ec2650e2ec40ad69c32fe45385a3d333d1792ffbc410655f1e98daa404f709062a7908bc0b03a0241825bc","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,"tags":{}}}[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, @r"
$ rlvkpnrz test.user@example.com 2001-02-03 08:05:10 33c10ace
│ my description
│ -- operation 9989311c94df snapshot working copy
┝ rlvkpnrz/1 test.user@example.com 2001-02-03 08:05:09 984f03b9 (hidden) (conflict)
│ my description
│ -- operation 863adc9ab542 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
┝ rlvkpnrz/2 test.user@example.com 2001-02-03 08:05:09 51e08f95 (hidden)
│ my description
│ -- operation 826347115e2d snapshot working copy
┝ rlvkpnrz/3 test.user@example.com 2001-02-03 08:05:08 b955b72e (hidden)
(empty) my description
-- operation e0f8e58b3800 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 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 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 describe
│ commit
│ e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm/1 test.user@example.com
2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 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 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 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 describe
commit
e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm/1 test.user@example.com
2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 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 69ecc16188a1 squash commits into 5ec0619af5cb4f7707a556a71a6f96af0bc294d2
│ │ │ Modified commit description:
│ │ │ 1 : <<<<<<< conflict 1 of 1
│ │ │ 2 : +++++++ side #1
│ │ │ 3 1: squashed 2
│ │ │ 4 : %%%%%%% diff from base #1 to side #2
│ │ │ 5 : +fourth
│ │ │ 6 1: %%%%%%% diff from base #2 to side #3
│ │ │ 7 : +fifth
│ │ │ 8 : >>>>>>> conflict 1 of 1 ends
│ │ ○ vruxwmqv/0 test.user@example.com 2001-02-03 08:05:15 770795d0 (hidden)
│ │ │ fifth
│ │ │ -- operation b22b0aceb94e 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 fc852ed87801 new empty commit
│ │ Modified commit description:
│ │ 1: fifth
│ ○ yqosqzyt/0 test.user@example.com 2001-02-03 08:05:14 ea8161b6 (hidden)
│ │ fourth
│ │ -- operation 3b09d55dfa6e 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 9404a551035a 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 fa9796d12627 squash commits into 690858846504af0e42fde980fdacf9851559ebb8
│ │ Modified commit description:
│ │ 1 : <<<<<<< conflict 1 of 1
│ │ 2 : +++++++ side #1
│ │ 3 1: squashed 1
│ │ 4 1: %%%%%%% diff from base to side #2
│ │ 5 : +third
│ │ 6 : >>>>>>> conflict 1 of 1 ends
│ │ 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 de96267cd621 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 4611a6121e8a 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 65c81703100d squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:10 69085884 (hidden)
├─╮ squashed 1
│ │ -- operation 65c81703100d squash commits into 5878cbe03cdf599c9353e5a1a52a01f4c5e0e0fa
│ │ Modified commit description:
│ │ 1 : <<<<<<< conflict 1 of 1
│ │ 2 : %%%%%%% diff from base to side #1
│ │ 3 : +first
│ │ 4 : +++++++ side #2
│ │ 5 : second
│ │ 6 : >>>>>>> conflict 1 of 1 ends
│ │ 1: squashed 1
│ ○ kkmpptxz/0 test.user@example.com 2001-02-03 08:05:10 a3759c9d (hidden)
│ │ second
│ │ -- operation a7b202f56742 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 26f649a0cdfa new empty commit
│ Modified commit description:
│ 1: second
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:09 5878cbe0 (hidden)
│ first
│ -- operation af15122a5868 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 75545f7ff2df 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 8f47435a3990 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"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:09 e1869e5d
│ file2
│ -- operation 043c31d6dd84 describe commit 32cabcfa05c604a36074d74ae59964e4e5eb18e9
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 32cabcfa (hidden)
│ file1
│ -- operation baef907e5b55 snapshot working copy
│ A file2
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:08 cb5ebdc6 (hidden)
│ file1
│ -- operation c4cf439c43a8 describe commit 093c3c9624b6cfe22b310586f5638792aa80e6d7
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:08 093c3c96 (hidden)
│ (no description set)
│ -- operation f41b80dc73b6 snapshot working copy
│ A file1
○ qpvuntsm/4 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 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"]), @r"
@ qpvuntsm test.user@example.com 2001-02-03 08:05:09 e1869e5d
│ file2
│ -- operation ab2192a635be 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, @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_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, @r"
qpvuntsm/3 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 add workspace 'default'
qpvuntsm/2 test.user@example.com 2001-02-03 08:05:08 b86e28cd (hidden)
(empty) a
-- operation ab34d1de4875 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
(empty) b
-- operation 3851e9877d51 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
-- operation 5f4c7b5cb177 describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
[EOF]
");
let output = work_dir.run_jj(["evolog", "--limit=2", "--reversed", "--no-graph"]);
insta::assert_snapshot!(output, @r"
qpvuntsm/1 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
(empty) b
-- operation 3851e9877d51 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
qpvuntsm test.user@example.com 2001-02-03 08:05:10 b28cda4b
(empty) c
-- operation 5f4c7b5cb177 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, @r"
○ qpvuntsm/4 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
│ (empty) (no description set)
│ -- operation 8f47435a3990 add workspace 'default'
○ qpvuntsm/3 test.user@example.com 2001-02-03 08:05:08 b86e28cd (hidden)
│ (empty) a
│ -- operation ab34d1de4875 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:09 9f43967b (hidden)
│ (empty) b
│ -- operation 3851e9877d51 describe commit b86e28cd6862624ad77e1aaf31e34b2c7545bebd
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:10 b28cda4b (hidden)
│ (empty) c
│ -- operation 5f4c7b5cb177 describe commit 9f43967b1cdbce4ab322cb7b4636fc0362c38373
│ ○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:11 6a4ff8aa (hidden)
├─╯ (empty) d
│ -- operation bc5f758ddd39 new empty commit
│ ○ royxmykx/0 test.user@example.com 2001-02-03 08:05:12 7dea2d1d (hidden)
├─╯ (empty) e
│ -- operation 984a0df6c274 new empty commit
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
-- operation 77d2222953aa squash commits into b28cda4b118fc50495ca34a24f030abc078d032e
[EOF]
");
let output = work_dir.run_jj(["evolog", "-rsubject(c+d+e)", "--limit=3", "--reversed"]);
insta::assert_snapshot!(output, @r"
○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:11 6a4ff8aa (hidden)
│ (empty) d
│ -- operation bc5f758ddd39 new empty commit
│ ○ royxmykx/0 test.user@example.com 2001-02-03 08:05:12 7dea2d1d (hidden)
├─╯ (empty) e
│ -- operation 984a0df6c274 new empty commit
○ qpvuntsm test.user@example.com 2001-02-03 08:05:13 78fdd026
(empty) c+d+e
-- operation 77d2222953aa 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 744c65238a20 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 653d54836a8e 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 ab5c35eec35c squash commits into e3ce68f48b53d16111a1310c7f417a39c2934931
│ │ │ predecessors: e3ce68f4,c6106cde,870e49d7
│ │ ○ mzvwutvl/0 test.user@example.com 2001-02-03 08:05:12 870e49d7 (hidden)
│ │ │ e
│ │ │ -- operation 1838e74a7014 snapshot working copy
│ │ │ predecessors: 3345e308
│ │ │ A file3
│ │ ○ mzvwutvl/1 test.user@example.com 2001-02-03 08:05:11 3345e308 (hidden)
│ │ (empty) e
│ │ -- operation 460508b07632 new empty commit
│ │ predecessors:
│ ○ kkmpptxz/0 test.user@example.com 2001-02-03 08:05:10 c6106cde (hidden)
│ │ d
│ │ -- operation 744c65238a20 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 653d54836a8e new empty commit
│ predecessors:
○ qpvuntsm/1 test.user@example.com 2001-02-03 08:05:08 e3ce68f4 (hidden)
│ (empty) c
│ -- operation 12d7ec2266d5 describe commit e8849ae12c709f2321908879bc724fdb2ab8a781
│ predecessors: e8849ae1
○ qpvuntsm/2 test.user@example.com 2001-02-03 08:05:07 e8849ae1 (hidden)
(empty) (no description set)
-- operation 8f47435a3990 add workspace 'default'
predecessors:
[EOF]
");
}
|