Patchwork [1,of,2,evolve-ext-V2] inhibit: update test with new behavior from core

login
register
mail settings
Submitter Laurent Charignon
Date Dec. 1, 2015, 6:33 p.m.
Message ID <fe1bd6c36f65c9d8c093.1448994806@lcharignon-mbp.local>
Download mbox | patch
Permalink /patch/11724/
State Accepted
Delegated to: Pierre-Yves David
Headers show

Comments

Laurent Charignon - Dec. 1, 2015, 6:33 p.m.
# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1448994338 28800
#      Tue Dec 01 10:25:38 2015 -0800
# Node ID fe1bd6c36f65c9d8c09362a97c24adcdb75c9f1c
# Parent  48547b4c77defdd17c670b1eb0eb94272edf0207
inhibit: update test with new behavior from core

The recent changes in core (to make sure that all bookmarks write are done at
the end of a transaction) changed the behavior of inhibit. When one rebases
a set of hidden revs somewhere, the hidden revs become visible at the end of
the rebase. Both the previous behavior and new behavior seems acceptable but
the tests have to be changed subsequently. This patch modifies one of the test
for inhibit when the case mentioned above happens. We prune the revs inhibited
by the rebase to make the change minimal.

Patch

diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -419,6 +419,41 @@  With severals hidden sha, rebase of one 
   |
   o  12:fe1634cbe235 add cK
   |
+  | o  11:53a94305e133 add cL
+  | |
+  | o  10:ad78ff7d621f add cK
+  | |
+  | | @  9:55c73a90e4b4 add cJ
+  | | |
+  | | | o  7:18214586bf78 add cJ
+  | | |/
+  | | o  6:cf5c4f4554ce add cH
+  | | |
+  | | o  5:5419eb264a33 add cG
+  | | |
+  | | o  4:98065434e5c6 add cE
+  | |/
+  o |  3:2db36d8066ff add cD
+  | |
+  o |  2:7df62a38b9bf add cC
+  | |
+  o |  1:02bcbc3f6e56 add cB
+  |/
+  o  0:54ccbc537fc2 add cA
+  
+
+Performing the rebase made ad78ff7d621f and 53a94305e133 visible, we prune
+them to make the graph more legible. It used to be the case that directaccess
+and inhibit were not making these revisions visible. Both behavior are
+acceptable but to keep the test changes minimal we prune those changesets.
+
+  $ hg strip ad78ff7d621f::
+  2 changesets pruned
+  $ hg log -G
+  o  13:2f7b7704d714 add cL
+  |
+  o  12:fe1634cbe235 add cK
+  |
   | @  9:55c73a90e4b4 add cJ
   | |
   | | o  7:18214586bf78 add cJ