Fossil SCM
Use artifact IDs, not record IDs, on the "diff" link of check-in change listings.
Commit
61c52dd6aa3641d0131a2c3e3c0a16e8a36ffee5
Parent
84439e9dc7077dc…
1 file changed
+11
-11
+11
-11
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -397,14 +397,14 @@ | ||
| 397 | 397 | }else{ |
| 398 | 398 | @ <a href="%s(g.zBaseURL)/vinfo/%T(zName)">[show diffs]</a><br/> |
| 399 | 399 | } |
| 400 | 400 | } |
| 401 | 401 | db_prepare(&q, |
| 402 | - "SELECT pid, fid, name, substr(a.uuid,1,10), substr(b.uuid,1,10)" | |
| 402 | + "SELECT pid, fid, name," | |
| 403 | + " (SELECT uuid FROM blob WHERE rid=mlink.pid)," | |
| 404 | + " (SELECT uuid FROM blob WHERE rid=mlink.fid)" | |
| 403 | 405 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 404 | - " LEFT JOIN blob a ON a.rid=pid" | |
| 405 | - " LEFT JOIN blob b ON b.rid=fid" | |
| 406 | 406 | " WHERE mlink.mid=%d" |
| 407 | 407 | " ORDER BY name", |
| 408 | 408 | rid |
| 409 | 409 | ); |
| 410 | 410 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -419,24 +419,24 @@ | ||
| 419 | 419 | continue; |
| 420 | 420 | }else{ |
| 421 | 421 | @ <p>Changes to %h(zName)</p> |
| 422 | 422 | } |
| 423 | 423 | }else if( zOld && zNew ){ |
| 424 | - @ <p>Modified <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> | |
| 425 | - @ from <a href="%s(g.zBaseURL)/artifact/%s(zOld)">[%s(zOld)]</a> | |
| 426 | - @ to <a href="%s(g.zBaseURL)/artifact/%s(zNew)">[%s(zNew)].</a> | |
| 424 | + @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> | |
| 425 | + @ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a> | |
| 426 | + @ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a> | |
| 427 | 427 | if( !showDiff ){ |
| 428 | 428 | @ |
| 429 | - @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(pid)&v2=%d(fid)">[diff]</a> | |
| 429 | + @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a> | |
| 430 | 430 | } |
| 431 | 431 | }else if( zOld ){ |
| 432 | - @ <p>Deleted <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> | |
| 433 | - @ version <a href="%s(g.zBaseURL)/artifact/%s(zOld)">[%s(zOld)]</a></p> | |
| 432 | + @ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> | |
| 433 | + @ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a></p> | |
| 434 | 434 | continue; |
| 435 | 435 | }else{ |
| 436 | - @ <p>Added <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> | |
| 437 | - @ version <a href="%s(g.zBaseURL)/artifact/%s(zNew)">[%s(zNew)]</a></p> | |
| 436 | + @ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> | |
| 437 | + @ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a></p> | |
| 438 | 438 | } |
| 439 | 439 | if( showDiff ){ |
| 440 | 440 | @ <blockquote><pre> |
| 441 | 441 | append_diff(pid, fid); |
| 442 | 442 | @ </pre></blockquote> |
| 443 | 443 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -397,14 +397,14 @@ | |
| 397 | }else{ |
| 398 | @ <a href="%s(g.zBaseURL)/vinfo/%T(zName)">[show diffs]</a><br/> |
| 399 | } |
| 400 | } |
| 401 | db_prepare(&q, |
| 402 | "SELECT pid, fid, name, substr(a.uuid,1,10), substr(b.uuid,1,10)" |
| 403 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 404 | " LEFT JOIN blob a ON a.rid=pid" |
| 405 | " LEFT JOIN blob b ON b.rid=fid" |
| 406 | " WHERE mlink.mid=%d" |
| 407 | " ORDER BY name", |
| 408 | rid |
| 409 | ); |
| 410 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -419,24 +419,24 @@ | |
| 419 | continue; |
| 420 | }else{ |
| 421 | @ <p>Changes to %h(zName)</p> |
| 422 | } |
| 423 | }else if( zOld && zNew ){ |
| 424 | @ <p>Modified <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> |
| 425 | @ from <a href="%s(g.zBaseURL)/artifact/%s(zOld)">[%s(zOld)]</a> |
| 426 | @ to <a href="%s(g.zBaseURL)/artifact/%s(zNew)">[%s(zNew)].</a> |
| 427 | if( !showDiff ){ |
| 428 | @ |
| 429 | @ <a href="%s(g.zBaseURL)/fdiff?v1=%d(pid)&v2=%d(fid)">[diff]</a> |
| 430 | } |
| 431 | }else if( zOld ){ |
| 432 | @ <p>Deleted <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> |
| 433 | @ version <a href="%s(g.zBaseURL)/artifact/%s(zOld)">[%s(zOld)]</a></p> |
| 434 | continue; |
| 435 | }else{ |
| 436 | @ <p>Added <a href="%s(g.zBaseURL)/finfo?name=%T(zName)">%h(zName)</a> |
| 437 | @ version <a href="%s(g.zBaseURL)/artifact/%s(zNew)">[%s(zNew)]</a></p> |
| 438 | } |
| 439 | if( showDiff ){ |
| 440 | @ <blockquote><pre> |
| 441 | append_diff(pid, fid); |
| 442 | @ </pre></blockquote> |
| 443 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -397,14 +397,14 @@ | |
| 397 | }else{ |
| 398 | @ <a href="%s(g.zBaseURL)/vinfo/%T(zName)">[show diffs]</a><br/> |
| 399 | } |
| 400 | } |
| 401 | db_prepare(&q, |
| 402 | "SELECT pid, fid, name," |
| 403 | " (SELECT uuid FROM blob WHERE rid=mlink.pid)," |
| 404 | " (SELECT uuid FROM blob WHERE rid=mlink.fid)" |
| 405 | " FROM mlink JOIN filename ON filename.fnid=mlink.fnid" |
| 406 | " WHERE mlink.mid=%d" |
| 407 | " ORDER BY name", |
| 408 | rid |
| 409 | ); |
| 410 | while( db_step(&q)==SQLITE_ROW ){ |
| @@ -419,24 +419,24 @@ | |
| 419 | continue; |
| 420 | }else{ |
| 421 | @ <p>Changes to %h(zName)</p> |
| 422 | } |
| 423 | }else if( zOld && zNew ){ |
| 424 | @ <p>Modified <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 425 | @ from <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a> |
| 426 | @ to <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)].</a> |
| 427 | if( !showDiff ){ |
| 428 | @ |
| 429 | @ <a href="%s(g.zTop)/fdiff?v1=%S(zOld)&v2=%S(zNew)">[diff]</a> |
| 430 | } |
| 431 | }else if( zOld ){ |
| 432 | @ <p>Deleted <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 433 | @ version <a href="%s(g.zTop)/artifact/%s(zOld)">[%S(zOld)]</a></p> |
| 434 | continue; |
| 435 | }else{ |
| 436 | @ <p>Added <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| 437 | @ version <a href="%s(g.zTop)/artifact/%s(zNew)">[%S(zNew)]</a></p> |
| 438 | } |
| 439 | if( showDiff ){ |
| 440 | @ <blockquote><pre> |
| 441 | append_diff(pid, fid); |
| 442 | @ </pre></blockquote> |
| 443 |