Ticket #3002: prop_diffs_3002.patch

templates/changeset.cs

@@ -212 +212 @@
    var:item.rev.new ?> of this file in browser"><?cs
    var:item.path.new ?></a></h2><?cs
    if:len(item.props) ?><ul class="props"><?cs
-    each:prop = item.props ?><li>Property <strong><?cs
-     var:prop.name ?></strong> <?cs
+    each:prop = item.props ?><li><?cs
+     alt:prop.html ?>Property <strong><?cs var:prop.name ?> </strong><?cs
      if:prop.old && prop.new ?>changed from <?cs
      elif:!prop.old ?>set<?cs
      else ?>deleted<?cs
      /if ?><?cs
      if:prop.old && prop.new ?><em><tt><?cs var:prop.old ?></tt></em><?cs /if ?><?cs
-     if:prop.new ?> to <em><tt><?cs var:prop.new ?></tt></em><?cs /if ?></li><?cs
+     if:prop.new ?> to <em><tt><?cs var:prop.new ?></tt></em><?cs /if ?><?cs /alt ?></li><?cs
     /each ?></ul><?cs
    /if ?><?cs
    if:len(item.diff) ?><table class="<?cs

trac/versioncontrol/web_ui/changeset.py

@@ -394 +394 @@
                     if not k in new_props:
                         changed_props[k] = {'old': v}
                     elif v != new_props[k]:
-                        changed_props[k] = {'old': v, 'new': new_props[k]}
+                        nv = new_props[k]
+                        changes = {'old': v, 'new': nv}
+                        if '\n' in v or '\n' in nv:
+                            # diff view for multiline properties
+                            changes['html'] = Mimeview(self.env).render(
+                                req, 'text/x-diff', 
+                                '--- %s\n+++ %s\n' % (k, k)
+                                + '\n'.join(unified_diff(v.splitlines(),
+                                                         nv.splitlines(), 3)))
+                        changed_props[k] = changes
                 for k,v in new_props.items():
                     if not k in old_props:
                         changed_props[k] = {'new': v}