Ticket #919: category.1060.patch

htdocs/css/trac.css

@@ -240 +240 @@
 a.missing:link,a.missing:visited { background: #fafaf0; color: #998 }
 a.missing:hover { color: #000; }
 
+a.external:link,a.external:visited { color: #00b }
+
 #content.wiki { line-height: 140% }
 .wikitoolbar {
  border: solid #d7d7d7;
@@ -345 +347 @@
 #content.error pre, div.system-message pre { margin-left: 1em; overflow: auto }
 div.system-message p { margin: 0; }
 div.system-message p.system-message-title { font-weight: bold; }
+div.sidebar, div.contents { 
+ background: #f7f7f0;
+ border: 1px outset #998;
+ float: right;
+ font-size: 90%;
+ padding: .8em;
+ margin: 0 1em 1em;
+ width: 26em;margin: 0; 
+}
+p.sidebar-title, p.topic-title { font-weight: bold; }
+div.note { 
+ background: #d7d7f0;
+ border: 1px outset #998;
+ float: left
+ font-size: 90%;
+ padding: .8em;
+ margin: 0 1em 1em;
+ width: 26em;
+}
+p.admonition-title { font-weight: bold;text-align: center }
 
 /* Styles for search word highlighting */
 .searchword0 { background: #ff9 }

htdocs/css/browser.css

@@ -40 +40 @@
 #chglist td.rev a, #chglist td.chgset a { border-bottom: none }
 #chglist td.summary { width: 100% }
 
+/* Styles for the diff forms inside the log table */
+#chglist input {
+ font-size: 10px;
+ margin: 0;
+ padding: 0;
+ text-align: center;
+ vertical-align: middle;
+}
+#chglist form {
+ margin: 0;
+ padding: 0;
+ white-space: nowrap;
+}
+
 /* Styles for the revision info in the file module */
 #info {
  background: #f7f7f0;

htdocs/css/ticket.css

@@ -21 +21 @@
 #ticket th { color: #996; font-weight: normal; text-align: left }
 #ticket hr { color: #dd9; border-color: #dd9; border-width: 1px 0 0; height: 1px; margin: .5em 0 0 }
 
+#ticket .category { font-size: 200% } 
+
 #attachments { border: 1px outset #996; padding: 1em }
 #attachments .attachments { list-style: square; margin-left: 2em; padding: 0 }
 

htdocs/css/timeline.css

@@ -27 +27 @@
 dt .time { color: #777 }
 dd { font-size: 80%; margin: 0 0 .5em 5em; padding: 0 }
 
+
 /* Apply icon background-image twice to avoid hover-flicker in IE/Win */
 dt.changeset, dt.changeset a { background-image: url(../changeset.png) !important }
 dt.newticket, dt.newticket a { background-image: url(../newticket.png) !important }
 dt.closedticket, dt.closedticket a { background-image: url(../closedticket.png) !important }
 dt.wiki, dt.wiki a { background-image: url(../wiki.png) !important }
 dt.milestone, dt.milestone a { background-image: url(../milestone.png) !important }
+dt.ticketcomment a { font-size: 80%; color: #555 }
+dd.ticketcomment { font-size: 70%; color: #555; margin: 0 0 .5em 5em; padding: 0 }
 
+
 .diff-unmod { color: #000 }
 .diff-rem { color: #e00 }
 .diff-add { color: #2e2 }

scripts/trac-admin

@@ -706 +706 @@
                 self._do_wiki_import(filename, page, cursor)
 
 
+    ## (Ticket) Category
+    _help_category = [('category list', 'Show possible ticket categories'),
+                       ('category add <value>', 'Add a category value option'),
+                       ('category change <value> <newvalue>',
+                        'Change a category value'),
+                       ('category remove <value>', 'Remove category value')]
+
+    def complete_category (self, text, line, begidx, endidx):
+        if begidx == 16:
+            comp = self.get_enum_list ('category')
+        elif begidx < 15:
+            comp = ['list','add','change','remove']
+        return self.word_complete(text, comp)
+
+    def do_category(self, line):
+        self._do_enum('category', line)
+
     ## (Ticket) Priority
     _help_priority = [('priority list', 'Show possible ticket priorities'),
                        ('priority add <value>', 'Add a priority value option'),

README.tracd

@@ +1 @@
+========================
 Trac in stand-alone mode
 ========================
+
 Trac 0.7 introduces among many other important features, the capability to run
 Trac as a stand-alone server (daemon), without a web server.
 
-*** NOTE:  THIS IS STILL AN EXPERIMENTAL FEATURE ***
+.. NOTE::  THIS IS STILL AN EXPERIMENTAL FEATURE 
 
 As of writing, tracd is still experimental, but we encourage testing it and
 providing feedback so we can improve it. Tracd supports all features of
@@ -12 +14 @@
 
 Running tracd
 -------------
-tracd [options] <database> [database] ...
+
+tracd [options] <environment> [environment2 ...]
 Options:
+  
+  -a, --auth <project,htdigest_file,realm>        Use Digest Authentication
+  -p, --port <port>                        Port number to use (default: 80)
+  -b, --hostname <hostname>                     IP to bind to (default: '')
 
-    -a --auth [project],[htdigest_file],[realm]
-    -p --port [port]\t\tPort number to use (default: 80)
-    -b --hostname [hostname]\tIP to bind to (default: '')
 
 
-Example:
+Example 1, without authentication::
 
   $ tracd -p 9090 /var/trac/myproject
 
+Example 2, with authentication::
 
+  $ TRAC_ENV=/var/trac/myproject
+  $ tracd -a `basename $TRAC_ENV`,`dirname $TRAC_ENV`/passwd.digest,REALM \
+      -p 9090 $TRAC_ENV
+
+The file htdigest can be generated using the Apache2 tool htdigest.
+
+
 Feedback and bug reports
 ------------------------
 Please provide feedback on tracd using the issue tracker or the mailing list.

trac/core.py

@@ -46 +46 @@
 #    name           (module_name, class_name, requires_svn)
     'log'         : ('Log', 'Log', 1),
     'file'        : ('File', 'File', 1),
-    'wiki'        : ('Wiki', 'WikiModule', 0),
+    'wiki'        : ('Wiki', 'WikiModule', 1), # support Svn backend for Wiki pages
     'about_trac'  : ('About', 'About', 0),
     'search'      : ('Search', 'Search', 0),
     'report'      : ('Report', 'Report', 0),
@@ -199 +199 @@
     pass
 
 def populate_hdf(hdf, env, db, req):
+    sql_to_hdf(db, "SELECT name FROM enum WHERE type='category' "
+               "ORDER BY value", hdf, 'enums.category')
     sql_to_hdf(db, "SELECT name FROM enum WHERE type='priority' "
                "ORDER BY value", hdf, 'enums.priority')
     sql_to_hdf(db, "SELECT name FROM enum WHERE type='severity' "

trac/db_default.py

@@ -21 +21 @@
 
 
 # Database version identifier. Used for automatic upgrades.
-db_version = 7
+db_version = 8
 
 def __mkreports(reps):
     """Utility function used to create report data in same syntax as the

trac/Query.py

@@ -59 +59 @@
             results.append({
                 'id': id,
                 'href': self.env.href.ticket(id),
+                'category': row['category'],
                 'summary': util.escape(row['summary'] or '(no summary)'),
                 'status': row['status'] or '',
                 'component': row['component'] or '',
@@ -78 +79 @@
         if self.args.has_key('search'):
             self.req.redirect(self.env.href.query(constraints, order, desc,
                                                   action='view'))
+        if self.args.has_key('clear'):
+            self.req.redirect(self.env.href.query())
 
         action = self.args.get('action')
         if not action and not constraints:
@@ -91 +94 @@
 
     def _render_editor(self, constraints, order, desc):
         self.req.hdf.setValue('title', 'Custom Query')
+        self.req.hdf.setValue('query.clear_href', self.env.href.query(action='edit'))
         util.add_to_hdf(constraints, self.req.hdf, 'query.constraints')
         self.req.hdf.setValue('query.order', order)
         if desc: self.req.hdf.setValue('query.desc', '1')
@@ -112 +116 @@
                 del constraints[field]
 
         cursor = self.db.cursor()
+        add_options('category', constraints, 'query.options.', cursor,
+                    "SELECT name FROM enum WHERE type='category' ORDER BY value")
         add_options('status', constraints, 'query.options.', cursor,
                     "SELECT name FROM enum WHERE type='status' ORDER BY value")
         add_options('resolution', constraints, 'query.options.', cursor,
@@ -129 +135 @@
 
         custom_fields = get_custom_fields(self.env)
         for custom in custom_fields:
-            if custom['type'] == 'select' or custom['type'] == 'radio':
+            if custom['type'] in ['select', 'radio', 'multi']:
                 check = constraints.has_key(custom['name'])
                 options = filter(None, custom['options'])
                 for i in range(len(options)):
@@ -146 +152 @@
 
         # FIXME: the user should be able to configure which columns should
         # be displayed
-        headers = [ 'id', 'summary', 'status', 'component', 'owner' ]
+        headers = [ 'category', 'id', 'summary', 'status', 'component', 'owner' ]
         cols = headers
         if not 'priority' in cols:
             cols.append('priority')
@@ -176 +182 @@
                       "(id=%s.ticket AND %s.name='%s')"
                       % (k, k, k, k))
 
-        for col in [c for c in ['status', 'resolution', 'priority', 'severity']
+        for col in [c for c in ['category', 'status', 'resolution', 'priority', 'severity']
                     if c in cols]:
             sql.append(" INNER JOIN (SELECT name AS %s_name, value AS %s_value " \
                                    "FROM enum WHERE type='%s')" \
@@ -194 +200 @@
         if clauses:
             sql.append(" WHERE " + " AND ".join(clauses))
 
-        if order in ['status', 'resolution', 'priority', 'severity']:
+        if order in ['category', 'status', 'resolution', 'priority', 'severity']:
             sql.append(" ORDER BY %s_value" % order)
         else:
             sql.append(" ORDER BY " + order)

trac/Timeline.py

@@ -34 +34 @@
     template_name = 'timeline.cs'
     template_rss_name = 'timeline_rss.cs'
 
-    def get_info (self, start, stop, maxrows, tickets,
+    def get_info (self, start, stop, maxrows, tickets, ticket_comments,
                   changeset, wiki, milestone):
         cursor = self.db.cursor ()
 
         tickets = tickets and self.perm.has_permission(perm.TICKET_VIEW)
+        ticket_comments = ticket_comments and self.perm.has_permission(perm.TICKET_VIEW)
         changeset = changeset and self.perm.has_permission(perm.CHANGESET_VIEW)
         wiki = wiki and self.perm.has_permission(perm.WIKI_VIEW)
         milestone = milestone and self.perm.has_permission(perm.MILESTONE_VIEW)
@@ -52 +53 @@
         REOPENED_TICKET = 4
         WIKI = 5
         MILESTONE = 6
+        TICKET_COMMENT = 7
 
         q = []
         if changeset:
             q.append("SELECT time, rev AS idata, '' AS tdata, 1 AS type, "
-                     " message, author "
+                     " message, author, '' AS category "
                      "FROM revision WHERE time>=%s AND time<=%s" %
                      (start, stop))
         if tickets:
             q.append("SELECT time, id AS idata, '' AS tdata, 2 AS type, "
-                     "summary AS message, reporter AS author "
+                     " summary AS message, reporter AS author, category "
                      "FROM ticket WHERE time>=%s AND time<=%s" %
                      (start, stop))
-            q.append("SELECT time, ticket AS idata, '' AS tdata, 4 AS type, "
-                     "'' AS message, author "
-                     "FROM ticket_change WHERE field='status' "
-                     "AND newvalue='reopened' AND time>=%s AND time<=%s" %
+            q.append("SELECT t1.time, t1.ticket AS idata, '' AS tdata, 4 AS type, "
+                     " '' AS message, t1.author, t0.category AS category "
+                     "FROM ticket_change t1 "
+                     " LEFT JOIN ticket t0 ON t0.id = t1.ticket "
+                     "WHERE t1.field='status' "
+                     "AND t1.newvalue='reopened' AND t1.time>=%s AND t1.time<=%s" %
                      (start, stop))
             q.append("SELECT t1.time AS time, t1.ticket AS idata,"
                      "       t2.newvalue AS tdata, 3 AS type,"
-                     "       t3.newvalue AS message, t1.author AS author"
+                     "       t3.newvalue AS message, t1.author AS author, t0.category AS category"
                      " FROM ticket_change t1"
+                     "   LEFT JOIN ticket t0 ON t0.id = t1.ticket"
                      "   INNER JOIN ticket_change t2 ON t1.ticket = t2.ticket"
                      "     AND t1.time = t2.time"
                      "   LEFT OUTER JOIN ticket_change t3 ON t1.time = t3.time"
@@ -82 +87 @@
                      "   AND t1.time >= %s AND t1.time <= %s" % (start,stop))
         if wiki:
             q.append("SELECT time, -1 AS idata, name AS tdata, 5 AS type, "
-                     "comment AS message, author "
+                     "comment AS message, author, '' AS category "
                         "FROM wiki WHERE time>=%s AND time<=%s" %
                      (start, stop))
         if milestone:
             q.append("SELECT time, -1 AS idata, '' AS tdata, 6 AS type, "
-                     "name AS message, '' AS author " 
+                     "name AS message, '' AS author, '' AS category " 
                      "FROM milestone WHERE time>=%s AND time<=%s" %
                      (start, stop))
 
+        if ticket_comments:
+            q.append("SELECT t1.time AS time, t1.ticket AS idata, '' AS tdata, 7 AS type, "
+                     "t1.newvalue AS message, t1.author AS author, t0.category AS category "
+                     "FROM ticket_change t1"
+                     "   LEFT JOIN ticket t0 ON t0.id = t1.ticket "
+                     "WHERE t1.field = 'comment' "
+                     "AND t1.time>=%s AND t1.time<=%s" % (start, stop))
+
         q_str = string.join(q, ' UNION ALL ')
         q_str += ' ORDER BY time DESC'
         if maxrows:
@@ -100 +113 @@
 
         # Make the data more HDF-friendly
         info = []
+        tickets = {}
         while 1:
             row = cursor.fetchone()
             if not row:
@@ -113 +127 @@
                     'tdata': row['tdata'],
                     'type': int(row['type']),
                     'message': row['message'] or '',
+                    'category': row['category'],
                     'author': util.escape(row['author'] or 'anonymous')
                     }
 
@@ -168 +183 @@
             elif item['type'] == MILESTONE:
                 item['href'] = self.env.href.milestone(item['message'])
                 item['message'] = util.escape(item['message'])
-            else:               # TICKET
+            else:               # all the TICKET types
                 item['href'] = self.env.href.ticket(item['idata'])
+                if item['type'] == TICKET_COMMENT:
+                # The following would be ok if there would be a cost effective way
+                # to get that change number...
+                # item['href'] += '#change_%d' % item['change']
+                    pass
+                else:
+                    tickets[(item['idata'], item['time'])] = 1
                 msg = item['message']
                 item['shortmsg'] = util.escape(util.shorten_line(msg))
                 item['message'] = wiki_to_oneliner(
@@ -187 +209 @@
             item['message.rss'] = util.escape(item['message'] or '')
 
             info.append(item)
-        return info
+        # Ok, the following line is maybe not Python 2.1 friendly, I don't know...
+        # return [ i for i in info if i['type'] != 7 or not tickets.has_key((i['idata'], i['time'])) ]
+        info2 = []
+        for item in info:
+            if item['type'] != 7 or not tickets.has_key((item['idata'], item['time'])):
+                info2.append(item)
+        return info2
 
     def render (self):
         self.perm.assert_permission(perm.TIMELINE_VIEW)
@@ -221 +249 @@
 
         wiki = self.args.has_key('wiki') 
         ticket = self.args.has_key('ticket')
+        ticket_comments = self.args.has_key('ticket_comments')
         changeset = self.args.has_key('changeset')
         milestone = self.args.has_key('milestone')
         if not (wiki or ticket or changeset or milestone):
@@ -230 +259 @@
             self.req.hdf.setValue('timeline.wiki', 'checked')
         if ticket:
             self.req.hdf.setValue('timeline.ticket', 'checked')
+        if ticket_comments:
+            self.req.hdf.setValue('timeline.ticket_comments', 'checked')
         if changeset:
             self.req.hdf.setValue('timeline.changeset', 'checked')
         if milestone:
             self.req.hdf.setValue('timeline.milestone', 'checked')
 
-        info = self.get_info (start, stop, maxrows, ticket,
+        info = self.get_info (start, stop, maxrows, ticket, ticket_comments, 
                               changeset, wiki, milestone)
         util.add_dictlist_to_hdf(info, self.req.hdf, 'timeline.items')
         self.req.hdf.setValue('title', 'Timeline')

trac/tests/wiki-tests.txt

@@ -127 +127 @@
 ------------------------------
 <h2>Heading with trailing white-space</h2>
 ==============================
+[[HelloWorld(hej hopp)]]
+------------------------------
+<p>
+<pre class="wiki">hej hopp</pre>
+</p>
+==============================
+[[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ]
+------------------------------
+<p>
+[[HelloWorld(hej hopp) ]] # This shouldnt executed as macro since it contain whitespace between ) and ]
+</p>
+==============================
+[[HelloWorld(hej hopp))]] # Extra right brace and still executed
+------------------------------
+<p>
+<pre class="wiki">hej hopp)</pre> # Extra right brace and still executed
+</p>
+==============================
+[[HelloWorld(hej hopp)]] [[HelloWorld(hej hopp2)]] # Test non greedy match
+------------------------------
+<p>
+<pre class="wiki">hej hopp</pre> <pre class="wiki">hej hopp2</pre> # Test non greedy match
+</p>
+==============================
+Inline [[html(<B> Test </B>)]] text
+------------------------------
+<p>
+Inline <B> Test </B> text
+</p>
+==============================
 A0B1, ST62T53C6, IR32V1H000
 ------------------------------
 <p>

trac/tests/wiki.py

@@ -4 +4 @@
 
 from Wiki import Formatter
 
+
 class WikiTestCase(unittest.TestCase):
     def __init__(self, input, correct):
         unittest.TestCase.__init__(self, 'test')
@@ -13 +14 @@
     def test(self):
         """Testing WikiFormatter"""
         import Href
+        import Mimeview
         class Environment:
             def __init__(self):
                 self.href = Href.Href('/')
                 self._wiki_pages = {}
+                self.mimeview = Mimeview.Mimeview(self)
         class Cursor:
             def execute(self, *kwargs): pass
             def fetchone(self): return []
@@ -28 +31 @@
         out = StringIO.StringIO()
         Formatter(None, Environment(), Connection()).format(self.input, out)
         if out.getvalue() != self.correct:
-            print "'%s' != '%s'" % (out.getvalue(), self.correct)
+            print "\n'%s' != \n'%s'" % (out.getvalue(), self.correct)
             assert self.correct == out.getvalue()
 
 def suite():

trac/util.py

@@ -70 +70 @@
                     .replace('>', '>') \
                     .replace('"', '"')
 
+def unescape(text):
+    """Reverses Escapes &, <, > and \""""
+    if not text:
+        return ''
+    if type(text) is StringType:
+        text = text.replace('&#34;', '"') \
+               .replace('&gt;', '>') \
+               .replace('&lt;', '<') \
+               .replace('&amp;', '&') 
+    return text
+
 def get_first_line(text, maxlen):
     """
     returns the first line of text. If the line is longer then

trac/Log.py

@@ -53 +53 @@
             'log.raw'  : util.escape(log),
             'log'      : wiki_to_oneliner(util.shorten_line(util.wiki_escape_newline(log)), self.req.hdf, self.env,self.db),
             'shortlog' : util.escape(shortlog),
+            'original_file_href': self.env.href.browser(self.path, rev),
             'file_href': self.env.href.browser(self.path, rev),
             'changeset_href': self.env.href.changeset(rev)
             }
@@ -71 +72 @@
         # Loop through all revisions and update the path
         # after each tag/branch/copy/rename.
         path = self.path
+        seq = len(self.log_info)
         for item in self.log_info:
+            item['seq'] = seq
+            seq -= 1
             item['file_href'] = self.env.href.browser(path, item['rev'])
+            item['intermediate_file_href'] = self.env.href.browser(path, item['rev'])
             if self.branch_info.has_key(item['rev']):
                 for info in self.branch_info[item['rev']]:
                     if path[:len(info[1])] == info[1]:
                         rel_path = path[len(info[1]):]
                         path = info[0]+rel_path
+        # Add suggested base revision for diffing
+        prev = None
+        log_info_backward = self.log_info[:]
+        log_info_backward.reverse()
+        for item in log_info_backward:
+            if prev:
+                item['diff'] = prev
+            prev = item['rev']
         return self.log_info
 
     def generate_path_links(self, rev, rev_specified):

trac/wikimacros/rst.py

@@ -43 +43 @@
     raise EnvironmentError, 'Docutils version >= %s required, %s found' % (docutils_required, __version__)
 
 from trac.Href import Href
+from trac.WikiFormatter import WikiProcessor
 
 __docformat__ = 'reStructuredText'
 
-WIKI_LINK = re.compile(r'(?:wiki:)?(?P<w>[A-Za-z][\w\#\?]*[^\w\#\?]*)') # Links must begin with Letters, \# ? so we can link inside pages.
-#WIKI_LINK = re.compile(r'(?:wiki:)?(?P<w>(^|(?<=[^A-Za-z]))[!]?[A-Z][a-z/]+(?:[A-Z][a-z/]+)+)')
+WIKI_LINK = re.compile(r'(?:wiki:)?(.+)')
+#WIKI_LINK = re.compile(r'(?:wiki:)?(?P<wikilink>[A-Za-z][\w\-]*[^\w\#\?]*)')
 TICKET_LINK = re.compile(r'(?:#(\d+))|(?:ticket:(\d+))')
 REPORT_LINK = re.compile(r'(?:{(\d+)})|(?:report:(\d+))')
 CHANGESET_LINK = re.compile(r'(?:\[(\d+)\])|(?:changeset:(\d+))')
 FILE_LINK = re.compile(r'(?:browser|repos|source):([^#]+)#?(.*)')
 
+#import trac.Logging
+#log = trac.Logging.logger_factory(logtype='file', logfile="/tmp/debug_rst.txt", level='ALL')
+
 def _wikipage(href, args):
     return href.wiki(args[0])
 
@@ -71 +75 @@
     return href.browser(path, rev)
 
 # TracLink REs and callback functions
-LINKS = [(WIKI_LINK, _wikipage),
-         (TICKET_LINK, _ticket),
+LINKS = [(TICKET_LINK, _ticket),
          (REPORT_LINK, _report),
          (CHANGESET_LINK, _changeset),
-         (FILE_LINK, _browser)]
+         (FILE_LINK, _browser),
+         (WIKI_LINK, _wikipage)]
 
 
-def trac_get_reference(env, rawtext, text):
+def trac_get_reference(env, rawtext, link, text):
+
     for (pattern, function) in LINKS:
-        m = pattern.match(text)
+        m = pattern.match(link)
         if m:
             g = filter(None, m.groups())
             missing = False
+            if not text:
+                text = g[0]
             if pattern == WIKI_LINK:
-                if not (env._wiki_pages.has_key(g[0])):
+                pagename = re.search(r'^[^\#]+',g[0])
+                if not (env._wiki_pages.has_key(pagename.group())):
                         missing = True
-                        text = text + "?"
+                        text = text + "?"            
             uri = function(env.href, g)
             reference = nodes.reference(rawtext, text)
             reference['refuri']= uri
             if missing:
                 reference.set_class('missing')
             return reference
+        
     return None