This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6040

py3: port things from chgserver.py
ClosedPublic

Authored by pulkit on Mar 1 2019, 7:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbce2356ece68: py3: port things from chgserver.py
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Mar 1 2019, 7:13 PM
Closed by commit rHGbce2356ece68: py3: port things from chgserver.py (authored by pulkit). · Explain WhyMar 1 2019, 9:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (7 lines)

Diff 14287

mercurial/chgserver.py

extensions, extensions,
node, node,
pycompat, pycompat,
util, util,
) )
from .utils import ( from .utils import (
procutil, procutil,
stringutil,
) )
def _hashlist(items): def _hashlist(items):
"""return sha1 hexdigest for a list""" """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 # sensitive config sections affecting confighash
_configsections = [ _configsections = [
'alias', # affects global state commands.table 'alias', # affects global state commands.table
'eol', # uses setconfig('eol', ...) 'eol', # uses setconfig('eol', ...)
'extdiff', # uisetup will register new commands 'extdiff', # uisetup will register new commands
'extensions', 'extensions',
] ]
_configsectionitems = [ _configsectionitems = [
('commands', 'show.aliasprefix'), # show.py reads it in extsetup ('commands', 'show.aliasprefix'), # show.py reads it in extsetup
] ]
# sensitive environment variables affecting confighash # sensitive environment variables affecting confighash
_envre = re.compile(r'''\A(?: _envre = re.compile(br'''\A(?:
CHGHG CHGHG
|HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)? |HG(?:DEMANDIMPORT|EMITWARNINGS|MODULEPOLICY|PROF|RCPATH)?
|HG(?:ENCODING|PLAIN).* |HG(?:ENCODING|PLAIN).*
|LANG(?:UAGE)? |LANG(?:UAGE)?
|LC_.* |LC_.*
|LD_.* |LD_.*
|PATH |PATH
|PYTHON.* |PYTHON.*
insts.append('unlink %s' % addr) insts.append('unlink %s' % addr)
# mtimehash is empty if one or more extensions fail to load. # mtimehash is empty if one or more extensions fail to load.
# to be compatible with hg, still serve the client this time. # to be compatible with hg, still serve the client this time.
if self.hashstate.mtimehash: if self.hashstate.mtimehash:
insts.append('reconnect') insts.append('reconnect')
if newhash.confighash != self.hashstate.confighash: if newhash.confighash != self.hashstate.confighash:
addr = _hashaddress(self.baseaddress, newhash.confighash) addr = _hashaddress(self.baseaddress, newhash.confighash)
insts.append('redirect %s' % addr) 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') self.cresult.write('\0'.join(insts) or '\0')
def chdir(self): def chdir(self):
"""Change current directory """Change current directory
Note that the behavior of --cwd option is bit different from this. Note that the behavior of --cwd option is bit different from this.
It does not affect --config parameter. It does not affect --config parameter.
""" """