changeset 14728:350dcd481410 stable

cmdserver: fix read-loop string concatenation
author Idan Kamara <idankk86@gmail.com>
date Fri, 24 Jun 2011 16:36:24 +0300
parents d4b9d3b91ce7
children 94eea58da2a3
files mercurial/commandserver.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commandserver.py	Fri Jun 24 16:30:43 2011 +0300
+++ b/mercurial/commandserver.py	Fri Jun 24 16:36:24 2011 +0300
@@ -73,8 +73,8 @@
             s = self._read(size, self.channel)
             buf = s
             while s:
+                s = self._read(size, self.channel)
                 buf += s
-                s = self._read(size, self.channel)
 
             return buf
         else:
@@ -104,8 +104,8 @@
             # keep asking for more until there's either no more or
             # we got a full line
             while s and s[-1] != '\n':
+                s = self._read(size, 'L')
                 buf += s
-                s = self._read(size, 'L')
 
             return buf
         else: