Fossil SCM
Show the user who make the change on the timeline, both on the www interface and in the cli.
Commit
1a4dd313a8300cbbd693e85fe4ea7df383f47d60
Parent
5602bbbaff8432d…
1 file changed
+4
-3
+4
-3
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -55,11 +55,11 @@ | ||
| 55 | 55 | Stmt q; |
| 56 | 56 | char zPrevDate[20]; |
| 57 | 57 | style_header("Timeline"); |
| 58 | 58 | zPrevDate[0] = 0; |
| 59 | 59 | db_prepare(&q, |
| 60 | - "SELECT uuid, datetime(event.mtime,'localtime'), comment" | |
| 60 | + "SELECT uuid, datetime(event.mtime,'localtime'), comment, user" | |
| 61 | 61 | " FROM event, blob" |
| 62 | 62 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 63 | 63 | " ORDER BY event.mtime DESC" |
| 64 | 64 | ); |
| 65 | 65 | @ <table cellspacing=0 border=0 cellpadding=0> |
| @@ -78,11 +78,11 @@ | ||
| 78 | 78 | } |
| 79 | 79 | @ <tr><td valign="top">%s(&zDate[11])</td> |
| 80 | 80 | @ <td width="20"></td> |
| 81 | 81 | @ <td valign="top" align="left"> |
| 82 | 82 | hyperlink_to_uuid(db_column_text(&q,0)); |
| 83 | - @ %s(db_column_text(&q,2))</td> | |
| 83 | + @ %h(db_column_text(&q,2)) (by %h(db_column_text(&q,3)))</td> | |
| 84 | 84 | } |
| 85 | 85 | db_finalize(&q); |
| 86 | 86 | @ </table> |
| 87 | 87 | style_footer(); |
| 88 | 88 | } |
| @@ -126,13 +126,14 @@ | ||
| 126 | 126 | */ |
| 127 | 127 | void timeline_cmd(void){ |
| 128 | 128 | Stmt q; |
| 129 | 129 | db_must_be_within_tree(); |
| 130 | 130 | db_prepare(&q, |
| 131 | - "SELECT uuid, datetime(event.mtime,'localtime'), comment" | |
| 131 | + "SELECT uuid, datetime(event.mtime,'localtime')," | |
| 132 | + " comment || ' (by ' || user || ')'" | |
| 132 | 133 | " FROM event, blob" |
| 133 | 134 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 134 | 135 | " ORDER BY event.mtime DESC" |
| 135 | 136 | ); |
| 136 | 137 | print_timeline(&q, 20); |
| 137 | 138 | db_finalize(&q); |
| 138 | 139 | } |
| 139 | 140 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -55,11 +55,11 @@ | |
| 55 | Stmt q; |
| 56 | char zPrevDate[20]; |
| 57 | style_header("Timeline"); |
| 58 | zPrevDate[0] = 0; |
| 59 | db_prepare(&q, |
| 60 | "SELECT uuid, datetime(event.mtime,'localtime'), comment" |
| 61 | " FROM event, blob" |
| 62 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 63 | " ORDER BY event.mtime DESC" |
| 64 | ); |
| 65 | @ <table cellspacing=0 border=0 cellpadding=0> |
| @@ -78,11 +78,11 @@ | |
| 78 | } |
| 79 | @ <tr><td valign="top">%s(&zDate[11])</td> |
| 80 | @ <td width="20"></td> |
| 81 | @ <td valign="top" align="left"> |
| 82 | hyperlink_to_uuid(db_column_text(&q,0)); |
| 83 | @ %s(db_column_text(&q,2))</td> |
| 84 | } |
| 85 | db_finalize(&q); |
| 86 | @ </table> |
| 87 | style_footer(); |
| 88 | } |
| @@ -126,13 +126,14 @@ | |
| 126 | */ |
| 127 | void timeline_cmd(void){ |
| 128 | Stmt q; |
| 129 | db_must_be_within_tree(); |
| 130 | db_prepare(&q, |
| 131 | "SELECT uuid, datetime(event.mtime,'localtime'), comment" |
| 132 | " FROM event, blob" |
| 133 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 134 | " ORDER BY event.mtime DESC" |
| 135 | ); |
| 136 | print_timeline(&q, 20); |
| 137 | db_finalize(&q); |
| 138 | } |
| 139 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -55,11 +55,11 @@ | |
| 55 | Stmt q; |
| 56 | char zPrevDate[20]; |
| 57 | style_header("Timeline"); |
| 58 | zPrevDate[0] = 0; |
| 59 | db_prepare(&q, |
| 60 | "SELECT uuid, datetime(event.mtime,'localtime'), comment, user" |
| 61 | " FROM event, blob" |
| 62 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 63 | " ORDER BY event.mtime DESC" |
| 64 | ); |
| 65 | @ <table cellspacing=0 border=0 cellpadding=0> |
| @@ -78,11 +78,11 @@ | |
| 78 | } |
| 79 | @ <tr><td valign="top">%s(&zDate[11])</td> |
| 80 | @ <td width="20"></td> |
| 81 | @ <td valign="top" align="left"> |
| 82 | hyperlink_to_uuid(db_column_text(&q,0)); |
| 83 | @ %h(db_column_text(&q,2)) (by %h(db_column_text(&q,3)))</td> |
| 84 | } |
| 85 | db_finalize(&q); |
| 86 | @ </table> |
| 87 | style_footer(); |
| 88 | } |
| @@ -126,13 +126,14 @@ | |
| 126 | */ |
| 127 | void timeline_cmd(void){ |
| 128 | Stmt q; |
| 129 | db_must_be_within_tree(); |
| 130 | db_prepare(&q, |
| 131 | "SELECT uuid, datetime(event.mtime,'localtime')," |
| 132 | " comment || ' (by ' || user || ')'" |
| 133 | " FROM event, blob" |
| 134 | " WHERE event.type='ci' AND blob.rid=event.objid" |
| 135 | " ORDER BY event.mtime DESC" |
| 136 | ); |
| 137 | print_timeline(&q, 20); |
| 138 | db_finalize(&q); |
| 139 | } |
| 140 |