Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 16941:a1eb17bed550

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: lowercase "unexpected response" message
author Martin Geisler <mg@aragost.com>
date Tue, 12 Jun 2012 14:18:18 +0200
parents 91f3ac205816
children 0c18aed2fcca
comparison
equal deleted inserted replaced
16940:6409a5c75125 16941:a1eb17bed550
2228 l = fp.readline() 2228 l = fp.readline()
2229 try: 2229 try:
2230 resp = int(l) 2230 resp = int(l)
2231 except ValueError: 2231 except ValueError:
2232 raise error.ResponseError( 2232 raise error.ResponseError(
2233 _('Unexpected response from remote server:'), l) 2233 _('unexpected response from remote server:'), l)
2234 if resp == 1: 2234 if resp == 1:
2235 raise util.Abort(_('operation forbidden by server')) 2235 raise util.Abort(_('operation forbidden by server'))
2236 elif resp == 2: 2236 elif resp == 2:
2237 raise util.Abort(_('locking the remote repository failed')) 2237 raise util.Abort(_('locking the remote repository failed'))
2238 elif resp != 0: 2238 elif resp != 0:
2241 l = fp.readline() 2241 l = fp.readline()
2242 try: 2242 try:
2243 total_files, total_bytes = map(int, l.split(' ', 1)) 2243 total_files, total_bytes = map(int, l.split(' ', 1))
2244 except (ValueError, TypeError): 2244 except (ValueError, TypeError):
2245 raise error.ResponseError( 2245 raise error.ResponseError(
2246 _('Unexpected response from remote server:'), l) 2246 _('unexpected response from remote server:'), l)
2247 self.ui.status(_('%d files to transfer, %s of data\n') % 2247 self.ui.status(_('%d files to transfer, %s of data\n') %
2248 (total_files, util.bytecount(total_bytes))) 2248 (total_files, util.bytecount(total_bytes)))
2249 handled_bytes = 0 2249 handled_bytes = 0
2250 self.ui.progress(_('clone'), 0, total=total_bytes) 2250 self.ui.progress(_('clone'), 0, total=total_bytes)
2251 start = time.time() 2251 start = time.time()
2255 try: 2255 try:
2256 name, size = l.split('\0', 1) 2256 name, size = l.split('\0', 1)
2257 size = int(size) 2257 size = int(size)
2258 except (ValueError, TypeError): 2258 except (ValueError, TypeError):
2259 raise error.ResponseError( 2259 raise error.ResponseError(
2260 _('Unexpected response from remote server:'), l) 2260 _('unexpected response from remote server:'), l)
2261 if self.ui.debugflag: 2261 if self.ui.debugflag:
2262 self.ui.debug('adding %s (%s)\n' % 2262 self.ui.debug('adding %s (%s)\n' %
2263 (name, util.bytecount(size))) 2263 (name, util.bytecount(size)))
2264 # for backwards compat, name was partially encoded 2264 # for backwards compat, name was partially encoded
2265 ofp = self.sopener(store.decodedir(name), 'w') 2265 ofp = self.sopener(store.decodedir(name), 'w')