cmdserver: get file attributes of 'e'-channel from stdout, not from stderr

It seems wrong to get attributes from object different than the underlying
file.  In the following example, it doesn't make sense to flush stderr after
writing to stdout:

    self.ferr.write(str(a))
    if not getattr(self.ferr, 'closed', False):
        self.ferr.flush()
This commit is contained in:
Yuya Nishihara 2014-09-27 12:27:03 +09:00
parent 2e0a7a3cee
commit 99d8be652a

View File

@ -153,7 +153,7 @@ class server(object):
self.repo = self.repoui = None
if mode == 'pipe':
self.cerr = channeledoutput(sys.stderr, sys.stdout, 'e')
self.cerr = channeledoutput(sys.stdout, sys.stdout, 'e')
self.cout = channeledoutput(sys.stdout, sys.stdout, 'o')
self.cin = channeledinput(sys.stdin, sys.stdout, 'I')
self.cresult = channeledoutput(sys.stdout, sys.stdout, 'r')