TrackLinks broken

[Karl <karl@…>]

If the commit message below is used

ticket:1
This is a commit message for ticket:1 with additional comments

TimeLine and BrowseSource return this traceback

Traceback (most recent call last):
  File "/usr/lib/python2.3/site-packages/trac/web/standalone.py", line 235, in _do_trac_req
    dispatch_request(path_info, req, env)
  File "/usr/lib/python2.3/site-packages/trac/web/main.py", line 139, in dispatch_request
    dispatcher.dispatch(req)
  File "/usr/lib/python2.3/site-packages/trac/web/main.py", line 107, in dispatch
    resp = chosen_handler.process_request(req)
  File "/usr/lib/python2.3/site-packages/trac/Timeline.py", line 136, in process_request
    filters)
  File "/usr/lib/python2.3/site-packages/trac/versioncontrol/web_ui/changeset.py", line 131, in get_timeline_events
    message = wiki_to_oneliner(excerpt, self.env, db)
  File "/usr/lib/python2.3/site-packages/trac/wiki/formatter.py", line 700, in wiki_to_oneliner
    OneLinerFormatter(env, absurls, db).format(wikitext, out)
  File "/usr/lib/python2.3/site-packages/trac/wiki/formatter.py", line 639, in format
    result = re.sub(self.rules, self.replace, util.escape(text.strip(), False))
  File "/usr/lib/python2.3/sre.py", line 143, in sub
    return _compile(pattern, 0).sub(repl, string, count)
  File "/usr/lib/python2.3/site-packages/trac/wiki/formatter.py", line 209, in replace
    return getattr(self, '_' + itype + '_formatter')(match, fullmatch)
  File "/usr/lib/python2.3/site-packages/trac/wiki/formatter.py", line 255, in _shref_formatter
    return self._make_link(ns, target, match, match)
  File "/usr/lib/python2.3/site-packages/trac/wiki/formatter.py", line 281, in _make_link
    return self.link_resolvers[ns](self, ns, target, label)
  File "/usr/lib/python2.3/site-packages/trac/ticket/api.py", line 160, in _format_link
    (target,))
ProgrammingError: ERROR:  invalid input syntax for integer: "1
This"

SELECT summary,status FROM ticket WHERE id='1
This'

Using Postgres

[Christopher Lenz]

cboos, can you have a look at this?

[Christian Boos]

I can reproduce the issue with SQLite, though it doesn't result in a SQL error there. In the timeline there's a bogus ticket:1 This link…

[Christian Boos]

The following changes (using \s instead of spaces) would fix the problem:

trac/wiki/formatter.py

@@ -149 +149 @@
                   r"(?P<htmlescapeentity>!?&#\d+;)"]
     _post_rules = [(r"(?P<shref>!?((?P<sns>%s):" % LINK_SCHEME +
                     r"(?P<stgt>'[^']+'|\"[^\"]+\"|"
-                    r"(?:\|(?=[^| ])|&(?!lt;)|[^|& ])*[^|'~_\.,& \)])))"),
+                    r"(?:\|(?=[^|\s])|&(?!lt;)|[^|&\s])*[^|'~_\.,&\s\)])))"),
                    (r"(?P<lhref>!?\[(?:(?P<lns>%s):" % LINK_SCHEME +
-                    r"(?P<ltgt>'[^']+'|\"[^\"]+\"|[^\] ]*)"
-                    r"|(?P<rel>[/.][^ [\]]*))"
-                    r"(?: (?P<label>'[^']+'|\"[^\"]+\"|[^\]]+))?\])"),
+                    r"(?P<ltgt>'[^']+'|\"[^\"]+\"|[^\]\s]*)"
+                    r"|(?P<rel>[/.][^\s[\]]*))"
+                    r"(?:\s+(?P<label>'[^']+'|\"[^\"]+\"|[^\]]+))?\])"),
                    (r"(?P<macro>!?\[\[(?P<macroname>[\w/+-]+)"
                     r"(\]\]|\((?P<macroargs>.*?)\)\]\]))"),
                    r"(?P<heading>^\s*(?P<hdepth>=+)\s.*\s(?P=hdepth)\s*$)",

[Christian Boos]

In addition to the previous fix, I integrated the suggestion made in #1153, as well as a complete set of unit-tests for the Wiki one-liner formatter (checked the results, not all unit-tests need to be repeated for the one-liner case, though)

[Christian Boos]

Unit-tests added in r2393, and issue fixed in r2395.