inventory: rename 'unmerge-lists' to 'list_difference'

pkgs/clan-cli/clan_lib/machines/actions.py

@@ -12,7 +12,7 @@ from clan_lib.persist.util import (
     is_writeable_key,
     retrieve_typed_field_names,
     set_value_by_path,
-    unmerge_lists,
+    list_difference,
 )
 
 
@@ -136,7 +136,7 @@ def get_machine_fields_schema(machine: Machine) -> dict[str, FieldSchema]:
     persisted_tags = (
         persisted_data.get("machines", {}).get(machine.name, {}).get("tags", [])
     )
-    nix_tags = unmerge_lists(all_tags, persisted_tags)
+    nix_tags = list_difference(all_tags, persisted_tags)
 
     return {
         field: {

pkgs/clan-cli/clan_lib/persist/util.py

@@ -122,7 +122,7 @@ def flatten_data(data: dict, parent_key: str = "", separator: str = ".") -> dict
     return flattened
 
 
-def unmerge_lists(all_items: list, filter_items: list) -> list:
+def list_difference(all_items: list, filter_items: list) -> list:
     """
     Unmerge the current list. Given a previous list.
 
@@ -292,7 +292,7 @@ After: {new}
                 persisted_data = data_dyn.get(key, [])
                 # List including nix values
                 all_list = data_all.get(key, [])
-                nix_list = unmerge_lists(all_list, persisted_data)
+                nix_list = list_difference(all_list, persisted_data)
 
                 # every item in nix_list MUST be in new
                 nix_items_to_remove = list(
@@ -307,7 +307,7 @@ After: {new}
                     raise ClanError(msg)
 
                 if new != all_list:
-                    patchset[key] = unmerge_lists(new, nix_list)
+                    patchset[key] = list_difference(new, nix_list)
             else:
                 patchset[key] = new
 

pkgs/clan-cli/clan_lib/persist/util_test.py

@@ -12,7 +12,7 @@ from clan_lib.persist.util import (
     merge_objects,
     path_match,
     set_value_by_path,
-    unmerge_lists,
+    list_difference,
 )
 
 
@@ -217,7 +217,7 @@ def test_list_unmerge() -> None:
     all_machines = ["machineA", "machineB"]
     inventory = ["machineB"]
 
-    nix_machines = unmerge_lists(all_machines, inventory)
+    nix_machines = list_difference(all_machines, inventory)
     assert nix_machines == ["machineA"]