Fossil SCM
Fix indentation of unanalyzed lines on /annotate and /blame screens.
Commit
00ced6df65596f4ea3c572cfd238ac6c714d113c6da67ac8fcb91258aa878016
Parent
2b6a34c7e45c16c…
1 file changed
+3
-3
+3
-3
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2483,11 +2483,11 @@ | ||
| 2483 | 2483 | @ <h2>Lines added by the %d(ann.nVers) most recent ancestors of |
| 2484 | 2484 | @ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a> |
| 2485 | 2485 | @ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2> |
| 2486 | 2486 | } |
| 2487 | 2487 | @ <pre> |
| 2488 | - szHash = length_of_S_display(); | |
| 2488 | + szHash = 10; | |
| 2489 | 2489 | for(i=0; i<ann.nOrig; i++){ |
| 2490 | 2490 | int iVers = ann.aOrig[i].iVers; |
| 2491 | 2491 | char *z = (char*)ann.aOrig[i].z; |
| 2492 | 2492 | int n = ann.aOrig[i].n; |
| 2493 | 2493 | char zPrefix[300]; |
| @@ -2503,11 +2503,11 @@ | ||
| 2503 | 2503 | "<span style='background-color:%s'>" |
| 2504 | 2504 | "%s%.10s</a> %s</span> %13.13s:", |
| 2505 | 2505 | p->zBgColor, zLink, zUuid, p->zDate, p->zUser); |
| 2506 | 2506 | fossil_free(zLink); |
| 2507 | 2507 | }else{ |
| 2508 | - sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s", szHash+28, ""); | |
| 2508 | + sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s", szHash+26, ""); | |
| 2509 | 2509 | } |
| 2510 | 2510 | }else{ |
| 2511 | 2511 | if( iVers>=0 ){ |
| 2512 | 2512 | struct AnnVers *p = ann.aVers+iVers; |
| 2513 | 2513 | const char *zUuid = fileVers ? p->zFUuid : p->zMUuid; |
| @@ -2516,11 +2516,11 @@ | ||
| 2516 | 2516 | "<span style='background-color:%s'>" |
| 2517 | 2517 | "%s%.10s</a> %s</span> %4d:", |
| 2518 | 2518 | p->zBgColor, zLink, zUuid, p->zDate, i+1); |
| 2519 | 2519 | fossil_free(zLink); |
| 2520 | 2520 | }else{ |
| 2521 | - sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s%4d:",szHash+14,"",i+1); | |
| 2521 | + sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s%4d:",szHash+12,"",i+1); | |
| 2522 | 2522 | } |
| 2523 | 2523 | } |
| 2524 | 2524 | @ %s(zPrefix) %h(z) |
| 2525 | 2525 | |
| 2526 | 2526 | } |
| 2527 | 2527 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2483,11 +2483,11 @@ | |
| 2483 | @ <h2>Lines added by the %d(ann.nVers) most recent ancestors of |
| 2484 | @ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a> |
| 2485 | @ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2> |
| 2486 | } |
| 2487 | @ <pre> |
| 2488 | szHash = length_of_S_display(); |
| 2489 | for(i=0; i<ann.nOrig; i++){ |
| 2490 | int iVers = ann.aOrig[i].iVers; |
| 2491 | char *z = (char*)ann.aOrig[i].z; |
| 2492 | int n = ann.aOrig[i].n; |
| 2493 | char zPrefix[300]; |
| @@ -2503,11 +2503,11 @@ | |
| 2503 | "<span style='background-color:%s'>" |
| 2504 | "%s%.10s</a> %s</span> %13.13s:", |
| 2505 | p->zBgColor, zLink, zUuid, p->zDate, p->zUser); |
| 2506 | fossil_free(zLink); |
| 2507 | }else{ |
| 2508 | sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s", szHash+28, ""); |
| 2509 | } |
| 2510 | }else{ |
| 2511 | if( iVers>=0 ){ |
| 2512 | struct AnnVers *p = ann.aVers+iVers; |
| 2513 | const char *zUuid = fileVers ? p->zFUuid : p->zMUuid; |
| @@ -2516,11 +2516,11 @@ | |
| 2516 | "<span style='background-color:%s'>" |
| 2517 | "%s%.10s</a> %s</span> %4d:", |
| 2518 | p->zBgColor, zLink, zUuid, p->zDate, i+1); |
| 2519 | fossil_free(zLink); |
| 2520 | }else{ |
| 2521 | sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s%4d:",szHash+14,"",i+1); |
| 2522 | } |
| 2523 | } |
| 2524 | @ %s(zPrefix) %h(z) |
| 2525 | |
| 2526 | } |
| 2527 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2483,11 +2483,11 @@ | |
| 2483 | @ <h2>Lines added by the %d(ann.nVers) most recent ancestors of |
| 2484 | @ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a> |
| 2485 | @ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2> |
| 2486 | } |
| 2487 | @ <pre> |
| 2488 | szHash = 10; |
| 2489 | for(i=0; i<ann.nOrig; i++){ |
| 2490 | int iVers = ann.aOrig[i].iVers; |
| 2491 | char *z = (char*)ann.aOrig[i].z; |
| 2492 | int n = ann.aOrig[i].n; |
| 2493 | char zPrefix[300]; |
| @@ -2503,11 +2503,11 @@ | |
| 2503 | "<span style='background-color:%s'>" |
| 2504 | "%s%.10s</a> %s</span> %13.13s:", |
| 2505 | p->zBgColor, zLink, zUuid, p->zDate, p->zUser); |
| 2506 | fossil_free(zLink); |
| 2507 | }else{ |
| 2508 | sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s", szHash+26, ""); |
| 2509 | } |
| 2510 | }else{ |
| 2511 | if( iVers>=0 ){ |
| 2512 | struct AnnVers *p = ann.aVers+iVers; |
| 2513 | const char *zUuid = fileVers ? p->zFUuid : p->zMUuid; |
| @@ -2516,11 +2516,11 @@ | |
| 2516 | "<span style='background-color:%s'>" |
| 2517 | "%s%.10s</a> %s</span> %4d:", |
| 2518 | p->zBgColor, zLink, zUuid, p->zDate, i+1); |
| 2519 | fossil_free(zLink); |
| 2520 | }else{ |
| 2521 | sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%*s%4d:",szHash+12,"",i+1); |
| 2522 | } |
| 2523 | } |
| 2524 | @ %s(zPrefix) %h(z) |
| 2525 | |
| 2526 | } |
| 2527 |