incorrect file diff result in changeset view

[anonymous]

Look at screenshots.

first one: I modified the line #2 from '-1' to '-2'.

second one: I modified the line #2 from '+1' to '+2'.

[anonymous]

'-1' → '-2'

[anonymous]

'+1' → '+2'

[anonymous]

I attach a diff of Diff.py. Please review.

[anonymous]

diff of Diff.py to fix the bug

[anonymous]

re-attach the diff from svn repository

[cboos@…]

Argh, I didn't see the patch before doing my own fix. Bah, just for fun then…

trac/Diff.py

@@ -39 +39 @@
         self.blockno = 0
         self.offset_base = 0
         self.offset_changed = 0
+        self.blocklen = 0
 
     def _escape(self, text):
         return space_re.sub(lambda m:
@@ -91 +92 @@
         self.blockno += 1
 
     def writeline(self, text):
-        if text[0:2] in ['++', '--']:
+        if self.blocklen <= 0: # we're in the header
+            match = line_re.search(text)
+            if match:
+                self.print_block()
+                self.changeno += 1
+                self.blockno = 0
+                self.offset_base = int(match.group(1)) - 1
+                self.offset_changed = int(match.group(3)) - 1
+                self.blocklen = int(match.group(2)) + int(match.group(4))
             return
-        match = line_re.search(text)
-        if match:
-            self.print_block()
-            self.changeno += 1
-            self.blockno = 0
-            self.offset_base = int(match.group(1)) - 1
-            self.offset_changed = int(match.group(3)) - 1
-            return
         ttype = text[0]
         text = text[1:]
         text = text.expandtabs(self.tabwidth)
+        if ttype == ' ':
+            self.blocklen -= 2
+        else:
+            self.blocklen -= 1
         if ttype == self.ttype:
             self.block.append(text)
         else:

[Christopher Lenz]

Fixed in [1132], ported to stable in [1133].

Thanks for the patches. Even though I ended up using a somewhat simpler approach, the patches did help demonstrate what needed to be fixed.