[PATCH 08 of 10] sshrepo: don't use readline() on the stderr pipe

Dan Villiom Podlaski Christiansen danchr at gmail.com
Wed Dec 1 15:35:01 CST 2010


# HG changeset patch
# User Dan Villiom Podlaski Christiansen <danchr at gmail.com>
# Date 1291236368 -3600
# Node ID 4a55efdf7020945136fc9e9bc46f7634b743f9b2
# Parent  a175f79ccac721ad66b9e47aa7cfc6f2cbb64000
sshrepo: don't use readline() on the stderr pipe

For some reason, the stat/readline dance suppressed lines following
the first in PyPy 1.4.

diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py
--- a/mercurial/sshrepo.py
+++ b/mercurial/sshrepo.py
@@ -91,10 +91,11 @@ class sshrepository(wireproto.wirereposi
             size = util.fstat(self.pipee).st_size
             if size == 0:
                 break
-            l = self.pipee.readline()
-            if not l:
+            s = self.pipee.read(size)
+            if not s:
                 break
-            self.ui.status(_("remote: "), l)
+            for l in s.splitlines():
+                self.ui.status(_("remote: "), l, '\n')
 
     def _abort(self, exception):
         self.cleanup()


More information about the Mercurial-devel mailing list