Bugfixes and make nbmerge actually work for the first time!

Try it on the files nbdime/tests/files/multilevel-test-*.ipynb

Merry christmas!

nbdime/diffing/generic.py

@@ -46,10 +46,7 @@ def diff(a, b, compare=operator.__eq__):
     return d
 
 
-def diff_lists(a, b, compare=operator.__eq__, shallow_diff=None, subdiffs=None):
-    if subdiffs is None:
-        subdiffs = {}
-
+def diff_lists(a, b, compare=operator.__eq__, shallow_diff=None):
     # First make the one-level list diff with custom compare,
     # unless it's provided for us
     if shallow_diff is None:
@@ -82,8 +79,7 @@ def diff_lists(a, b, compare=operator.__eq__, shallow_diff=None, subdiffs=None):
             aval = a[acons+i]
             bval = b[bcons+i]
             if not is_atomic(aval):
-                diffit = subdiffs.get(key, diff)
-                d = diffit(aval, bval, compare=compare)
+                d = diff(aval, bval, compare=compare)
                 if d:
                     pdi.append([PATCH, acons+i, d])
 

nbdime/merging/notebooks.py

@@ -12,13 +12,13 @@
 
 from ..diffing import diff
 from ..dformat import PATCH, INSERT, DELETE, REPLACE, SEQINSERT, SEQDELETE
-
+from .generic import merge
 
 def merge_notebooks(base, local, remote):
     """Merge changes introduced by notebooks local and remote from a shared ancestor base.
 
     Return new (partially) merged notebook and unapplied diffs from the local and remote side.
     """
     # FIXME: Implement notebook aware merge
-    merged, conflicts = merge(base, local, remote)
-    return nbformat.from_dict(merged), conflicts
+    merged, local_conflict_diffs, remote_conflict_diffs = merge(base, local, remote)
+    return nbformat.from_dict(merged), local_conflict_diffs, remote_conflict_diffs

nbdime/nbmergeapp.py

@@ -35,13 +35,16 @@ def main_merge(bfn, lfn, rfn, mfn):
     l = nbformat.read(lfn, as_version=4)
     r = nbformat.read(rfn, as_version=4)
 
-    m = merge_notebooks(b, l, r)
+    m, lc, rc = merge_notebooks(b, l, r)
 
     verbose = True
     if verbose:
         print(m)
+        print(lc)
+        print(rc)
 
-    nbformat.write(mfn, m)
+    with open(mfn, "w") as mf:
+        nbformat.write(m, mf)
     return 0