changeset 30650:a3f335d1247c

chgserver: backout changeset dfb19aed409e (per discussion) On Wed, 21 Dec 2016 15:39:05 +0000, Jun Wu wrote: > Actually, patch 1 is unnecessary if we go with the "ui._runpager" approach. > Maybe someone can drop it without adding too many markers.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Dec 2016 01:09:45 +0900
parents 2bb8c53be961
children ea3540e66fd8
files mercurial/chgserver.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/chgserver.py	Fri Dec 16 14:48:37 2016 +0000
+++ b/mercurial/chgserver.py	Thu Dec 22 01:09:45 2016 +0900
@@ -327,9 +327,8 @@
 
 class chgcmdserver(commandserver.server):
     def __init__(self, ui, repo, fin, fout, sock, hashstate, baseaddress):
-        self._csystem = channeledsystem(fin, fout, 'S')
         super(chgcmdserver, self).__init__(
-            _newchgui(ui, self._csystem), repo, fin, fout)
+            _newchgui(ui, channeledsystem(fin, fout, 'S')), repo, fin, fout)
         self.clientsock = sock
         self._oldios = []  # original (self.ch, ui.fp, fd) before "attachio"
         self.hashstate = hashstate