mercurial/commands.py

--- a/mercurial/commands.py	Sat Aug 03 12:14:34 2019 +0530
+++ b/mercurial/commands.py	Wed Aug 07 19:18:20 2019 +0530
@@ -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: