This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9924

config: use a new `alter` method in `fixconfig`
ClosedPublic

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

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7621ab4005bf: config: use a new `alter` method in `fixconfig`
Summary

The set function is doing various work related to metadata (eg: the source,
later the level). However the fixconfig call only updating some values
according to standard processing, not changing any of the related metadata. So
we introduce a new method and use it there.

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

I feel like the docstring is a bit short, maybe some of the commit message can find its way in there.

Alphare accepted this revision.Feb 8 2021, 5:08 AM

... but it's not really reason enough to not accept it since the code is simple enough.

marmoute added a comment.Feb 9 2021, 12:45 PM

I updated the docstring a bit.

baymax edited parent revisions, added: D9920: config: test priority involving alias and cli; removed: D9923: config: use the right API to access git-submodule.Feb 9 2021, 6:29 PM
baymax updated this revision to Diff 25516.

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

Alphare accepted this revision.Feb 10 2021, 4:39 AM
baymax updated this revision to Diff 25573.Feb 11 2021, 1:46 PM

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

pulkit accepted this revision.Mar 4 2021, 6:25 AM
This revision is now accepted and ready to land.Mar 4 2021, 6:25 AM
marmoute added a commit: rHG7621ab4005bf: config: use a new `alter` method in `fixconfig`.Mar 4 2021, 7:38 AM
Closed by commit rHG7621ab4005bf: config: use a new `alter` method in `fixconfig` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/config.py (10 lines)
Mmercurial/ui.py (2 lines)

Diff 26055

mercurial/config.py

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
if source: if source:
self._source = self._source.preparewrite() self._source = self._source.preparewrite()
self._source[(section, item)] = source self._source[(section, item)] = source
def alter(self, section, key, new_value):
"""alter a value without altering its source or level
This method is meant to be used by `ui.fixconfig` only."""
item = self._data[section][key]
size = len(item)
new_item = (new_value,) + item[1:]
assert len(new_item) == size
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() self._source = self._source.preparewrite()
if len(data) == 4: if len(data) == 4:
# restore old data # restore old data
section, item, value, source = data section, item, value, source = data
self._data[section] = self._data[section].preparewrite() self._data[section] = self._data[section].preparewrite()
self._data[section][item] = value self._data[section][item] = value

mercurial/ui.py

self.warn( self.warn(
_(b"(deprecated '%%' in path %s=%s from %s)\n") _(b"(deprecated '%%' in path %s=%s from %s)\n")
% (n, p, s) % (n, p, s)
) )
p = p.replace(b'%%', b'%') p = p.replace(b'%%', b'%')
p = util.expandpath(p) p = util.expandpath(p)
if not util.hasscheme(p) and not os.path.isabs(p): if not util.hasscheme(p) and not os.path.isabs(p):
p = os.path.normpath(os.path.join(root, p)) p = os.path.normpath(os.path.join(root, p))
c.set(b"paths", n, p) c.alter(b"paths", n, p)
if section in (None, b'ui'): if section in (None, b'ui'):
# update ui options # update ui options
self._fmsgout, self._fmsgerr = _selectmsgdests(self) self._fmsgout, self._fmsgerr = _selectmsgdests(self)
self.debugflag = self.configbool(b'ui', b'debug') self.debugflag = self.configbool(b'ui', b'debug')
self.verbose = self.debugflag or self.configbool(b'ui', b'verbose') self.verbose = self.debugflag or self.configbool(b'ui', b'verbose')
self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet') self.quiet = not self.debugflag and self.configbool(b'ui', b'quiet')
if self.verbose and self.quiet: if self.verbose and self.quiet: