diff tests/test-evolve-phase-divergence.t @ 6316:b1d1f4ade142

evolve: don't embed graft data when completing interrupted evolve operations

This data shows in TortoiseHg, and is a bit awkward since it wasn't added before
in the non interrupted case.  It originated before 823031b51d81, when the
implementation changed away from using the graft command.  According to
@marmoute, unconditionally adding `source` served as noise to create a new hash
and prevent a cycle, so use the same key (`rebase_source`) as would happen in
the uninterrupted case (as demonstrated by the first change in
test-stabilize-conflict.t).

--- a/tests/test-evolve-phase-divergence.t	Sat Oct 29 17:26:46 2022 +0400
+++ b/tests/test-evolve-phase-divergence.t	Fri Oct 07 18:14:58 2022 -0400
@@ -878,11 +878,11 @@
 
   $ hg evolve --continue
   evolving 19:5fd38c0de46e "added l to l"
-  committed as e3090241a10c
-  working directory is now at e3090241a10c
+  committed as c2aa021d3c99
+  working directory is now at c2aa021d3c99
 
   $ hg glog
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
   |   () draft
   o  17:f3794e5a91dc added l to l
   |   () public
@@ -910,19 +910,19 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID e3090241a10c320b6132e4673915fd6b19c0de39
+  # Node ID c2aa021d3c99453c0b1b646fb7e9325b151780df
   # Parent  f3794e5a91dc1d4d36fee5c423386b19433a1f48
   phase-divergent update to f3794e5a91dc:
   
   added l to l
   
-  diff -r f3794e5a91dc -r e3090241a10c l
+  diff -r f3794e5a91dc -r c2aa021d3c99 l
   --- a/l	Thu Jan 01 00:00:00 1970 +0000
   +++ b/l	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -l
   +kl
-  diff -r f3794e5a91dc -r e3090241a10c x
+  diff -r f3794e5a91dc -r c2aa021d3c99 x
   --- a/x	Thu Jan 01 00:00:00 1970 +0000
   +++ b/x	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
@@ -933,7 +933,7 @@
 ------------------------------------------------------------------------
 
   $ hg glog -r .
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
   |   () draft
   ~
   $ echo f > f
@@ -947,42 +947,42 @@
 
   $ hg evolve --list
 
-  $ hg phase -r 428f7900a969 --public --hidden
+  $ hg phase -r 3bb2b4083933 --public --hidden
   1 new phase-divergent changesets
 
   $ hg glog -r f3794e5a91dc::
-  @  24:390acb97e50a added f
+  @  24:39a4f9562a25 added f
   |   () draft
-  | o  23:428f7900a969 added g
+  | o  23:3bb2b4083933 added g
   | |   () public
-  | o  22:21ae52e414e6 added f
+  | o  22:12f787829d43 added f
   |/    () public
-  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  o  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
   |   () public
   o  17:f3794e5a91dc added l to l
   |   () public
   ~
 
   $ hg evolve --list
-  390acb97e50a: added f
-    phase-divergent: 21ae52e414e6 (immutable precursor)
-    phase-divergent: 428f7900a969 (immutable precursor)
+  39a4f9562a25: added f
+    phase-divergent: 12f787829d43 (immutable precursor)
+    phase-divergent: 3bb2b4083933 (immutable precursor)
   
 Resolving phase divergence using `hg evolve`
 
   $ hg evolve --phase-divergent --all
   recreate:[24] added f
   atop:[23] added g
-  rebasing to destination parent: 21ae52e414e6
+  rebasing to destination parent: 12f787829d43
   no changes to commit
-  working directory is now at e3090241a10c
+  working directory is now at c2aa021d3c99
 
   $ hg glog -r f3794e5a91dc::
-  o  23:428f7900a969 added g
+  o  23:3bb2b4083933 added g
   |   () public
-  o  22:21ae52e414e6 added f
+  o  22:12f787829d43 added f
   |   () public
-  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
+  @  21:c2aa021d3c99 phase-divergent update to f3794e5a91dc:
   |   () public
   o  17:f3794e5a91dc added l to l
   |   () public