Patchwork D6720: config: fix fm.data() handling of defaultvalue

login
register
mail settings
Submitter phabricator
Date Aug. 7, 2019, 3:18 p.m.
Message ID <91845f596e1af120f548e1722396513c@localhost.localdomain>
Download mbox | patch
Permalink /patch/41199/
State Not Applicable
Headers show

Comments

phabricator - Aug. 7, 2019, 3:18 p.m.
navaneeth.suresh updated this revision to Diff 16150.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6720?vs=16149&id=16150

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6720/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6720

AFFECTED FILES
  mercurial/commands.py
  tests/test-config.t

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-config.t b/tests/test-config.t
--- a/tests/test-config.t
+++ b/tests/test-config.t
@@ -57,11 +57,13 @@ 
   $ hg showconfig Section -Tjson
   [
    {
+    "defaultvalue": null,
     "name": "Section.KeY",
     "source": "*.hgrc:*", (glob)
     "value": "Case Sensitive"
    },
    {
+    "defaultvalue": null,
     "name": "Section.key",
     "source": "*.hgrc:*", (glob)
     "value": "lower case"
@@ -77,8 +79,8 @@ 
    }
   ]
   $ hg showconfig -Tjson | tail -7
-   },
    {
+    "defaultvalue": null,
     "name": "*", (glob)
     "source": "*", (glob)
     "value": "*" (glob)
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1882,10 +1882,11 @@ 
         fm.startitem()
         fm.condwrite(ui.debugflag, 'source', '%s: ', source)
         if uniquesel:
-            fm.data(name=entryname, defaultvalue=defaultvalue)
+            fm.data(name=entryname)
             fm.write('value', '%s\n', value)
         else:
             fm.write('name value', '%s=%s\n', entryname, value)
+        fm.data(defaultvalue=defaultvalue)
         matched = True
     fm.end()
     if matched: