Fossil SCM
Use "%S" format in stead of "%.10s" in more places where UUID's are handled.
Commit
b246fa0cee6708272834a551f73d4a74b10df1eb
Parent
c405c1be3c164c6…
9 files changed
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
+1
-1
+1
-1
+3
-3
+3
-5
+1
-1
| --- src/browse.c | ||
| +++ src/browse.c | ||
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | if( linkTip ){ |
| 180 | 180 | style_submenu_element("Tip", "Tip", "%s", |
| 181 | 181 | url_render(&sURI, "ci", "tip", 0, 0)); |
| 182 | 182 | } |
| 183 | 183 | if( zCI ){ |
| 184 | - @ <h2>Files of check-in [%z(href("vinfo?name=%s",zUuid))%.10s(zUuid)</a>] | |
| 184 | + @ <h2>Files of check-in [%z(href("vinfo?name=%s",zUuid))%S(zUuid)</a>] | |
| 185 | 185 | @ %s(blob_str(&dirname))</h2> |
| 186 | 186 | zSubdirLink = mprintf("%R/dir?ci=%s&name=%T", zUuid, zPrefix); |
| 187 | 187 | if( nD==0 ){ |
| 188 | 188 | style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%s", |
| 189 | 189 | zUuid); |
| 190 | 190 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | if( linkTip ){ |
| 180 | style_submenu_element("Tip", "Tip", "%s", |
| 181 | url_render(&sURI, "ci", "tip", 0, 0)); |
| 182 | } |
| 183 | if( zCI ){ |
| 184 | @ <h2>Files of check-in [%z(href("vinfo?name=%s",zUuid))%.10s(zUuid)</a>] |
| 185 | @ %s(blob_str(&dirname))</h2> |
| 186 | zSubdirLink = mprintf("%R/dir?ci=%s&name=%T", zUuid, zPrefix); |
| 187 | if( nD==0 ){ |
| 188 | style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%s", |
| 189 | zUuid); |
| 190 |
| --- src/browse.c | |
| +++ src/browse.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | if( linkTip ){ |
| 180 | style_submenu_element("Tip", "Tip", "%s", |
| 181 | url_render(&sURI, "ci", "tip", 0, 0)); |
| 182 | } |
| 183 | if( zCI ){ |
| 184 | @ <h2>Files of check-in [%z(href("vinfo?name=%s",zUuid))%S(zUuid)</a>] |
| 185 | @ %s(blob_str(&dirname))</h2> |
| 186 | zSubdirLink = mprintf("%R/dir?ci=%s&name=%T", zUuid, zPrefix); |
| 187 | if( nD==0 ){ |
| 188 | style_submenu_element("File Ages", "File Ages", "%R/fileage?name=%s", |
| 189 | zUuid); |
| 190 |
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -928,11 +928,11 @@ | ||
| 928 | 928 | " WHERE datetime(mtime)>=%Q" |
| 929 | 929 | " AND type='ci' AND objid=%d", |
| 930 | 930 | zDate, rid |
| 931 | 931 | ); |
| 932 | 932 | if( b ){ |
| 933 | - fossil_fatal("ancestor check-in [%.10s] (%s) is not older (clock skew?)" | |
| 933 | + fossil_fatal("ancestor check-in [%S] (%s) is not older (clock skew?)" | |
| 934 | 934 | " Use --allow-older to override.", zUuid, zDate); |
| 935 | 935 | } |
| 936 | 936 | #endif |
| 937 | 937 | } |
| 938 | 938 | |
| 939 | 939 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -928,11 +928,11 @@ | |
| 928 | " WHERE datetime(mtime)>=%Q" |
| 929 | " AND type='ci' AND objid=%d", |
| 930 | zDate, rid |
| 931 | ); |
| 932 | if( b ){ |
| 933 | fossil_fatal("ancestor check-in [%.10s] (%s) is not older (clock skew?)" |
| 934 | " Use --allow-older to override.", zUuid, zDate); |
| 935 | } |
| 936 | #endif |
| 937 | } |
| 938 | |
| 939 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -928,11 +928,11 @@ | |
| 928 | " WHERE datetime(mtime)>=%Q" |
| 929 | " AND type='ci' AND objid=%d", |
| 930 | zDate, rid |
| 931 | ); |
| 932 | if( b ){ |
| 933 | fossil_fatal("ancestor check-in [%S] (%s) is not older (clock skew?)" |
| 934 | " Use --allow-older to override.", zUuid, zDate); |
| 935 | } |
| 936 | #endif |
| 937 | } |
| 938 | |
| 939 |
+1
-1
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -67,11 +67,11 @@ | ||
| 67 | 67 | vid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 68 | 68 | if( vid==0 ){ |
| 69 | 69 | fossil_fatal("no such check-in: %s", g.argv[2]); |
| 70 | 70 | } |
| 71 | 71 | if( !is_a_version(vid) ){ |
| 72 | - fossil_fatal("object [%.10s] is not a check-in", blob_str(&uuid)); | |
| 72 | + fossil_fatal("object [%S] is not a check-in", blob_str(&uuid)); | |
| 73 | 73 | } |
| 74 | 74 | if( load_vfile_from_rid(vid) && !forceMissingFlag ){ |
| 75 | 75 | fossil_fatal("missing content, unable to checkout"); |
| 76 | 76 | }; |
| 77 | 77 | return vid; |
| 78 | 78 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -67,11 +67,11 @@ | |
| 67 | vid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 68 | if( vid==0 ){ |
| 69 | fossil_fatal("no such check-in: %s", g.argv[2]); |
| 70 | } |
| 71 | if( !is_a_version(vid) ){ |
| 72 | fossil_fatal("object [%.10s] is not a check-in", blob_str(&uuid)); |
| 73 | } |
| 74 | if( load_vfile_from_rid(vid) && !forceMissingFlag ){ |
| 75 | fossil_fatal("missing content, unable to checkout"); |
| 76 | }; |
| 77 | return vid; |
| 78 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -67,11 +67,11 @@ | |
| 67 | vid = db_int(0, "SELECT rid FROM blob WHERE uuid=%B", &uuid); |
| 68 | if( vid==0 ){ |
| 69 | fossil_fatal("no such check-in: %s", g.argv[2]); |
| 70 | } |
| 71 | if( !is_a_version(vid) ){ |
| 72 | fossil_fatal("object [%S] is not a check-in", blob_str(&uuid)); |
| 73 | } |
| 74 | if( load_vfile_from_rid(vid) && !forceMissingFlag ){ |
| 75 | fossil_fatal("missing content, unable to checkout"); |
| 76 | }; |
| 77 | return vid; |
| 78 |
+1
-1
| --- src/descendants.c | ||
| +++ src/descendants.c | ||
| @@ -406,11 +406,11 @@ | ||
| 406 | 406 | zLastBr = fossil_strdup(zBr); |
| 407 | 407 | } |
| 408 | 408 | n++; |
| 409 | 409 | sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n); |
| 410 | 410 | fossil_print("%6s ", zLineNo); |
| 411 | - z = mprintf("%s [%.10s] %s", zDate, zId, zCom); | |
| 411 | + z = mprintf("%s [%S] %s", zDate, zId, zCom); | |
| 412 | 412 | comment_print(z, 7, width); |
| 413 | 413 | fossil_free(z); |
| 414 | 414 | } |
| 415 | 415 | fossil_free(zLastBr); |
| 416 | 416 | db_finalize(&q); |
| 417 | 417 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -406,11 +406,11 @@ | |
| 406 | zLastBr = fossil_strdup(zBr); |
| 407 | } |
| 408 | n++; |
| 409 | sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n); |
| 410 | fossil_print("%6s ", zLineNo); |
| 411 | z = mprintf("%s [%.10s] %s", zDate, zId, zCom); |
| 412 | comment_print(z, 7, width); |
| 413 | fossil_free(z); |
| 414 | } |
| 415 | fossil_free(zLastBr); |
| 416 | db_finalize(&q); |
| 417 |
| --- src/descendants.c | |
| +++ src/descendants.c | |
| @@ -406,11 +406,11 @@ | |
| 406 | zLastBr = fossil_strdup(zBr); |
| 407 | } |
| 408 | n++; |
| 409 | sqlite3_snprintf(sizeof(zLineNo), zLineNo, "(%d)", n); |
| 410 | fossil_print("%6s ", zLineNo); |
| 411 | z = mprintf("%s [%S] %s", zDate, zId, zCom); |
| 412 | comment_print(z, 7, width); |
| 413 | fossil_free(z); |
| 414 | } |
| 415 | fossil_free(zLastBr); |
| 416 | db_finalize(&q); |
| 417 |
+2
-2
| --- src/finfo.c | ||
| +++ src/finfo.c | ||
| @@ -200,11 +200,11 @@ | ||
| 200 | 200 | char *zOut; |
| 201 | 201 | if( zBr==0 ) zBr = "trunk"; |
| 202 | 202 | if( iBrief ){ |
| 203 | 203 | fossil_print("%s ", zDate); |
| 204 | 204 | zOut = sqlite3_mprintf( |
| 205 | - "[%.10s] %s (user: %s, artifact: [%.10s], branch: %s)", | |
| 205 | + "[%S] %s (user: %s, artifact: [%S], branch: %s)", | |
| 206 | 206 | zCiUuid, zCom, zUser, zFileUuid, zBr); |
| 207 | 207 | comment_print(zOut, 11, iWidth); |
| 208 | 208 | sqlite3_free(zOut); |
| 209 | 209 | }else{ |
| 210 | 210 | blob_reset(&line); |
| @@ -382,11 +382,11 @@ | ||
| 382 | 382 | if( baseCheckin ){ |
| 383 | 383 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", baseCheckin); |
| 384 | 384 | char *zLink = href("%R/info/%s", zUuid); |
| 385 | 385 | blob_appendf(&title, "Ancestors of file "); |
| 386 | 386 | hyperlinked_path(zFilename, &title, zUuid, "tree", ""); |
| 387 | - blob_appendf(&title, " from check-in %z%.10s</a>", zLink, zUuid); | |
| 387 | + blob_appendf(&title, " from check-in %z%S</a>", zLink, zUuid); | |
| 388 | 388 | fossil_free(zUuid); |
| 389 | 389 | }else{ |
| 390 | 390 | blob_appendf(&title, "History of files named "); |
| 391 | 391 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 392 | 392 | } |
| 393 | 393 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -200,11 +200,11 @@ | |
| 200 | char *zOut; |
| 201 | if( zBr==0 ) zBr = "trunk"; |
| 202 | if( iBrief ){ |
| 203 | fossil_print("%s ", zDate); |
| 204 | zOut = sqlite3_mprintf( |
| 205 | "[%.10s] %s (user: %s, artifact: [%.10s], branch: %s)", |
| 206 | zCiUuid, zCom, zUser, zFileUuid, zBr); |
| 207 | comment_print(zOut, 11, iWidth); |
| 208 | sqlite3_free(zOut); |
| 209 | }else{ |
| 210 | blob_reset(&line); |
| @@ -382,11 +382,11 @@ | |
| 382 | if( baseCheckin ){ |
| 383 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", baseCheckin); |
| 384 | char *zLink = href("%R/info/%s", zUuid); |
| 385 | blob_appendf(&title, "Ancestors of file "); |
| 386 | hyperlinked_path(zFilename, &title, zUuid, "tree", ""); |
| 387 | blob_appendf(&title, " from check-in %z%.10s</a>", zLink, zUuid); |
| 388 | fossil_free(zUuid); |
| 389 | }else{ |
| 390 | blob_appendf(&title, "History of files named "); |
| 391 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 392 | } |
| 393 |
| --- src/finfo.c | |
| +++ src/finfo.c | |
| @@ -200,11 +200,11 @@ | |
| 200 | char *zOut; |
| 201 | if( zBr==0 ) zBr = "trunk"; |
| 202 | if( iBrief ){ |
| 203 | fossil_print("%s ", zDate); |
| 204 | zOut = sqlite3_mprintf( |
| 205 | "[%S] %s (user: %s, artifact: [%S], branch: %s)", |
| 206 | zCiUuid, zCom, zUser, zFileUuid, zBr); |
| 207 | comment_print(zOut, 11, iWidth); |
| 208 | sqlite3_free(zOut); |
| 209 | }else{ |
| 210 | blob_reset(&line); |
| @@ -382,11 +382,11 @@ | |
| 382 | if( baseCheckin ){ |
| 383 | char *zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", baseCheckin); |
| 384 | char *zLink = href("%R/info/%s", zUuid); |
| 385 | blob_appendf(&title, "Ancestors of file "); |
| 386 | hyperlinked_path(zFilename, &title, zUuid, "tree", ""); |
| 387 | blob_appendf(&title, " from check-in %z%S</a>", zLink, zUuid); |
| 388 | fossil_free(zUuid); |
| 389 | }else{ |
| 390 | blob_appendf(&title, "History of files named "); |
| 391 | hyperlinked_path(zFilename, &title, 0, "tree", ""); |
| 392 | } |
| 393 |
+1
-1
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -531,11 +531,11 @@ | ||
| 531 | 531 | timeline_utc(), timeline_utc(), rid, rid |
| 532 | 532 | ); |
| 533 | 533 | sideBySide = !is_false(PD("sbs","1")); |
| 534 | 534 | if( db_step(&q1)==SQLITE_ROW ){ |
| 535 | 535 | const char *zUuid = db_column_text(&q1, 0); |
| 536 | - char *zTitle = mprintf("Check-in [%.10s]", zUuid); | |
| 536 | + char *zTitle = mprintf("Check-in [%S]", zUuid); | |
| 537 | 537 | char *zEUser, *zEComment; |
| 538 | 538 | const char *zUser; |
| 539 | 539 | const char *zComment; |
| 540 | 540 | const char *zDate; |
| 541 | 541 | const char *zOrigDate; |
| 542 | 542 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -531,11 +531,11 @@ | |
| 531 | timeline_utc(), timeline_utc(), rid, rid |
| 532 | ); |
| 533 | sideBySide = !is_false(PD("sbs","1")); |
| 534 | if( db_step(&q1)==SQLITE_ROW ){ |
| 535 | const char *zUuid = db_column_text(&q1, 0); |
| 536 | char *zTitle = mprintf("Check-in [%.10s]", zUuid); |
| 537 | char *zEUser, *zEComment; |
| 538 | const char *zUser; |
| 539 | const char *zComment; |
| 540 | const char *zDate; |
| 541 | const char *zOrigDate; |
| 542 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -531,11 +531,11 @@ | |
| 531 | timeline_utc(), timeline_utc(), rid, rid |
| 532 | ); |
| 533 | sideBySide = !is_false(PD("sbs","1")); |
| 534 | if( db_step(&q1)==SQLITE_ROW ){ |
| 535 | const char *zUuid = db_column_text(&q1, 0); |
| 536 | char *zTitle = mprintf("Check-in [%S]", zUuid); |
| 537 | char *zEUser, *zEComment; |
| 538 | const char *zUser; |
| 539 | const char *zComment; |
| 540 | const char *zDate; |
| 541 | const char *zOrigDate; |
| 542 |
+1
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1983,11 +1983,11 @@ | ||
| 1983 | 1983 | for(i=0; i<p->nTag; i++){ |
| 1984 | 1984 | zTagUuid = p->aTag[i].zUuid; |
| 1985 | 1985 | if( !zTagUuid ) continue; |
| 1986 | 1986 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1987 | 1987 | blob_appendf(&comment, |
| 1988 | - " Edit [%s|%.10s]:", | |
| 1988 | + " Edit [%s|%S]:", | |
| 1989 | 1989 | zTagUuid, zTagUuid); |
| 1990 | 1990 | branchMove = 0; |
| 1991 | 1991 | if( permitHooks && db_exists("SELECT 1 FROM event, blob" |
| 1992 | 1992 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1993 | 1993 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1994 | 1994 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1983,11 +1983,11 @@ | |
| 1983 | for(i=0; i<p->nTag; i++){ |
| 1984 | zTagUuid = p->aTag[i].zUuid; |
| 1985 | if( !zTagUuid ) continue; |
| 1986 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1987 | blob_appendf(&comment, |
| 1988 | " Edit [%s|%.10s]:", |
| 1989 | zTagUuid, zTagUuid); |
| 1990 | branchMove = 0; |
| 1991 | if( permitHooks && db_exists("SELECT 1 FROM event, blob" |
| 1992 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1993 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1994 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1983,11 +1983,11 @@ | |
| 1983 | for(i=0; i<p->nTag; i++){ |
| 1984 | zTagUuid = p->aTag[i].zUuid; |
| 1985 | if( !zTagUuid ) continue; |
| 1986 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1987 | blob_appendf(&comment, |
| 1988 | " Edit [%s|%S]:", |
| 1989 | zTagUuid, zTagUuid); |
| 1990 | branchMove = 0; |
| 1991 | if( permitHooks && db_exists("SELECT 1 FROM event, blob" |
| 1992 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1993 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1994 |
+3
-3
| --- src/name.c | ||
| +++ src/name.c | ||
| @@ -444,11 +444,11 @@ | ||
| 444 | 444 | " WHERE ticket.tkt_id = ticketchng.tkt_id" |
| 445 | 445 | " AND tkt_uuid GLOB '%q*'" |
| 446 | 446 | " GROUP BY tkt_uuid" |
| 447 | 447 | " ORDER BY tkt_ctime DESC", z); |
| 448 | 448 | while( db_step(&q)==SQLITE_ROW ){ |
| 449 | - int rid = db_column_int(&q, 0); | |
| 449 | + int rid = db_column_int(&q, 0); | |
| 450 | 450 | const char *zUuid = db_column_text(&q, 1); |
| 451 | 451 | const char *zTitle = db_column_text(&q, 2); |
| 452 | 452 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 453 | 453 | @ %s(zUuid)</a> - |
| 454 | 454 | @ <ul></ul> |
| @@ -465,11 +465,11 @@ | ||
| 465 | 465 | "SELECT rid, uuid FROM" |
| 466 | 466 | " (SELECT tagxref.rid AS rid, substr(tagname, 7) AS uuid" |
| 467 | 467 | " FROM tagxref, tag WHERE tagxref.tagid = tag.tagid" |
| 468 | 468 | " AND tagname GLOB 'event-%q*') GROUP BY uuid", z); |
| 469 | 469 | while( db_step(&q)==SQLITE_ROW ){ |
| 470 | - int rid = db_column_int(&q, 0); | |
| 470 | + int rid = db_column_int(&q, 0); | |
| 471 | 471 | const char* zUuid = db_column_text(&q, 1); |
| 472 | 472 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 473 | 473 | @ %s(zUuid)</a> - |
| 474 | 474 | @ <ul><li> |
| 475 | 475 | object_description(rid, 0, 0); |
| @@ -599,11 +599,11 @@ | ||
| 599 | 599 | " AND blob.rid=mlink.mid" |
| 600 | 600 | " ORDER BY event.mtime DESC /*sort*/", |
| 601 | 601 | timeline_utc(), rid); |
| 602 | 602 | while( db_step(&q)==SQLITE_ROW ){ |
| 603 | 603 | fossil_print("file: %s\n", db_column_text(&q,0)); |
| 604 | - fossil_print(" part of [%.10s] by %s on %s\n", | |
| 604 | + fossil_print(" part of [%S] by %s on %s\n", | |
| 605 | 605 | db_column_text(&q, 1), |
| 606 | 606 | db_column_text(&q, 3), |
| 607 | 607 | db_column_text(&q, 2)); |
| 608 | 608 | fossil_print(" "); |
| 609 | 609 | comment_print(db_column_text(&q,4), 12, -1); |
| 610 | 610 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -444,11 +444,11 @@ | |
| 444 | " WHERE ticket.tkt_id = ticketchng.tkt_id" |
| 445 | " AND tkt_uuid GLOB '%q*'" |
| 446 | " GROUP BY tkt_uuid" |
| 447 | " ORDER BY tkt_ctime DESC", z); |
| 448 | while( db_step(&q)==SQLITE_ROW ){ |
| 449 | int rid = db_column_int(&q, 0); |
| 450 | const char *zUuid = db_column_text(&q, 1); |
| 451 | const char *zTitle = db_column_text(&q, 2); |
| 452 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 453 | @ %s(zUuid)</a> - |
| 454 | @ <ul></ul> |
| @@ -465,11 +465,11 @@ | |
| 465 | "SELECT rid, uuid FROM" |
| 466 | " (SELECT tagxref.rid AS rid, substr(tagname, 7) AS uuid" |
| 467 | " FROM tagxref, tag WHERE tagxref.tagid = tag.tagid" |
| 468 | " AND tagname GLOB 'event-%q*') GROUP BY uuid", z); |
| 469 | while( db_step(&q)==SQLITE_ROW ){ |
| 470 | int rid = db_column_int(&q, 0); |
| 471 | const char* zUuid = db_column_text(&q, 1); |
| 472 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 473 | @ %s(zUuid)</a> - |
| 474 | @ <ul><li> |
| 475 | object_description(rid, 0, 0); |
| @@ -599,11 +599,11 @@ | |
| 599 | " AND blob.rid=mlink.mid" |
| 600 | " ORDER BY event.mtime DESC /*sort*/", |
| 601 | timeline_utc(), rid); |
| 602 | while( db_step(&q)==SQLITE_ROW ){ |
| 603 | fossil_print("file: %s\n", db_column_text(&q,0)); |
| 604 | fossil_print(" part of [%.10s] by %s on %s\n", |
| 605 | db_column_text(&q, 1), |
| 606 | db_column_text(&q, 3), |
| 607 | db_column_text(&q, 2)); |
| 608 | fossil_print(" "); |
| 609 | comment_print(db_column_text(&q,4), 12, -1); |
| 610 |
| --- src/name.c | |
| +++ src/name.c | |
| @@ -444,11 +444,11 @@ | |
| 444 | " WHERE ticket.tkt_id = ticketchng.tkt_id" |
| 445 | " AND tkt_uuid GLOB '%q*'" |
| 446 | " GROUP BY tkt_uuid" |
| 447 | " ORDER BY tkt_ctime DESC", z); |
| 448 | while( db_step(&q)==SQLITE_ROW ){ |
| 449 | int rid = db_column_int(&q, 0); |
| 450 | const char *zUuid = db_column_text(&q, 1); |
| 451 | const char *zTitle = db_column_text(&q, 2); |
| 452 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 453 | @ %s(zUuid)</a> - |
| 454 | @ <ul></ul> |
| @@ -465,11 +465,11 @@ | |
| 465 | "SELECT rid, uuid FROM" |
| 466 | " (SELECT tagxref.rid AS rid, substr(tagname, 7) AS uuid" |
| 467 | " FROM tagxref, tag WHERE tagxref.tagid = tag.tagid" |
| 468 | " AND tagname GLOB 'event-%q*') GROUP BY uuid", z); |
| 469 | while( db_step(&q)==SQLITE_ROW ){ |
| 470 | int rid = db_column_int(&q, 0); |
| 471 | const char* zUuid = db_column_text(&q, 1); |
| 472 | @ <li><p><a href="%s(g.zTop)/%T(zSrc)/%s(zUuid)"> |
| 473 | @ %s(zUuid)</a> - |
| 474 | @ <ul><li> |
| 475 | object_description(rid, 0, 0); |
| @@ -599,11 +599,11 @@ | |
| 599 | " AND blob.rid=mlink.mid" |
| 600 | " ORDER BY event.mtime DESC /*sort*/", |
| 601 | timeline_utc(), rid); |
| 602 | while( db_step(&q)==SQLITE_ROW ){ |
| 603 | fossil_print("file: %s\n", db_column_text(&q,0)); |
| 604 | fossil_print(" part of [%S] by %s on %s\n", |
| 605 | db_column_text(&q, 1), |
| 606 | db_column_text(&q, 3), |
| 607 | db_column_text(&q, 2)); |
| 608 | fossil_print(" "); |
| 609 | comment_print(db_column_text(&q,4), 12, -1); |
| 610 |
+3
-5
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1198,11 +1198,11 @@ | ||
| 1198 | 1198 | blob_appendf(&desc, "%d ancestors", np); |
| 1199 | 1199 | db_multi_exec("%s", blob_str(&sql)); |
| 1200 | 1200 | } |
| 1201 | 1201 | if( d_rid==0 && useDividers ) timeline_add_dividers(0, p_rid); |
| 1202 | 1202 | } |
| 1203 | - blob_appendf(&desc, " of %z[%.10s]</a>", | |
| 1203 | + blob_appendf(&desc, " of %z[%S]</a>", | |
| 1204 | 1204 | href("%R/info/%s", zUuid), zUuid); |
| 1205 | 1205 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1206 | 1206 | if( p_rid ){ |
| 1207 | 1207 | url_add_parameter(&url, "p", zUuid); |
| 1208 | 1208 | } |
| @@ -1228,11 +1228,11 @@ | ||
| 1228 | 1228 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1229 | 1229 | db_multi_exec("%s", blob_str(&sql)); |
| 1230 | 1230 | if( useDividers ) timeline_add_dividers(0, f_rid); |
| 1231 | 1231 | blob_appendf(&desc, "Parents and children of check-in "); |
| 1232 | 1232 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid); |
| 1233 | - blob_appendf(&desc, "%z[%.10s]</a>", href("%R/info/%s", zUuid), zUuid); | |
| 1233 | + blob_appendf(&desc, "%z[%S]</a>", href("%R/info/%s", zUuid), zUuid); | |
| 1234 | 1234 | tmFlags |= TIMELINE_DISJOINT; |
| 1235 | 1235 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1236 | 1236 | url_add_parameter(&url, "f", zUuid); |
| 1237 | 1237 | timeline_submenu(&url, "Unhide", "unhide", "", 0); |
| 1238 | 1238 | } |
| @@ -1549,11 +1549,10 @@ | ||
| 1549 | 1549 | int nChild = db_column_int(q, 4); |
| 1550 | 1550 | int nParent = db_column_int(q, 5); |
| 1551 | 1551 | char *zFree = 0; |
| 1552 | 1552 | int n = 0; |
| 1553 | 1553 | char zPrefix[80]; |
| 1554 | - char zUuid[UUID_SIZE+1]; | |
| 1555 | 1554 | |
| 1556 | 1555 | if( nAbsLimit!=0 ){ |
| 1557 | 1556 | if( nLimit<0 && nLine>=nAbsLimit ){ |
| 1558 | 1557 | fossil_print("--- line limit (%d) reached ---\n", nAbsLimit); |
| 1559 | 1558 | break; /* line count limit hit, stop. */ |
| @@ -1560,11 +1559,10 @@ | ||
| 1560 | 1559 | }else if( nEntry>=nAbsLimit ){ |
| 1561 | 1560 | fossil_print("--- entry limit (%d) reached ---\n", nAbsLimit); |
| 1562 | 1561 | break; /* entry count limit hit, stop. */ |
| 1563 | 1562 | } |
| 1564 | 1563 | } |
| 1565 | - sqlite3_snprintf(sizeof(zUuid), zUuid, "%.10s", zId); | |
| 1566 | 1564 | if( fossil_strnicmp(zDate, zPrevDate, 10) ){ |
| 1567 | 1565 | fossil_print("=== %.10s ===\n", zDate); |
| 1568 | 1566 | memcpy(zPrevDate, zDate, 10); |
| 1569 | 1567 | nLine++; /* record another line */ |
| 1570 | 1568 | } |
| @@ -1587,11 +1585,11 @@ | ||
| 1587 | 1585 | } |
| 1588 | 1586 | if( fossil_strcmp(zCurrentUuid,zId)==0 ){ |
| 1589 | 1587 | sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*CURRENT* "); |
| 1590 | 1588 | n += strlen(zPrefix); |
| 1591 | 1589 | } |
| 1592 | - zFree = sqlite3_mprintf("[%.10s] %s%s", zUuid, zPrefix, zCom); | |
| 1590 | + zFree = sqlite3_mprintf("[%S] %s%s", zId, zPrefix, zCom); | |
| 1593 | 1591 | nLine += comment_print(zFree, 9, width); /* record another X lines */ |
| 1594 | 1592 | sqlite3_free(zFree); |
| 1595 | 1593 | |
| 1596 | 1594 | if(verboseFlag){ |
| 1597 | 1595 | if( !fchngQueryInit ){ |
| 1598 | 1596 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1198,11 +1198,11 @@ | |
| 1198 | blob_appendf(&desc, "%d ancestors", np); |
| 1199 | db_multi_exec("%s", blob_str(&sql)); |
| 1200 | } |
| 1201 | if( d_rid==0 && useDividers ) timeline_add_dividers(0, p_rid); |
| 1202 | } |
| 1203 | blob_appendf(&desc, " of %z[%.10s]</a>", |
| 1204 | href("%R/info/%s", zUuid), zUuid); |
| 1205 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1206 | if( p_rid ){ |
| 1207 | url_add_parameter(&url, "p", zUuid); |
| 1208 | } |
| @@ -1228,11 +1228,11 @@ | |
| 1228 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1229 | db_multi_exec("%s", blob_str(&sql)); |
| 1230 | if( useDividers ) timeline_add_dividers(0, f_rid); |
| 1231 | blob_appendf(&desc, "Parents and children of check-in "); |
| 1232 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid); |
| 1233 | blob_appendf(&desc, "%z[%.10s]</a>", href("%R/info/%s", zUuid), zUuid); |
| 1234 | tmFlags |= TIMELINE_DISJOINT; |
| 1235 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1236 | url_add_parameter(&url, "f", zUuid); |
| 1237 | timeline_submenu(&url, "Unhide", "unhide", "", 0); |
| 1238 | } |
| @@ -1549,11 +1549,10 @@ | |
| 1549 | int nChild = db_column_int(q, 4); |
| 1550 | int nParent = db_column_int(q, 5); |
| 1551 | char *zFree = 0; |
| 1552 | int n = 0; |
| 1553 | char zPrefix[80]; |
| 1554 | char zUuid[UUID_SIZE+1]; |
| 1555 | |
| 1556 | if( nAbsLimit!=0 ){ |
| 1557 | if( nLimit<0 && nLine>=nAbsLimit ){ |
| 1558 | fossil_print("--- line limit (%d) reached ---\n", nAbsLimit); |
| 1559 | break; /* line count limit hit, stop. */ |
| @@ -1560,11 +1559,10 @@ | |
| 1560 | }else if( nEntry>=nAbsLimit ){ |
| 1561 | fossil_print("--- entry limit (%d) reached ---\n", nAbsLimit); |
| 1562 | break; /* entry count limit hit, stop. */ |
| 1563 | } |
| 1564 | } |
| 1565 | sqlite3_snprintf(sizeof(zUuid), zUuid, "%.10s", zId); |
| 1566 | if( fossil_strnicmp(zDate, zPrevDate, 10) ){ |
| 1567 | fossil_print("=== %.10s ===\n", zDate); |
| 1568 | memcpy(zPrevDate, zDate, 10); |
| 1569 | nLine++; /* record another line */ |
| 1570 | } |
| @@ -1587,11 +1585,11 @@ | |
| 1587 | } |
| 1588 | if( fossil_strcmp(zCurrentUuid,zId)==0 ){ |
| 1589 | sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*CURRENT* "); |
| 1590 | n += strlen(zPrefix); |
| 1591 | } |
| 1592 | zFree = sqlite3_mprintf("[%.10s] %s%s", zUuid, zPrefix, zCom); |
| 1593 | nLine += comment_print(zFree, 9, width); /* record another X lines */ |
| 1594 | sqlite3_free(zFree); |
| 1595 | |
| 1596 | if(verboseFlag){ |
| 1597 | if( !fchngQueryInit ){ |
| 1598 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1198,11 +1198,11 @@ | |
| 1198 | blob_appendf(&desc, "%d ancestors", np); |
| 1199 | db_multi_exec("%s", blob_str(&sql)); |
| 1200 | } |
| 1201 | if( d_rid==0 && useDividers ) timeline_add_dividers(0, p_rid); |
| 1202 | } |
| 1203 | blob_appendf(&desc, " of %z[%S]</a>", |
| 1204 | href("%R/info/%s", zUuid), zUuid); |
| 1205 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1206 | if( p_rid ){ |
| 1207 | url_add_parameter(&url, "p", zUuid); |
| 1208 | } |
| @@ -1228,11 +1228,11 @@ | |
| 1228 | blob_appendf(&sql, " AND event.objid IN ok"); |
| 1229 | db_multi_exec("%s", blob_str(&sql)); |
| 1230 | if( useDividers ) timeline_add_dividers(0, f_rid); |
| 1231 | blob_appendf(&desc, "Parents and children of check-in "); |
| 1232 | zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid); |
| 1233 | blob_appendf(&desc, "%z[%S]</a>", href("%R/info/%s", zUuid), zUuid); |
| 1234 | tmFlags |= TIMELINE_DISJOINT; |
| 1235 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1236 | url_add_parameter(&url, "f", zUuid); |
| 1237 | timeline_submenu(&url, "Unhide", "unhide", "", 0); |
| 1238 | } |
| @@ -1549,11 +1549,10 @@ | |
| 1549 | int nChild = db_column_int(q, 4); |
| 1550 | int nParent = db_column_int(q, 5); |
| 1551 | char *zFree = 0; |
| 1552 | int n = 0; |
| 1553 | char zPrefix[80]; |
| 1554 | |
| 1555 | if( nAbsLimit!=0 ){ |
| 1556 | if( nLimit<0 && nLine>=nAbsLimit ){ |
| 1557 | fossil_print("--- line limit (%d) reached ---\n", nAbsLimit); |
| 1558 | break; /* line count limit hit, stop. */ |
| @@ -1560,11 +1559,10 @@ | |
| 1559 | }else if( nEntry>=nAbsLimit ){ |
| 1560 | fossil_print("--- entry limit (%d) reached ---\n", nAbsLimit); |
| 1561 | break; /* entry count limit hit, stop. */ |
| 1562 | } |
| 1563 | } |
| 1564 | if( fossil_strnicmp(zDate, zPrevDate, 10) ){ |
| 1565 | fossil_print("=== %.10s ===\n", zDate); |
| 1566 | memcpy(zPrevDate, zDate, 10); |
| 1567 | nLine++; /* record another line */ |
| 1568 | } |
| @@ -1587,11 +1585,11 @@ | |
| 1585 | } |
| 1586 | if( fossil_strcmp(zCurrentUuid,zId)==0 ){ |
| 1587 | sqlite3_snprintf(sizeof(zPrefix)-n, &zPrefix[n], "*CURRENT* "); |
| 1588 | n += strlen(zPrefix); |
| 1589 | } |
| 1590 | zFree = sqlite3_mprintf("[%S] %s%s", zId, zPrefix, zCom); |
| 1591 | nLine += comment_print(zFree, 9, width); /* record another X lines */ |
| 1592 | sqlite3_free(zFree); |
| 1593 | |
| 1594 | if(verboseFlag){ |
| 1595 | if( !fchngQueryInit ){ |
| 1596 |