Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Some minor fixes to the /finfo tree construction. Still having problems with incorrect mlink entries being created for files added by merge. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | mlink-improvements |
| Files: | files | file ages | folders |
| SHA1: |
f603a914320243fb1a1914cde1433393 |
| User & Date: | drh 2015-01-25 02:29:45.336 |
Context
|
2015-01-26
| ||
| 11:52 | Omit MLINK entries when a file is added by merge. check-in: bd08b03a72 user: drh tags: mlink-improvements | |
|
2015-01-25
| ||
| 02:29 | Some minor fixes to the /finfo tree construction. Still having problems with incorrect mlink entries being created for files added by merge. check-in: f603a91432 user: drh tags: mlink-improvements | |
| 01:30 | Comment improvements in the schema. Attempt to get the /finfo page to show merge arrows. check-in: 7d5a85bba8 user: drh tags: mlink-improvements | |
Changes
Changes to src/finfo.c.
| ︙ | ︙ | |||
292 293 294 295 296 297 298 299 300 301 302 303 304 305 |
Stmt q;
const char *zFilename;
char zPrevDate[20];
const char *zA;
const char *zB;
int n;
int baseCheckin;
Blob title;
Blob sql;
HQuery url;
GraphContext *pGraph;
int brBg = P("brbg")!=0;
int uBg = P("ubg")!=0;
| > | 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 |
Stmt q;
const char *zFilename;
char zPrevDate[20];
const char *zA;
const char *zB;
int n;
int baseCheckin;
int fnid;
Blob title;
Blob sql;
HQuery url;
GraphContext *pGraph;
int brBg = P("brbg")!=0;
int uBg = P("ubg")!=0;
|
| ︙ | ︙ | |||
400 401 402 403 404 405 406 407 408 409 410 411 412 413 |
hyperlinked_path(zFilename, &title, zUuid, "tree", "");
blob_appendf(&title, " from check-in %z%S</a>", zLink, zUuid);
fossil_free(zUuid);
}else{
blob_appendf(&title, "History of files named ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
}
@ <h2>%b(&title)</h2>
blob_reset(&title);
pGraph = graph_init();
@ <div id="canvas" style="position:relative;width:1px;height:1px;"
@ onclick="clickOnGraph(event)"></div>
@ <table id="timelineTable" class="timelineTable">
while( db_step(&q)==SQLITE_ROW ){
| > > | 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 |
hyperlinked_path(zFilename, &title, zUuid, "tree", "");
blob_appendf(&title, " from check-in %z%S</a>", zLink, zUuid);
fossil_free(zUuid);
}else{
blob_appendf(&title, "History of files named ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
}
fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename);
if( fShowId ) blob_appendf(&title, " (%d)", fnid);
@ <h2>%b(&title)</h2>
blob_reset(&title);
pGraph = graph_init();
@ <div id="canvas" style="position:relative;width:1px;height:1px;"
@ onclick="clickOnGraph(event)"></div>
@ <table id="timelineTable" class="timelineTable">
while( db_step(&q)==SQLITE_ROW ){
|
| ︙ | ︙ | |||
426 427 428 429 430 431 432 |
int gidx;
char zTime[10];
int nParent = 0;
int aParent[32];
static Stmt qparent;
db_static_prepare(&qparent,
"SELECT DISTINCT pid FROM mlink"
| | > | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 |
int gidx;
char zTime[10];
int nParent = 0;
int aParent[32];
static Stmt qparent;
db_static_prepare(&qparent,
"SELECT DISTINCT pid FROM mlink"
" WHERE fid=:fid AND mid=:mid AND pid>0 AND fnid=:fnid"
" ORDER BY isaux /*sort*/"
);
db_bind_int(&qparent, ":fid", frid);
db_bind_int(&qparent, ":mid", fmid);
db_bind_int(&qparent, ":fnid", fnid);
while( db_step(&qparent)==SQLITE_ROW && nParent<32 ){
aParent[nParent++] = db_column_int(&qparent, 0);
}
db_reset(&qparent);
if( zBr==0 ) zBr = "trunk";
if( uBg ){
zBgClr = hash_color(zUser);
|
| ︙ | ︙ |