Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 7641:d2f753830f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error: move UnexpectedOutput (now ResponseError)
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:28:28 -0600
parents 7197812e8d44
children 182b7114d35a
comparison
equal deleted inserted replaced
7640:7197812e8d44 7641:d2f753830f80
2074 fp = remote.stream_out() 2074 fp = remote.stream_out()
2075 l = fp.readline() 2075 l = fp.readline()
2076 try: 2076 try:
2077 resp = int(l) 2077 resp = int(l)
2078 except ValueError: 2078 except ValueError:
2079 raise util.UnexpectedOutput( 2079 raise error.ResponseError(
2080 _('Unexpected response from remote server:'), l) 2080 _('Unexpected response from remote server:'), l)
2081 if resp == 1: 2081 if resp == 1:
2082 raise util.Abort(_('operation forbidden by server')) 2082 raise util.Abort(_('operation forbidden by server'))
2083 elif resp == 2: 2083 elif resp == 2:
2084 raise util.Abort(_('locking the remote repository failed')) 2084 raise util.Abort(_('locking the remote repository failed'))
2087 self.ui.status(_('streaming all changes\n')) 2087 self.ui.status(_('streaming all changes\n'))
2088 l = fp.readline() 2088 l = fp.readline()
2089 try: 2089 try:
2090 total_files, total_bytes = map(int, l.split(' ', 1)) 2090 total_files, total_bytes = map(int, l.split(' ', 1))
2091 except (ValueError, TypeError): 2091 except (ValueError, TypeError):
2092 raise util.UnexpectedOutput( 2092 raise error.ResponseError(
2093 _('Unexpected response from remote server:'), l) 2093 _('Unexpected response from remote server:'), l)
2094 self.ui.status(_('%d files to transfer, %s of data\n') % 2094 self.ui.status(_('%d files to transfer, %s of data\n') %
2095 (total_files, util.bytecount(total_bytes))) 2095 (total_files, util.bytecount(total_bytes)))
2096 start = time.time() 2096 start = time.time()
2097 for i in xrange(total_files): 2097 for i in xrange(total_files):
2099 l = fp.readline() 2099 l = fp.readline()
2100 try: 2100 try:
2101 name, size = l.split('\0', 1) 2101 name, size = l.split('\0', 1)
2102 size = int(size) 2102 size = int(size)
2103 except (ValueError, TypeError): 2103 except (ValueError, TypeError):
2104 raise util.UnexpectedOutput( 2104 raise error.ResponseError(
2105 _('Unexpected response from remote server:'), l) 2105 _('Unexpected response from remote server:'), l)
2106 self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size))) 2106 self.ui.debug(_('adding %s (%s)\n') % (name, util.bytecount(size)))
2107 ofp = self.sopener(name, 'w') 2107 ofp = self.sopener(name, 'w')
2108 for chunk in util.filechunkiter(fp, limit=size): 2108 for chunk in util.filechunkiter(fp, limit=size):
2109 ofp.write(chunk) 2109 ofp.write(chunk)