Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: remove pycompat.bytestr() for defaultvalue
authorNavaneeth Suresh <navaneeths1998@gmail.com>
Sat, 03 Aug 2019 12:14:34 +0530
changeset 42705 049b2ac3252e
parent 42704 6957f7b93e03
child 42706 60789444acd6
config: remove pycompat.bytestr() for defaultvalue This is a follow-up patch to 51a2e3102db2. This removes `pycompat.bytestr` to preserve `None` in `commands.config()`. Differential Revision: https://phab.mercurial-scm.org/D6712
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-config.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Sat Jul 27 12:19:51 2019 +0530
+++ b/mercurial/commands.py	Sat Aug 03 12:14:34 2019 +0530
@@ -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')
--- a/tests/test-config.t	Sat Jul 27 12:19:51 2019 +0530
+++ b/tests/test-config.t	Sat Aug 03 12:14:34 2019 +0530
@@ -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"
Mercurial