# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1463893597 -32400
# Node ID 581c0c7cb25810bbb332647fd12f55111d746e14
# Parent  71c197d82b7ebe4fcb38b1c7f263d6bf5d5521b0
chgserver: refactor initialization of real/base addresses

Instead of overwriting self.address, calculate it from the address argument,
which is the base address.

diff -r 71c197d82b7e -r 581c0c7cb258 hgext/chgserver.py
--- a/hgext/chgserver.py	Sun May 22 14:05:34 2016 +0900
+++ b/hgext/chgserver.py	Sun May 22 14:06:37 2016 +0900
@@ -546,19 +546,19 @@
         self.lastactive = time.time()
 
     def bindsocket(self, sock, address):
-        self.address = address
-        self._inithashstate()
+        self._inithashstate(address)
         self._checkextensions()
         self._bind(sock)
         self._createsymlink()
 
-    def _inithashstate(self):
-        self.baseaddress = self.address
+    def _inithashstate(self, address):
+        self.baseaddress = address
         if self.ui.configbool('chgserver', 'skiphash', False):
             self.hashstate = None
+            self.address = address
             return
         self.hashstate = hashstate.fromui(self.ui)
-        self.address = _hashaddress(self.address, self.hashstate.confighash)
+        self.address = _hashaddress(address, self.hashstate.confighash)
 
     def _checkextensions(self):
         if not self.hashstate: