Ticket #352: cap_ticket352.patch

trac/util.py

@@ -56 +56 @@
     out.write ('</select>')
     return out.getvalue()
 
+def wiki_escape_newline(text):
+    text = text.replace(os.linesep, '[[BR]]')
+    return text
+        
 def escape(text):
     """Escapes &, <, > and \""""
     if not text:
@@ -156 +160 @@
 def shorten_line(text, maxlen = 75):
     if not text:
         return ''
-    if len(text) < maxlen:
+    i = text.find('[[BR]]')
+    if i < maxlen:
+            shortline = text[:i]+' ...'
+    elif len(text) < maxlen:
         shortline = text
     else:
         i = text[:maxlen].rfind(' ')

trac/File.py

@@ -252 +252 @@
                                       svn.core.SVN_PROP_REVISION_AUTHOR, self.pool)
         msg = svn.fs.revision_prop(self.fs_ptr, rev,
                                    svn.core.SVN_PROP_REVISION_LOG, self.pool)
-        msg_html = wiki_to_html(msg, self.req.hdf, self.env)
+        msg_html = wiki_to_html(util.wiki_escape_newline(msg), self.req.hdf, self.env)
         date = svn.fs.revision_prop(self.fs_ptr, rev,
                                     svn.core.SVN_PROP_REVISION_DATE, self.pool)
         sdate = util.svn_date_to_string(date, self.pool)

trac/Log.py

@@ -40 +40 @@
             if change.copyfrom_path:
                 self.branch_info[rev] = (change.copyfrom_path, newpath)
 
-        shortlog = shorten_line(log)
+        shortlog = shorten_line(wiki_escape_newline(log))
         t = util.svn_time_from_cstring(date, pool) / 1000000
         gmt = time.gmtime(t)
         item = {
@@ -49 +49 @@
             'date'     : svn_date_to_string (date, pool),
             'gmt'      : time.strftime('%a, %d %b %Y %H:%M:%S GMT', gmt),
             'log.raw'  : escape(log),
-            'log'      : wiki_to_oneliner(log, self.req.hdf, self.env),
+            'log'      : wiki_to_oneliner(shorten_line(wiki_escape_newline(log)), self.req.hdf, self.env),
             'shortlog' : escape(shortlog),
             'file_href': self.env.href.browser(self.path, rev),
             'changeset_href': self.env.href.changeset(rev)

trac/Changeset.py

@@ -263 +263 @@
         author = changeset_info['author'] or 'None'
         self.req.hdf.setValue('changeset.author', escape(author))
         self.req.hdf.setValue('changeset.message',
-                              wiki_to_html(changeset_info['message'],
+                              wiki_to_html(wiki_escape_newline(changeset_info['message']),
                                            self.req.hdf, self.env))
         self.req.hdf.setValue('changeset.revision', str(self.rev))
         add_dictlist_to_hdf(change_info, self.req.hdf, 'changeset.changes')

trac/Browser.py

@@ -92 +92 @@
                 'age'          : pretty_age(date_seconds),
                 'is_dir'       : is_dir,
                 'author'       : author,
-                'change'       : wiki_to_oneliner(shorten_line(change),
+                'change'       : wiki_to_oneliner(shorten_line(wiki_escape_newline(change)),
                                                   self.req.hdf, self.env)
                 }
             if rev_specified: