D6040: py3: port things from chgserver.py
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Mar 2 00:13:18 UTC 2019
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
I have installed mercurial on my personal laptop using Python 3.7. I also have
hg aliased to chg. Before this commit, `hg version` didn't work. After this
patch, things are better and now chg works.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6040
AFFECTED FILES
mercurial/chgserver.py
CHANGE DETAILS
diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py
--- a/mercurial/chgserver.py
+++ b/mercurial/chgserver.py
@@ -64,11 +64,12 @@
from .utils import (
procutil,
+ stringutil,
)
def _hashlist(items):
"""return sha1 hexdigest for a list"""
- return node.hex(hashlib.sha1(str(items)).digest())
+ return node.hex(hashlib.sha1(stringutil.pprint(items)).digest())
# sensitive config sections affecting confighash
_configsections = [
@@ -83,7 +84,7 @@
]
# sensitive environment variables affecting confighash
-_envre = re.compile(r'''\A(?:
+_envre = re.compile(br'''\A(?:
CHGHG
|HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)?
|HG(?:ENCODING|PLAIN).*
@@ -449,7 +450,7 @@
if newhash.confighash != self.hashstate.confighash:
addr = _hashaddress(self.baseaddress, newhash.confighash)
insts.append('redirect %s' % addr)
- self.ui.log('chgserver', 'validate: %s\n', insts)
+ self.ui.log('chgserver', 'validate: %s\n', stringutil.pprint(insts))
self.cresult.write('\0'.join(insts) or '\0')
def chdir(self):
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list