D6704: config: add defaultvalue template keyword
navaneeth.suresh (Navaneeth Suresh)
phabricator at mercurial-scm.org
Thu Aug 1 17:43:44 UTC 2019
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This patch tries to fix one of the issues mentioned in issue6014.
This adds a new `defaultvalue` template keyword to be used with
`hg showconfig` to get the default value of the config item.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6704
AFFECTED FILES
mercurial/commands.py
mercurial/ui.py
tests/test-config.t
CHANGE DETAILS
diff --git a/tests/test-config.t b/tests/test-config.t
--- a/tests/test-config.t
+++ b/tests/test-config.t
@@ -70,6 +70,7 @@
$ hg showconfig Section.KeY -Tjson
[
{
+ "defaultvalue": "None",
"name": "Section.KeY",
"source": "*.hgrc:*", (glob)
"value": "Case Sensitive"
@@ -102,6 +103,7 @@
$ hg config empty.source -Tjson
[
{
+ "defaultvalue": "None",
"name": "empty.source",
"source": "",
"value": "value"
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -783,6 +783,17 @@
return None
return default
+ def configdefault(self, section, name):
+ """returns the default value of the config item"""
+ item = self._knownconfig.get(section, {}).get(name)
+ itemdefault = None
+ if item is not None:
+ if callable(item.default):
+ itemdefault = item.default()
+ else:
+ itemdefault = item.default
+ return itemdefault
+
def hasconfig(self, section, name, untrusted=False):
return self._data(untrusted).hasitem(section, name)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1872,6 +1872,7 @@
for section, name, value in ui.walkconfig(untrusted=untrusted):
source = ui.configsource(section, name, untrusted)
value = pycompat.bytestr(value)
+ defaultvalue = str(ui.configdefault(section, name))
if fm.isplain():
source = source or 'none'
value = value.replace('\n', '\\n')
@@ -1881,7 +1882,7 @@
fm.startitem()
fm.condwrite(ui.debugflag, 'source', '%s: ', source)
if uniquesel:
- fm.data(name=entryname)
+ fm.data(name=entryname, defaultvalue=defaultvalue)
fm.write('value', '%s\n', value)
else:
fm.write('name value', '%s=%s\n', entryname, value)
To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list