Fossil SCM

Add the --external-baseline option to the "fossil diff" command, plus some minor name refactoring in the diff system.

drh 2024-12-14 20:41 trunk merge
Commit 99d0baa61508415ebb69afdb701e93af5df4efc80d25a7fc259573a00b05b6b6
Parent 903142fef8a3c62…
3 files changed +2 -2 +5 -1 +80 -13
~ src/checkin.c ~ src/diff.tcl ~ src/diffcmd.c
M src/checkin.c
+2 -2
--- src/checkin.c
+++ src/checkin.c
@@ -1563,17 +1563,17 @@
15631563
 break;
15641564
 }
15651565
 diffFiles[i].nName = strlen(diffFiles[i].zName);
15661566
 diffFiles[i].nUsed = 0;
15671567
 }
1568
- diff_against_disk(0, &DCfg, diffFiles, &prompt);
1568
+ diff_version_to_checkout(0, &DCfg, diffFiles, &prompt);
15691569
 for( i=0; diffFiles[i].zName; ++i ){
15701570
 fossil_free(diffFiles[i].zName);
15711571
 }
15721572
 fossil_free(diffFiles);
15731573
 }else{
1574
- diff_against_disk(0, &DCfg, 0, &prompt);
1574
+ diff_version_to_checkout(0, &DCfg, 0, &prompt);
15751575
 }
15761576
 }
15771577
 prompt_for_user_comment(pComment, &prompt);
15781578
 blob_reset(&prompt);
15791579
 }
15801580
--- src/checkin.c
+++ src/checkin.c
@@ -1563,17 +1563,17 @@
1563 break;
1564 }
1565 diffFiles[i].nName = strlen(diffFiles[i].zName);
1566 diffFiles[i].nUsed = 0;
1567 }
1568 diff_against_disk(0, &DCfg, diffFiles, &prompt);
1569 for( i=0; diffFiles[i].zName; ++i ){
1570 fossil_free(diffFiles[i].zName);
1571 }
1572 fossil_free(diffFiles);
1573 }else{
1574 diff_against_disk(0, &DCfg, 0, &prompt);
1575 }
1576 }
1577 prompt_for_user_comment(pComment, &prompt);
1578 blob_reset(&prompt);
1579 }
1580
--- src/checkin.c
+++ src/checkin.c
@@ -1563,17 +1563,17 @@
1563 break;
1564 }
1565 diffFiles[i].nName = strlen(diffFiles[i].zName);
1566 diffFiles[i].nUsed = 0;
1567 }
1568 diff_version_to_checkout(0, &DCfg, diffFiles, &prompt);
1569 for( i=0; diffFiles[i].zName; ++i ){
1570 fossil_free(diffFiles[i].zName);
1571 }
1572 fossil_free(diffFiles);
1573 }else{
1574 diff_version_to_checkout(0, &DCfg, 0, &prompt);
1575 }
1576 }
1577 prompt_for_user_comment(pComment, &prompt);
1578 blob_reset(&prompt);
1579 }
1580
M src/diff.tcl
+5 -1
--- src/diff.tcl
+++ src/diff.tcl
@@ -110,11 +110,15 @@
110110
111111
 set fromIndex [lsearch -glob $fossilcmd *-from]
112112
 set toIndex [lsearch -glob $fossilcmd *-to]
113113
 set branchIndex [lsearch -glob $fossilcmd *-branch]
114114
 set checkinIndex [lsearch -glob $fossilcmd *-checkin]
115
- set fA {base check-in}
115
+ if {[string match *?--external-baseline* $fossilcmd]} {
116
+ set fA {external baseline}
117
+ } else {
118
+ set fA {base check-in}
119
+ }
116120
 set fB {current check-out}
117121
 if {$fromIndex > -1} {set fA [lindex $fossilcmd $fromIndex+1]}
118122
 if {$toIndex > -1} {set fB [lindex $fossilcmd $toIndex+1]}
119123
 if {$branchIndex > -1} {set fA "branch point"; set fB "leaf of branch '[lindex $fossilcmd $branchIndex+1]'"}
120124
 if {$checkinIndex > -1} {set fA "primary parent"; set fB [lindex $fossilcmd $checkinIndex+1]}
