Mercurial > public > mercurial-scm > hg

comparison mercurial/sshpeer.py @ 29727:0dbd788a2dfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sshpeer: use `iter(callable, sentinel)` instead of while True This is functionally equivalent, but is a little more concise.
author Augie Fackler <augie@google.com>
date Fri, 05 Aug 2016 14:00:22 -0400
parents 98e8313dcd9e
children bb04f96df51c
comparison
equal deleted inserted replaced
29726:160c829dd5d0 29727:0dbd788a2dfd
290 290
291 def _callpush(self, cmd, fp, **args): 291 def _callpush(self, cmd, fp, **args):
292 r = self._call(cmd, **args) 292 r = self._call(cmd, **args)
293 if r: 293 if r:
294 return '', r 294 return '', r
295 while True: 295 for d in iter(lambda: fp.read(4096), ''):
296 d = fp.read(4096)
297 if not d:
298 break
299 self._send(d) 296 self._send(d)
300 self._send("", flush=True) 297 self._send("", flush=True)
301 r = self._recv() 298 r = self._recv()
302 if r: 299 if r:
303 return '', r 300 return '', r
306 def _calltwowaystream(self, cmd, fp, **args): 303 def _calltwowaystream(self, cmd, fp, **args):
307 r = self._call(cmd, **args) 304 r = self._call(cmd, **args)
308 if r: 305 if r:
309 # XXX needs to be made better 306 # XXX needs to be made better
310 raise error.Abort(_('unexpected remote reply: %s') % r) 307 raise error.Abort(_('unexpected remote reply: %s') % r)
311 while True: 308 for d in iter(lambda: fp.read(4096), ''):
312 d = fp.read(4096)
313 if not d:
314 break
315 self._send(d) 309 self._send(d)
316 self._send("", flush=True) 310 self._send("", flush=True)
317 return self.pipei 311 return self.pipei
318 312
319 def _getamount(self): 313 def _getamount(self):
351 similar to unbundle(). DEPRECATED, since it requires locking the 345 similar to unbundle(). DEPRECATED, since it requires locking the
352 remote.''' 346 remote.'''
353 d = self._call("addchangegroup") 347 d = self._call("addchangegroup")
354 if d: 348 if d:
355 self._abort(error.RepoError(_("push refused: %s") % d)) 349 self._abort(error.RepoError(_("push refused: %s") % d))
356 while True: 350 for d in iter(lambda: cg.read(4096), ''):
357 d = cg.read(4096)
358 if not d:
359 break
360 self.pipeo.write(d) 351 self.pipeo.write(d)
361 self.readerr() 352 self.readerr()
362 353
363 self.pipeo.flush() 354 self.pipeo.flush()
364 355