Patchwork D10346: test-copies: simplify some conditional output

login
register
mail settings
Submitter phabricator
Date April 9, 2021, 8:51 a.m.
Message ID <differential-rev-PHID-DREV-hhw5vl2mvydrzmp6h4co-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48662/
State Superseded
Headers show

Comments

phabricator - April 9, 2021, 8:51 a.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Now that all computation using sidedata give the same result, we can
  simplify conditional

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10346

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t
--- a/tests/test-copies-chain-merge.t
+++ b/tests/test-copies-chain-merge.t
@@ -3404,12 +3404,7 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBF-change-m-0")'
   M b
   A d
-    h (filelog !)
-    h (sidedata !)
-    h (upgraded !)
-    h (upgraded-parallel !)
-    h (changeset !)
-    h (compatibility !)
+    h
   A t
     p
   R a
@@ -3563,24 +3558,15 @@ 
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm")' f
   A f
-    a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE,Km")' f
   A f
-    a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AEm")' f
   A f
-    a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility !)
 
 
 The result from mEAm is the same for the subsequent merge:
@@ -3588,23 +3574,17 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA,Jm")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EAm")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)
 
 Subcase: chaining conflicting rename resolution
 ```````````````````````````````````````````````
@@ -3619,24 +3599,17 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm")' v
   A v
     r (filelog !)
-    p (sidedata !)
-    p (upgraded !)
-    p (upgraded-parallel !)
+    p (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQ,Tm")' v
   A v
     r (filelog !)
-    p (sidedata !)
-    p (upgraded !)
-    p (upgraded-parallel !)
+    p (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mT,PQm")' v
   A v
     r (filelog !)
-    p (sidedata !)
-    p (upgraded !)
-    p (upgraded-parallel !)
-
+    p (no-changeset no-compatibility no-filelog !)
 
 The result from mQPm is the same for the subsequent merge:
 
@@ -3651,9 +3624,7 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mS,QPm")' v
   A v
     r (filelog !)
-    r (sidedata !)
-    r (upgraded !)
-    r (upgraded-parallel !)
+    r (no-changeset no-compatibility no-filelog !)
 
 
 Subcase: chaining salvage information during a merge
@@ -3732,30 +3703,22 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm")' d
   A d
     a (filelog !)
-    h (sidedata !)
-    h (upgraded !)
-    h (upgraded-parallel !)
+    h (no-changeset no-compatibility no-filelog !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm")' d
   A d
     a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility no-filelog !)
 
 Chained output
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mO,FGm")' d
   A d
     a (filelog !)
-    h (sidedata !)
-    h (upgraded !)
-    h (upgraded-parallel !)
+    h (no-changeset no-compatibility no-filelog !)
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFG,Om")' d
   A d
     a (filelog !)
-    h (sidedata !)
-    h (upgraded !)
-    h (upgraded-parallel !)
+    h (no-changeset no-compatibility no-filelog !)
 
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d
@@ -3778,17 +3741,11 @@ 
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m")' f
   A f
-    a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change,Km")' f
   A f
-    a (filelog !)
-    a (sidedata !)
-    a (upgraded !)
-    a (upgraded-parallel !)
+    a (no-changeset no-compatibility !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AE-change-m")' f
   A f
@@ -3800,20 +3757,14 @@ 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change,Jm")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EA-change-m")' f
   A f
     a (filelog !)
-    b (sidedata !)
-    b (upgraded !)
-    b (upgraded-parallel !)
+    b (no-changeset no-compatibility no-filelog !)