Fossil SCM

Do not display the user on annotation output. Show only the check-in ID, date, and line number.

drh 2013-05-24 21:18 UTC annotate
Commit 8fee580ded080e4ae9a282f1670837a2db378db7
Parent 0b0ab858a8545ed…
1 file changed +8 -9
~ src/diff.c
M src/diff.c
+8 -9
--- src/diff.c
+++ src/diff.c
@@ -2479,11 +2479,10 @@
24792479
 @ <h2>Versions analyzed:</h2>
24802480
 @ <ol>
24812481
 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
24822482
 @ <li><span style='background-color:%s(p->zBgColor);'>%s(p->zDate)
24832483
 @ check-in %z(href("%R/info/%S",p->zMUuid))%.10s(p->zMUuid)</a>
2484
- @ by %h(p->zUser)
24852484
 @ artifact %z(href("%R/artifact/%S",p->zFUuid))%.10s(p->zFUuid)</a>
24862485
 @ </span></li>
24872486
 }
24882487
 @ </ol>
24892488
 @ <hr>
@@ -2512,15 +2511,15 @@
25122511
 if( iVers>=0 ){
25132512
 struct AnnVers *p = ann.aVers+iVers;
25142513
 char *zLink = xhref("target='infowindow'", "%R/info/%S", p->zMUuid);
25152514
 sqlite3_snprintf(sizeof(zPrefix), zPrefix,
25162515
 "<span style='background-color:%s'>"
2517
- "%s%.10s</a> %s %13.13s</span> %4d:",
2518
- p->zBgColor, zLink, p->zMUuid, p->zDate, p->zUser, i+1);
2516
+ "%s%.10s</a> %s</span> %4d:",
2517
+ p->zBgColor, zLink, p->zMUuid, p->zDate, i+1);
25192518
 fossil_free(zLink);
25202519
 }else{
2521
- sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%36s%4d: ", "", i+1);
2520
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%22s%4d: ", "", i+1);
25222521
 }
25232522
 @ %s(zPrefix) %h(z)
25242523
25252524
 }
25262525
 @ </pre>
@@ -2592,12 +2591,12 @@
25922591
 annFlags |= ANN_FILE_ANCEST;
25932592
 annotate_file(&ann, fnid, mid, iLimit, annFlags);
25942593
 if( showLog ){
25952594
 struct AnnVers *p;
25962595
 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
2597
- fossil_print("version %3d: %s %.10s by %-13s file %.10s\n",
2598
- i+1, p->zDate, p->zMUuid, p->zUser, p->zFUuid);
2596
+ fossil_print("version %3d: %s %.10s file %.10s\n",
2597
+ i+1, p->zDate, p->zMUuid, p->zFUuid);
25992598
 }
26002599
 fossil_print("---------------------------------------------------\n");
26012600
 }
26022601
 for(i=0; i<ann.nOrig; i++){
26032602
 struct AnnVers *p;
@@ -2607,16 +2606,16 @@
26072606
 char zPrefix[200];
26082607
 z[n] = 0;
26092608
 if( iLimit>ann.nVers && iVers<0 ) iVers = ann.nVers-1;
26102609
 if( iVers>=0 ){
26112610
 struct AnnVers *p = ann.aVers+iVers;
2612
- sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%.10s %s %13.13s",
2613
- fileVers ? p->zFUuid : p->zMUuid, p->zDate, p->zUser);
2611
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%.10s %s",
2612
+ fileVers ? p->zFUuid : p->zMUuid, p->zDate);
26142613
 }else{
26152614
 zPrefix[0] = 0;
26162615
 }
2617
- fossil_print("%35s %4d: %.*s\n", zPrefix, i+1, n, z);
2616
+ fossil_print("%21s %4d: %.*s\n", zPrefix, i+1, n, z);
26182617
 }
26192618
 }
