D6712: config: fix defaultvalue template keyword (patch 1 of 2)
navaneeth.suresh (Navaneeth Suresh)
phabricator at mercurial-scm.org
Wed Aug 7 09:45:46 EDT 2019
navaneeth.suresh retitled this revision from "config: fix defaultvalue template keyword" to "config: fix defaultvalue template keyword (patch 1 of 2)".
navaneeth.suresh edited the summary of this revision.
navaneeth.suresh updated this revision to Diff 16148.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6712?vs=16144&id=16148
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6712/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6712
AFFECTED FILES
mercurial/commands.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,7 +70,7 @@
$ hg showconfig Section.KeY -Tjson
[
{
- "defaultvalue": "None",
+ "defaultvalue": null,
"name": "Section.KeY",
"source": "*.hgrc:*", (glob)
"value": "Case Sensitive"
@@ -103,7 +103,7 @@
$ hg config empty.source -Tjson
[
{
- "defaultvalue": "None",
+ "defaultvalue": null,
"name": "empty.source",
"source": "",
"value": "value"
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1872,7 +1872,7 @@
for section, name, value in ui.walkconfig(untrusted=untrusted):
source = ui.configsource(section, name, untrusted)
value = pycompat.bytestr(value)
- defaultvalue = pycompat.bytestr(ui.configdefault(section, name))
+ defaultvalue = ui.configdefault(section, name)
if fm.isplain():
source = source or 'none'
value = value.replace('\n', '\\n')
To: navaneeth.suresh, #hg-reviewers
Cc: durin42, marmoute, mercurial-devel
More information about the Mercurial-devel
mailing list