Fossil SCM

Making it build; diff doesn't work well, about with calculation, yet.

viriketo 2013-02-11 19:46 annotate_links
Commit facd98ce8c640da5e132aaebca95a7b1d8b0cc88
Parent bdeb633a6ca008a…
1 file changed +6 -66
~ src/diff.c
M src/diff.c
+6 -66
--- src/diff.c
+++ src/diff.c
@@ -1273,16 +1273,16 @@
12731273
 int nContext; /* Lines of context above and below each change */
12741274
 int showDivider = 0; /* True to show the divider */
12751275
12761276
 memset(&s, 0, sizeof(s));
12771277
 s.width = diff_width(diffFlags);
1278
- if (width == 0 && maxwidth == 0){ /* Autocalculate */
1278
+ if (s.width == 0 && maxwidth == 0){ /* Autocalculate */
12791279
 Blob dump;
12801280
 /* Webserver */
12811281
 maxwidth = -1;
12821282
 blob_zero(&dump);
1283
- sbsDiff(&p, &dump, escHtml, diffFlags);
1283
+ sbsDiff(p, &dump, pRe, diffFlags);
12841284
 s.width = maxwidth;
12851285
 blob_reset(&dump);
12861286
 }
12871287
 s.zLine = fossil_malloc( 15*s.width + 200 );
12881288
 if( s.zLine==0 ) return;
@@ -2244,84 +2244,35 @@
22442244
 if( !content_get(rid, &toAnnotate) ){
22452245
 fossil_panic("unable to retrieve content of artifact #%d", rid);
22462246
 }
22472247
 if( iLimit<=0 ) iLimit = 1000000000;
22482248
 annotation_start(p, &toAnnotate);
2249
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
2250
-
2251
- db_prepare(&q,
2252
- "SELECT mlink.fid,"
2253
- " (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2254
- " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
2255
- " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
2256
- " date(event.mtime), "
2257
- " coalesce(event.euser,event.user) "
2258
- " FROM ancestor, mlink, event"
2259
- " WHERE mlink.fnid=%d"
2260
- " AND mlink.mid=ancestor.rid"
2261
- " AND event.objid=ancestor.rid"
2262
- " ORDER BY ancestor.generation ASC"
2263
- " LIMIT %d",
2264
- (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2265
- fnid,
2266
- iLimit>0 ? iLimit : 10000000
2267
-======= COMMON ANCESTOR content follows ============================
2268
-
2269
- db_prepare(&q,
2270
- "SELECT mlink.fid,"
2271
- " (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2272
- " date(event.mtime), "
2273
- " coalesce(event.euser,event.user) "
2274
- " FROM ancestor, mlink, event"
2275
- " WHERE mlink.fnid=%d"
2276
- " AND mlink.mid=ancestor.rid"
2277
- " AND event.objid=ancestor.rid"
2278
- " ORDER BY ancestor.generation ASC"
2279
- " LIMIT %d",
2280
- (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2281
- fnid,
2282
- iLimit>0 ? iLimit : 10000000
2283
-======= MERGED IN content follows ==================================
22842249
22852250
 db_prepare(&q,
22862251
 "SELECT (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2252
+ " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
2253
+ " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
22872254
 " date(event.mtime),"
22882255
 " coalesce(event.euser,event.user),"
22892256
 " mlink.pid"
22902257
 " FROM mlink, event"
22912258
 " WHERE mlink.fid=:rid"
22922259
 " AND event.objid=mlink.mid"
22932260
 " ORDER BY event.mtime",
22942261
 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid"
2295
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
22962262
 );
2297
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
2298
- while( db_step(&q)==SQLITE_ROW ){
2299
- int pid = db_column_int(&q, 0);
2300
- const char *zUuid = db_column_text(&q, 1);
2301
- const char *zUuidFile = db_column_text(&q, 2);
2302
- const char *zUuidParentFile = db_column_text(&q, 3);
2303
- const char *zDate = db_column_text(&q, 4);
2304
- const char *zUser = db_column_text(&q, 5);
2305
-======= COMMON ANCESTOR content follows ============================
2306
- while( db_step(&q)==SQLITE_ROW ){
2307
- int pid = db_column_int(&q, 0);
2308
- const char *zUuid = db_column_text(&q, 1);
2309
- const char *zDate = db_column_text(&q, 2);
2310
- const char *zUser = db_column_text(&q, 3);
2311
-======= MERGED IN content follows ==================================
23122263
23132264
 db_bind_int(&q, ":rid", rid);
23142265
 if( iLimit==0 ) iLimit = 1000000000;
23152266
 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
23162267
 const char *zUuid = db_column_text(&q, 0);
2268
+ const char *zUuidFile = db_column_text(&q, 2);
2269
+ const char *zUuidParentFile = db_column_text(&q, 3);
23172270
 const char *zDate = db_column_text(&q, 1);
23182271
 const char *zUser = db_column_text(&q, 2);
23192272
 int prevId = db_column_int(&q, 3);
2320
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
23212273
 if( webLabel ){
2322
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
23232274
 if (zUuidParentFile) {
23242275
 zLabel = mprintf(
23252276
 "<a href='%R/info/%s' %s>%.10s</a> "
23262277
 "<a href='%R/fdiff?v1=%s&v2=%s' %s>d</a> "
23272278
 "%s %13.13s",
@@ -2333,21 +2284,10 @@
23332284
 "<a href='%R/info/%s' %s>%.10s</a> "
23342285
 "%s %13.13s",
23352286
 zUuid, zInfoTarget, zUuid,
23362287
 zDate, zUser);
23372288
 }
2338
-======= COMMON ANCESTOR content follows ============================
2339
- zLabel = mprintf(
2340
- "<a href='%R/info/%s' target='infowindow'>%.10s</a> %s %13.13s",
2341
- zUuid, zUuid, zDate, zUser
2342
- );
2343
-======= MERGED IN content follows ==================================
2344
- zLabel = mprintf(
2345
- "<a href='%R/info/%s' target='infowindow'>%.10s</a> %s %13.13s",
2346
- zUuid, zUuid, zDate, zUser
2347
- );
2348
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
23492289
 }else{
23502290
 zLabel = mprintf("%.10s %s %13.13s", zUuid, zDate, zUser);
23512291
 }
23522292
 p->nVers++;
23532293
 p->azVers = fossil_realloc(p->azVers, p->nVers*sizeof(p->azVers[0]) );
23542294
--- src/diff.c
+++ src/diff.c
@@ -1273,16 +1273,16 @@
1273 int nContext; /* Lines of context above and below each change */
1274 int showDivider = 0; /* True to show the divider */
1275
1276 memset(&s, 0, sizeof(s));
1277 s.width = diff_width(diffFlags);
1278 if (width == 0 && maxwidth == 0){ /* Autocalculate */
1279 Blob dump;
1280 /* Webserver */
1281 maxwidth = -1;
1282 blob_zero(&dump);
1283 sbsDiff(&p, &dump, escHtml, diffFlags);
1284 s.width = maxwidth;
1285 blob_reset(&dump);
1286 }
1287 s.zLine = fossil_malloc( 15*s.width + 200 );
1288 if( s.zLine==0 ) return;
@@ -2244,84 +2244,35 @@
2244 if( !content_get(rid, &toAnnotate) ){
2245 fossil_panic("unable to retrieve content of artifact #%d", rid);
2246 }
2247 if( iLimit<=0 ) iLimit = 1000000000;
2248 annotation_start(p, &toAnnotate);
2249 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
2250
2251 db_prepare(&q,
2252 "SELECT mlink.fid,"
2253 " (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2254 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
2255 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
2256 " date(event.mtime), "
2257 " coalesce(event.euser,event.user) "
2258 " FROM ancestor, mlink, event"
2259 " WHERE mlink.fnid=%d"
2260 " AND mlink.mid=ancestor.rid"
2261 " AND event.objid=ancestor.rid"
2262 " ORDER BY ancestor.generation ASC"
2263 " LIMIT %d",
2264 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2265 fnid,
2266 iLimit>0 ? iLimit : 10000000
2267 ======= COMMON ANCESTOR content follows ============================
2268
2269 db_prepare(&q,
2270 "SELECT mlink.fid,"
2271 " (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2272 " date(event.mtime), "
2273 " coalesce(event.euser,event.user) "
2274 " FROM ancestor, mlink, event"
2275 " WHERE mlink.fnid=%d"
2276 " AND mlink.mid=ancestor.rid"
2277 " AND event.objid=ancestor.rid"
2278 " ORDER BY ancestor.generation ASC"
2279 " LIMIT %d",
2280 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid",
2281 fnid,
2282 iLimit>0 ? iLimit : 10000000
2283 ======= MERGED IN content follows ==================================
2284
2285 db_prepare(&q,
2286 "SELECT (SELECT uuid FROM blob WHERE rid=mlink.%s),"
 
 
2287 " date(event.mtime),"
2288 " coalesce(event.euser,event.user),"
2289 " mlink.pid"
2290 " FROM mlink, event"
2291 " WHERE mlink.fid=:rid"
2292 " AND event.objid=mlink.mid"
2293 " ORDER BY event.mtime",
2294 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid"
2295 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
2296 );
2297 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
2298 while( db_step(&q)==SQLITE_ROW ){
2299 int pid = db_column_int(&q, 0);
2300 const char *zUuid = db_column_text(&q, 1);
2301 const char *zUuidFile = db_column_text(&q, 2);
2302 const char *zUuidParentFile = db_column_text(&q, 3);
2303 const char *zDate = db_column_text(&q, 4);
2304 const char *zUser = db_column_text(&q, 5);
2305 ======= COMMON ANCESTOR content follows ============================
2306 while( db_step(&q)==SQLITE_ROW ){
2307 int pid = db_column_int(&q, 0);
2308 const char *zUuid = db_column_text(&q, 1);
2309 const char *zDate = db_column_text(&q, 2);
2310 const char *zUser = db_column_text(&q, 3);
2311 ======= MERGED IN content follows ==================================
2312
2313 db_bind_int(&q, ":rid", rid);
2314 if( iLimit==0 ) iLimit = 1000000000;
2315 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
2316 const char *zUuid = db_column_text(&q, 0);
 
 
2317 const char *zDate = db_column_text(&q, 1);
2318 const char *zUser = db_column_text(&q, 2);
2319 int prevId = db_column_int(&q, 3);
2320 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
2321 if( webLabel ){
2322 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
2323 if (zUuidParentFile) {
2324 zLabel = mprintf(
2325 "<a href='%R/info/%s' %s>%.10s</a> "
2326 "<a href='%R/fdiff?v1=%s&v2=%s' %s>d</a> "
2327 "%s %13.13s",
@@ -2333,21 +2284,10 @@
2333 "<a href='%R/info/%s' %s>%.10s</a> "
2334 "%s %13.13s",
2335 zUuid, zInfoTarget, zUuid,
2336 zDate, zUser);
2337 }
2338 ======= COMMON ANCESTOR content follows ============================
2339 zLabel = mprintf(
2340 "<a href='%R/info/%s' target='infowindow'>%.10s</a> %s %13.13s",
2341 zUuid, zUuid, zDate, zUser
2342 );
2343 ======= MERGED IN content follows ==================================
2344 zLabel = mprintf(
2345 "<a href='%R/info/%s' target='infowindow'>%.10s</a> %s %13.13s",
2346 zUuid, zUuid, zDate, zUser
2347 );
2348 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
2349 }else{
2350 zLabel = mprintf("%.10s %s %13.13s", zUuid, zDate, zUser);
2351 }
2352 p->nVers++;
2353 p->azVers = fossil_realloc(p->azVers, p->nVers*sizeof(p->azVers[0]) );
2354
--- src/diff.c
+++ src/diff.c
@@ -1273,16 +1273,16 @@
1273 int nContext; /* Lines of context above and below each change */
1274 int showDivider = 0; /* True to show the divider */
1275
1276 memset(&s, 0, sizeof(s));
1277 s.width = diff_width(diffFlags);
1278 if (s.width == 0 && maxwidth == 0){ /* Autocalculate */
1279 Blob dump;
1280 /* Webserver */
1281 maxwidth = -1;
1282 blob_zero(&dump);
1283 sbsDiff(p, &dump, pRe, diffFlags);
1284 s.width = maxwidth;
1285 blob_reset(&dump);
1286 }
1287 s.zLine = fossil_malloc( 15*s.width + 200 );
1288 if( s.zLine==0 ) return;
@@ -2244,84 +2244,35 @@
2244 if( !content_get(rid, &toAnnotate) ){
2245 fossil_panic("unable to retrieve content of artifact #%d", rid);
2246 }
2247 if( iLimit<=0 ) iLimit = 1000000000;
2248 annotation_start(p, &toAnnotate);
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2249
2250 db_prepare(&q,
2251 "SELECT (SELECT uuid FROM blob WHERE rid=mlink.%s),"
2252 " (SELECT uuid FROM blob WHERE rid=mlink.fid),"
2253 " (SELECT uuid FROM blob WHERE rid=mlink.pid),"
2254 " date(event.mtime),"
2255 " coalesce(event.euser,event.user),"
2256 " mlink.pid"
2257 " FROM mlink, event"
2258 " WHERE mlink.fid=:rid"
2259 " AND event.objid=mlink.mid"
2260 " ORDER BY event.mtime",
2261 (annFlags & ANN_FILE_VERS)!=0 ? "fid" : "mid"
 
2262 );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2263
2264 db_bind_int(&q, ":rid", rid);
2265 if( iLimit==0 ) iLimit = 1000000000;
2266 while( rid && iLimit>cnt && db_step(&q)==SQLITE_ROW ){
2267 const char *zUuid = db_column_text(&q, 0);
2268 const char *zUuidFile = db_column_text(&q, 2);
2269 const char *zUuidParentFile = db_column_text(&q, 3);
2270 const char *zDate = db_column_text(&q, 1);
2271 const char *zUser = db_column_text(&q, 2);
2272 int prevId = db_column_int(&q, 3);
 
2273 if( webLabel ){
 
2274 if (zUuidParentFile) {
2275 zLabel = mprintf(
2276 "<a href='%R/info/%s' %s>%.10s</a> "
2277 "<a href='%R/fdiff?v1=%s&v2=%s' %s>d</a> "
2278 "%s %13.13s",
@@ -2333,21 +2284,10 @@
2284 "<a href='%R/info/%s' %s>%.10s</a> "
2285 "%s %13.13s",
2286 zUuid, zInfoTarget, zUuid,
2287 zDate, zUser);
2288 }
 
 
 
 
 
 
 
 
 
 
 
2289 }else{
2290 zLabel = mprintf("%.10s %s %13.13s", zUuid, zDate, zUser);
2291 }
2292 p->nVers++;
2293 p->azVers = fossil_realloc(p->azVers, p->nVers*sizeof(p->azVers[0]) );
2294

Keyboard Shortcuts

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