rewrite: add labels for rebased commits

Author: scott2000

CHANGELOG.md

@@ -25,8 +25,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * The `CryptographicSignature.key()` template method now also works for SSH
   signatures and returns the corresponding public key fingerprint.
 
-* Conflicts resulting from merges now have labels indicating the change ID and
-  commit ID for each side.
+* Conflicts resulting from merges and rebases now have labels indicating the
+  change ID and commit ID for each side.
 
 ### Fixed bugs
 

cli/tests/test_absorb_command.rs

@@ -421,32 +421,32 @@ fn test_absorb_conflict() {
     work_dir.run_jj(["new", "root()"]).success();
     work_dir.write_file("file1", "2a\n2b\n");
     let output = work_dir.run_jj(["rebase", "-r@", "-ddescription(1)"]);
-    insta::assert_snapshot!(output, @r###"
+    insta::assert_snapshot!(output, @r"
     ------- stderr -------
     Rebased 1 commits to destination
-    Working copy  (@) now at: kkmpptxz 66d44b8c (conflict) (no description set)
+    Working copy  (@) now at: kkmpptxz 7575ac57 (conflict) (no description set)
     Parent commit (@-)      : qpvuntsm e35bcaff 1
     Added 0 files, modified 1 files, removed 0 files
     Warning: There are unresolved conflicts at these paths:
     file1    2-sided conflict
     New conflicts appeared in 1 commits:
-      kkmpptxz 66d44b8c (conflict) (no description set)
+      kkmpptxz 7575ac57 (conflict) (no description set)
     Hint: To resolve the conflicts, start by creating a commit on top of
     the conflicted commit:
       jj new kkmpptxz
     Then use `jj resolve`, or edit the conflict markers in the file directly.
     Once the conflicts are resolved, you can inspect the result with `jj diff`.
     Then run `jj squash` to move the resolution into the conflicted commit.
     [EOF]
-    "###);
+    ");
 
     let conflict_content = work_dir.read_file("file1");
     insta::assert_snapshot!(conflict_content, @r"
     <<<<<<< Conflict 1 of 1
-    %%%%%%% Changes from base to side #1
+    %%%%%%% Changes from base (zzzzzzzz 00000000) to side #1 (rebase destination: qpvuntsm e35bcaff)
     +1a
     +1b
-    +++++++ Contents of side #2
+    +++++++ Contents of side #2 (rebased commit: kkmpptxz e05db987)
     2a
     2b
     >>>>>>> Conflict 1 of 1 ends

cli/tests/test_completion.rs

@@ -1327,7 +1327,7 @@ fn test_files() {
     │  M f_modified
     │  M f_not_yet_copied
     │  R {f_not_yet_renamed => f_renamed}
-    │ ×  royxmykx [email protected] 2001-02-03 08:05:14 conflicted cf10549a conflict
+    │ ×  royxmykx [email protected] 2001-02-03 08:05:14 conflicted 0c17cca0 conflict
     ├─╯  conflicted
     │    A f_added_2
     │    A f_dir/dir_file_1

cli/tests/test_evolog_command.rs

@@ -34,10 +34,10 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     @  rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  -- operation 3499115d3831 snapshot working copy
-    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    │  -- operation cefc13a2ade8 snapshot working copy
+    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     │  my description
-    │  -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     ○  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     │  my description
     │  -- operation 18a971ce330a snapshot working copy
@@ -52,10 +52,10 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     @  rlvkpnrz [38;5;[email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  [38;5;8m--[39m operation [38;5;4m3499115d3831[39m snapshot working copy
-    [1m[38;5;1m×[0m  [1m[39mr[0m[38;5;8mlvkpnrz[39m hidden [38;5;[email protected][39m [38;5;6m2001-02-03 08:05:09[39m [1m[38;5;4m7[0m[38;5;8mf56b2a0[39m [38;5;1mconflict[39m
+    │  [38;5;8m--[39m operation [38;5;4mcefc13a2ade8[39m snapshot working copy
+    [1m[38;5;1m×[0m  [1m[39mr[0m[38;5;8mlvkpnrz[39m hidden [38;5;[email protected][39m [38;5;6m2001-02-03 08:05:09[39m [1m[38;5;4ma[0m[38;5;8mb065353[39m [38;5;1mconflict[39m
     │  my description
-    │  [38;5;8m--[39m operation [38;5;4meb87ec366530[39m rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  [38;5;8m--[39m operation [38;5;4m2ef828d530fe[39m rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     ○  rlvkpnrz hidden [38;5;[email protected] 2001-02-03 08:05:09 51e08f95
     │  my description
     │  -- operation 18a971ce330a snapshot working copy
@@ -71,18 +71,18 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     @  rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  -- operation 3499115d3831 snapshot working copy
+    │  -- operation cefc13a2ade8 snapshot working copy
     │  Resolved conflict in file1:
     │     1     : <<<<<<< Conflict 1 of 1
-    │     2     : %%%%%%% Changes from base to side #1
+    │     2     : %%%%%%% Changes from base (qpvuntsm c664a51b) to side #1 (rebase destination: zzzzzzzz 00000000)
     │     3     : -foo
-    │     4     : +++++++ Contents of side #2
+    │     4     : +++++++ Contents of side #2 (rebased commit: rlvkpnrz 51e08f95)
     │     5     : foo
     │     6     : bar
     │     7    1: >>>>>>> Conflict 1 of 1 endsresolved
-    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     │  my description
-    │  -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     ○  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     │  my description
     │  -- operation 18a971ce330a snapshot working copy
@@ -104,10 +104,10 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     @  rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  -- operation 3499115d3831 snapshot working copy
-    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    │  -- operation cefc13a2ade8 snapshot working copy
+    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     │  my description
-    │  -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     ○  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     │  my description
     │  -- operation 18a971ce330a snapshot working copy
@@ -128,10 +128,10 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     @  rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  -- operation 3499115d3831 snapshot working copy
-    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    │  -- operation cefc13a2ade8 snapshot working copy
+    ×  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     │  my description
-    │  -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     [EOF]
     ");
 
@@ -140,10 +140,10 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     my description
-    -- operation 3499115d3831 snapshot working copy
-    rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    -- operation cefc13a2ade8 snapshot working copy
+    rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     my description
-    -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     my description
     -- operation 18a971ce330a snapshot working copy
@@ -158,23 +158,23 @@ fn test_evolog_with_or_without_diff() {
     insta::assert_snapshot!(output, @r"
     rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     my description
-    -- operation 3499115d3831 snapshot working copy
+    -- operation cefc13a2ade8 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
+    -%%%%%%% Changes from base (qpvuntsm c664a51b) to side #1 (rebase destination: zzzzzzzz 00000000)
     --foo
-    -+++++++ Contents of side #2
+    -+++++++ Contents of side #2 (rebased commit: rlvkpnrz 51e08f95)
     -foo
     -bar
     ->>>>>>> Conflict 1 of 1 ends
     +resolved
-    rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     my description
-    -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     my description
     -- operation 18a971ce330a snapshot working copy
@@ -293,10 +293,10 @@ fn test_evolog_with_custom_symbols() {
     insta::assert_snapshot!(output, @r"
     $  rlvkpnrz [email protected] 2001-02-03 08:05:10 33c10ace
     │  my description
-    │  -- operation 3622beb20303 snapshot working copy
-    ┝  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 7f56b2a0 conflict
+    │  -- operation 86c717ddde1c snapshot working copy
+    ┝  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 ab065353 conflict
     │  my description
-    │  -- operation eb87ec366530 rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
+    │  -- operation 2ef828d530fe rebase commit 51e08f95160c897080d035d330aead3ee6ed5588
     ┝  rlvkpnrz hidden [email protected] 2001-02-03 08:05:09 51e08f95
     │  my description
     │  -- operation 18a971ce330a snapshot working copy

cli/tests/test_file_show_command.rs

@@ -106,10 +106,10 @@ fn test_show() {
     let output = work_dir.run_jj(["file", "show", "file1"]);
     insta::assert_snapshot!(output, @r"
     <<<<<<< Conflict 1 of 1
-    %%%%%%% Changes from base to side #1
+    %%%%%%% Changes from base (rlvkpnrz d506fcb9) to side #1 (rebase destination: qpvuntsm eb7b8a1f)
     -b
     +a
-    +++++++ Contents of side #2
+    +++++++ Contents of side #2 (rebased commit: kpqxywon 9433f7fb)
     c
     >>>>>>> Conflict 1 of 1 ends
     [EOF]

cli/tests/test_git_colocated.rs

@@ -1232,7 +1232,7 @@ fn test_git_colocated_update_index_rebase_conflict() {
         .success();
 
     insta::assert_snapshot!(get_log_output(&work_dir), @r"
-    @  535388c5aab1b3a33fdc04a4bf8033de0d1b86ec left
+    @  ab9aea1d02400101e36feb6a820d0efe1e41def8 left
     ○  620e15db9fcd05fff912c52d2cafd36c9e01523c right git_head()
     ○  1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
     ◆  0000000000000000000000000000000000000000
@@ -1251,8 +1251,8 @@ fn test_git_colocated_update_index_rebase_conflict() {
     work_dir.run_jj(["new"]).success();
 
     insta::assert_snapshot!(get_log_output(&work_dir), @r"
-    @  04ebd7523ac6107ccdd5bc34600a073b94e43299
-    ×  535388c5aab1b3a33fdc04a4bf8033de0d1b86ec left git_head()
+    @  89a164d9c51c4da64ec29689f59e15ba5b1f6d9a
+    ×  ab9aea1d02400101e36feb6a820d0efe1e41def8 left git_head()
     ○  620e15db9fcd05fff912c52d2cafd36c9e01523c right
     ○  1861378a9167e6561bf8ce4a6fef2d7c0897dd87 base
     ◆  0000000000000000000000000000000000000000

cli/tests/test_git_push.rs

@@ -1407,8 +1407,8 @@ fn test_git_push_conflict() {
     let output = work_dir.run_jj(["git", "push", "--all"]);
     insta::assert_snapshot!(output, @r"
     ------- stderr -------
-    Error: Won't push commit 654e715becca since it has conflicts
-    Hint: Rejected commit: yostqsxw 654e715b my-bookmark | (conflict) third
+    Error: Won't push commit 0b9c8b70b10b since it has conflicts
+    Hint: Rejected commit: yostqsxw 0b9c8b70 my-bookmark | (conflict) third
     [EOF]
     [exit status: 1]
     ");

cli/tests/test_next_prev_commands.rs

@@ -938,7 +938,7 @@ fn test_next_conflict_head() {
     insta::assert_snapshot!(output, @r"
     ------- stderr -------
     Error: The working copy has no descendants with conflicts
-    Hint: Working copy: rlvkpnrz 5f088cac (conflict) (no description set)
+    Hint: Working copy: rlvkpnrz 91942261 (conflict) (no description set)
     [EOF]
     [exit status: 1]
     ");