In-line diff option

[jamesm@…]

The side-by-side diff view seems to display with variable width and because of display width limitations lines of code get wrapped. Both of these make it difficult to identify the diff.

Perhaps instead of a side-by-side diff there should be an in-line diff so that the diff can span the full width of the browser window. This should eliminate the inconsistent diff-box width and it will also minimize text wrapping.

[jamesm@…]

After thinking some more about it perhaps it would be nicer to have a button on the diff sections for switching each section to side-by-side or inline. That may be complicated, don't know.

[jamesm@…]

Patch for changeset.cs to display side-by-side or inline diff

[jamesm@…]

Patch for macros.cs defining the inline html construct

[jamesm@…]

Patch for changeset.py for passing diff.inline parameter to changeset.cs

[jamesm@…]

First round patches (attached above) do not offer button per file for switching between side-by-side and inline. Still thinking about that one. However, the above patches provide inline diff functionality by specifying a new section and key in trac.ini

[diff]
inline = true

If the diff section does not exist, the displayed diff will default to side-by-side.

[jamesm@…]

I also recommend changing the side-by-side diff to this:

-          <tr><td class="diff-line">line <?cs var:change.line.old ?></td>
-          <td class="diff-line">line <?cs var:change.line.new ?></td></tr>
+          <tr><td class="diff-line">Base version line <?cs var:change.line.old ?></td>
+          <td class="diff-line">Changed version line <?cs var:change.line.new ?></td></tr>}}}

[jamesm@…]

Hmmm… the triple braces ate my text.. lets try again

- <tr><td class="diff-line">line <?cs var:change.line.old ?></td>
- <td class="diff-line">line <?cs var:change.line.new ?></td></tr>
+ <tr><td class="diff-line">Base version line <?cs var:change.line.old ?></td>
+ <td class="diff-line">Changed version line <?cs var:change.line.new ?></td></tr>

[jamesm@…]

USE INSTEAD: Patch revision to changeset.py - add in url parsing (?inline=on or ?sidebyside=on) to define diff type to override Trac default diff setting

[jamesm@…]

USE INSTEAD: Patch revision to changeset.cs - add link to override Trac default diff setting

[jamesm@…]

Second round patches now display a link on the changeset page which allows the user to override the default diff style for the current page.

[jamesm@…]

Oh yeah… patch 2 has some hand-fixed html code in the diff changeset.cs. I am not savvy enough with css and I currently don't have access to more browsers than IE6 and Firefox to verify proper layout. Actually, I couldn't get the link where I wanted it. I figure one of you guys would modify the layout anyway.

[cmlenz]

Implemented in [757].