# HG changeset patch # User Yuya Nishihara # Date 2016-12-21 16:09:45 # Node ID a3f335d1247caabd14fc2dde64a6c5a36edfa3fc # Parent 2bb8c53be961f41026ce99e1227ff2e530fbe425 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. diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py --- a/mercurial/chgserver.py +++ b/mercurial/chgserver.py @@ -327,9 +327,8 @@ class channeledsystem(object): 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