314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
|
-
+
-
+
|
char *zOPath = mprintf("%s%s", g.zLocalRoot, zOrig);
Blob delta, a, b, disk;
if( rid==0 ){
db_ephemeral_blob(&q, 6, &a);
fossil_print("ADDED %s\n", zNew);
diff_print_index(zNew, diffFlags);
if( !fIncludeBinary ){
eType = looks_like_text(&a)&3;
eType = looks_like_text(&a);
}
diff_file_mem(&empty, &a, eType, zNew, zDiffCmd,
zBinGlob, fIncludeBinary, diffFlags);
}else if( isRemoved ){
fossil_print("DELETE %s\n", zOrig);
if( fBaseline==0 ){
if( file_wd_islink(zOPath) ){
blob_read_link(&a, zOPath);
}else{
blob_read_from_file(&a, zOPath);
}
}else{
content_get(rid, &a);
}
diff_print_index(zNew, diffFlags);
if( !fIncludeBinary){
eType = looks_like_text(&a)&3;
eType = looks_like_text(&a);
}
diff_file_mem(&a, &empty, eType, zOrig, zDiffCmd,
zBinGlob, fIncludeBinary, diffFlags);
}else{
int isOrigLink = file_wd_islink(zOPath);
db_ephemeral_blob(&q, 6, &delta);
if( fBaseline==0 ){
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
|
-
-
+
+
|
printf(DIFF_CANNOT_COMPUTE_SYMLINK);
}else{
Blob *pBase = fBaseline ? &a : &disk;
content_get(rid, &a);
blob_delta_apply(&a, &delta, &b);
int eType2 = 0;
if( !fIncludeBinary ){
eType = looks_like_text(pBase)&3;
eType2 = looks_like_text(&b)&3;
eType = looks_like_text(pBase);
eType2 = looks_like_text(&b);
}
if( eType!=eType2 ){
diff_print_filenames(zOrig, zNew, diffFlags);
printf(DIFF_CANNOT_COMPUTE_ENCODING);
}else{
diff_file_mem(pBase, &b, eType, zNew, zDiffCmd,
zBinGlob, fIncludeBinary, diffFlags);
|