From 4ebeb1eb0712db8a5d85b91af0694919a2afb04e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Fri, 13 Jan 2023 21:11:44 +0100
Subject: [PATCH] Improve commit diffing code

---
 scripts/diff-drvs.py | 51 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/scripts/diff-drvs.py b/scripts/diff-drvs.py
index 79a27e86..58340d5d 100644
--- a/scripts/diff-drvs.py
+++ b/scripts/diff-drvs.py
@@ -14,11 +14,21 @@ new_derivation = json.load(open(new_drv))
 
 packages = {}
 
+
+def get_name(drv):
+    if "pname" in drv["env"]:
+        return drv["env"]["pname"]
+    name = drv["env"]["name"]
+    if "version" in drvData["env"]:
+        return name.removesuffix("-" + drvData["env"]["version"])
+    return name
+
+
 for drv in old_derivation:
     drvData = old_derivation[drv]
     if not "pname" in drvData["env"] and not "name" in drvData["env"]:
         continue
-    used_name = drvData["env"]["pname"] if "pname" in drvData["env"] else drvData["env"]["name"]
+    used_name = get_name(drvData)
     if not "version" in drvData["env"]:
         continue
     version = drvData["env"]["version"]
@@ -31,7 +41,7 @@ for drv in new_derivation:
     drvData = new_derivation[drv]
     if not "pname" in drvData["env"] and not "name" in drvData["env"]:
         continue
-    used_name = drvData["env"]["pname"] if "pname" in drvData["env"] else drvData["env"]["name"]
+    used_name = get_name(drvData)
     if not "version" in drvData["env"]:
         continue
     version = drvData["env"]["version"]
@@ -43,13 +53,32 @@ for drv in new_derivation:
     else:
         packages[used_name] = {"new": {version}}
 
-for package in packages:
+pkg_names = sorted(packages)
+
+print("New packages")
+for package in pkg_names:
+    if "new" in packages[package] and "old" not in packages[package]:
+        print(package + ": " + ", ".join(sorted(packages[package]["new"])))
+
+print()
+print("Old packages")
+for package in pkg_names:
+    if "old" in packages[package] and "new" not in packages[package]:
+        print(package + ": " + ", ".join(sorted(packages[package]["old"])))
+
+print()
+print("Updated packages")
+for package in pkg_names:
     if "old" in packages[package] and "new" in packages[package]:
-        if packages[package]["old"] != packages[package]["new"]:
-            print(
-                f"{package}: {sorted(packages[package]['old'])} -> {sorted(packages[package]['new'])}"
-            )
-    elif "old" in packages[package]:
-        print(f"{package}: {sorted(packages[package]['old'])} -> removed")
-    elif "new" in packages[package]:
-        print(f"{package}: added -> {sorted(packages[package]['new'])}")
+        if packages[package]["old"] == packages[package]["new"]:
+            continue
+        common_versions = packages[package]["old"].intersection(
+            packages[package]["new"])
+        removed_versions = packages[package]["old"].difference(common_versions)
+        added_versions = packages[package]["new"].difference(common_versions)
+        common_versions_string = ", ".join(sorted(common_versions))
+        removed_versions_string = ", ".join(sorted(removed_versions))
+        added_versions_string = ", ".join(sorted(added_versions))
+        print(
+            f"{package}: [{removed_versions_string}] -> [{added_versions_string}] (common: {common_versions_string})"
+        )
-- 
2.47.0