Index: templates/changeset.cs =================================================================== --- templates/changeset.cs (Revision 2436) +++ templates/changeset.cs (working copy) @@ -22,7 +22,7 @@
-

Changeset

+

Changeset

-
-
Timestamp:
-
-
Author:
-
-
Message:
-
 
-
Files:
-
-
    -
  • -
    • -
-
-
+ +
+
Timestamp:
+
+
Author:
+
+
Message:
+
 
+
Files:
+
+
    +
  • +
    • +
+
+
-
-
-

Legend:

-
-
Unmodified
-
Added
-
Removed
-
Modified
-
Copied
-
Moved
-
+
+
+

Legend:

+
+
Unmodified
+
Added
+
Removed
+
Modified
+
Copied
+
Moved
+
+
+

    • Property changed from setdeleted to
    + + + + + + + + + + + + + + + + +
    Revision Revision
    … … 
    rr 
    …… 
-

    • Property changed from setdeleted to
    - - - - - - - - - - - - - - - - -
    Revision Revision
    … … 
    rr 
    …… 
-
+ + + + + + + + + + + + + + + + + +
DateAuthorLog Message
+
+
+
+ Change Log Message: +
+
+ +

+
+
+ +
+ +
+
+
+
Index: trac/db_default.py =================================================================== --- trac/db_default.py (Revision 2436) +++ trac/db_default.py (working copy) @@ -83,6 +83,12 @@ Column('author'), Column('message'), Index(['time'])], + Table('log_change', key=('rev', 'time'))[ + Column('rev'), + Column('time', type='int'), + Column('author'), + Column('message'), + Index(['rev', 'time'])], Table('node_change', key=('rev', 'path', 'change'))[ Column('rev'), Column('path'), Index: trac/versioncontrol/cache.py =================================================================== --- trac/versioncontrol/cache.py (Revision 2436) +++ trac/versioncontrol/cache.py (working copy) @@ -125,6 +125,13 @@ def normalize_rev(self, rev): return self.repos.normalize_rev(rev) + def change_log(self, rev, message, author): + # update svn fs + self.repos.get_changeset(rev).change_log(self.db, message, author) + # update cached repo + cursor = self.db.cursor() + cursor.execute("UPDATE revision SET message=%s WHERE rev=%s", (message, rev)) + self.db.commit() class CachedChangeset(Changeset): @@ -153,3 +160,14 @@ kind = _kindmap[kind] change = _actionmap[change] yield path, kind, change, base_path, base_rev + + def last_modified(self): + cursor = self.db.cursor() + cursor.execute("SELECT time FROM log_change WHERE rev=%s", (self.rev,)) + rows = cursor.fetchall() or [] + + def cmp_func(a, b): + return cmp(b[0], a[0]) + + rows.sort(cmp_func) + return rows[0][0] or self.date \ No newline at end of file Index: trac/versioncontrol/svn_fs.py =================================================================== --- trac/versioncontrol/svn_fs.py (Revision 2436) +++ trac/versioncontrol/svn_fs.py (working copy) @@ -16,7 +16,7 @@ from __future__ import generators -from trac.util import TracError +from trac.util import TracError, get_reporter_id from trac.versioncontrol import Changeset, Node, Repository import os.path @@ -504,5 +504,12 @@ for change in changes: yield tuple(change) + def change_log(self, db, message, author): + fs.change_rev_prop(self.fs_ptr, self.rev, core.SVN_PROP_REVISION_LOG, message, self.pool()) + cursor = db.cursor() + cursor.execute("INSERT INTO log_change (rev,time,author,message) " + "VALUES (%s,%s,%s,%s)", (str(self.rev), + int(time.time()), author, self.message)) + def _get_prop(self, name): - return fs.revision_prop(self.fs_ptr, self.rev, name, self.pool()) + return fs.revision_prop(self.fs_ptr, self.rev, name, self.pool()) \ No newline at end of file Index: trac/versioncontrol/web_ui/changeset.py =================================================================== --- trac/versioncontrol/web_ui/changeset.py (Revision 2436) +++ trac/versioncontrol/web_ui/changeset.py (working copy) @@ -72,9 +72,17 @@ req.redirect(self.env.href.changeset(rev)) chgset = repos.get_changeset(rev) - req.check_modified(chgset.date, + req.check_modified(chgset.last_modified(), diff_options[0] + ''.join(diff_options[1])) + action = req.args.get('action') + + if req.method == 'POST': + # test for message change + if req.args.get('message') != chgset.message: + repos.change_log(rev, req.args.get('message'), util.get_reporter_id(req)) + req.redirect(self.env.href.changeset(rev)) + format = req.args.get('format') if format == 'diff': self._render_diff(req, repos, chgset, diff_options) @@ -155,10 +163,40 @@ 'revision': chgset.rev, 'time': util.format_datetime(chgset.date), 'author': util.escape(chgset.author or 'anonymous'), - 'message': wiki_to_html(chgset.message or '--', self.env, req, - escape_newlines=True) + 'message_html': wiki_to_html(chgset.message or '--', self.env, req, + escape_newlines=True), + 'message': chgset.message or '--', + 'href': self.env.href.changeset(chgset.rev) } + action = req.args.get('action') + req.hdf['changeset.mode'] = action or 'view' + + if action == 'edit': + rev = req.args.get('rev') + db = self.env.get_db_cnx() + cursor = db.cursor() + cursor.execute("SELECT time, author, message FROM log_change WHERE rev=%s", (rev,)) + rows = cursor.fetchall() or [] + + # sort log message history by date (descending) + def cmp_func(a, b): + return cmp(b[0], a[0]) + + rows.sort(cmp_func) + + idx = 0 + last_message = chgset.message + for date, author, msg in rows: + req.hdf['changeset.change.%d.time' % idx] = time.strftime('%x %X', time.localtime(date)) + req.hdf['changeset.change.%d.author' % idx] = author + req.hdf['changeset.change.%d.msg' % idx] = wiki_to_oneliner(util.shorten_line(last_message), self.env, db) + last_message = msg + idx = idx + 1 + req.hdf['changeset.change.%d.time' % idx] = util.format_datetime(chgset.date) + req.hdf['changeset.change.%d.author' % idx] = chgset.author or 'anonymous' + req.hdf['changeset.change.%d.msg' % idx] = wiki_to_oneliner(util.shorten_line(last_message), self.env, db) + oldest_rev = repos.oldest_rev if chgset.rev != oldest_rev: add_link(req, 'first', self.env.href.changeset(oldest_rev),