##// END OF EJS Templates
chg: drop progress.assume-tty config...
Jun Wu -
r28327:3ab370f8 default
parent child Browse files
Show More
@@ -38,7 +38,6 b' serve:'
38 $(HG) serve --cwd / --cmdserver chgunix \
38 $(HG) serve --cwd / --cmdserver chgunix \
39 --address $(CHGSOCKNAME) \
39 --address $(CHGSOCKNAME) \
40 --config extensions.chgserver= \
40 --config extensions.chgserver= \
41 --config progress.assume-tty=1 \
42 --config cmdserver.log=/dev/stderr
41 --config cmdserver.log=/dev/stderr
43
42
44 .PHONY: clean
43 .PHONY: clean
@@ -216,8 +216,6 b' static void execcmdserver(const struct c'
216 "--daemon-postexec", "none",
216 "--daemon-postexec", "none",
217 "--pid-file", opts->pidfile,
217 "--pid-file", opts->pidfile,
218 "--config", "extensions.chgserver=",
218 "--config", "extensions.chgserver=",
219 /* wrap root ui so that it can be disabled/enabled by config */
220 "--config", "progress.assume-tty=1",
221 };
219 };
222 size_t baseargvsize = sizeof(baseargv) / sizeof(baseargv[0]);
220 size_t baseargvsize = sizeof(baseargv) / sizeof(baseargv[0]);
223 size_t argsize = baseargvsize + opts->argsize + 1;
221 size_t argsize = baseargvsize + opts->argsize + 1;
@@ -582,8 +582,6 b' class AutoExitMixIn: # use old-style to'
582
582
583 class chgunixservice(commandserver.unixservice):
583 class chgunixservice(commandserver.unixservice):
584 def init(self):
584 def init(self):
585 # drop options set for "hg serve --cmdserver" command
586 self.ui.setconfig('progress', 'assume-tty', None)
587 signal.signal(signal.SIGHUP, self._reloadconfig)
585 signal.signal(signal.SIGHUP, self._reloadconfig)
588 self._inithashstate()
586 self._inithashstate()
589 class cls(AutoExitMixIn, SocketServer.ForkingMixIn,
587 class cls(AutoExitMixIn, SocketServer.ForkingMixIn,
General Comments 0
You need to be logged in to leave comments. Login now