26202619
26212620
 /*
26222621
 ** COMMAND: test-looks-like-utf
26232622
--- src/diff.c
+++ src/diff.c
@@ -2479,11 +2479,10 @@
2479 @ <h2>Versions analyzed:</h2>
2480 @ <ol>
2481 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
2482 @ <li><span style='background-color:%s(p->zBgColor);'>%s(p->zDate)
2483 @ check-in %z(href("%R/info/%S",p->zMUuid))%.10s(p->zMUuid)</a>
2484 @ by %h(p->zUser)
2485 @ artifact %z(href("%R/artifact/%S",p->zFUuid))%.10s(p->zFUuid)</a>
2486 @ </span></li>
2487 }
2488 @ </ol>
2489 @ <hr>
@@ -2512,15 +2511,15 @@
2512 if( iVers>=0 ){
2513 struct AnnVers *p = ann.aVers+iVers;
2514 char *zLink = xhref("target='infowindow'", "%R/info/%S", p->zMUuid);
2515 sqlite3_snprintf(sizeof(zPrefix), zPrefix,
2516 "<span style='background-color:%s'>"
2517 "%s%.10s</a> %s %13.13s</span> %4d:",
2518 p->zBgColor, zLink, p->zMUuid, p->zDate, p->zUser, i+1);
2519 fossil_free(zLink);
2520 }else{
2521 sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%36s%4d: ", "", i+1);
2522 }
2523 @ %s(zPrefix) %h(z)
2524
2525 }
2526 @ </pre>
@@ -2592,12 +2591,12 @@
2592 annFlags |= ANN_FILE_ANCEST;
2593 annotate_file(&ann, fnid, mid, iLimit, annFlags);
2594 if( showLog ){
2595 struct AnnVers *p;
2596 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
2597 fossil_print("version %3d: %s %.10s by %-13s file %.10s\n",
2598 i+1, p->zDate, p->zMUuid, p->zUser, p->zFUuid);
2599 }
2600 fossil_print("---------------------------------------------------\n");
2601 }
2602 for(i=0; i<ann.nOrig; i++){
2603 struct AnnVers *p;
@@ -2607,16 +2606,16 @@
2607 char zPrefix[200];
2608 z[n] = 0;
2609 if( iLimit>ann.nVers && iVers<0 ) iVers = ann.nVers-1;
2610 if( iVers>=0 ){
2611 struct AnnVers *p = ann.aVers+iVers;
2612 sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%.10s %s %13.13s",
2613 fileVers ? p->zFUuid : p->zMUuid, p->zDate, p->zUser);
2614 }else{
2615 zPrefix[0] = 0;
2616 }
2617 fossil_print("%35s %4d: %.*s\n", zPrefix, i+1, n, z);
2618 }
2619 }
2620
2621 /*
2622 ** COMMAND: test-looks-like-utf
2623
--- src/diff.c
+++ src/diff.c
@@ -2479,11 +2479,10 @@
2479 @ <h2>Versions analyzed:</h2>
2480 @ <ol>
2481 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
2482 @ <li><span style='background-color:%s(p->zBgColor);'>%s(p->zDate)
2483 @ check-in %z(href("%R/info/%S",p->zMUuid))%.10s(p->zMUuid)</a>
 
2484 @ artifact %z(href("%R/artifact/%S",p->zFUuid))%.10s(p->zFUuid)</a>
2485 @ </span></li>
2486 }
2487 @ </ol>
2488 @ <hr>
@@ -2512,15 +2511,15 @@
2511 if( iVers>=0 ){
2512 struct AnnVers *p = ann.aVers+iVers;
2513 char *zLink = xhref("target='infowindow'", "%R/info/%S", p->zMUuid);
2514 sqlite3_snprintf(sizeof(zPrefix), zPrefix,
2515 "<span style='background-color:%s'>"
2516 "%s%.10s</a> %s</span> %4d:",
2517 p->zBgColor, zLink, p->zMUuid, p->zDate, i+1);
2518 fossil_free(zLink);
2519 }else{
2520 sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%22s%4d: ", "", i+1);
2521 }
2522 @ %s(zPrefix) %h(z)
2523
2524 }
2525 @ </pre>
@@ -2592,12 +2591,12 @@
2591 annFlags |= ANN_FILE_ANCEST;
2592 annotate_file(&ann, fnid, mid, iLimit, annFlags);
2593 if( showLog ){
2594 struct AnnVers *p;
2595 for(p=ann.aVers, i=0; i<ann.nVers; i++, p++){
2596 fossil_print("version %3d: %s %.10s file %.10s\n",
2597 i+1, p->zDate, p->zMUuid, p->zFUuid);
2598 }
2599 fossil_print("---------------------------------------------------\n");
2600 }
2601 for(i=0; i<ann.nOrig; i++){
2602 struct AnnVers *p;
@@ -2607,16 +2606,16 @@
2606 char zPrefix[200];
2607 z[n] = 0;
2608 if( iLimit>ann.nVers && iVers<0 ) iVers = ann.nVers-1;
2609 if( iVers>=0 ){
2610 struct AnnVers *p = ann.aVers+iVers;
2611 sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%.10s %s",
2612 fileVers ? p->zFUuid : p->zMUuid, p->zDate);
2613 }else{
2614 zPrefix[0] = 0;
2615 }
2616 fossil_print("%21s %4d: %.*s\n", zPrefix, i+1, n, z);
2617 }
2618 }
2619
2620 /*
2621 ** COMMAND: test-looks-like-utf
2622

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button