# HG changeset patch # User Vadim Gelfer # Date 1153069456 25200 # Node ID 064aef9162cc3652998036ed24ff00b396d0d32f # Parent 5a5852a417b15b2389ffaed7fbd96a036d33759b rename stream hgrc option to compressed. diff -r 5a5852a417b1 -r 064aef9162cc doc/hgrc.5.txt --- a/doc/hgrc.5.txt Sat Jul 15 16:06:35 2006 -0700 +++ b/doc/hgrc.5.txt Sun Jul 16 10:04:16 2006 -0700 @@ -328,7 +328,7 @@ server:: Controls generic server settings. - stream;; + uncompressed;; Whether to allow clients to clone a repo using the uncompressed streaming protocol. This transfers about 40% more data than a regular clone, but uses less memory and CPU on both server and diff -r 5a5852a417b1 -r 064aef9162cc mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Sat Jul 15 16:06:35 2006 -0700 +++ b/mercurial/hgweb/hgweb_mod.py Sun Jul 16 10:04:16 2006 -0700 @@ -861,7 +861,7 @@ def do_capabilities(self, req): caps = ['unbundle'] - if self.repo.ui.configbool('server', 'stream'): + if self.repo.ui.configbool('server', 'uncompressed'): caps.append('stream=%d' % self.repo.revlogversion) resp = ' '.join(caps) req.httphdr("application/mercurial-0.1", length=len(resp)) diff -r 5a5852a417b1 -r 064aef9162cc mercurial/sshserver.py --- a/mercurial/sshserver.py Sat Jul 15 16:06:35 2006 -0700 +++ b/mercurial/sshserver.py Sun Jul 16 10:04:16 2006 -0700 @@ -61,7 +61,7 @@ ''' caps = ['unbundle'] - if self.ui.configbool('server', 'stream'): + if self.ui.configbool('server', 'uncompressed'): caps.append('stream=%d' % self.repo.revlogversion) self.respond("capabilities: %s\n" % (' '.join(caps),)) diff -r 5a5852a417b1 -r 064aef9162cc mercurial/streamclone.py --- a/mercurial/streamclone.py Sat Jul 15 16:06:35 2006 -0700 +++ b/mercurial/streamclone.py Sun Jul 16 10:04:16 2006 -0700 @@ -60,7 +60,7 @@ '''stream out all metadata files in repository. writes to file-like object, must support write() and optional flush().''' - if not repo.ui.configbool('server', 'stream'): + if not repo.ui.configbool('server', 'uncompressed'): fileobj.write('1\n') return diff -r 5a5852a417b1 -r 064aef9162cc tests/test-http --- a/tests/test-http Sat Jul 15 16:06:35 2006 -0700 +++ b/tests/test-http Sun Jul 16 10:04:16 2006 -0700 @@ -4,7 +4,7 @@ cd test echo foo>foo hg commit -A -d '0 0' -m 1 -hg --config server.stream=True serve -p 20059 -d --pid-file=hg1.pid +hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg1.pid cat hg1.pid >> $DAEMON_PIDS hg serve -p 20060 -d --pid-file=hg2.pid cat hg2.pid >> $DAEMON_PIDS diff -r 5a5852a417b1 -r 064aef9162cc tests/test-http-proxy --- a/tests/test-http-proxy Sat Jul 15 16:06:35 2006 -0700 +++ b/tests/test-http-proxy Sun Jul 16 10:04:16 2006 -0700 @@ -4,7 +4,7 @@ cd a echo a > a hg ci -Ama -d '1123456789 0' -hg --config server.stream=True serve -p 20059 -d --pid-file=hg.pid +hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg.pid cat hg.pid >> $DAEMON_PIDS cd .. diff -r 5a5852a417b1 -r 064aef9162cc tests/test-ssh --- a/tests/test-ssh Sat Jul 15 16:06:35 2006 -0700 +++ b/tests/test-ssh Sun Jul 16 10:04:16 2006 -0700 @@ -28,7 +28,7 @@ echo this > foo hg ci -A -m "init" -d "1000000 0" foo echo '[server]' > .hg/hgrc -echo 'stream = True' >> .hg/hgrc +echo 'uncompressed = True' >> .hg/hgrc cd ..