Unified diff sections are not displayed when there are only the ---/+++ headers.

[bulb@…]

If you upload a multi-file unified diff that has no other headers than the —-/+++ lines, than only odd files are displayed in the formatted view. Such diff is however correct and patch will happily apply changes to all files. The attached diffs are the same, but the diff -u this that comments were removed from the headerless.diff. You can check by viewing the attachments, that the attachment:headerless.diff​ only shows differences to one file, while the attachment:headerfull.diff shows differences to both.

Note: I checked this with our installation at work which is 0.10.3 from Debian; and with the live demo site.

[bulb@…]

Normally shown diff.

[bulb@…]

Diff where one section is not displayed.

[Christian Boos]

I just verified that attachment:headerless.diff​ displays correctly in 0.11.

We don't plan to backport those fixes on 0.10-stable however, as the code base has already significantly diverged there.

[bulb@…]

Fix should be:

trac/mimeview/patch.py

@@ -178 +178 @@
                             fromline += 1
                         else:
                             return None
-                line = lines.next()
         except StopIteration:
             pass
 

and looking at current trunk, it seems to really be fixed.

If you don't plan to release 0.10.4, you should somehow remove it ;-).

[Christian Boos]

Replying to bulb@ucw.cz:

Fix should be: …

OK, a patch helps ;)

The problem is that we have to be reasonably sure that there are no regressions.

If you don't plan to release 0.10.4, you should somehow remove it ;-).

We will, but mostly with important bugfixes.

I nevertheess reopen the issue, so the patch might get in…

[Christian Boos]

Closing as worksforme again. 0.10.x is mostly frozen now.