This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9926

config: track the "level" of a value
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa3dced4b7b04: config: track the "level" of a value
Summary

Config value now remember the "level" of the config that loaded it. This will be
used to ensure good priority management for alias.

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 accepted this revision.Feb 8 2021, 5:19 AM
Alphare added a subscriber: Alphare.

This is a more "manual" implementation than the Rust one, but I suspect the churn would be too big and maybe the performance would be affected too much.

marmoute added a comment.Feb 9 2021, 12:17 PM
In D9926#150863, @Alphare wrote:

This is a more "manual" implementation than the Rust one, but I suspect the churn would be too big and maybe the performance would be affected too much.

Yeah, the goal of this series is mostly to add the new behavior with minimal internal change. That way we can introduce the new behavior (surprising) with associated test and clean up the config API to make the internal more insulated. Once this is done, it should be easier to refactor the internal if it seems useful.

baymax updated this revision to Diff 25518.Feb 9 2021, 6:29 PM

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

baymax updated this revision to Diff 25575.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: rHGa3dced4b7b04: config: track the "level" of a value.Mar 4 2021, 7:38 AM
Closed by commit rHGa3dced4b7b04: config: track the "level" of a value (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/config.py (31 lines)
Mmercurial/ui.py (7 lines)

Diff 25392

mercurial/config.py

error, error,
pycompat, pycompat,
util, util,
) )
class config(object): class config(object):
def __init__(self, data=None): def __init__(self, data=None):
self._current_source_level = 0
self._data = {} self._data = {}
self._unset = [] self._unset = []
if data: if data:
for k in data._data: for k in data._data:
self._data[k] = data[k].copy() self._data[k] = data[k].copy()
self._current_source_level = data._current_source_level + 1
def new_source(self):
"""increment the source counter
This is used to define source priority when reading"""
self._current_source_level += 1
def copy(self): def copy(self):
return config(self) return config(self)
def __contains__(self, section): def __contains__(self, section):
return section in self._data return section in self._data
def hasitem(self, section, item): def hasitem(self, section, item):
return item in self._data.get(section, {}) return item in self._data.get(section, {})
def __getitem__(self, section): def __getitem__(self, section):
return self._data.get(section, {}) return self._data.get(section, {})
def __iter__(self): def __iter__(self):
for d in self.sections(): for d in self.sections():
yield d yield d
def update(self, src): def update(self, src):
current_level = self._current_source_level
current_level += 1
max_level = self._current_source_level
for s, n in src._unset: for s, n in src._unset:
ds = self._data.get(s, None) ds = self._data.get(s, None)
if ds is not None and n in ds: if ds is not None and n in ds:
self._data[s] = ds.preparewrite() self._data[s] = ds.preparewrite()
del self._data[s][n] del self._data[s][n]
for s in src: for s in src:
ds = self._data.get(s, None) ds = self._data.get(s, None)
if ds: if ds:
self._data[s] = ds.preparewrite() self._data[s] = ds.preparewrite()
else: else:
self._data[s] = util.cowsortdict() self._data[s] = util.cowsortdict()
self._data[s].update(src._data[s]) for k, v in src._data[s].items():
value, source, level = v
level += current_level
max_level = max(level, current_level)
self._data[s][k] = (value, source, level)
self._current_source_level = max_level
def _get(self, section, item): def _get(self, section, item):
return self._data.get(section, {}).get(item) return self._data.get(section, {}).get(item)
def get(self, section, item, default=None): def get(self, section, item, default=None):
result = self._get(section, item) result = self._get(section, item)
if result is None: if result is None:
return default return default
return (section, key) + item return (section, key) + item
def source(self, section, item): def source(self, section, item):
result = self._get(section, item) result = self._get(section, item)
if result is None: if result is None:
return b"" return b""
return result[1] return result[1]
def level(self, section, item):
result = self._get(section, item)
if result is None:
return None
return result[2]
def sections(self): def sections(self):
return sorted(self._data.keys()) return sorted(self._data.keys())
def items(self, section): def items(self, section):
items = pycompat.iteritems(self._data.get(section, {})) items = pycompat.iteritems(self._data.get(section, {}))
return [(k, v) for (k, (v, s)) in items] return [(k, v[0]) for (k, v) in items]
def set(self, section, item, value, source=b""): def set(self, section, item, value, source=b""):
if pycompat.ispy3: if pycompat.ispy3:
assert not isinstance( assert not isinstance(
section, str section, str
), b'config section may not be unicode strings on Python 3' ), b'config section may not be unicode strings on Python 3'
assert not isinstance( assert not isinstance(
item, str item, str
), b'config item may not be unicode strings on Python 3' ), b'config item may not be unicode strings on Python 3'
assert not isinstance( assert not isinstance(
value, str value, str
), b'config values may not be unicode strings on Python 3' ), b'config values may not be unicode strings on Python 3'
if section not in self: if section not in self:
self._data[section] = util.cowsortdict() self._data[section] = util.cowsortdict()
else: else:
self._data[section] = self._data[section].preparewrite() self._data[section] = self._data[section].preparewrite()
self._data[section][item] = (value, source) self._data[section][item] = (value, source, self._current_source_level)
def alter(self, section, key, new_value): def alter(self, section, key, new_value):
"""alter a value, to be used by `ui.fixconfig`""" """alter a value, to be used by `ui.fixconfig`"""
item = self._data[section][key] item = self._data[section][key]
size = len(item) size = len(item)
new_item = (new_value,) + item[1:] new_item = (new_value,) + item[1:]
assert len(new_item) == size assert len(new_item) == size
self._data[section][key] = new_item self._data[section][key] = new_item
continue continue
message = l.rstrip() message = l.rstrip()
if l.startswith(b' '): if l.startswith(b' '):
message = b"unexpected leading whitespace: %s" % message message = b"unexpected leading whitespace: %s" % message
raise error.ConfigError(message, (b"%s:%d" % (src, line))) raise error.ConfigError(message, (b"%s:%d" % (src, line)))
def read(self, path, fp=None, sections=None, remap=None): def read(self, path, fp=None, sections=None, remap=None):
self.new_source()
if not fp: if not fp:
fp = util.posixfile(path, b'rb') fp = util.posixfile(path, b'rb')
assert ( assert (
getattr(fp, 'mode', 'rb') == 'rb' getattr(fp, 'mode', 'rb') == 'rb'
), b'config files must be opened in binary mode, got fp=%r mode=%r' % ( ), b'config files must be opened in binary mode, got fp=%r mode=%r' % (
fp, fp,
fp.mode, fp.mode,
) )
dir = os.path.dirname(path) dir = os.path.dirname(path)
def include(rel, remap, sections): def include(rel, remap, sections):
abs = os.path.normpath(os.path.join(dir, rel)) abs = os.path.normpath(os.path.join(dir, rel))
self.read(abs, remap=remap, sections=sections) self.read(abs, remap=remap, sections=sections)
# anything after the include has a higher level
self.new_source()
self.parse( self.parse(
path, fp.read(), sections=sections, remap=remap, include=include path, fp.read(), sections=sections, remap=remap, include=include
) )
def parselist(value): def parselist(value):
"""parse a configuration value as a list of comma/space separated strings """parse a configuration value as a list of comma/space separated strings

