author | Jun Wu <quark@fb.com> |
Thu, 10 Mar 2016 00:12:33 +0000 | |
changeset 28454 | 8062869860b8 |
parent 28453 | 8a7110e351ec |
child 28455 | 412ee35a8005 |
contrib/chg/README | file | annotate | diff | comparison | revisions | |
contrib/chg/chg.1 | file | annotate | diff | comparison | revisions | |
contrib/chg/chg.c | file | annotate | diff | comparison | revisions | |
hgext/chgserver.py | file | annotate | diff | comparison | revisions |
--- a/contrib/chg/README Wed Mar 09 01:20:57 2016 +0000 +++ b/contrib/chg/README Thu Mar 10 00:12:33 2016 +0000 @@ -13,7 +13,6 @@ $ chg help # show help of Mercurial $ alias hg=chg # replace hg command $ chg --kill-chg-daemon # terminate background server - $ chg --reload-chg-daemon # reload configuration files Environment variables: @@ -21,8 +20,7 @@ changed after spawning the server. The following variables are specially handled: - * configuration files are reloaded if HGPLAIN or HGPLAINEXCEPT changed, but - some behaviors won't change correctly. + * configuration files are reloaded automatically by default. * CHGHG or HG specifies the path to the hg executable spawned as the background command server.
--- a/contrib/chg/chg.1 Wed Mar 09 01:20:57 2016 +0000 +++ b/contrib/chg/chg.1 Thu Mar 10 00:12:33 2016 +0000 @@ -35,9 +35,6 @@ .TP .B \-\-kill\-chg\-daemon Terminate the background command servers. -.TP -.B \-\-reload\-chg\-daemon -Reload configuration files. .SH SEE ALSO .BR hg (1), .SH AUTHOR
--- a/contrib/chg/chg.c Wed Mar 09 01:20:57 2016 +0000 +++ b/contrib/chg/chg.c Thu Mar 10 00:12:33 2016 +0000 @@ -539,8 +539,6 @@ int sig = 0; if (strcmp(argv[1], "--kill-chg-daemon") == 0) sig = SIGTERM; - if (strcmp(argv[1], "--reload-chg-daemon") == 0) - sig = SIGHUP; if (sig > 0) { killcmdserver(&opts, sig); return 0;
--- a/hgext/chgserver.py Wed Mar 09 01:20:57 2016 +0000 +++ b/hgext/chgserver.py Thu Mar 10 00:12:33 2016 +0000 @@ -28,9 +28,6 @@ 'validate' command reload the config and check if the server is up to date -'SIGHUP' signal - reload configuration files - Config ------ @@ -48,7 +45,6 @@ import inspect import os import re -import signal import struct import sys import threading @@ -616,7 +612,6 @@ class chgunixservice(commandserver.unixservice): def init(self): - signal.signal(signal.SIGHUP, self._reloadconfig) self._inithashstate() class cls(AutoExitMixIn, SocketServer.ForkingMixIn, SocketServer.UnixStreamServer): @@ -647,9 +642,6 @@ os.symlink(os.path.basename(self.address), tempaddress) util.rename(tempaddress, self.baseaddress) - def _reloadconfig(self, signum, frame): - self.ui = self.server.ui = _renewui(self.ui) - def run(self): try: self.server.serve_forever()