Mercurial > hg-stable
changeset 28327:3ab370f84a23
chg: drop progress.assume-tty config
It was necessary to go through progress.uisetup() to set up the progressui
wrapper. Since the progress extension has got into the core, progress.assume-tty
is no longer necessary.
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Mon, 29 Feb 2016 11:43:25 +0000 |
| parents | ea400a4f32e6 |
| children | e00e57d83653 |
| files | contrib/chg/Makefile contrib/chg/chg.c hgext/chgserver.py |
| diffstat | 3 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/chg/Makefile Wed Mar 02 10:10:06 2016 +0000 +++ b/contrib/chg/Makefile Mon Feb 29 11:43:25 2016 +0000 @@ -38,7 +38,6 @@ $(HG) serve --cwd / --cmdserver chgunix \ --address $(CHGSOCKNAME) \ --config extensions.chgserver= \ - --config progress.assume-tty=1 \ --config cmdserver.log=/dev/stderr .PHONY: clean
--- a/contrib/chg/chg.c Wed Mar 02 10:10:06 2016 +0000 +++ b/contrib/chg/chg.c Mon Feb 29 11:43:25 2016 +0000 @@ -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;
--- a/hgext/chgserver.py Wed Mar 02 10:10:06 2016 +0000 +++ b/hgext/chgserver.py Mon Feb 29 11:43:25 2016 +0000 @@ -582,8 +582,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,