121125
--- src/diff.tcl
+++ src/diff.tcl
@@ -110,11 +110,15 @@
110
111 set fromIndex [lsearch -glob $fossilcmd *-from]
112 set toIndex [lsearch -glob $fossilcmd *-to]
113 set branchIndex [lsearch -glob $fossilcmd *-branch]
114 set checkinIndex [lsearch -glob $fossilcmd *-checkin]
115 set fA {base check-in}
 
 
 
 
116 set fB {current check-out}
117 if {$fromIndex > -1} {set fA [lindex $fossilcmd $fromIndex+1]}
118 if {$toIndex > -1} {set fB [lindex $fossilcmd $toIndex+1]}
119 if {$branchIndex > -1} {set fA "branch point"; set fB "leaf of branch '[lindex $fossilcmd $branchIndex+1]'"}
120 if {$checkinIndex > -1} {set fA "primary parent"; set fB [lindex $fossilcmd $checkinIndex+1]}
121
--- src/diff.tcl
+++ src/diff.tcl
@@ -110,11 +110,15 @@
110
111 set fromIndex [lsearch -glob $fossilcmd *-from]
112 set toIndex [lsearch -glob $fossilcmd *-to]
113 set branchIndex [lsearch -glob $fossilcmd *-branch]
114 set checkinIndex [lsearch -glob $fossilcmd *-checkin]
115 if {[string match *?--external-baseline* $fossilcmd]} {
116 set fA {external baseline}
117 } else {
118 set fA {base check-in}
119 }
120 set fB {current check-out}
121 if {$fromIndex > -1} {set fA [lindex $fossilcmd $fromIndex+1]}
122 if {$toIndex > -1} {set fB [lindex $fossilcmd $toIndex+1]}
123 if {$branchIndex > -1} {set fA "branch point"; set fB "leaf of branch '[lindex $fossilcmd $branchIndex+1]'"}
124 if {$checkinIndex > -1} {set fA "primary parent"; set fB [lindex $fossilcmd $checkinIndex+1]}
125
M src/diffcmd.c
+80 -13
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -784,26 +784,27 @@
784784
 blob_reset(&file);
785785
 return rc;
786786
 }
787787
788788
 /*
789
-** Run a diff between the version zFrom and files on disk. zFrom might
790
-** be NULL which means to simply show the difference between the edited
791
-** files on disk and the check-out on which they are based.
789
+** Run a diff between the version zFrom and files on disk in the current
790
+** working checkout. zFrom might be NULL which means to simply show the
791
+** difference between the edited files on disk and the check-out on which
792
+** they are based.
792793
 **
793794
 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
794795
 ** command zDiffCmd to do the diffing.
795796
 **
796797
 ** When using an external diff program, zBinGlob contains the GLOB patterns
797798
 ** for file names to treat as binary. If fIncludeBinary is zero, these files
798799
 ** will be skipped in addition to files that may contain binary content.
799800
 */
800
-void diff_against_disk(
801
+void diff_version_to_checkout(
801802
 const char *zFrom, /* Version to difference from */
802803
 DiffConfig *pCfg, /* Flags controlling diff output */
803804
 FileDirList *pFileDir, /* Which files to diff */
804
- Blob *pOut /* Blob to output diff instead of stdout */
805
+ Blob *pOut /* Blob to output diff instead of stdout */
805806
 ){
806807
 int vid;
807808
 Blob sql;
808809
 Stmt q;
809810
 int asNewFile; /* Treat non-existant files as empty files */
@@ -928,20 +929,20 @@
928929
 db_finalize(&q);
929930
 db_end_transaction(1); /* ROLLBACK */
930931
 }
931932
932933
 /*
933
-** Run a diff between the undo buffer and files on disk.
934
+** Run a diff from the undo buffer to files on disk.
934935
 **
935936
 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
936937
 ** command zDiffCmd to do the diffing.
937938
 **
938939
 ** When using an external diff program, zBinGlob contains the GLOB patterns
939940
 ** for file names to treat as binary. If fIncludeBinary is zero, these files
940941
 ** will be skipped in addition to files that may contain binary content.
941942
 */
942
-static void diff_against_undo(
943
+static void diff_undo_to_checkout(
943944
 DiffConfig *pCfg, /* Flags controlling diff output */
944945
 FileDirList *pFileDir /* List of files and directories to diff */
945946
 ){
946947
 Stmt q;
947948
 Blob content;
@@ -1088,10 +1089,67 @@
10881089
 }
10891090
 }
10901091
 manifest_destroy(pFrom);
10911092
 manifest_destroy(pTo);
10921093
 }
