Edgewall Software

Ticket #1032: patch-recognize-subversion-style-revision-numbers-r1111.diff

File patch-recognize-subversion-style-revision-numbers-r1111.diff, 1.3 KB (added by rmunn@…, 4 years ago)
  • trac/WikiFormatter.py

     
    4242              r"""(?P<inlinecode>!?\{\{\{(?P<inline>.*?)\}\}\})""", 
    4343              r"""(?P<htmlescapeentity>!?&#\d+;)""", 
    4444              r"""(?P<tickethref>!?#\d+)""", 
    45               r"""(?P<changesethref>!?\[\d+\])""", 
     45              r"""(?P<changesethref>!?(\[\d+\]|\b[rR]\d+\b))""", 
    4646              r"""(?P<reporthref>!?\{\d+\})""", 
    4747              r"""(?P<modulehref>!?((?P<modulename>bug|ticket|browser|source|repos|report|changeset|wiki|milestone|search):(?P<moduleargs>(&#34;(.*?)&#34;|'(.*?)')|([^ ]*[^'~_\., \)]))))""", 
    4848              r"""(?P<wikilink>!?(^|(?<=[^A-Za-z]))[A-Z][a-z]+(?:[A-Z][a-z]*[a-z/])+(?=\Z|\s|[.,;:!?\)}\]]))""", 
     
    128128                return '<a href="%s" title="%s">#%d</a>' % (self._href.ticket(number), summary, number) 
    129129 
    130130    def _changesethref_formatter(self, match, fullmatch): 
    131         number = int(match[1:-1]) 
     131        if match[0] in ('r', 'R'): 
     132            number = int(match[1:]) 
     133        else: 
     134            number = int(match[1:-1]) 
    132135        cursor = self.db.cursor () 
    133136        cursor.execute('SELECT message FROM revision WHERE rev=%d', number) 
    134137        row = cursor.fetchone ()