This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9927

config: use level to properly deal with value priority
ClosedPublic

Authored by marmoute on Jan 29 2021, 8:40 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb91a695b3b08: config: use level to properly deal with value priority
Summary

A higher priority alias will now take precedence over lower priority ones.

This was a requirements step before using alias more widely, especially to
rename existing and established config option.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jan 29 2021, 8:40 PM
Alphare added a subscriber: Alphare.Feb 8 2021, 5:20 AM
Alphare added inline comments.
tests/test-config.t
476–477

Should this comment be dropped now?

marmoute added inline comments.Feb 9 2021, 12:45 PM
tests/test-config.t
476–477

good catch, it should. (dropped in latest version).

Alphare accepted this revision.Feb 9 2021, 3:37 PM
baymax updated this revision to Diff 25519.Feb 9 2021, 6:29 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 25576.Feb 11 2021, 1:46 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Mar 4 2021, 6:27 AM
This revision is now accepted and ready to land.Mar 4 2021, 6:27 AM
marmoute added a commit: rHGb91a695b3b08: config: use level to properly deal with value priority.Mar 4 2021, 7:38 AM
Closed by commit rHGb91a695b3b08: config: use level to properly deal with value priority (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (13 lines)
Mtests/test-config.t (14 lines)

Diff 25519

mercurial/ui.py

): ):
msg = ( msg = (
b"specifying a mismatched default value for a registered " b"specifying a mismatched default value for a registered "
b"config item: '%s.%s' '%s'" b"config item: '%s.%s' '%s'"
) )
msg %= (section, name, pycompat.bytestr(default)) msg %= (section, name, pycompat.bytestr(default))
self.develwarn(msg, 2, b'warn-config-default') self.develwarn(msg, 2, b'warn-config-default')
candidates = []
config = self._data(untrusted)
for s, n in alternates: for s, n in alternates:
candidate = self._data(untrusted).get(s, n, None) candidate = config.get(s, n, None)
if candidate is not None: if candidate is not None:
value = candidate candidates.append((s, n, candidate))
break if candidates:
def level(x):
return config.level(x[0], x[1])
value = max(candidates, key=level)[2]
if self.debugflag and not untrusted and self._reportuntrusted: if self.debugflag and not untrusted and self._reportuntrusted:
for s, n in alternates: for s, n in alternates:
uvalue = self._ucfg.get(s, n) uvalue = self._ucfg.get(s, n)
if uvalue is not None and uvalue != value: if uvalue is not None and uvalue != value:
self.debug( self.debug(
b"ignoring untrusted configuration option " b"ignoring untrusted configuration option "
b"%s.%s = %s\n" % (s, n, uvalue) b"%s.%s = %s\n" % (s, n, uvalue)

tests/test-config.t

Alias ordering Alias ordering
-------------- --------------
The official config is now `command-templates.log`, the historical The official config is now `command-templates.log`, the historical
`ui.logtemplate` is a valid alternative for it. `ui.logtemplate` is a valid alternative for it.
When both are defined, the value for any of them defined within the highest When both are defined, the value for any of them defined within the highest
level config source (read later) should win. level config source (read later) should win.
BROKEN: currently not the case.
$ HGRCPATH="file-A.rc" hg log -r . $ HGRCPATH="file-A.rc" hg log -r .
AlphareUnsubmitted
Not Done

Should this comment be dropped now?

Alphare: Should this comment be dropped now?
marmouteAuthorUnsubmitted
Done

good catch, it should. (dropped in latest version).

marmoute: good catch, it should. (dropped in latest version).
value-A value-A
$ HGRCPATH="file-B.rc" hg log -r . $ HGRCPATH="file-B.rc" hg log -r .
value-B value-B
$ HGRCPATH="file-A.rc:file-B.rc" hg log -r . $ HGRCPATH="file-A.rc:file-B.rc" hg log -r .
value-A (known-bad-output !) value-B
value-B (missing-correct-output !)
Alias and include Alias and include
----------------- -----------------
The pre/post include priority should also apply when tie-breaking alternatives. The pre/post include priority should also apply when tie-breaking alternatives.
See the case above for details about the two config options used. See the case above for details about the two config options used.
$ HGRCPATH="file-C.rc" hg log -r . $ HGRCPATH="file-C.rc" hg log -r .
value-included (known-bad-output !) value-C
value-C (missing-correct-output !)
$ HGRCPATH="file-D.rc" hg log -r . $ HGRCPATH="file-D.rc" hg log -r .
value-D (known-bad-output !) value-included
value-included (missing-correct-output !)
command line override command line override
--------------------- ---------------------
$ HGRCPATH="file-A.rc:file-B.rc" hg log -r . --config ui.logtemplate="value-CLI\n" $ HGRCPATH="file-A.rc:file-B.rc" hg log -r . --config ui.logtemplate="value-CLI\n"
value-A (known-bad-output !) value-CLI
value-CLI (missing-correct-output !)