Fossil SCM
Show the edited user id in annotations.
Commit
e7efca9ee92021d8e2f07464b2883a739748da67
Parent
23c0d16718b1b08…
1 file changed
+2
-1
+2
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -696,11 +696,12 @@ | ||
| 696 | 696 | db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)"); |
| 697 | 697 | compute_ancestors(mid, 1000000000); |
| 698 | 698 | annotation_start(p, &toAnnotate); |
| 699 | 699 | |
| 700 | 700 | db_prepare(&q, |
| 701 | - "SELECT mlink.fid, blob.uuid, date(event.mtime), event.user " | |
| 701 | + "SELECT mlink.fid, blob.uuid, date(event.mtime), " | |
| 702 | + " coalesce(event.euser,event.user) " | |
| 702 | 703 | " FROM mlink, blob, event" |
| 703 | 704 | " WHERE mlink.fnid=%d" |
| 704 | 705 | " AND mlink.mid IN ok" |
| 705 | 706 | " AND blob.rid=mlink.mid" |
| 706 | 707 | " AND event.objid=mlink.mid" |
| 707 | 708 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -696,11 +696,12 @@ | |
| 696 | db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)"); |
| 697 | compute_ancestors(mid, 1000000000); |
| 698 | annotation_start(p, &toAnnotate); |
| 699 | |
| 700 | db_prepare(&q, |
| 701 | "SELECT mlink.fid, blob.uuid, date(event.mtime), event.user " |
| 702 | " FROM mlink, blob, event" |
| 703 | " WHERE mlink.fnid=%d" |
| 704 | " AND mlink.mid IN ok" |
| 705 | " AND blob.rid=mlink.mid" |
| 706 | " AND event.objid=mlink.mid" |
| 707 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -696,11 +696,12 @@ | |
| 696 | db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)"); |
| 697 | compute_ancestors(mid, 1000000000); |
| 698 | annotation_start(p, &toAnnotate); |
| 699 | |
| 700 | db_prepare(&q, |
| 701 | "SELECT mlink.fid, blob.uuid, date(event.mtime), " |
| 702 | " coalesce(event.euser,event.user) " |
| 703 | " FROM mlink, blob, event" |
| 704 | " WHERE mlink.fnid=%d" |
| 705 | " AND mlink.mid IN ok" |
| 706 | " AND blob.rid=mlink.mid" |
| 707 | " AND event.objid=mlink.mid" |
| 708 |