This is an archive of the discontinued Mercurial Phabricator instance.

Differential D917

eol: make [eol] config section sensitive for chg confighash
ClosedPublic

Authored by quark on Oct 2 2017, 10:25 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG37b7581e5737: eol: make [eol] config section sensitive for chg confighash
Summary

The eol extension may mangle the [eol] config section and that means chg is
unable to detect config file change (because it re-applies setconfig
changes).

This makes test-eol.t pass with chg.

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 2 2017, 10:25 PM
yuja requested changes to this revision.Oct 4 2017, 9:03 AM
yuja added a subscriber: yuja.

It's a core extension. Let's simply add it to chgserver.py.

This revision now requires changes to proceed.Oct 4 2017, 9:03 AM
quark updated this revision to Diff 2453.Oct 5 2017, 12:45 AM
Closed by commit rHG37b7581e5737: eol: make [eol] config section sensitive for chg confighash (authored by quark). · Explain WhyOct 5 2017, 10:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/chgserver.py (1 line)

Diff 2463

mercurial/chgserver.py

def _hashlist(items): def _hashlist(items):
"""return sha1 hexdigest for a list""" """return sha1 hexdigest for a list"""
return hashlib.sha1(str(items)).hexdigest() return hashlib.sha1(str(items)).hexdigest()
# 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', ...)
'extdiff', # uisetup will register new commands 'extdiff', # uisetup will register new commands
'extensions', 'extensions',
] ]
# 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)?