diff renderer has problems processing file names

[theultramage@…]

I discovered a glitch in how trac renders unified diffs. Specifically, depending on the old and new filename, the results will vary a lot.

Following are several examples:

---

same name

x.txt

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

---

different name, no dot in name (in /trunk, this displays as "(a) xxx vs. (b) yyy")

(a) xxx vs. (b) yyy

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

---

different name, dot in name

.txt

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

for reference, this is an image of how the third case looked like at the time of writing:

as you can see, the 'xxx' and 'yyy' replaced the 'old'/'new' columns, and the title is completely wrong.

[theultramage@…]

screenshot of how a diff of two differently named files with a dot renders like

[Tim Hatch]

I'm a little confused about why '.' is considered a pathsep in source:trunk/trac/mimeview/patch.py​ line 130. Removing the . seems to make them a little intuitive. What's the use case for having . there (comparing a.txt and a.txt.old?)

[theultramage@…]

Oh, and the 'source code' for the diffs above, if anyone needs to reproduce:

{{{
#!diff
--- xxx.txt       Wed Oct 17 08:44:43 2007
+++ yyy.txt       Wed Oct 17 08:44:58 2007
@@ -1,3 +1,3 @@
 this is example text
 and one more line
-no more lines
+no more lines
}}}

[theultramage@…]

It is possible that the intent of the . separator was to handle names in the form file.c.r9999 vs. file.c.r12345. In that case it would display as file.c in the diff header, and 9999 / 12345 in the column headers.

However, when the names are not in this form, the renderer fails badly. And I'm still wondering why in example 2 the file names get substituted by 'a' and 'b' instead of just using the file names in the column headers. Who came up with this thing?

[Christian Boos]

Replying to theultramage@…:

It is possible that the intent of the . separator was to handle names in the form file.c.r9999 vs. file.c.r12345. In that case it would display as file.c in the diff header, and 9999 / 12345 in the column headers.

That was the case, IIRC.

However, when the names are not in this form, the renderer fails badly.

Right, I should check for a second dot.

[Christian Boos]

Another example: attachment:7512-r9194.2.patch:ticket:7512​.

[theultramage@…]

Link to attachment image instead of remote url.

[Jun Omae]

#12341 was closed as duplicate.

[Ryan J Ollos]

Moved ticket assigned to next-stable-1.0.x since maintenance of 1.0.x is coming to a close. Please move the ticket back if it's critical to fix on 1.0.x.

[Ryan J Ollos]

Milestone renamed