Add support for dmp deltas

Author: WorldMaker

tokdiff.py

@@ -10,15 +10,22 @@
 This is a simple diff utility based upon pygments' lexer token streams.
 """
 
-parser = argparse.ArgumentParser(description=__file__.__doc__)
+parser = argparse.ArgumentParser(
+    description="Generates tokenized diffs using Pygments")
 parser.add_argument('lexername', help="Pygments lexer to utilize")
 parser.add_argument('file1', type=argparse.FileType('r'))
 parser.add_argument('file2', type=argparse.FileType('r'))
 parser.add_argument('-o', '--out', type=argparse.FileType('w'),
     default=sys.stdout)
 group = parser.add_mutually_exclusive_group()
-group.add_argument('-v', '--verbose', action='store_true')
-group.add_argument('-u', '--unidiff', action='store_true')
+group.add_argument('-v', '--verbose', action='store_true',
+    help='Verbose tokenization diff')
+group.add_argument('-u', '--unidiff', action='store_true',
+    help='Unidiff-like character-based diff (default)')
+group.add_argument('-d', '--delta', action='store_true',
+    help='Simplified intermediate delta')
+group.add_argument('-c', '--compare', action='store_true',
+    help='HTML comparison of tokenized diff to char diffs')
 data = parser.parse_args()
 
 lexer = pygments.lexers.get_lexer_by_name(data.lexername)
@@ -28,7 +35,9 @@
 
 sm = SequenceMatcher(None, a, b)
 
-if data.verbose or not data.unidiff:
+data.unidiff = not data.verbose and not data.delta and not data.compare
+
+if data.verbose:
     for op, a1, a2, b1, b2 in sm.get_opcodes():
         if op == 'equal':
             for item in a[a1:a2]:
@@ -48,7 +57,7 @@
                 data.out.write("- %s: %s\n" % item)
         else:
             data.out.write("<<%s>>\n" % op)
-elif data.unidiff:
+else:
     dmp = diff_match_patch()
     diffs = []
     for op, a1, a2, b1, b2 in sm.get_opcodes():
@@ -66,7 +75,10 @@
         elif op == 'delete':
             for line in ''.join(val for type, val in b[a1:a2]).splitlines(True):
                 diffs.append((dmp.DIFF_DELETE, line))
-    patches = dmp.patch_make(diffs)
-    data.out.write(dmp.patch_toText(patches))
+    if data.unidiff:
+        patches = dmp.patch_make(diffs)
+        data.out.write(dmp.patch_toText(patches))
+    elif data.delta:
+        data.out.write(dmp.diff_toDelta(diffs))
 
 # vim: ai et ts=4 sts=4 sw=4