Patchwork [8,of,9] tests: remove all remaining usage of experimental.bundle2-exp

login
register
mail settings
Submitter Pierre-Yves David
Date Aug. 3, 2016, 2:54 p.m.
Message ID <1777c92b13f9413ea713.1470236093@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/16062/
State Accepted
Headers show

Comments

Pierre-Yves David - Aug. 3, 2016, 2:54 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1470232331 -7200
#      Wed Aug 03 15:52:11 2016 +0200
# Node ID 1777c92b13f9413ea71332680de92a43baaf669b
# Parent  8bec28ff9108b74d798e93ec51b7f44ce6614bc4
# EXP-Topic bundle2.devel
tests: remove all remaining usage of experimental.bundle2-exp

The only remaining usage of the experimental config were enforcing bundle2 on.
These are very old remains of when bundle2 was off by default. This was also
useful to highlight the fact that this was a bundle2 run and that a bundle1 one
was nearby. However, we want a future developer working on bundle3 to notice
possible output/behavior change on these tests and take them in account.  So we
do not enforce bundle2 for these runs. We leave a comment around to make sure
dev still notice the bundle1 version.

Patch

diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-bookmarks-pushpull.t	Wed Aug 03 15:52:11 2016 +0200
@@ -822,7 +822,7 @@  Local push
 Using ssh
 ---------
 
-  $ hg push -B @ ssh --config experimental.bundle2-exp=True
+  $ hg push -B @ ssh # bundle2+
   pushing to ssh://user@dummy/issue4455-dest
   searching for changes
   no changes found
@@ -845,7 +845,7 @@  Using ssh
 Using http
 ----------
 
-  $ hg push -B @ http --config experimental.bundle2-exp=True
+  $ hg push -B @ http # bundle2+
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-obsolete.t	Wed Aug 03 15:52:11 2016 +0200
@@ -650,7 +650,7 @@  List of both
 Test the debug output for exchange
 ----------------------------------
 
-  $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' --config 'experimental.bundle2-exp=True'
+  $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2
   pulling from ../tmpb
   searching for changes
   no changes found
diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-phases-exchange.t	Wed Aug 03 15:52:11 2016 +0200
@@ -1041,7 +1041,7 @@  same over the wire
   $ cat ../beta.pid >> $DAEMON_PIDS
   $ cd ../gamma
 
-  $ hg pull http://localhost:$HGPORT/ --config experimental.bundle2-exp=True
+  $ hg pull http://localhost:$HGPORT/ # bundle2+
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-pull-http.t
--- a/tests/test-pull-http.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-pull-http.t	Wed Aug 03 15:52:11 2016 +0200
@@ -48,7 +48,7 @@  expect error, cloning not allowed
   $ echo 'allowpull = false' >> .hg/hgrc
   $ hg serve -p $HGPORT -d --pid-file=hg.pid -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
-  $ hg clone http://localhost:$HGPORT/ test4 --config experimental.bundle2-exp=True
+  $ hg clone http://localhost:$HGPORT/ test4 # bundle2+
   requesting all changes
   abort: authorization failed
   [255]
diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-push-hook-lock.t
--- a/tests/test-push-hook-lock.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-push-hook-lock.t	Wed Aug 03 15:52:11 2016 +0200
@@ -38,7 +38,7 @@ 
 
   $ hg --cwd 1 --config extensions.strip= strip tip -q
   $ hg --cwd 2 --config extensions.strip= strip tip -q
-  $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True
+  $ hg --cwd 3 push ../2 # bundle2+
   pushing to ../2
   searching for changes
   adding changesets
diff -r 8bec28ff9108 -r 1777c92b13f9 tests/test-subrepo.t
--- a/tests/test-subrepo.t	Wed Aug 03 15:39:55 2016 +0200
+++ b/tests/test-subrepo.t	Wed Aug 03 15:52:11 2016 +0200
@@ -1539,7 +1539,7 @@  Courtesy phases synchronisation to publi
   [1]
 # clean the push cache
   $ rm s/.hg/cache/storehash/*
-  $ hg push --config experimental.bundle2-exp=True
+  $ hg push # bundle2+
   pushing to $TESTTMP/issue3781-dest (glob)
   pushing subrepo s to $TESTTMP/issue3781-dest/s
   searching for changes