# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 2016-03-10 00:12:33
# Node ID 8062869860b817d008e4b82a56670b4cbd37e9ab
# Parent  8a7110e351eccbfd58797f1d1be835f7e38576e1

chg: remove manual reload logic

chgserver now validates and reloads configs automatically. Manually reloading
is no longer necessary. Besides, we are deprecating pid files since the server
will periodically check its ownership of the socket file and exit if it does
not own the socket file any longer, which works more reliable than a pid file.
This patch removes the SIGHUP reload logic from both chg server and client.

diff --git a/contrib/chg/README b/contrib/chg/README
--- a/contrib/chg/README
+++ b/contrib/chg/README
@@ -13,7 +13,6 @@ Usage:
  $ 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 @@ Although cHg tries to update environment
 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.
 
diff --git a/contrib/chg/chg.1 b/contrib/chg/chg.1
--- a/contrib/chg/chg.1
+++ b/contrib/chg/chg.1
@@ -35,9 +35,6 @@ command. Additionally it accepts the fol
 .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
diff --git a/contrib/chg/chg.c b/contrib/chg/chg.c
--- a/contrib/chg/chg.c
+++ b/contrib/chg/chg.c
@@ -539,8 +539,6 @@ int main(int argc, const char *argv[], c
 		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;
diff --git a/hgext/chgserver.py b/hgext/chgserver.py
--- a/hgext/chgserver.py
+++ b/hgext/chgserver.py
@@ -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 errno
 import inspect
 import os
 import re
-import signal
 import struct
 import sys
 import threading
@@ -616,7 +612,6 @@ class AutoExitMixIn:  # use old-style to
 
 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 @@ class chgunixservice(commandserver.unixs
         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()