streaming: actually change default

mercurial/streamclone.py

@@ -1,70 +1,70 b''
 # streamclone.py - streaming clone server support for mercurial
 #
 # Copyright 2006 Vadim Gelfer <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 import util, error
 from i18n import _
 
 from mercurial import store
 
 class StreamException(Exception):
     def __init__(self, code):
         Exception.__init__(self)
         self.code = code
     def __str__(self):
         return '%i\n' % self.code
 
 # if server supports streaming clone, it advertises "stream"
 # capability with value that is version+flags of repo it is serving.
 # client only streams if it can read that repo format.
 
 # stream file format is simple.
 #
 # server writes out line that says how many files, how many total
 # bytes.  separator is ascii space, byte counts are strings.
 #
 # then for each file:
 #
 #   server writes out line that says filename, how many bytes in
 #   file.  separator is ascii nul, byte count is string.
 #
 #   server writes out raw file data.
 
 def allowed(ui):
-    return ui.configbool('server', 'uncompressed', untrusted=True)
+    return ui.configbool('server', 'uncompressed', True, untrusted=True)
 
 def stream_out(repo):
     '''stream out all metadata files in repository.
     writes to file-like object, must support write() and optional flush().'''
 
     if not allowed(repo.ui):
         raise StreamException(1)
 
     entries = []
     total_bytes = 0
     try:
         # get consistent snapshot of repo, lock during scan
         lock = repo.lock()
         try:
             repo.ui.debug('scanning\n')
             for name, ename, size in repo.store.walk():
                 entries.append((name, size))
                 total_bytes += size
         finally:
             lock.release()
     except error.LockError:
         raise StreamException(2)
 
     yield '0\n'
     repo.ui.debug('%d files, %d bytes to transfer\n' %
                   (len(entries), total_bytes))
     yield '%d %d\n' % (len(entries), total_bytes)
     for name, size in entries:
         repo.ui.debug('sending %s (%d bytes)\n' % (name, size))
         # partially encode name over the wire for backwards compat
         yield '%s\0%d\n' % (store.encodedir(name), size)
         for chunk in util.filechunkiter(repo.sopener(name), limit=size):
             yield chunk

tests/test-hgweb-commands

@@ -1,64 +1,64 b''
 #!/bin/sh
 # An attempt at more fully testing the hgweb web interface.
 # The following things are tested elsewhere and are therefore omitted:
 # - archive, tested in test-archive
 # - unbundle, tested in test-push-http
 # - changegroupsubset, tested in test-pull
 
 echo % Set up the repo
 hg init test
 cd test
 mkdir da
 echo foo > da/foo
 echo foo > foo
 hg ci -Ambase
 hg tag 1.0
 echo another > foo
 hg branch stable
 hg ci -Ambranch
-hg serve -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
+hg serve --config server.uncompressed=False -n test -p $HGPORT -d --pid-file=hg.pid -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 
 echo % Logs and changes
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log/1/foo/?style=atom' | sed "s/http:\/\/[^/]*\//http:\/\/127.0.0.1\//"
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/shortlog/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/0/'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/rev/1/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/log?rev=base'
 
 echo % File-related
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/annotate/1/foo/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/?style=raw'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/file/1/foo'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/filediff/1/foo/?style=raw'
 
 echo % Overviews
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-tags'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/raw-branches'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/summary/?style=gitweb'
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/?style=gitweb'
 
 echo % capabilities
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=capabilities'
 echo % heads
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=heads'
 echo % lookup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=lookup&node=1'
 echo % branches
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=branches'
 echo % changegroup
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=changegroup' \
     | $TESTDIR/printrepr.py
 echo % stream_out
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=stream_out'
 echo % failing unbundle, requires POST request
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '?cmd=unbundle'
 
 echo % Static files
 "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/static/style.css'
 
 echo % ERRORS ENCOUNTERED
 cat errors.log

tests/test-http

@@ -1,43 +1,43 b''
 #!/bin/sh
 
 cp "$TESTDIR"/printenv.py .
 
 hg init test
 cd test
 echo foo>foo
 mkdir foo.d foo.d/bAr.hg.d foo.d/baR.d.hg
 echo foo>foo.d/foo
 echo bar>foo.d/bAr.hg.d/BaR
 echo bar>foo.d/baR.d.hg/bAR
 
 hg commit -A -m 1
-hg --config server.uncompressed=True serve -p $HGPORT -d --pid-file=../hg1.pid
-hg serve -p $HGPORT1 -d --pid-file=../hg2.pid
+hg serve -p $HGPORT -d --pid-file=../hg1.pid
+hg --config server.uncompressed=False serve -p $HGPORT1 -d --pid-file=../hg2.pid
 # Test server address cannot be reused
 hg serve -p $HGPORT1 2>&1 | sed -e "s/abort: cannot start server at ':$HGPORT1':.*/abort: cannot start server at ':\$HGPORT1':/"
 cd ..
 cat hg1.pid hg2.pid >> $DAEMON_PIDS
 
 echo % clone via stream
 hg clone --uncompressed http://localhost:$HGPORT/ copy 2>&1 | \
   sed -e 's/[0-9][0-9.]*/XXX/g' -e 's/[KM]\(B\/sec\)/X\1/'
 hg verify -R copy
 
 echo % try to clone via stream, should use pull instead
 hg clone --uncompressed http://localhost:$HGPORT1/ copy2
 
 echo % clone via pull
 hg clone http://localhost:$HGPORT1/ copy-pull
 hg verify -R copy-pull
 
 cd test
 echo bar > bar
 hg commit -A -d '1 0' -m 2
 cd ..
 
 echo % pull
 cd copy-pull
 echo '[hooks]' >> .hg/hgrc
 echo 'changegroup = python ../printenv.py changegroup' >> .hg/hgrc
 hg pull | sed -e "s,:$HGPORT1/,:\$HGPORT1/,"
 cd ..