1094
+
1095
+/*
1096
+** Compute the difference from an external tree of files to the current
1097
+** working checkout with its edits.
1098
+**
1099
+** To put it another way: Every managed file in the current working
1100
+** checkout is compared to the file with same under in zExternBase. The
1101
+** zExternBase files are on the left and the files in the current working
1102
+** directory are on the right.
1103
+*/
1104
+void diff_externbase_to_checkout(
1105
+ const char *zExternBase, /* Remote tree to use as the baseline */
1106
+ DiffConfig *pCfg, /* Diff settings */
1107
+ FileDirList *pFileDir /* Only look at these files */
1108
+){
1109
+ int vid;
1110
+ Stmt q;
1111
+
1112
+ vid = db_lget_int("checkout",0);
1113
+ if( file_isdir(zExternBase, ExtFILE)!=1 ){
1114
+ fossil_fatal("\"%s\" is not a directory", zExternBase);
1115
+ }
1116
+ db_prepare(&q,
1117
+ "SELECT pathname FROM vfile WHERE vid=%d ORDER BY pathname",
1118
+ vid
1119
+ );
1120
+ while( db_step(&q)==SQLITE_ROW ){
1121
+ const char *zFile; /* Name of file in the repository */
1122
+ char *zLhs; /* Full name of left-hand side file */
1123
+ char *zRhs; /* Full name of right-hand side file */
1124
+ Blob rhs; /* Full text of RHS */
1125
+ Blob lhs; /* Full text of LHS */
1126
+
1127
+ zFile = db_column_text(&q,0);
1128
+ if( !file_dir_match(pFileDir, zFile) ) continue;
1129
+ zLhs = mprintf("%s/%s", zExternBase, zFile);
1130
+ zRhs = mprintf("%s%s", g.zLocalRoot, zFile);
1131
+ if( file_size(zLhs, ExtFILE)<0 ){
1132
+ blob_zero(&lhs);
1133
+ }else{
1134
+ blob_read_from_file(&lhs, zLhs, ExtFILE);
1135
+ }
1136
+ blob_read_from_file(&rhs, zRhs, ExtFILE);
1137
+ if( blob_size(&lhs)!=blob_size(&rhs)
1138
+ || memcmp(blob_buffer(&lhs), blob_buffer(&rhs), blob_size(&lhs))!=0
1139
+ ){
1140
+ diff_print_index(zFile, pCfg, 0);
1141
+ diff_file_mem(&lhs, &rhs, zFile, pCfg);
1142
+ }
1143
+ blob_reset(&lhs);
1144
+ blob_reset(&rhs);
1145
+ fossil_free(zLhs);
1146
+ fossil_free(zRhs);
1147
+ }
1148
+ db_finalize(&q);
1149
+}
1150
+
10931151
10941152
 /*
10951153
 ** Return the name of the external diff command, or return NULL if
10961154
 ** no external diff command is defined.
10971155
 */
@@ -1270,11 +1328,12 @@
12701328
 ** --strip-trailing-cr Strip trailing CR
12711329
 ** --tcl Tcl-formatted output used internally by --tk
12721330
 ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
12731331
 ** --tk Launch a Tcl/Tk GUI for display
12741332
 ** --to VERSION Select VERSION as target for the diff
1275
-** --undo Diff against the "undo" buffer
1333
+** --external-baseline DIR Use files under DIR as the baseline
1334
+** --undo Use the undo buffer as the baseline
12761335
 ** --unified Unified diff
12771336
 ** -v|--verbose Output complete text of added or deleted files
12781337
 ** -h|--versions Show compared versions in the diff header
12791338
 ** --webpage Format output as a stand-alone HTML webpage
12801339
 ** -W|--width N Width of lines in side-by-side diff
@@ -1284,10 +1343,11 @@
12841343
 int isGDiff; /* True for gdiff. False for normal diff */
12851344
 const char *zFrom; /* Source version number */
12861345
 const char *zTo; /* Target version number */
12871346
 const char *zCheckin; /* Check-in version number */
12881347
 const char *zBranch; /* Branch to diff */
