diff -r d4b9d3b91ce7 -r 350dcd481410 mercurial/commandserver.py
--- 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: