test: fix common-pattern for pure variant

The $USUAL_COMPRESSIONS$ value that was taken was not compatible with the pure
variant systems as zlib seems to not be available in these case.

Differential Revision: https://phab.mercurial-scm.org/D1562

tests/common-pattern.py

@@ -1,75 +1,75 b''
 # common patterns in test at can safely be replaced
 from __future__ import absolute_import
 
 substitutions = [
     # list of possible compressions
-    (br'zstd,zlib,none,bzip2',
+    (br'(zstd,)?zlib,none,bzip2',
      br'$USUAL_COMPRESSIONS$'
     ),
     # capabilities sent through http
     (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A'
      br'changegroup%253D01%252C02%250A'
      br'digests%253Dmd5%252Csha1%252Csha512%250A'
      br'error%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250A'
      br'hgtagsfnodes%250A'
      br'listkeys%250A'
      br'phases%253Dheads%250A'
      br'pushkey%250A'
      br'remote-changegroup%253Dhttp%252Chttps',
      # (the replacement patterns)
      br'$USUAL_BUNDLE_CAPS$'
     ),
     # bundle2 capabilities sent through ssh
     (br'bundle2=HG20%0A'
      br'changegroup%3D01%2C02%0A'
      br'digests%3Dmd5%2Csha1%2Csha512%0A'
      br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A'
      br'hgtagsfnodes%0A'
      br'listkeys%0A'
      br'phases%3Dheads%0A'
      br'pushkey%0A'
      br'remote-changegroup%3Dhttp%2Chttps',
      # (replacement patterns)
      br'$USUAL_BUNDLE2_CAPS$'
     ),
     # HTTP log dates
     (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET',
      br' - - [$LOGDATE$] "GET'
     ),
 ]
 
 # Various platform error strings, keyed on a common replacement string
 _errors = {
     br'$ENOENT$': (
         # strerror()
         br'No such file or directory',
 
         # FormatMessage(ERROR_FILE_NOT_FOUND)
         br'The system cannot find the file specified',
     ),
     br'$ENOTDIR$': (
         # strerror()
         br'Not a directory',
 
         # FormatMessage(ERROR_PATH_NOT_FOUND)
         br'The system cannot find the path specified',
     ),
     br'$ECONNRESET$': (
         # strerror()
         br'Connection reset by peer',
 
         # FormatMessage(WSAECONNRESET)
         br'An existing connection was forcibly closed by the remote host',
     ),
     br'$EADDRINUSE$': (
         # strerror()
         br'Address already in use',
 
         # FormatMessage(WSAEADDRINUSE)
         br'Only one usage of each socket address'
         br' \(protocol/network address/port\) is normally permitted',
     ),
 }
 
 for replace, msgs in _errors.items():
     substitutions.extend((m, replace) for m in msgs)

tests/test-treediscovery.t

@@ -1,580 +1,580 b''
 #require killdaemons
 
 Tests discovery against servers without getbundle support:
 
   $ CAP="getbundle bundle2"
   $ . "$TESTDIR/notcapable"
   $ cat >> $HGRCPATH <<EOF
   > [ui]
   > logtemplate="{rev} {node|short}: {desc} {branches}\n"
   > EOF
 
 Setup HTTP server control:
 
   $ remote=http://localhost:$HGPORT/
   $ export remote
   $ tstart() {
   >   echo '[web]' > $1/.hg/hgrc
   >   echo 'push_ssl = false' >> $1/.hg/hgrc
   >   echo 'allow_push = *' >> $1/.hg/hgrc
   >   hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   >   cat hg.pid >> $DAEMON_PIDS
   > }
   $ tstop() {
   >   killdaemons.py
   >   [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log
   >   rm access.log errors.log
   > }
 
 Both are empty:
 
   $ hg init empty1
   $ hg init empty2
   $ tstart empty2
   $ hg incoming -R empty1 $remote
   comparing with http://localhost:$HGPORT/
   no changes found
   [1]
   $ hg outgoing -R empty1 $remote
   comparing with http://localhost:$HGPORT/
   no changes found
   [1]
   $ hg pull -R empty1 $remote
   pulling from http://localhost:$HGPORT/
   no changes found
   $ hg push -R empty1 $remote
   pushing to http://localhost:$HGPORT/
   no changes found
   [1]
   $ tstop
 
 Base repo:
 
   $ hg init main
   $ cd main
   $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
   $ hg log -G
   o  11 a19bfa7e7328: r11 both
   |
   o  10 8b6bad1512e1: r10 both
   |
   o    9 025829e08038: r9 both
   |\
   | o  8 d8f638ac69e9: r8 name2
   | |
   | o  7 b6b4d315a2ac: r7 name2
   | |
   | o  6 6c6f5d5f3c11: r6 name2
   | |
   | o  5 70314b29987d: r5 name2
   | |
   o |  4 e71dbbc70e03: r4 name1
   | |
   o |  3 2c8d5d5ec612: r3 name1
   | |
   o |  2 a7892891da29: r2 name1
   |/
   o  1 0019a3b924fd: r1
   |
   o  0 d57206cc072a: r0
   
   $ cd ..
   $ tstart main
 
 Full clone:
 
   $ hg clone main full
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd full
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
 
 Local is empty:
 
   $ cd empty1
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   0 d57206cc072a: r0 
   1 0019a3b924fd: r1 
   2 a7892891da29: r2 name1
   3 2c8d5d5ec612: r3 name1
   4 e71dbbc70e03: r4 name1
   5 70314b29987d: r5 name2
   6 6c6f5d5f3c11: r6 name2
   7 b6b4d315a2ac: r7 name2
   8 d8f638ac69e9: r8 name2
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   no changes found
   [1]
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   no changes found
   [1]
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 12 changesets with 24 changes to 2 files
   new changesets d57206cc072a:a19bfa7e7328
   (run 'hg update' to get a working copy)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
 
 Local is subset:
 
   $ hg clone main subset --rev name2 ; cd subset
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 12 changes to 2 files
   new changesets d57206cc072a:d8f638ac69e9
   updating to branch name2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   6 a7892891da29: r2 name1
   7 2c8d5d5ec612: r3 name1
   8 e71dbbc70e03: r4 name1
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 12 changes to 2 files
   new changesets a7892891da29:a19bfa7e7328
   (run 'hg update' to get a working copy)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
 Remote is empty:
 
   $ tstart empty2
   $ cd main
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   0 d57206cc072a: r0 
   1 0019a3b924fd: r1 
   2 a7892891da29: r2 name1
   3 2c8d5d5ec612: r3 name1
   4 e71dbbc70e03: r4 name1
   5 70314b29987d: r5 name2
   6 6c6f5d5f3c11: r6 name2
   7 b6b4d315a2ac: r7 name2
   8 d8f638ac69e9: r8 name2
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 12 changesets with 24 changes to 2 files
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
 Local is superset:
 
   $ hg clone main subset2 --rev name2
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 12 changes to 2 files
   new changesets d57206cc072a:d8f638ac69e9
   updating to branch name2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ tstart subset2
   $ cd main
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   2 a7892891da29: r2 name1
   3 2c8d5d5ec612: r3 name1
   4 e71dbbc70e03: r4 name1
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
   $ hg push $remote
   pushing to http://localhost:$HGPORT/
   searching for changes
   abort: push creates new remote branches: both, name1!
   (use 'hg push --new-branch' to create new remote branches)
   [255]
   $ hg push $remote --new-branch
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 6 changesets with 12 changes to 2 files
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
 Partial pull:
 
   $ tstart main
   $ hg clone $remote partial --rev name2
   adding changesets
   adding manifests
   adding file changes
   added 6 changesets with 12 changes to 2 files
   new changesets d57206cc072a:d8f638ac69e9
   updating to branch name2
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd partial
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   6 a7892891da29: r2 name1
   7 2c8d5d5ec612: r3 name1
   8 e71dbbc70e03: r4 name1
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ hg incoming $remote --rev name1
   comparing with http://localhost:$HGPORT/
   searching for changes
   6 a7892891da29: r2 name1
   7 2c8d5d5ec612: r3 name1
   8 e71dbbc70e03: r4 name1
   $ hg pull $remote --rev name1
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 6 changes to 2 files (+1 heads)
   new changesets a7892891da29:e71dbbc70e03
   (run 'hg heads' to see heads)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   9 025829e08038: r9 both
   10 8b6bad1512e1: r10 both
   11 a19bfa7e7328: r11 both
   $ cd ..
   $ tstop
 
 Both have new stuff in new named branches:
 
   $ hg clone main repo1a --rev name1 -q
   $ hg clone repo1a repo1b -q
   $ hg clone main repo2a --rev name2 -q
   $ hg clone repo2a repo2b -q
   $ tstart repo1a
 
   $ cd repo2a
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   6 a7892891da29: r2 name1
   7 2c8d5d5ec612: r3 name1
   8 e71dbbc70e03: r4 name1
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   2 70314b29987d: r5 name2
   3 6c6f5d5f3c11: r6 name2
   4 b6b4d315a2ac: r7 name2
   5 d8f638ac69e9: r8 name2
   $ hg push $remote --new-branch
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 4 changesets with 8 changes to 2 files (+1 heads)
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 6 changes to 2 files (+1 heads)
   new changesets a7892891da29:e71dbbc70e03
   (run 'hg heads' to see heads)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
   $ tstart repo1b
   $ cd repo2b
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   6 a7892891da29: r2 name1
   7 2c8d5d5ec612: r3 name1
   8 e71dbbc70e03: r4 name1
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   2 70314b29987d: r5 name2
   3 6c6f5d5f3c11: r6 name2
   4 b6b4d315a2ac: r7 name2
   5 d8f638ac69e9: r8 name2
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 3 changesets with 6 changes to 2 files (+1 heads)
   new changesets a7892891da29:e71dbbc70e03
   (run 'hg heads' to see heads)
   $ hg push $remote --new-branch
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 4 changesets with 8 changes to 2 files (+1 heads)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
 Both have new stuff in existing named branches:
 
   $ rm -r repo1a repo1b repo2a repo2b
   $ hg clone main repo1a --rev 3 --rev 8 -q
   $ hg clone repo1a repo1b -q
   $ hg clone main repo2a --rev 4 --rev 7 -q
   $ hg clone repo2a repo2b -q
   $ tstart repo1a
 
   $ cd repo2a
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   8 d8f638ac69e9: r8 name2
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   4 e71dbbc70e03: r4 name1
   $ hg push $remote --new-branch
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 2 changes to 2 files
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets d8f638ac69e9
   (run 'hg update' to get a working copy)
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
   $ tstop
 
   $ tstart repo1b
   $ cd repo2b
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   8 d8f638ac69e9: r8 name2
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   4 e71dbbc70e03: r4 name1
   $ hg pull $remote
   pulling from http://localhost:$HGPORT/
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
   new changesets d8f638ac69e9
   (run 'hg update' to get a working copy)
   $ hg push $remote --new-branch
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 2 changes to 2 files
   $ hg incoming $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ hg outgoing $remote
   comparing with http://localhost:$HGPORT/
   searching for changes
   no changes found
   [1]
   $ cd ..
 #if zstd
   $ tstop show
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
   "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
   "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
 #else
   $ tstop show
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
-  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
   "GET /?cmd=capabilities HTTP/1.1" 200 -
-  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
+  "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
 #endif