* Implemented difference highlighting within lines. Closes #434.

 * Simplified source:trunk/trac/Diff.py by using {{{util.add_to_hdf()}}}


git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@906 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: cmlenz

htdocs/css/diff.css

@@ -139,6 +139,8 @@
 .diff table.inline tbody.add tr.first td.chg { border-top-width: 1px }
 .diff table.inline tbody.mod tr.last td.chg,
 .diff table.inline tbody.add tr.last td.chg { border-bottom-width: 1px }
+.diff table.inline tbody.mod td del { background: #e99; color: #000 }
+.diff table.inline tbody.mod td ins { background: #9e9; color: #000 }
 
 /* Styles for the side-by-side diff */
 .diff table.sidebyside colgroup.content { width: 50% }
@@ -148,3 +150,6 @@
 .diff table.sidebyside tbody.add td.chg { background: #cfc }
 .diff table.sidebyside tbody.rem td.base { background: #f88 }
 .diff table.sidebyside tbody.rem td.chg { background: #faa }
+.diff table.sidebyside tbody.mod del, .diff table.sidebyside tbody.mod ins {
+ background: #fc0;
+}

templates/macros.cs

@@ -36,22 +36,22 @@
   each:block = change.blocks ?><?cs
    if:block.type == 'unmod' ?><tbody class="unmod"><?cs
     each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
+     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
      <td class="base"><span><?cs var:line ?></span></td>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
+     <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
      <td class="chg"><span><?cs var:line ?></span></td>
     </tr><?cs /each ?>
    </tbody><?cs
    elif:block.type == 'mod' ?><tbody class="mod"><?cs
     if:len(block.base.lines) >= len(block.changed.lines) ?><?cs
      each:line = block.base.lines ?><tr>
-      <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
-      <td class="base"><del><?cs var:line ?></del></td><?cs
-      if:len(block.changed.lines) >= name(line) ?><?cs
+      <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
+      <td class="base"><?cs var:line ?></td><?cs
+      if:len(block.changed.lines) >= name(line) + 1 ?><?cs
        each:changedline = block.changed.lines ?><?cs
         if:name(changedline) == name(line) ?>
-         <th class="chg"><?cs var:#block.changed.offset + name(changedline) ?></th>
-         <td class="chg"><ins><?cs var:changedline ?></ins></td><?cs
+         <th class="chg"><?cs var:#block.changed.offset + name(changedline) + 1 ?></th>
+         <td class="chg"><?cs var:changedline ?></td><?cs
         /if ?><?cs
        /each ?><?cs
       else ?>
@@ -61,32 +61,32 @@
      </tr><?cs /each ?><?cs
     else ?><?cs
      each:line = block.changed.lines ?><tr><?cs
-      if:len(block.base.lines) >= name(line) ?><?cs
+      if:len(block.base.lines) >= name(line) + 1 ?><?cs
        each:baseline = block.base.lines ?><?cs
         if:name(baseline) == name(line) ?>
-         <th class="base"><?cs var:#block.base.offset + name(baseline) ?></th>
-         <td class="base"><del><?cs var:baseline ?></del></td><?cs
+         <th class="base"><?cs var:#block.base.offset + name(baseline) + 1 ?></th>
+         <td class="base"><?cs var:baseline ?></td><?cs
         /if ?><?cs
        /each ?><?cs
       else ?>
        <th class="base">&nbsp;</th>
        <td class="base">&nbsp;</td><?cs
       /if ?>
-      <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
-      <td class="chg"><ins><?cs var:line ?></ins></td>
+      <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
+      <td class="chg"><?cs var:line ?></td>
      </tr><?cs /each ?><?cs
     /if ?>
    </tbody><?cs
    elif:block.type == 'add' ?><tbody class="add"><?cs
     each:line = block.changed.lines ?><tr>
      <th class="base">&nbsp;</th>
      <td class="base">&nbsp;</td>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
+     <th class="chg"><?cs var:#block.changed.offset + name(line) + 1 ?></th>
      <td class="chg"><ins><?cs var:line ?></ins></td>
     </tr><?cs /each ?><?cs
    elif:block.type == 'rem' ?><tbody class="rem"><?cs
     each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
+     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
      <td class="base"><del><?cs var:line ?></del></td>
      <th class="chg">&nbsp;</th>
      <td class="chg">&nbsp;</td>
@@ -98,39 +98,39 @@
   each:block = change.blocks ?>
    <?cs if:block.type == 'unmod' ?><tbody class="unmod"><?cs
     each:line = block.base.lines ?><tr>
-     <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
+     <th class="base"><?cs var:#block.base.offset + name(line) + #1 ?></th>
+     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
      <td class="base"><span><?cs var:line ?></span></td>
     </tr><?cs /each ?>
    </tbody>
    <?cs elif:block.type == 'mod' ?><tbody class="mod"><?cs
     each:line = block.base.lines ?><tr class="<?cs
-      if:name(line) == 1 ?> first<?cs /if ?>">
-     <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
+      if:name(line) == 0 ?>first<?cs /if ?>">
+     <th class="base"><?cs var:#block.base.offset + name(line) + #1 ?></th>
      <th class="chg">&nbsp;</th>
-     <td class="base"><del><?cs var:line ?></del></td>
+     <td class="base"><?cs var:line ?></td>
     </tr><?cs /each ?><?cs
     each:line = block.changed.lines ?><tr class="<?cs
-      if:name(line) == len(block.changed.lines) ?> last<?cs /if ?>">
+      if:name(line) + 1 == len(block.changed.lines) ?> last<?cs /if ?>">
      <th class="base">&nbsp;</th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
-     <td class="chg"><ins><?cs var:line ?></ins></td>
+     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
+     <td class="chg"><?cs var:line ?></td>
     </tr><?cs /each ?>
    </tbody>
    <?cs elif:block.type == 'add' ?><tbody class="add"><?cs
     each:line = block.changed.lines ?><tr class="<?cs
-      if:name(line) == 1 ?> first<?cs /if ?><?cs
-      if:name(line) == len(block.changed.lines) ?> last ?><?cs /if ?>">
+      if:name(line) == 0 ?>first<?cs /if ?><?cs
+      if:name(line) + 1 == len(block.changed.lines) ?> last ?><?cs /if ?>">
      <th class="base">&nbsp;</th>
-     <th class="chg"><?cs var:#block.changed.offset + name(line) ?></th>
+     <th class="chg"><?cs var:#block.changed.offset + name(line) + #1 ?></th>
      <td class="chg"><ins><?cs var:line ?></ins></td>
     </tr><?cs /each ?>
    </tbody>
    <?cs elif:block.type == 'rem' ?><tbody class="rem"><?cs
     each:line = block.base.lines ?><tr class="<?cs
-      if:name(line) == 1 ?> first<?cs /if ?><?cs
-      if:name(line) == len(block.base.lines) ?> last ?><?cs /if ?>">
-     <th class="base"><?cs var:#block.base.offset + name(line) ?></th>
+      if:name(line) == 0 ?>first<?cs /if ?><?cs
+      if:name(line) + 1 == len(block.base.lines) ?> last ?><?cs /if ?>">
+     <th class="base"><?cs var:#block.base.offset + name(line) + 1 ?></th>
      <th class="chg">&nbsp;</th>
      <td class="base"><del><?cs var:line ?></del></td>
     </tr><?cs /each ?>

trac/Diff.py

@@ -20,6 +20,9 @@
 # Author: Jonas Borgström <[email protected]>
 
 import re
+from difflib import SequenceMatcher
+from StringIO import StringIO
+from util import add_to_hdf
 
 line_re = re.compile('@@ [+-]([0-9]+),([0-9]+) [+-]([0-9]+),([0-9]+) @@')
 header_re = re.compile('header ([^\|]+) ([^\|]+) \| ([^\|]+) ([^\|]+) redaeh')
@@ -38,24 +41,42 @@ def __init__(self, hdf, prefix, tabwidth=8):
         self.blockno = 0
         self.offset_base = 0
         self.offset_changed = 0
+        self.matcher = SequenceMatcher()
+
+    def _write_line (self, prefix, oldline, newline):
+        oldval = StringIO()
+        newval = StringIO()
+        self.matcher.set_seq1(oldline)
+        self.matcher.set_seq2(newline)
+        for tag, i1, i2, j1, j2 in self.matcher.get_opcodes():
+            if tag == 'equal':
+                oldval.write(oldline[i1:i2])
+                newval.write(oldline[i1:i2])
+            elif tag == 'delete':
+                oldval.write('<del>%s</del>' % oldline[i1:i2])
+            elif tag == 'insert':
+                newval.write('<ins>%s</ins>' % newline[j1:j2])
+            elif tag == 'replace':
+                oldval.write('<del>%s</del>' % oldline[i1:i2])
+                newval.write('<ins>%s</ins>' % newline[j1:j2])
+        self.hdf.setValue(prefix + '.base.lines.0', oldval.getvalue())
+        self.hdf.setValue(prefix + '.changed.lines.0', newval.getvalue())
 
     def _write_block (self, prefix, dtype, old = None, new = None):
         self.hdf.setValue(prefix + '.type', dtype);
         self.hdf.setValue(prefix + '.base.offset', str(self.offset_base))
         self.hdf.setValue(prefix + '.changed.offset',
                           str(self.offset_changed))
+        if dtype == 'mod' and len(old) == len(new) == 1:
+            self._write_line (prefix, old[0], new[0])
+            return
+
         if old:
-            lineno = 1
-            for line in old:
-                self.hdf.setValue(prefix + '.base.lines.%d' % lineno, line)
-                lineno += 1
-            self.offset_base += lineno - 1
+            add_to_hdf(old, self.hdf, prefix + '.base.lines')
+            self.offset_base += len(old)
         if new:
-            lineno = 1
-            for line in new:
-                self.hdf.setValue(prefix + '.changed.lines.%d' % lineno, line)
-                lineno += 1
-            self.offset_changed += lineno - 1
+            add_to_hdf(new, self.hdf, prefix + '.changed.lines')
+            self.offset_changed += len(new)
 
     def print_block (self):
         prefix = '%s.changes.%d.blocks.%d' % (self.prefix, self.changeno,