[PATCH 03 of 10] chg: drop progress.assume-tty config

Jun Wu quark at fb.com
Wed Mar 2 05:44:05 EST 2016


# HG changeset patch
# User Jun Wu <quark at fb.com>
# Date 1456746205 0
#      Mon Feb 29 11:43:25 2016 +0000
# Node ID 855e65accbb4519f7140828efe6800b0b92fd5f4
# Parent  74f9fd794398e5bebb6271cea53d5e5e5bf5e590
chg: drop progress.assume-tty config

Since chgserver will just take over the fds passed from the client. It can
pass istty check and progress.assume-tty is no longer necessary.

diff --git a/contrib/chg/chg.c b/contrib/chg/chg.c
--- a/contrib/chg/chg.c
+++ b/contrib/chg/chg.c
@@ -216,8 +216,6 @@
 		"--daemon-postexec", "none",
 		"--pid-file", opts->pidfile,
 		"--config", "extensions.chgserver=",
-		/* wrap root ui so that it can be disabled/enabled by config */
-		"--config", "progress.assume-tty=1",
 	};
 	size_t baseargvsize = sizeof(baseargv) / sizeof(baseargv[0]);
 	size_t argsize = baseargvsize + opts->argsize + 1;
diff --git a/hgext/chgserver.py b/hgext/chgserver.py
--- a/hgext/chgserver.py
+++ b/hgext/chgserver.py
@@ -580,8 +580,6 @@
 
 class chgunixservice(commandserver.unixservice):
     def init(self):
-        # drop options set for "hg serve --cmdserver" command
-        self.ui.setconfig('progress', 'assume-tty', None)
         signal.signal(signal.SIGHUP, self._reloadconfig)
         self._inithashstate()
         class cls(AutoExitMixIn, SocketServer.ForkingMixIn,


More information about the Mercurial-devel mailing list