##// END OF EJS Templates
push: propagate --new-branch and --ssh options when pushing subrepos...
push: propagate --new-branch and --ssh options when pushing subrepos Up until now the all the push command options were ignored when pushing subrepos. In particular, the fact that the --new-branch command was not passed down to subrepos made it not possible to push a repo when any of its subrepos had a new branch, even if you used the --new-branch option of the push command. In addition the error message was confusing since it showed the following hint: "--new-branch hint: use 'hg push --new-branch' to create new remote branches". However using the --new_branch flag did not fix the problem, as it was ignored when pushing subrepos. This patch passes the --new-branch and --ssh flags to every subrepo that is pushed. Issues/Limitations: - All subrepo types get these flags, but only the mercurial subrepos use them. - It is no longer possible to _not_ pass down these flags to subrepos when pushing: * An alternative would be to introduce a --subrepos flag that should be used to pass down these flags to the subrepos. * If we did this, it could make sense to make the --force flag respect this new --subrepos flag as well for consistency's sake. - Matt suggested that the ssh related flags could also be passed down to subrepos during pull and clone. However it seems that it would be the "update" command that would need to get those, since subrepos are only pulled on update. In any case I'd prefer to leave that for a later patch.

File last commit:

r15218:c81dce8a default
r15708:309e4949 default
Show More
test_chunked_transfer.py
153 lines | 6.0 KiB | text/x-python | PythonLexer
# Copyright 2010, Google Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import cStringIO
import unittest
import http
# relative import to ease embedding the library
import util
def chunkedblock(x, eol='\r\n'):
r"""Make a chunked transfer-encoding block.
>>> chunkedblock('hi')
'2\r\nhi\r\n'
>>> chunkedblock('hi' * 10)
'14\r\nhihihihihihihihihihi\r\n'
>>> chunkedblock('hi', eol='\n')
'2\nhi\n'
"""
return ''.join((hex(len(x))[2:], eol, x, eol))
class ChunkedTransferTest(util.HttpTestBase, unittest.TestCase):
def testChunkedUpload(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
sock.read_wait_sentinel = '0\r\n\r\n'
sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'Content-Length: 6',
'\r\n\r\n',
"Thanks"]
zz = 'zz\n'
con.request('POST', '/', body=cStringIO.StringIO(
(zz * (0x8010 / 3)) + 'end-of-body'))
expected_req = ('POST / HTTP/1.1\r\n'
'transfer-encoding: chunked\r\n'
'Host: 1.2.3.4\r\n'
'accept-encoding: identity\r\n\r\n')
expected_req += chunkedblock('zz\n' * (0x8000 / 3) + 'zz')
expected_req += chunkedblock(
'\n' + 'zz\n' * ((0x1b - len('end-of-body')) / 3) + 'end-of-body')
expected_req += '0\r\n\r\n'
self.assertEqual(('1.2.3.4', 80), sock.sa)
self.assertStringEqual(expected_req, sock.sent)
self.assertEqual("Thanks", con.getresponse().read())
self.assertEqual(sock.closed, False)
def testChunkedDownload(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'transfer-encoding: chunked',
'\r\n\r\n',
chunkedblock('hi '),
chunkedblock('there'),
chunkedblock(''),
]
con.request('GET', '/')
self.assertStringEqual('hi there', con.getresponse().read())
def testChunkedDownloadBadEOL(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
sock.data = ['HTTP/1.1 200 OK\n',
'Server: BogusServer 1.0\n',
'transfer-encoding: chunked',
'\n\n',
chunkedblock('hi ', eol='\n'),
chunkedblock('there', eol='\n'),
chunkedblock('', eol='\n'),
]
con.request('GET', '/')
self.assertStringEqual('hi there', con.getresponse().read())
def testChunkedDownloadPartialChunkBadEOL(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
sock.data = ['HTTP/1.1 200 OK\n',
'Server: BogusServer 1.0\n',
'transfer-encoding: chunked',
'\n\n',
chunkedblock('hi ', eol='\n'),
] + list(chunkedblock('there\n' * 5, eol='\n')) + [
chunkedblock('', eol='\n')]
con.request('GET', '/')
self.assertStringEqual('hi there\nthere\nthere\nthere\nthere\n',
con.getresponse().read())
def testChunkedDownloadPartialChunk(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'transfer-encoding: chunked',
'\r\n\r\n',
chunkedblock('hi '),
] + list(chunkedblock('there\n' * 5)) + [chunkedblock('')]
con.request('GET', '/')
self.assertStringEqual('hi there\nthere\nthere\nthere\nthere\n',
con.getresponse().read())
def testChunkedDownloadEarlyHangup(self):
con = http.HTTPConnection('1.2.3.4:80')
con._connect()
sock = con.sock
broken = chunkedblock('hi'*20)[:-1]
sock.data = ['HTTP/1.1 200 OK\r\n',
'Server: BogusServer 1.0\r\n',
'transfer-encoding: chunked',
'\r\n\r\n',
broken,
]
sock.close_on_empty = True
con.request('GET', '/')
resp = con.getresponse()
self.assertRaises(http.HTTPRemoteClosedError, resp.read)
# no-check-code