Fossil SCM
More fixes to reverse annotation via the /fdiff page. It is closer, but it is still not right.
Commit
08cacbf6e59692d3498acc85a7f231f994be2cfd121e2d50bfc17f28d9ccbd7a
Parent
a9ef45ed06d558b…
2 files changed
+1
-1
+2
-2
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2259,11 +2259,11 @@ | ||
| 2259 | 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | 2260 | zFilename = blob_str(&treename); |
| 2261 | 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | 2262 | |
| 2263 | 2263 | db_prepare(&q, |
| 2264 | - "SELECT" | |
| 2264 | + "SELECT DISTINCT" | |
| 2265 | 2265 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2266 | 2266 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2267 | 2267 | " date(event.mtime)," |
| 2268 | 2268 | " coalesce(event.euser,event.user)," |
| 2269 | 2269 | " mlink.fid" |
| 2270 | 2270 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2259,11 +2259,11 @@ | |
| 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | zFilename = blob_str(&treename); |
| 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | |
| 2263 | db_prepare(&q, |
| 2264 | "SELECT" |
| 2265 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2266 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2267 | " date(event.mtime)," |
| 2268 | " coalesce(event.euser,event.user)," |
| 2269 | " mlink.fid" |
| 2270 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2259,11 +2259,11 @@ | |
| 2259 | file_tree_name(zFilename, &treename, 0, 1); |
| 2260 | zFilename = blob_str(&treename); |
| 2261 | fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename); |
| 2262 | |
| 2263 | db_prepare(&q, |
| 2264 | "SELECT DISTINCT" |
| 2265 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)," |
| 2266 | " (SELECT uuid FROM blob WHERE rid=mlink.mid)," |
| 2267 | " date(event.mtime)," |
| 2268 | " coalesce(event.euser,event.user)," |
| 2269 | " mlink.fid" |
| 2270 |
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1584,12 +1584,12 @@ | ||
| 1584 | 1584 | " AND eb.objid=b.mid" |
| 1585 | 1585 | " ORDER BY ea.mtime ASC, eb.mtime ASC", |
| 1586 | 1586 | v1, v2 |
| 1587 | 1587 | ); |
| 1588 | 1588 | if( db_step(&q)==SQLITE_ROW ){ |
| 1589 | - const char *zOrig = db_column_text(&q, 0); | |
| 1590 | - const char *zCkin = db_column_text(&q, 1); | |
| 1589 | + const char *zCkin = db_column_text(&q, 0); | |
| 1590 | + const char *zOrig = db_column_text(&q, 1); | |
| 1591 | 1591 | const char *zFN = db_column_text(&q, 2); |
| 1592 | 1592 | style_submenu_element("Annotate", |
| 1593 | 1593 | "%R/annotate?origin=%s&checkin=%s&filename=%T", |
| 1594 | 1594 | zOrig, zCkin, zFN); |
| 1595 | 1595 | } |
| 1596 | 1596 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1584,12 +1584,12 @@ | |
| 1584 | " AND eb.objid=b.mid" |
| 1585 | " ORDER BY ea.mtime ASC, eb.mtime ASC", |
| 1586 | v1, v2 |
| 1587 | ); |
| 1588 | if( db_step(&q)==SQLITE_ROW ){ |
| 1589 | const char *zOrig = db_column_text(&q, 0); |
| 1590 | const char *zCkin = db_column_text(&q, 1); |
| 1591 | const char *zFN = db_column_text(&q, 2); |
| 1592 | style_submenu_element("Annotate", |
| 1593 | "%R/annotate?origin=%s&checkin=%s&filename=%T", |
| 1594 | zOrig, zCkin, zFN); |
| 1595 | } |
| 1596 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1584,12 +1584,12 @@ | |
| 1584 | " AND eb.objid=b.mid" |
| 1585 | " ORDER BY ea.mtime ASC, eb.mtime ASC", |
| 1586 | v1, v2 |
| 1587 | ); |
| 1588 | if( db_step(&q)==SQLITE_ROW ){ |
| 1589 | const char *zCkin = db_column_text(&q, 0); |
| 1590 | const char *zOrig = db_column_text(&q, 1); |
| 1591 | const char *zFN = db_column_text(&q, 2); |
| 1592 | style_submenu_element("Annotate", |
| 1593 | "%R/annotate?origin=%s&checkin=%s&filename=%T", |
| 1594 | zOrig, zCkin, zFN); |
| 1595 | } |
| 1596 |