Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix the /finfo page to do a better job of showing later deletions of files that are deleted more than once. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
bf8e4377a9cab88a2c3918f2a4207ef1 |
| User & Date: | drh 2015-02-07 04:14:06.302 |
Context
|
2015-02-07
| ||
| 04:18 | Add the Tk tests/id.test file graphing test case to the release checklist. check-in: ff7019ec93 user: drh tags: trunk | |
| 04:14 | Fix the /finfo page to do a better job of showing later deletions of files that are deleted more than once. check-in: bf8e4377a9 user: drh tags: trunk | |
| 02:49 | Improved management of URL parameters in the file browsers. Add file and directory icons to the flat-view. check-in: 7478f9974c user: drh tags: trunk | |
Changes
Changes to src/finfo.c.
| ︙ | ︙ | |||
356 357 358 359 360 361 362 363 |
blob_append_sql(&sql, " AND event.mtime>=julianday('%q')", zA);
url_add_parameter(&url, "a", zA);
}
if( (zB = P("b"))!=0 ){
blob_append_sql(&sql, " AND event.mtime<=julianday('%q')", zB);
url_add_parameter(&url, "b", zB);
}
blob_append_sql(&sql,
| > > > > > > > > | > | 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 |
blob_append_sql(&sql, " AND event.mtime>=julianday('%q')", zA);
url_add_parameter(&url, "a", zA);
}
if( (zB = P("b"))!=0 ){
blob_append_sql(&sql, " AND event.mtime<=julianday('%q')", zB);
url_add_parameter(&url, "b", zB);
}
/* We only want each version of a file to appear on the graph once,
** at its earliest appearance. All the other times that it gets merged
** into this or that branch can be ignored. An exception is for when
** files are deleted (when they have mlink.fid==0). If the same file
** is deleted in multiple places, we want to show each deletion, so
** use a "fake fid" which is derived from the parent-fid for grouping.
** The same fake-fid must be used on the graph.
*/
blob_append_sql(&sql,
" GROUP BY"
" CASE WHEN mlink.fid>0 THEN mlink.fid ELSE mlink.pid+1000000000 END"
" ORDER BY event.mtime DESC /*sort*/"
);
if( (n = atoi(PD("n","0")))>0 ){
blob_append_sql(&sql, " LIMIT %d", n);
url_add_parameter(&url, "n", P("n"));
}
db_prepare(&q, "%s", blob_sql_text(&sql));
|
| ︙ | ︙ | |||
430 431 432 433 434 435 436 |
db_reset(&qparent);
if( zBr==0 ) zBr = "trunk";
if( uBg ){
zBgClr = hash_color(zUser);
}else if( brBg || zBgClr==0 || zBgClr[0]==0 ){
zBgClr = strcmp(zBr,"trunk")==0 ? "" : hash_color(zBr);
}
| | > | 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 |
db_reset(&qparent);
if( zBr==0 ) zBr = "trunk";
if( uBg ){
zBgClr = hash_color(zUser);
}else if( brBg || zBgClr==0 || zBgClr[0]==0 ){
zBgClr = strcmp(zBr,"trunk")==0 ? "" : hash_color(zBr);
}
gidx = graph_add_row(pGraph, frid>0 ? frid : fpid+1000000000,
nParent, aParent, zBr, zBgClr,
zUuid, 0);
if( strncmp(zDate, zPrevDate, 10) ){
sqlite3_snprintf(sizeof(zPrevDate), zPrevDate, "%.10s", zDate);
@ <tr><td>
@ <div class="divider">%s(zPrevDate)</div>
@ </td><td></td><td></td></tr>
}
|
| ︙ | ︙ |