This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6730

config: handle default values of type list
AbandonedPublic

Authored by navaneeth.suresh on Aug 16 2019, 5:03 AM.

Details

Reviewers
av6
Group Reviewers
hg-reviewers
Summary

This patch improves the output of the defaultvalue keyword.
For example, progress.format.
Its default value is shown to be ['topic', 'bar', 'number', 'estimate']
until now, but it does not match hg help config.progress.format
(it says default: topic bar number estimate), and that is also not the
format that users would need to use for the actual value in hgrc or using
--config flag.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

av6 requested changes to this revision.Aug 17 2019, 9:00 AM
av6 added a subscriber: av6.

The changes in tests that this patch causes are actually already present in the D6709, so let's fold this patch into it as well.

This revision now requires changes to proceed.Aug 17 2019, 9:00 AM
navaneeth.suresh abandoned this revision.Aug 17 2019, 10:56 AM
In D6730#98852, @av6 wrote:

The changes in tests that this patch causes are actually already present in the D6709, so let's fold this patch into it as well.

Okay. Folded and updated D6709. Abandoning this.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (2 lines)

Diff 16219

mercurial/ui.py

"""returns the default value of the config item""" """returns the default value of the config item"""
item = self._knownconfig.get(section, {}).get(name) item = self._knownconfig.get(section, {}).get(name)
itemdefault = None itemdefault = None
if item is not None: if item is not None:
if callable(item.default): if callable(item.default):
itemdefault = item.default() itemdefault = item.default()
else: else:
itemdefault = item.default itemdefault = item.default
if isinstance(itemdefault, list):
itemdefault = ' '.join(itemdefault)
return itemdefault return itemdefault
def hasconfig(self, section, name, untrusted=False): def hasconfig(self, section, name, untrusted=False):
return self._data(untrusted).hasitem(section, name) return self._data(untrusted).hasitem(section, name)
def has_section(self, section, untrusted=False): def has_section(self, section, untrusted=False):
'''tell whether section exists in config.''' '''tell whether section exists in config.'''
return section in self._data(untrusted) return section in self._data(untrusted)