##// END OF EJS Templates
rename stream hgrc option to compressed.
Vadim Gelfer -
r2622:064aef91 default
parent child Browse files
Show More
@@ -328,7 +328,7 b' paths::'
328
328
329 server::
329 server::
330 Controls generic server settings.
330 Controls generic server settings.
331 stream;;
331 uncompressed;;
332 Whether to allow clients to clone a repo using the uncompressed
332 Whether to allow clients to clone a repo using the uncompressed
333 streaming protocol. This transfers about 40% more data than a
333 streaming protocol. This transfers about 40% more data than a
334 regular clone, but uses less memory and CPU on both server and
334 regular clone, but uses less memory and CPU on both server and
@@ -861,7 +861,7 b' class hgweb(object):'
861
861
862 def do_capabilities(self, req):
862 def do_capabilities(self, req):
863 caps = ['unbundle']
863 caps = ['unbundle']
864 if self.repo.ui.configbool('server', 'stream'):
864 if self.repo.ui.configbool('server', 'uncompressed'):
865 caps.append('stream=%d' % self.repo.revlogversion)
865 caps.append('stream=%d' % self.repo.revlogversion)
866 resp = ' '.join(caps)
866 resp = ' '.join(caps)
867 req.httphdr("application/mercurial-0.1", length=len(resp))
867 req.httphdr("application/mercurial-0.1", length=len(resp))
@@ -61,7 +61,7 b' class sshserver(object):'
61 '''
61 '''
62
62
63 caps = ['unbundle']
63 caps = ['unbundle']
64 if self.ui.configbool('server', 'stream'):
64 if self.ui.configbool('server', 'uncompressed'):
65 caps.append('stream=%d' % self.repo.revlogversion)
65 caps.append('stream=%d' % self.repo.revlogversion)
66 self.respond("capabilities: %s\n" % (' '.join(caps),))
66 self.respond("capabilities: %s\n" % (' '.join(caps),))
67
67
@@ -60,7 +60,7 b' def stream_out(repo, fileobj):'
60 '''stream out all metadata files in repository.
60 '''stream out all metadata files in repository.
61 writes to file-like object, must support write() and optional flush().'''
61 writes to file-like object, must support write() and optional flush().'''
62
62
63 if not repo.ui.configbool('server', 'stream'):
63 if not repo.ui.configbool('server', 'uncompressed'):
64 fileobj.write('1\n')
64 fileobj.write('1\n')
65 return
65 return
66
66
@@ -4,7 +4,7 b' hg init test'
4 cd test
4 cd test
5 echo foo>foo
5 echo foo>foo
6 hg commit -A -d '0 0' -m 1
6 hg commit -A -d '0 0' -m 1
7 hg --config server.stream=True serve -p 20059 -d --pid-file=hg1.pid
7 hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg1.pid
8 cat hg1.pid >> $DAEMON_PIDS
8 cat hg1.pid >> $DAEMON_PIDS
9 hg serve -p 20060 -d --pid-file=hg2.pid
9 hg serve -p 20060 -d --pid-file=hg2.pid
10 cat hg2.pid >> $DAEMON_PIDS
10 cat hg2.pid >> $DAEMON_PIDS
@@ -4,7 +4,7 b' hg init a'
4 cd a
4 cd a
5 echo a > a
5 echo a > a
6 hg ci -Ama -d '1123456789 0'
6 hg ci -Ama -d '1123456789 0'
7 hg --config server.stream=True serve -p 20059 -d --pid-file=hg.pid
7 hg --config server.uncompressed=True serve -p 20059 -d --pid-file=hg.pid
8 cat hg.pid >> $DAEMON_PIDS
8 cat hg.pid >> $DAEMON_PIDS
9
9
10 cd ..
10 cd ..
@@ -28,7 +28,7 b' cd remote'
28 echo this > foo
28 echo this > foo
29 hg ci -A -m "init" -d "1000000 0" foo
29 hg ci -A -m "init" -d "1000000 0" foo
30 echo '[server]' > .hg/hgrc
30 echo '[server]' > .hg/hgrc
31 echo 'stream = True' >> .hg/hgrc
31 echo 'uncompressed = True' >> .hg/hgrc
32
32
33 cd ..
33 cd ..
34
34
General Comments 0
You need to be logged in to leave comments. Login now