@@ -176,15 +176,19 @@
176 176 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
/* Don't do "extend++" here, because the CR needs to be stripped! */
177 177 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( k>0 && z[k-1]=='\r' ){ k--; }
178 178 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
179 179 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( (diffFlags & DIFF_IGNORE_ALLWS)==DIFF_IGNORE_ALLWS ){
180 180 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
while( s<k && fossil_isspace(z[s]) ){s++; extent++;}
181 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- }
182 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- for(h=0, x=s; x<k; x++){
183 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- if( (diffFlags & DIFF_IGNORE_ALLWS)==DIFF_IGNORE_ALLWS && fossil_isspace(z[x]) ){
184 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- ++numws;
185 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- }else{
181 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ for(h=0, x=s; x<k; x++){
182 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ if( fossil_isspace(z[x]) ){
183 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ ++numws;
184 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ }else{
185 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ h = h ^ (h<<2) ^ z[x];
186 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ }
187 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ }
188 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ }else{
189 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ for(h=0, x=0; x<k; x++){
186 190 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
h = h ^ (h<<2) ^ z[x];
187 191 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
188 192 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
189 193 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
a[i].z = z;
190 194 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
a[i].extent = extent+numws;
@@ -2094,10 +2098,11 @@
2094 2098 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2095 2099 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( !content_get(rid, &toAnnotate) ){
2096 2100 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fossil_fatal("unable to retrieve content of artifact #%d", rid);
2097 2101 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2098 2102 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( iLimit<=0 ) iLimit = 1000000000;
2103 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ blob_to_utf8_no_bom(&toAnnotate, 0);
2099 2104 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
annotation_start(p, &toAnnotate, diffFlags);
2100 2105 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
db_begin_transaction();
2101 2106 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
db_multi_exec(
2102 2107 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
2103 2108 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"DELETE FROM vseen;"
@@ -2128,10 +2133,11 @@
2128 2133 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2129 2134 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2130 2135 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2131 2136 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( p->nVers ){
2132 2137 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
content_get(rid, &step);
2138 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ blob_to_utf8_no_bom(&step, 0);
2133 2139 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
annotation_step(p, &step, p->nVers-1, diffFlags);
2134 2140 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
blob_reset(&step);
2135 2141 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2136 2142 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->nVers++;
2137 2143 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
db_bind_int(&ins, ":rid", rid);
@@ -2325,26 +2331,26 @@
2325 2331 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"<span style='background-color:%s'>"
2326 2332 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"%s%.10s</a> %s</span> %13.13s:",
2327 2333 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->zBgColor, zLink, p->zMUuid, p->zDate, p->zUser);
2328 2334 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fossil_free(zLink);
2329 2335 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}else{
2330 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%36s ", "");
2336 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%36s", "");
2331 2337 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2332 2338 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}else{
2333 2339 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( iVers>=0 ){
2334 2340 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
struct AnnVers *p = ann.aVers+iVers;
2335 2341 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
char *zLink = xhref("target='infowindow'", "%R/info/%S", p->zMUuid);
2336 2342 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
sqlite3_snprintf(sizeof(zPrefix), zPrefix,
2337 2343 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"<span style='background-color:%s'>"
2338 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- "%s%.10s</a> %s</span> %4d: ",
2344 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ "%s%.10s</a> %s</span> %4d:",
2339 2345 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
p->zBgColor, zLink, p->zMUuid, p->zDate, i+1);
2340 2346 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fossil_free(zLink);
2341 2347 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}else{
2342 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%22s%4d: ", "", i+1);
2348 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ sqlite3_snprintf(sizeof(zPrefix), zPrefix, "%22s%4d:", "", i+1);
2343 2349 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2344 2350 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2345 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- @ %s(zPrefix)%h(z)
2351 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ @ %s(zPrefix) %h(z)
2346 2352 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
2347 2353 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2348 2354 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
@ </pre>
2349 2355 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
style_footer();
2350 2356 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
@@ -2448,12 +2454,12 @@
2448 2454 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2449 2455 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}else{
2450 2456 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
if( iVers>=0 ){
2451 2457 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fossil_print("%.10s %s %5d: %.*s\n",
2452 2458 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fileVers ? p->zFUuid : p->zMUuid, p->zDate, i+1, n, z);
2453 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
- }else {
2459 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
+ }else{
2454 2460 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
fossil_print("%21s %5d: %.*s\n",
2455 2461 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
"", i+1, n, z);
2456 2462 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2457 2463 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2458 2464 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2459 2465 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!
}
2460 2466 { copied = false; pop = false }, 1000)" :class="copied && 'copied'">Copy link Copied!