equal
deleted
inserted
replaced
177 r = self._recv() |
177 r = self._recv() |
178 if r: |
178 if r: |
179 return '', r |
179 return '', r |
180 return self._recv(), '' |
180 return self._recv(), '' |
181 |
181 |
|
182 def _calltwowaystream(self, cmd, fp, **args): |
|
183 r = self._call(cmd, **args) |
|
184 if r: |
|
185 # XXX needs to be made better |
|
186 raise util.Abort('unexpected remote reply: %s' % r) |
|
187 while True: |
|
188 d = fp.read(4096) |
|
189 if not d: |
|
190 break |
|
191 self._send(d) |
|
192 self._send("", flush=True) |
|
193 return self.pipei |
182 |
194 |
183 def _recv(self): |
195 def _recv(self): |
184 l = self.pipei.readline() |
196 l = self.pipei.readline() |
185 if l == '\n': |
197 if l == '\n': |
186 err = [] |
198 err = [] |