##// END OF EJS Templates
protocol: unify stream_out client code
Matt Mackall -
r11588:8a1f625e default
parent child Browse files
Show More
@@ -141,6 +141,9 b' class httprepository(wireproto.wirerepos'
141 def _call(self, cmd, **args):
141 def _call(self, cmd, **args):
142 return self.do_read(cmd, **args)
142 return self.do_read(cmd, **args)
143
143
144 def _callstream(self, cmd, **args):
145 return self.do_cmd(cmd, **args)
146
144 def _abort(self, exception):
147 def _abort(self, exception):
145 raise exception
148 raise exception
146
149
@@ -205,9 +208,6 b' class httprepository(wireproto.wirerepos'
205 fp.close()
208 fp.close()
206 os.unlink(tempname)
209 os.unlink(tempname)
207
210
208 def stream_out(self):
209 return self.do_cmd('stream_out')
210
211 class httpsrepository(httprepository):
211 class httpsrepository(httprepository):
212 def __init__(self, ui, path):
212 def __init__(self, ui, path):
213 if not url.has_https:
213 if not url.has_https:
@@ -136,6 +136,9 b' class sshrepository(wireproto.wirereposi'
136 self.do_cmd(cmd, **args)
136 self.do_cmd(cmd, **args)
137 return self._recv()
137 return self._recv()
138
138
139 def _callstream(self, cmd, **args):
140 return self.do_cmd(cmd, **args)
141
139 def _recv(self):
142 def _recv(self):
140 l = self.pipei.readline()
143 l = self.pipei.readline()
141 self.readerr()
144 self.readerr()
@@ -224,7 +227,4 b' class sshrepository(wireproto.wirereposi'
224 except:
227 except:
225 self.abort(error.ResponseError(_("unexpected response:"), r))
228 self.abort(error.ResponseError(_("unexpected response:"), r))
226
229
227 def stream_out(self):
228 return self.do_cmd('stream_out')
229
230 instance = sshrepository
230 instance = sshrepository
@@ -88,6 +88,9 b' class wirerepository(repo.repository):'
88 r[k.decode('string-escape')] = v.decode('string-escape')
88 r[k.decode('string-escape')] = v.decode('string-escape')
89 return r
89 return r
90
90
91 def stream_out(self):
92 return self._callstream('stream_out')
93
91 # server side
94 # server side
92
95
93 def dispatch(repo, proto, command):
96 def dispatch(repo, proto, command):
General Comments 0
You need to be logged in to leave comments. Login now