Fix for comparing dict/list values, closes #32

simonw · Dec 5, 2021 · 8857ce1 · 8857ce1
1 parent b132142
commit 8857ce1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/git_history/cli.py b/git_history/cli.py
@@ -5,7 +5,7 @@
 import sqlite_utils
 import textwrap
 from pathlib import Path
-from .utils import fix_reserved_columns
+from .utils import fix_reserved_columns, is_different
 
 
 def iterate_file_versions(
@@ -382,7 +382,7 @@ def column_id(column):
                                         key: value
                                         for key, value in item.items()
                                         if (key not in previous_item)
-                                        or previous_item[key] != value
+                                        or is_different(previous_item[key], value)
                                     }
                                 except IndexError:
                                     # First version of this item

diff --git a/git_history/utils.py b/git_history/utils.py
@@ -1,3 +1,4 @@
+import json
 import re
 
 RESERVED = (
@@ -28,3 +29,14 @@ def _fix_key(key):
         return key + "_"
     else:
         return key
+
+
+def _comparable(obj):
+    if isinstance(obj, (tuple, list, dict)):
+        return json.dumps(obj, default=repr)
+    return obj
+
+
+def is_different(one, two):
+    "Compares values, including lists and dictionaries"
+    return _comparable(one) != _comparable(two)