Patchwork [5,of,5,mainline] test: enforce generaldelta format with the right option

login
register
mail settings
Submitter Pierre-Yves David
Date Nov. 12, 2015, 7:29 p.m.
Message ID <621ee576df0ee187f032.1447356581@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/11381/
State Accepted
Commit 6839f2d4eea75138a65ee56aed1b20f31b6427fb
Headers show

Comments

Pierre-Yves David - Nov. 12, 2015, 7:29 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1447325539 28800
#      Thu Nov 12 02:52:19 2015 -0800
# Node ID 621ee576df0ee187f032ae11bec8ae156673a1ea
# Parent  5453a87fe45e9c625651cbf00d12064cf349fd56
# EXP-Topic generaldelta
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r 621ee576df0e
test: enforce generaldelta format with the right option

The option that will become true by default is now 'usegeneraldelta' We have to
adjust the change made in b75fed55f6dc to actually achieve its goal.

Patch

diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -969,11 +969,11 @@  shelve --patch and shelve --stat should 
 Shelve from general delta repo uses bundle2 on disk
 --------------------------------------------------
 
 no general delta
 
-  $ hg clone --pull repo bundle1 --config format.generaldelta=0
+  $ hg clone --pull repo bundle1 --config format.usegeneraldelta=0
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 8 changes to 6 files
@@ -989,11 +989,11 @@  no general delta
   7e30d8ac6f23cfc84330fd7e698730374615d21a
   $ cd ..
 
 with general delta
 
-  $ hg clone --pull repo bundle2 --config format.generaldelta=1
+  $ hg clone --pull repo bundle2 --config format.usegeneraldelta=1
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 5 changesets with 8 changes to 6 files