This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9925

config: track "source" along side value
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd3df397e7a59: config: track "source" along side value
Summary

Currently the source is stored in a entirely different way than the data. This
is impractical. Especially if we are about to add more of such metadata. So lets
put them back together.

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

marmoute created this revision.Jan 29 2021, 8:39 PM
Alphare accepted this revision.Feb 8 2021, 5:15 AM
Alphare added a subscriber: Alphare.

This is more in line with the (soon to be used) Rust implementation, also.

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

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

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

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

pulkit accepted this revision.Mar 4 2021, 6:26 AM
This revision is now accepted and ready to land.Mar 4 2021, 6:26 AM
marmoute added a commit: rHGd3df397e7a59: config: track "source" along side value.Mar 4 2021, 7:38 AM
Closed by commit rHGd3df397e7a59: config: track "source" along side value (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Mar 5 2021, 7:30 PM

This patch makes test-releasenotes-formatting.t fail for me. I noticed that it has #require fuzzywuzzy at the top. Could you install that (I don't even remember what it is) and send a fix?

marmoute added a comment.Mar 6 2021, 12:36 AM
In D9925#153685, @martinvonz wrote:

This patch makes test-releasenotes-formatting.t fail for me. I noticed that it has #require fuzzywuzzy at the top. Could you install that (I don't even remember what it is) and send a fix?

Here is the fix: https://phab.mercurial-scm.org/D10121

and here is the MR to install fuzzywuzzy in the CI image: https://foss.heptapod.net/octobus/ci-dockerfiles/-/merge_requests/54

marmoute added a comment.EditedMar 11 2021, 12:02 PM
In D9925#154175, @mharbison72 wrote:

With this new API, what's the equivalent of this?
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/blob/1be900fc8505ed5a93c900d19d1d8700a1b22aee/tortoisehg/hgqt/thgrepo.py#L874

After discussion on IRC, the link is actually wrong, one should like at the previous function that use _source. The source information is not stored along side the value (in a (value, source, level) tuple). You can access it using `config.source(section, key).

Revision Contents
Changeset List

PathPackages
Mmercurial/config.py (47 lines)

Diff 26056

mercurial/config.py

class config(object): class config(object):
def __init__(self, data=None): def __init__(self, data=None):
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._source = data._source.copy()
else:
self._source = util.cowdict()
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):
self._source = self._source.preparewrite()
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]
del self._source[(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]) self._data[s].update(src._data[s])
self._source.update(src._source)
def _get(self, section, item):
return self._data.get(section, {}).get(item)
def get(self, section, item, default=None): def get(self, section, item, default=None):
return self._data.get(section, {}).get(item, default) result = self._get(section, item)
if result is None:
return default
return result[0]
def backup(self, section, item): def backup(self, section, key):
"""return a tuple allowing restore to reinstall a previous value """return a tuple allowing restore to reinstall a previous value
The main reason we need it is because it handles the "no data" case. The main reason we need it is because it handles the "no data" case.
""" """
try: try:
value = self._data[section][item] item = self._data[section][key]
source = self.source(section, item)
return (section, item, value, source)
except KeyError: except KeyError:
return (section, item) return (section, key)
else:
return (section, key) + item
def source(self, section, item): def source(self, section, item):
return self._source.get((section, item), b"") result = self._get(section, item)
if result is None:
return b""
return result[1]
def sections(self): def sections(self):
return sorted(self._data.keys()) return sorted(self._data.keys())
def items(self, section): def items(self, section):
return list(pycompat.iteritems(self._data.get(section, {}))) items = pycompat.iteritems(self._data.get(section, {}))
return [(k, v) for (k, (v, s)) 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 self._data[section][item] = (value, source)
if source:
self._source = self._source.preparewrite()
self._source[(section, item)] = source
def alter(self, section, key, new_value): def alter(self, section, key, new_value):
"""alter a value without altering its source or level """alter a value without altering its source or level
This method is meant to be used by `ui.fixconfig` only.""" This method is meant to be used by `ui.fixconfig` only."""
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
def restore(self, data): def restore(self, data):
"""restore data returned by self.backup""" """restore data returned by self.backup"""
self._source = self._source.preparewrite() if len(data) != 2:
if len(data) == 4:
# restore old data # restore old data
section, item, value, source = data section, key = data[:2]
item = data[2:]
self._data[section] = self._data[section].preparewrite() self._data[section] = self._data[section].preparewrite()
self._data[section][item] = value self._data[section][key] = item
self._source[(section, item)] = source
else: else:
# no data before, remove everything # no data before, remove everything
section, item = data section, item = data
if section in self._data: if section in self._data:
self._data[section].pop(item, None) self._data[section].pop(item, None)
self._source.pop((section, item), None)
def parse(self, src, data, sections=None, remap=None, include=None): def parse(self, src, data, sections=None, remap=None, include=None):
sectionre = util.re.compile(br'\[([^\[]+)\]') sectionre = util.re.compile(br'\[([^\[]+)\]')
itemre = util.re.compile(br'([^=\s][^=]*?)\s*=\s*(.*\S|)') itemre = util.re.compile(br'([^=\s][^=]*?)\s*=\s*(.*\S|)')
contre = util.re.compile(br'\s+(\S|\S.*\S)\s*$') contre = util.re.compile(br'\s+(\S|\S.*\S)\s*$')
emptyre = util.re.compile(br'(;|#|\s*$)') emptyre = util.re.compile(br'(;|#|\s*$)')
commentre = util.re.compile(br'(;|#)') commentre = util.re.compile(br'(;|#)')
unsetre = util.re.compile(br'%unset\s+(\S+)') unsetre = util.re.compile(br'%unset\s+(\S+)')