Merge pull request #4650 from ESMCI/fix-xmlchange

Fixes check_lockedfiles call in xmlchange

Fixes check_lockedfiles only being called once when multiple settings
are changed.
Fixes reporting settings that are component specific
Test suite: n/a
Test baseline: n/a
Test namelist changes: n/a
Test status: n/a

Fixes #4643

User interface changes?: n/a
Update gh-pages html (Y/N)?: n

CIME/Tools/xmlchange

@@ -229,10 +229,6 @@ def xmlchange_single_value(
 
         if xmlfile is not None:
             xmlfile = [xmlfile]
-        # Pass caseroot, in cases where --file is used and case does not have access to env_case.xml
-        check_lockedfiles(
-            case, skip=["env_case"], quiet=True, caseroot=caseroot, whitelist=xmlfile
-        )
     else:
         logger.warning("'%s' = '%s'", xmlid, xmlval)
 
@@ -313,6 +309,13 @@ def xmlchange(
                 xmlfile,
             )
 
+        check_lockedfiles(
+            case,
+            skip=["env_case"],
+            caseroot=caseroot,
+            whitelist=xmlfile,
+        )
+
     if not noecho:
         argstr = ""
         for arg in sys.argv:

CIME/XML/entry_id.py

@@ -500,7 +500,7 @@ def compare_xml(self, other, root=None, otherroot=None):
                                 "{}_{}".format(vid, comp), resolved=False
                             )
                             if f1val != f2val:
-                                xmldiffs[vid] = [f1val, f2val]
+                                xmldiffs[f"{vid}_{comp}"] = [f1val, f2val]
                         else:
                             if node != f2match:
                                 f1value_nodes = self.get_children("value", root=node)