Fossil SCM
Fix the origin= and checkin= query parameters on the "Annotate" link of the /fdiff page.
Commit
a9ef45ed06d558bb385e472caad96494f30abc4255d6cd5f4096c73a03ad4ba3
Parent
75fffb49ce9e23a…
1 file changed
+5
-2
+5
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1572,16 +1572,19 @@ | ||
| 1572 | 1572 | ** annotation between those version. */ |
| 1573 | 1573 | db_prepare(&q, |
| 1574 | 1574 | "SELECT (SELECT substr(uuid,1,20) FROM blob WHERE rid=a.mid)," |
| 1575 | 1575 | " (SELECT substr(uuid,1,20) FROM blob WHERE rid=b.mid)," |
| 1576 | 1576 | " (SELECT name FROM filename WHERE filename.fnid=a.fnid)" |
| 1577 | - " FROM mlink a, mlink b" | |
| 1577 | + " FROM mlink a, event ea, mlink b, event eb" | |
| 1578 | 1578 | " WHERE a.fid=%d" |
| 1579 | 1579 | " AND b.fid=%d" |
| 1580 | 1580 | " AND a.fnid=b.fnid" |
| 1581 | 1581 | " AND a.fid!=a.pid" |
| 1582 | - " AND b.fid!=b.pid", | |
| 1582 | + " AND b.fid!=b.pid" | |
| 1583 | + " AND ea.objid=a.mid" | |
| 1584 | + " AND eb.objid=b.mid" | |
| 1585 | + " ORDER BY ea.mtime ASC, eb.mtime ASC", | |
| 1583 | 1586 | v1, v2 |
| 1584 | 1587 | ); |
| 1585 | 1588 | if( db_step(&q)==SQLITE_ROW ){ |
| 1586 | 1589 | const char *zOrig = db_column_text(&q, 0); |
| 1587 | 1590 | const char *zCkin = db_column_text(&q, 1); |
| 1588 | 1591 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1572,16 +1572,19 @@ | |
| 1572 | ** annotation between those version. */ |
| 1573 | db_prepare(&q, |
| 1574 | "SELECT (SELECT substr(uuid,1,20) FROM blob WHERE rid=a.mid)," |
| 1575 | " (SELECT substr(uuid,1,20) FROM blob WHERE rid=b.mid)," |
| 1576 | " (SELECT name FROM filename WHERE filename.fnid=a.fnid)" |
| 1577 | " FROM mlink a, mlink b" |
| 1578 | " WHERE a.fid=%d" |
| 1579 | " AND b.fid=%d" |
| 1580 | " AND a.fnid=b.fnid" |
| 1581 | " AND a.fid!=a.pid" |
| 1582 | " AND b.fid!=b.pid", |
| 1583 | v1, v2 |
| 1584 | ); |
| 1585 | if( db_step(&q)==SQLITE_ROW ){ |
| 1586 | const char *zOrig = db_column_text(&q, 0); |
| 1587 | const char *zCkin = db_column_text(&q, 1); |
| 1588 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1572,16 +1572,19 @@ | |
| 1572 | ** annotation between those version. */ |
| 1573 | db_prepare(&q, |
| 1574 | "SELECT (SELECT substr(uuid,1,20) FROM blob WHERE rid=a.mid)," |
| 1575 | " (SELECT substr(uuid,1,20) FROM blob WHERE rid=b.mid)," |
| 1576 | " (SELECT name FROM filename WHERE filename.fnid=a.fnid)" |
| 1577 | " FROM mlink a, event ea, mlink b, event eb" |
| 1578 | " WHERE a.fid=%d" |
| 1579 | " AND b.fid=%d" |
| 1580 | " AND a.fnid=b.fnid" |
| 1581 | " AND a.fid!=a.pid" |
| 1582 | " AND b.fid!=b.pid" |
| 1583 | " AND ea.objid=a.mid" |
| 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 |