mercurial/ui.py

if b'*' in allowed: if b'*' in allowed:
self._exportableenviron = self.environ self._exportableenviron = self.environ
else: else:
self._exportableenviron = {} self._exportableenviron = {}
for k in allowed: for k in allowed:
if k in self.environ: if k in self.environ:
self._exportableenviron[k] = self.environ[k] self._exportableenviron[k] = self.environ[k]
def _new_source(self):
self._ocfg.new_source()
self._tcfg.new_source()
self._ucfg.new_source()
@classmethod @classmethod
def load(cls): def load(cls):
"""Create a ui and load global and user configs""" """Create a ui and load global and user configs"""
u = cls() u = cls()
# we always trust global config files and environment variables # we always trust global config files and environment variables
for t, f in rcutil.rccomponents(): for t, f in rcutil.rccomponents():
if t == b'path': if t == b'path':
u.readconfig(f, trust=True) u.readconfig(f, trust=True)
elif t == b'resource': elif t == b'resource':
u.read_resource_config(f, trust=True) u.read_resource_config(f, trust=True)
elif t == b'items': elif t == b'items':
u._new_source()
sections = set() sections = set()
for section, name, value, source in f: for section, name, value, source in f:
# do not set u._ocfg # do not set u._ocfg
# XXX clean this up once immutable config object is a thing # XXX clean this up once immutable config object is a thing
u._tcfg.set(section, name, value, source) u._tcfg.set(section, name, value, source)
u._ucfg.set(section, name, value, source) u._ucfg.set(section, name, value, source)
sections.add(section) sections.add(section)
for section in sections: for section in sections:
u.fixconfig(section=section) u.fixconfig(section=section)
else: else:
raise error.ProgrammingError(b'unknown rctype: %s' % t) raise error.ProgrammingError(b'unknown rctype: %s' % t)
u._maybetweakdefaults() u._maybetweakdefaults()
u._new_source() # anything after that is a different level
return u return u
def _maybetweakdefaults(self): def _maybetweakdefaults(self):
if not self.configbool(b'ui', b'tweakdefaults'): if not self.configbool(b'ui', b'tweakdefaults'):
return return
if self._tweaked or self.plain(b'tweakdefaults'): if self._tweaked or self.plain(b'tweakdefaults'):
return return