429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
|
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
|
-
+
|
manifest_destroy(pTo);
}
/*
** COMMAND: diff
** COMMAND: gdiff
**
** Usage: %fossil diff|gdiff ?options? ?FILE1? ?FILE2 ...?
** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
**
** Show the difference between the current version of each of the FILEs
** specified (as they exist on disk) and that same file as it was checked
** out. Or if the FILE arguments are omitted, show the unsaved changed
** currently in the working check-out.
**
** If the "--from VERSION" or "-r VERSION" option is used it specifies
|
452
453
454
455
456
457
458
459
460
461
462
463
464
465
|
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
|
+
+
+
+
+
+
|
** The "-i" command-line option forces the use of the internal diff logic
** rather than any external diff program that might be configured using
** the "setting" command. If no external diff program is configured, then
** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
**
** The "-N" or "--new-file" option causes the complete text of added or
** deleted files to be displayed.
**
** Options:
** --from|-r VERSION select VERSION as source for the diff
** --new-file|-N output complete text of added or deleted files
** -i use internal diff logic
** --to VERSION select VERSION as target for the diff
*/
void diff_cmd(void){
int isGDiff; /* True for gdiff. False for normal diff */
int isInternDiff; /* True for internal diff */
int hasNFlag; /* True if -N or --new-file flag is used */
const char *zFrom; /* Source version number */
const char *zTo; /* Target version number */
|