This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1158

test-show: make it compatible with chg
ClosedPublic

Authored by quark on Oct 17 2017, 1:50 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG110040e715c9: test-show: make it compatible with chg
Summary

The show extension reads commands.show.aliasprefix config in its
extsetup and that causes issues with chg. This patch adds that config item
to chg confighash to solve the issue.

Test Plan

run-tests.py -l --chg test-show.t

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

quark created this revision.Oct 17 2017, 1:50 PM
yuja accepted this revision.Oct 18 2017, 8:21 AM
This revision is now accepted and ready to land.Oct 18 2017, 8:21 AM
Closed by commit rHG110040e715c9: test-show: make it compatible with chg (authored by quark). · Explain WhyOct 18 2017, 8:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (6 lines)

Diff 2968

mercurial/chgserver.py

# 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 = [
('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(r'''\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_.*
not qualified to serve its client and should redirect the client to a new not qualified to serve its client and should redirect the client to a new
server. different from mtimehash, confighash change will not mark the server. different from mtimehash, confighash change will not mark the
server outdated and exit since the user can have different configs at the server outdated and exit since the user can have different configs at the
same time. same time.
""" """
sectionitems = [] sectionitems = []
for section in _configsections: for section in _configsections:
sectionitems.append(ui.configitems(section)) sectionitems.append(ui.configitems(section))
for section, item in _configsectionitems:
sectionitems.append(ui.config(section, item))
sectionhash = _hashlist(sectionitems) sectionhash = _hashlist(sectionitems)
envitems = [(k, v) for k, v in encoding.environ.iteritems() envitems = [(k, v) for k, v in encoding.environ.iteritems()
if _envre.match(k)] if _envre.match(k)]
envhash = _hashlist(sorted(envitems)) envhash = _hashlist(sorted(envitems))
return sectionhash[:6] + envhash[:6] return sectionhash[:6] + envhash[:6]
def _getmtimepaths(ui): def _getmtimepaths(ui):
"""get a list of paths that should be checked to detect change """get a list of paths that should be checked to detect change