1348
+ const char *zExBase; /* The --external-baseline option */
12891349
 int againstUndo = 0; /* Diff against files in the undo buffer */
12901350
 FileDirList *pFileDir = 0; /* Restrict the diff to these files */
12911351
 DiffConfig DCfg; /* Diff configuration object */
12921352
12931353
 if( find_option("tk",0,0)!=0 || has_option("tclsh") ){
@@ -1297,12 +1357,17 @@
12971357
 isGDiff = g.argv[1][0]=='g';
12981358
 zFrom = find_option("from", "r", 1);
12991359
 zTo = find_option("to", 0, 1);
13001360
 zCheckin = find_option("checkin", "ci", 1);
13011361
 zBranch = find_option("branch", 0, 1);
1362
+ zExBase = find_option("external-baseline", 0, 1);
13021363
 againstUndo = find_option("undo",0,0)!=0;
1303
- if( againstUndo && ( zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){
1364
+ if( zExBase && (zFrom || zTo || zCheckin || zBranch || againstUndo) ){
1365
+ fossil_fatal("cannot use --external-baseline together with any of"
1366
+ " --from, --to, --checkin, --branch, or --undo");
1367
+ }
1368
+ if( againstUndo && (zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){
13041369
 fossil_fatal("cannot use --undo together with --from, --to, --checkin,"
13051370
 " or --branch");
13061371
 }
13071372
 if( zBranch ){
13081373
 if( zTo || zFrom || zCheckin ){
@@ -1309,11 +1374,11 @@
13091374
 fossil_fatal("cannot use --from, --to, or --checkin with --branch");
13101375
 }
13111376
 zTo = zBranch;
13121377
 zFrom = mprintf("root:%s", zBranch);
13131378
 }
1314
- if( zCheckin!=0 && ( zFrom!=0 || zTo!=0 ) ){
1379
+ if( zCheckin!=0 && (zFrom!=0 || zTo!=0) ){
13151380
 fossil_fatal("cannot use --checkin together with --from or --to");
13161381
 }
13171382
 diff_options(&DCfg, isGDiff, 0);
13181383
 determine_exec_relative_option(1);
13191384
 if( 0==zCheckin ){
@@ -1357,18 +1422,20 @@
13571422
 if( zFrom==0 ){
13581423
 fossil_fatal("check-in %s has no parent", zTo);
13591424
 }
13601425
 }
13611426
 diff_begin(&DCfg);
1362
- if( againstUndo ){
1427
+ if( zExBase ){
1428
+ diff_externbase_to_checkout(zExBase, &DCfg, pFileDir);
1429
+ }else if( againstUndo ){
13631430
 if( db_lget_int("undo_available",0)==0 ){
13641431
 fossil_print("No undo or redo is available\n");
13651432
 return;
13661433
 }
1367
- diff_against_undo(&DCfg, pFileDir);
1434
+ diff_undo_to_checkout(&DCfg, pFileDir);
13681435
 }else if( zTo==0 ){
1369
- diff_against_disk(zFrom, &DCfg, pFileDir, 0);
1436
+ diff_version_to_checkout(zFrom, &DCfg, pFileDir, 0);
13701437
 }else{
13711438
 diff_two_versions(zFrom, zTo, &DCfg, pFileDir);
13721439
 }
13731440
 if( pFileDir ){
13741441
 int i;
13751442
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -784,26 +784,27 @@
784 blob_reset(&file);
785 return rc;
786 }
787
788 /*
789 ** Run a diff between the version zFrom and files on disk. zFrom might
790 ** be NULL which means to simply show the difference between the edited
791 ** files on disk and the check-out on which they are based.
 
792 **
793 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
794 ** command zDiffCmd to do the diffing.
795 **
796 ** When using an external diff program, zBinGlob contains the GLOB patterns
797 ** for file names to treat as binary. If fIncludeBinary is zero, these files
798 ** will be skipped in addition to files that may contain binary content.
799 */
800 void diff_against_disk(
801 const char *zFrom, /* Version to difference from */
802 DiffConfig *pCfg, /* Flags controlling diff output */
803 FileDirList *pFileDir, /* Which files to diff */
804 Blob *pOut /* Blob to output diff instead of stdout */
805 ){
806 int vid;
807 Blob sql;
808 Stmt q;
809 int asNewFile; /* Treat non-existant files as empty files */
@@ -928,20 +929,20 @@
928 db_finalize(&q);
929 db_end_transaction(1); /* ROLLBACK */
930 }
931
932 /*
933 ** Run a diff between the undo buffer and files on disk.
934 **
935 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
936 ** command zDiffCmd to do the diffing.
937 **
938 ** When using an external diff program, zBinGlob contains the GLOB patterns
939 ** for file names to treat as binary. If fIncludeBinary is zero, these files
940 ** will be skipped in addition to files that may contain binary content.
941 */
942 static void diff_against_undo(
943 DiffConfig *pCfg, /* Flags controlling diff output */
944 FileDirList *pFileDir /* List of files and directories to diff */
945 ){
946 Stmt q;
947 Blob content;
@@ -1088,10 +1089,67 @@
1088 }
1089 }
1090 manifest_destroy(pFrom);
1091 manifest_destroy(pTo);
1092 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1093
1094 /*
1095 ** Return the name of the external diff command, or return NULL if
1096 ** no external diff command is defined.
1097 */
@@ -1270,11 +1328,12 @@
1270 ** --strip-trailing-cr Strip trailing CR
1271 ** --tcl Tcl-formatted output used internally by --tk
1272 ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
1273 ** --tk Launch a Tcl/Tk GUI for display
1274 ** --to VERSION Select VERSION as target for the diff
1275 ** --undo Diff against the "undo" buffer
 
1276 ** --unified Unified diff
1277 ** -v|--verbose Output complete text of added or deleted files
1278 ** -h|--versions Show compared versions in the diff header
1279 ** --webpage Format output as a stand-alone HTML webpage
1280 ** -W|--width N Width of lines in side-by-side diff
@@ -1284,10 +1343,11 @@
1284 int isGDiff; /* True for gdiff. False for normal diff */
1285 const char *zFrom; /* Source version number */
1286 const char *zTo; /* Target version number */
1287 const char *zCheckin; /* Check-in version number */
1288 const char *zBranch; /* Branch to diff */
 
1289 int againstUndo = 0; /* Diff against files in the undo buffer */
1290 FileDirList *pFileDir = 0; /* Restrict the diff to these files */
1291 DiffConfig DCfg; /* Diff configuration object */
1292
1293 if( find_option("tk",0,0)!=0 || has_option("tclsh") ){
@@ -1297,12 +1357,17 @@
1297 isGDiff = g.argv[1][0]=='g';
1298 zFrom = find_option("from", "r", 1);
1299 zTo = find_option("to", 0, 1);
1300 zCheckin = find_option("checkin", "ci", 1);
1301 zBranch = find_option("branch", 0, 1);
 
1302 againstUndo = find_option("undo",0,0)!=0;
1303 if( againstUndo && ( zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){
 
 
 
 
1304 fossil_fatal("cannot use --undo together with --from, --to, --checkin,"
1305 " or --branch");
1306 }
1307 if( zBranch ){
1308 if( zTo || zFrom || zCheckin ){
@@ -1309,11 +1374,11 @@
1309 fossil_fatal("cannot use --from, --to, or --checkin with --branch");
1310 }
1311 zTo = zBranch;
1312 zFrom = mprintf("root:%s", zBranch);
1313 }
1314 if( zCheckin!=0 && ( zFrom!=0 || zTo!=0 ) ){
1315 fossil_fatal("cannot use --checkin together with --from or --to");
1316 }
1317 diff_options(&DCfg, isGDiff, 0);
1318 determine_exec_relative_option(1);
1319 if( 0==zCheckin ){
@@ -1357,18 +1422,20 @@
1357 if( zFrom==0 ){
1358 fossil_fatal("check-in %s has no parent", zTo);
1359 }
1360 }
1361 diff_begin(&DCfg);
1362 if( againstUndo ){
 
 
1363 if( db_lget_int("undo_available",0)==0 ){
1364 fossil_print("No undo or redo is available\n");
1365 return;
1366 }
1367 diff_against_undo(&DCfg, pFileDir);
1368 }else if( zTo==0 ){
1369 diff_against_disk(zFrom, &DCfg, pFileDir, 0);
1370 }else{
1371 diff_two_versions(zFrom, zTo, &DCfg, pFileDir);
1372 }
1373 if( pFileDir ){
1374 int i;
1375
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -784,26 +784,27 @@
784 blob_reset(&file);
785 return rc;
786 }
787
788 /*
789 ** Run a diff between the version zFrom and files on disk in the current
790 ** working checkout. zFrom might be NULL which means to simply show the
791 ** difference between the edited files on disk and the check-out on which
792 ** they are based.
793 **
794 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
795 ** command zDiffCmd to do the diffing.
796 **
797 ** When using an external diff program, zBinGlob contains the GLOB patterns
798 ** for file names to treat as binary. If fIncludeBinary is zero, these files
799 ** will be skipped in addition to files that may contain binary content.
800 */
801 void diff_version_to_checkout(
802 const char *zFrom, /* Version to difference from */
803 DiffConfig *pCfg, /* Flags controlling diff output */
804 FileDirList *pFileDir, /* Which files to diff */
805 Blob *pOut /* Blob to output diff instead of stdout */
806 ){
807 int vid;
808 Blob sql;
809 Stmt q;
810 int asNewFile; /* Treat non-existant files as empty files */
@@ -928,20 +929,20 @@
929 db_finalize(&q);
930 db_end_transaction(1); /* ROLLBACK */
931 }
932
933 /*
934 ** Run a diff from the undo buffer to files on disk.
935 **
936 ** Use the internal diff logic if zDiffCmd is NULL. Otherwise call the
937 ** command zDiffCmd to do the diffing.
938 **
939 ** When using an external diff program, zBinGlob contains the GLOB patterns
940 ** for file names to treat as binary. If fIncludeBinary is zero, these files
941 ** will be skipped in addition to files that may contain binary content.
942 */
943 static void diff_undo_to_checkout(
944 DiffConfig *pCfg, /* Flags controlling diff output */
945 FileDirList *pFileDir /* List of files and directories to diff */
946 ){
947 Stmt q;
948 Blob content;
@@ -1088,10 +1089,67 @@
1089 }
1090 }
1091 manifest_destroy(pFrom);
1092 manifest_destroy(pTo);
1093 }
1094
1095 /*
1096 ** Compute the difference from an external tree of files to the current
1097 ** working checkout with its edits.
1098 **
1099 ** To put it another way: Every managed file in the current working
1100 ** checkout is compared to the file with same under in zExternBase. The
1101 ** zExternBase files are on the left and the files in the current working
1102 ** directory are on the right.
1103 */
1104 void diff_externbase_to_checkout(
1105 const char *zExternBase, /* Remote tree to use as the baseline */
1106 DiffConfig *pCfg, /* Diff settings */
1107 FileDirList *pFileDir /* Only look at these files */
1108 ){
1109 int vid;
1110 Stmt q;
1111
1112 vid = db_lget_int("checkout",0);
1113 if( file_isdir(zExternBase, ExtFILE)!=1 ){
1114 fossil_fatal("\"%s\" is not a directory", zExternBase);
1115 }
1116 db_prepare(&q,
1117 "SELECT pathname FROM vfile WHERE vid=%d ORDER BY pathname",
1118 vid
1119 );
1120 while( db_step(&q)==SQLITE_ROW ){
1121 const char *zFile; /* Name of file in the repository */
1122 char *zLhs; /* Full name of left-hand side file */
1123 char *zRhs; /* Full name of right-hand side file */
1124 Blob rhs; /* Full text of RHS */
1125 Blob lhs; /* Full text of LHS */
1126
1127 zFile = db_column_text(&q,0);
1128 if( !file_dir_match(pFileDir, zFile) ) continue;
1129 zLhs = mprintf("%s/%s", zExternBase, zFile);
1130 zRhs = mprintf("%s%s", g.zLocalRoot, zFile);
1131 if( file_size(zLhs, ExtFILE)<0 ){
1132 blob_zero(&lhs);
1133 }else{
1134 blob_read_from_file(&lhs, zLhs, ExtFILE);
1135 }
1136 blob_read_from_file(&rhs, zRhs, ExtFILE);
1137 if( blob_size(&lhs)!=blob_size(&rhs)
1138 || memcmp(blob_buffer(&lhs), blob_buffer(&rhs), blob_size(&lhs))!=0
1139 ){
1140 diff_print_index(zFile, pCfg, 0);
1141 diff_file_mem(&lhs, &rhs, zFile, pCfg);
1142 }
1143 blob_reset(&lhs);
1144 blob_reset(&rhs);
1145 fossil_free(zLhs);
1146 fossil_free(zRhs);
1147 }
1148 db_finalize(&q);
1149 }
1150
1151
1152 /*
1153 ** Return the name of the external diff command, or return NULL if
1154 ** no external diff command is defined.
1155 */
@@ -1270,11 +1328,12 @@
1328 ** --strip-trailing-cr Strip trailing CR
1329 ** --tcl Tcl-formatted output used internally by --tk
1330 ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
1331 ** --tk Launch a Tcl/Tk GUI for display
1332 ** --to VERSION Select VERSION as target for the diff
1333 ** --external-baseline DIR Use files under DIR as the baseline
1334 ** --undo Use the undo buffer as the baseline
1335 ** --unified Unified diff
1336 ** -v|--verbose Output complete text of added or deleted files
1337 ** -h|--versions Show compared versions in the diff header
1338 ** --webpage Format output as a stand-alone HTML webpage
1339 ** -W|--width N Width of lines in side-by-side diff
@@ -1284,10 +1343,11 @@
1343 int isGDiff; /* True for gdiff. False for normal diff */
1344 const char *zFrom; /* Source version number */
1345 const char *zTo; /* Target version number */
1346 const char *zCheckin; /* Check-in version number */
1347 const char *zBranch; /* Branch to diff */
1348 const char *zExBase; /* The --external-baseline option */
1349 int againstUndo = 0; /* Diff against files in the undo buffer */
1350 FileDirList *pFileDir = 0; /* Restrict the diff to these files */
1351 DiffConfig DCfg; /* Diff configuration object */
1352
1353 if( find_option("tk",0,0)!=0 || has_option("tclsh") ){
@@ -1297,12 +1357,17 @@
1357 isGDiff = g.argv[1][0]=='g';
1358 zFrom = find_option("from", "r", 1);
1359 zTo = find_option("to", 0, 1);
1360 zCheckin = find_option("checkin", "ci", 1);
1361 zBranch = find_option("branch", 0, 1);
1362 zExBase = find_option("external-baseline", 0, 1);
1363 againstUndo = find_option("undo",0,0)!=0;
1364 if( zExBase && (zFrom || zTo || zCheckin || zBranch || againstUndo) ){
1365 fossil_fatal("cannot use --external-baseline together with any of"
1366 " --from, --to, --checkin, --branch, or --undo");
1367 }
1368 if( againstUndo && (zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){
1369 fossil_fatal("cannot use --undo together with --from, --to, --checkin,"
1370 " or --branch");
1371 }
1372 if( zBranch ){
1373 if( zTo || zFrom || zCheckin ){
@@ -1309,11 +1374,11 @@
1374 fossil_fatal("cannot use --from, --to, or --checkin with --branch");
1375 }
1376 zTo = zBranch;
1377 zFrom = mprintf("root:%s", zBranch);
1378 }
1379 if( zCheckin!=0 && (zFrom!=0 || zTo!=0) ){
1380 fossil_fatal("cannot use --checkin together with --from or --to");
1381 }
1382 diff_options(&DCfg, isGDiff, 0);
1383 determine_exec_relative_option(1);
1384 if( 0==zCheckin ){
@@ -1357,18 +1422,20 @@
1422 if( zFrom==0 ){
1423 fossil_fatal("check-in %s has no parent", zTo);
1424 }
1425 }
1426 diff_begin(&DCfg);
1427 if( zExBase ){
1428 diff_externbase_to_checkout(zExBase, &DCfg, pFileDir);
1429 }else if( againstUndo ){
1430 if( db_lget_int("undo_available",0)==0 ){
1431 fossil_print("No undo or redo is available\n");
1432 return;
1433 }
1434 diff_undo_to_checkout(&DCfg, pFileDir);
1435 }else if( zTo==0 ){
1436 diff_version_to_checkout(zFrom, &DCfg, pFileDir, 0);
1437 }else{
1438 diff_two_versions(zFrom, zTo, &DCfg, pFileDir);
1439 }
1440 if( pFileDir ){
1441 int i;
1442

Keyboard Shortcuts

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