trac diff parser doesn't recognize \ No newline at end of file

[theultramage@…]

Example diff

# ! diff (without the spaces)
--- a.txt       Wed Oct 17 08:44:43 2007
+++ b.txt       Wed Oct 17 08:44:58 2007
@@ -1,3 +1,3 @@
 this is example text
 and one more line
-no more lines
\ No newline at end of file
+no more lines

renders as

.txt

@@ -1 +1 @@
 this is example text
 and one more line
-no more lines
- No newline at end of file
+no more lines

but if I omit the "\ No newline…" part, it renders like I wanted it to

.txt

@@ -1 +1 @@
 this is example text
 and one more line
-no more lines
+no more lines

Tested on 0.10.4 release and r6049 trunk, 100% reproducible.

[Christian Boos]

Right, so far there's no special handling for the "\ No newline at end of file" case.

[Christian Boos]

Well, I forgot that I've already added support for that :P

So if in 0.11 you get no highlighting by the dedicated patch renderer, it's because there has been an error. Can you look it up in the log file and post it?

Then, the display of the "No newline at the end of the file" line could be made visually different, so that it stands out from a normal modified line.

Can you try the attachment:t6199.patch​? It works fine for me on your example.

[Christian Boos]

Highlight "meta" line change information

[Christian Boos]

Highlight "meta" line change information - updated patch, which fixed one mistake in the previous patch and adapted the unit tests.

[Christian Boos]

Above patch committed as r6072.

I'm still waiting for the backtrace for the error you had…

[Christian Boos]

(moving to 0.11.1 in the meantime)

[theultramage@…]

debug trace

[theultramage@…]

Sorry for the delay, due to a filter against trac-users group, notifications about this ended up deleted…

Attached ​trace from revision 6122 trunk (latest) shows no obvious problems… but the above example still doesn't render as I want it in the preview page (actually it just displays as plaintext).

Any suggestions/instructions?

[Christian Boos]

When a {{{\n#!diff\n...}}} blocks fails to render, there must be a message in the logs. Well, even when it's successfully rendered, there's something written, along the lines of:

... DEBUG: Trying to render HTML preview using PatchRenderer [No annotations]"

So to me, the trace you've given above doesn't match the attempt to display a diff block…

[Christian Boos]

I believe this issue was fixed with r6072.

If it appears to not work, please reopen and provide the relevant information (please take the time to read my other comments here in this ticket).