Fossil SCM
Change the --external-baseline option on "diff" and "ui" to be just --from. See [forum:forumpost/91ce9dd9f9afa7fe|forum thread 91ce9dd9f9afa7fe].
Commit
763758db16aec46573243e18a4a69d13cc96540382372a72a4d9b0d550ef5711
Parent
3807891e6278559…
2 files changed
+21
-12
+5
-5
+21
-12
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1282,10 +1282,14 @@ | ||
| 1282 | 1282 | ** option specifies the check-in from which the second version of the file |
| 1283 | 1283 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1284 | 1284 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1285 | 1285 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1286 | 1286 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1287 | +** | |
| 1288 | +** With the "--from VERSION" option, if VERSION is actually a directory name | |
| 1289 | +** (not a tag or check-in hash) then the files under that directory are used | |
| 1290 | +** as the baseline for the diff. | |
| 1287 | 1291 | ** |
| 1288 | 1292 | ** The "-i" command-line option forces the use of Fossil's own internal |
| 1289 | 1293 | ** diff logic rather than any external diff program that might be configured |
| 1290 | 1294 | ** using the "setting" command. If no external diff program is configured, |
| 1291 | 1295 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| @@ -1314,11 +1318,13 @@ | ||
| 1314 | 1318 | ** with negative N meaning show all content |
| 1315 | 1319 | ** --dark Use dark mode for the Tcl/Tk-based GUI and HTML |
| 1316 | 1320 | ** --diff-binary BOOL Include binary files with external commands |
| 1317 | 1321 | ** --exec-abs-paths Force absolute path names on external commands |
| 1318 | 1322 | ** --exec-rel-paths Force relative path names on external commands |
| 1319 | -** -r|--from VERSION Select VERSION as source for the diff | |
| 1323 | +** -r|--from VERSION Use VERSION as the baseline for the diff, or | |
| 1324 | +** if VERSION is a directory name, use files in | |
| 1325 | +** that directory as the baseline. | |
| 1320 | 1326 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1321 | 1327 | ** -i|--internal Use internal diff logic |
| 1322 | 1328 | ** --invert Invert the diff |
| 1323 | 1329 | ** --json Output formatted as JSON |
| 1324 | 1330 | ** -n|--linenum Show line numbers |
| @@ -1328,11 +1334,10 @@ | ||
| 1328 | 1334 | ** --strip-trailing-cr Strip trailing CR |
| 1329 | 1335 | ** --tcl Tcl-formatted output used internally by --tk |
| 1330 | 1336 | ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh") |
| 1331 | 1337 | ** --tk Launch a Tcl/Tk GUI for display |
| 1332 | 1338 | ** --to VERSION Select VERSION as target for the diff |
| 1333 | -** --external-baseline DIR Use files under DIR as the baseline | |
| 1334 | 1339 | ** --undo Use the undo buffer as the baseline |
| 1335 | 1340 | ** --unified Unified diff |
| 1336 | 1341 | ** -v|--verbose Output complete text of added or deleted files |
| 1337 | 1342 | ** -h|--versions Show compared versions in the diff header |
| 1338 | 1343 | ** --webpage Format output as a stand-alone HTML webpage |
| @@ -1343,14 +1348,14 @@ | ||
| 1343 | 1348 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 1344 | 1349 | const char *zFrom; /* Source version number */ |
| 1345 | 1350 | const char *zTo; /* Target version number */ |
| 1346 | 1351 | const char *zCheckin; /* Check-in version number */ |
| 1347 | 1352 | const char *zBranch; /* Branch to diff */ |
| 1348 | - const char *zExBase; /* The --external-baseline option */ | |
| 1349 | 1353 | int againstUndo = 0; /* Diff against files in the undo buffer */ |
| 1350 | 1354 | FileDirList *pFileDir = 0; /* Restrict the diff to these files */ |
| 1351 | 1355 | DiffConfig DCfg; /* Diff configuration object */ |
| 1356 | + int bFromIsDir = 0; /* True if zFrom is a directory name */ | |
| 1352 | 1357 | |
| 1353 | 1358 | if( find_option("tk",0,0)!=0 || has_option("tclsh") ){ |
| 1354 | 1359 | diff_tk("diff", 2); |
| 1355 | 1360 | return; |
| 1356 | 1361 | } |
| @@ -1357,16 +1362,11 @@ | ||
| 1357 | 1362 | isGDiff = g.argv[1][0]=='g'; |
| 1358 | 1363 | zFrom = find_option("from", "r", 1); |
| 1359 | 1364 | zTo = find_option("to", 0, 1); |
| 1360 | 1365 | zCheckin = find_option("checkin", "ci", 1); |
| 1361 | 1366 | zBranch = find_option("branch", 0, 1); |
| 1362 | - zExBase = find_option("external-baseline", 0, 1); | |
| 1363 | 1367 | 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 | 1368 | if( againstUndo && (zFrom!=0 || zTo!=0 || zCheckin!=0 || zBranch!=0) ){ |
| 1369 | 1369 | fossil_fatal("cannot use --undo together with --from, --to, --checkin," |
| 1370 | 1370 | " or --branch"); |
| 1371 | 1371 | } |
| 1372 | 1372 | if( zBranch ){ |
| @@ -1377,12 +1377,10 @@ | ||
| 1377 | 1377 | zFrom = mprintf("root:%s", zBranch); |
| 1378 | 1378 | } |
| 1379 | 1379 | if( zCheckin!=0 && (zFrom!=0 || zTo!=0) ){ |
| 1380 | 1380 | fossil_fatal("cannot use --checkin together with --from or --to"); |
| 1381 | 1381 | } |
| 1382 | - diff_options(&DCfg, isGDiff, 0); | |
| 1383 | - determine_exec_relative_option(1); | |
| 1384 | 1382 | if( 0==zCheckin ){ |
| 1385 | 1383 | if( zTo==0 || againstUndo ){ |
| 1386 | 1384 | db_must_be_within_tree(); |
| 1387 | 1385 | }else if( zFrom==0 ){ |
| 1388 | 1386 | fossil_fatal("must use --from if --to is present"); |
| @@ -1390,10 +1388,21 @@ | ||
| 1390 | 1388 | db_find_and_open_repository(0, 0); |
| 1391 | 1389 | } |
| 1392 | 1390 | }else{ |
| 1393 | 1391 | db_find_and_open_repository(0, 0); |
| 1394 | 1392 | } |
| 1393 | + determine_exec_relative_option(1); | |
| 1394 | + if( zFrom!=file_tail(zFrom) | |
| 1395 | + && file_isdir(zFrom, ExtFILE)==1 | |
| 1396 | + && !db_exists("SELECT 1 FROM tag WHERE tagname='sym-%q'", zFrom) | |
| 1397 | + ){ | |
| 1398 | + bFromIsDir = 1; | |
| 1399 | + if( zTo ){ | |
| 1400 | + fossil_fatal("cannot use --to together with \"--from PATH\""); | |
| 1401 | + } | |
| 1402 | + } | |
| 1403 | + diff_options(&DCfg, isGDiff, 0); | |
| 1395 | 1404 | verify_all_options(); |
| 1396 | 1405 | g.diffCnt[0] = g.diffCnt[1] = g.diffCnt[2] = 0; |
| 1397 | 1406 | if( g.argc>=3 ){ |
| 1398 | 1407 | int i; |
| 1399 | 1408 | Blob fname; |
| @@ -1422,12 +1431,12 @@ | ||
| 1422 | 1431 | if( zFrom==0 ){ |
| 1423 | 1432 | fossil_fatal("check-in %s has no parent", zTo); |
| 1424 | 1433 | } |
| 1425 | 1434 | } |
| 1426 | 1435 | diff_begin(&DCfg); |
| 1427 | - if( zExBase ){ | |
| 1428 | - diff_externbase_to_checkout(zExBase, &DCfg, pFileDir); | |
| 1436 | + if( bFromIsDir ){ | |
| 1437 | + diff_externbase_to_checkout(zFrom, &DCfg, pFileDir); | |
| 1429 | 1438 | }else if( againstUndo ){ |
| 1430 | 1439 | if( db_lget_int("undo_available",0)==0 ){ |
| 1431 | 1440 | fossil_print("No undo or redo is available\n"); |
| 1432 | 1441 | return; |
| 1433 | 1442 | } |
| 1434 | 1443 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1282,10 +1282,14 @@ | |
| 1282 | ** option specifies the check-in from which the second version of the file |
| 1283 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1284 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1285 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1286 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1287 | ** |
| 1288 | ** The "-i" command-line option forces the use of Fossil's own internal |
| 1289 | ** diff logic rather than any external diff program that might be configured |
| 1290 | ** using the "setting" command. If no external diff program is configured, |
| 1291 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| @@ -1314,11 +1318,13 @@ | |
| 1314 | ** with negative N meaning show all content |
| 1315 | ** --dark Use dark mode for the Tcl/Tk-based GUI and HTML |
| 1316 | ** --diff-binary BOOL Include binary files with external commands |
| 1317 | ** --exec-abs-paths Force absolute path names on external commands |
| 1318 | ** --exec-rel-paths Force relative path names on external commands |
| 1319 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1320 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1321 | ** -i|--internal Use internal diff logic |
| 1322 | ** --invert Invert the diff |
| 1323 | ** --json Output formatted as JSON |
| 1324 | ** -n|--linenum Show line numbers |
| @@ -1328,11 +1334,10 @@ | |
| 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 |
| @@ -1343,14 +1348,14 @@ | |
| 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") ){ |
| 1354 | diff_tk("diff", 2); |
| 1355 | return; |
| 1356 | } |
| @@ -1357,16 +1362,11 @@ | |
| 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 ){ |
| @@ -1377,12 +1377,10 @@ | |
| 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 ){ |
| 1385 | if( zTo==0 || againstUndo ){ |
| 1386 | db_must_be_within_tree(); |
| 1387 | }else if( zFrom==0 ){ |
| 1388 | fossil_fatal("must use --from if --to is present"); |
| @@ -1390,10 +1388,21 @@ | |
| 1390 | db_find_and_open_repository(0, 0); |
| 1391 | } |
| 1392 | }else{ |
| 1393 | db_find_and_open_repository(0, 0); |
| 1394 | } |
| 1395 | verify_all_options(); |
| 1396 | g.diffCnt[0] = g.diffCnt[1] = g.diffCnt[2] = 0; |
| 1397 | if( g.argc>=3 ){ |
| 1398 | int i; |
| 1399 | Blob fname; |
| @@ -1422,12 +1431,12 @@ | |
| 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 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1282,10 +1282,14 @@ | |
| 1282 | ** option specifies the check-in from which the second version of the file |
| 1283 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1284 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1285 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1286 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1287 | ** |
| 1288 | ** With the "--from VERSION" option, if VERSION is actually a directory name |
| 1289 | ** (not a tag or check-in hash) then the files under that directory are used |
| 1290 | ** as the baseline for the diff. |
| 1291 | ** |
| 1292 | ** The "-i" command-line option forces the use of Fossil's own internal |
| 1293 | ** diff logic rather than any external diff program that might be configured |
| 1294 | ** using the "setting" command. If no external diff program is configured, |
| 1295 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| @@ -1314,11 +1318,13 @@ | |
| 1318 | ** with negative N meaning show all content |
| 1319 | ** --dark Use dark mode for the Tcl/Tk-based GUI and HTML |
| 1320 | ** --diff-binary BOOL Include binary files with external commands |
| 1321 | ** --exec-abs-paths Force absolute path names on external commands |
| 1322 | ** --exec-rel-paths Force relative path names on external commands |
| 1323 | ** -r|--from VERSION Use VERSION as the baseline for the diff, or |
| 1324 | ** if VERSION is a directory name, use files in |
| 1325 | ** that directory as the baseline. |
| 1326 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1327 | ** -i|--internal Use internal diff logic |
| 1328 | ** --invert Invert the diff |
| 1329 | ** --json Output formatted as JSON |
| 1330 | ** -n|--linenum Show line numbers |
| @@ -1328,11 +1334,10 @@ | |
| 1334 | ** --strip-trailing-cr Strip trailing CR |
| 1335 | ** --tcl Tcl-formatted output used internally by --tk |
| 1336 | ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh") |
| 1337 | ** --tk Launch a Tcl/Tk GUI for display |
| 1338 | ** --to VERSION Select VERSION as target for the diff |
| 1339 | ** --undo Use the undo buffer as the baseline |
| 1340 | ** --unified Unified diff |
| 1341 | ** -v|--verbose Output complete text of added or deleted files |
| 1342 | ** -h|--versions Show compared versions in the diff header |
| 1343 | ** --webpage Format output as a stand-alone HTML webpage |
| @@ -1343,14 +1348,14 @@ | |
| 1348 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 1349 | const char *zFrom; /* Source version number */ |
| 1350 | const char *zTo; /* Target version number */ |
| 1351 | const char *zCheckin; /* Check-in version number */ |
| 1352 | const char *zBranch; /* Branch to diff */ |
| 1353 | int againstUndo = 0; /* Diff against files in the undo buffer */ |
| 1354 | FileDirList *pFileDir = 0; /* Restrict the diff to these files */ |
| 1355 | DiffConfig DCfg; /* Diff configuration object */ |
| 1356 | int bFromIsDir = 0; /* True if zFrom is a directory name */ |
| 1357 | |
| 1358 | if( find_option("tk",0,0)!=0 || has_option("tclsh") ){ |
| 1359 | diff_tk("diff", 2); |
| 1360 | return; |
| 1361 | } |
| @@ -1357,16 +1362,11 @@ | |
| 1362 | isGDiff = g.argv[1][0]=='g'; |
| 1363 | zFrom = find_option("from", "r", 1); |
| 1364 | zTo = find_option("to", 0, 1); |
| 1365 | zCheckin = find_option("checkin", "ci", 1); |
| 1366 | zBranch = find_option("branch", 0, 1); |
| 1367 | againstUndo = find_option("undo",0,0)!=0; |
| 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 ){ |
| @@ -1377,12 +1377,10 @@ | |
| 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 | if( 0==zCheckin ){ |
| 1383 | if( zTo==0 || againstUndo ){ |
| 1384 | db_must_be_within_tree(); |
| 1385 | }else if( zFrom==0 ){ |
| 1386 | fossil_fatal("must use --from if --to is present"); |
| @@ -1390,10 +1388,21 @@ | |
| 1388 | db_find_and_open_repository(0, 0); |
| 1389 | } |
| 1390 | }else{ |
| 1391 | db_find_and_open_repository(0, 0); |
| 1392 | } |
| 1393 | determine_exec_relative_option(1); |
| 1394 | if( zFrom!=file_tail(zFrom) |
| 1395 | && file_isdir(zFrom, ExtFILE)==1 |
| 1396 | && !db_exists("SELECT 1 FROM tag WHERE tagname='sym-%q'", zFrom) |
| 1397 | ){ |
| 1398 | bFromIsDir = 1; |
| 1399 | if( zTo ){ |
| 1400 | fossil_fatal("cannot use --to together with \"--from PATH\""); |
| 1401 | } |
| 1402 | } |
| 1403 | diff_options(&DCfg, isGDiff, 0); |
| 1404 | verify_all_options(); |
| 1405 | g.diffCnt[0] = g.diffCnt[1] = g.diffCnt[2] = 0; |
| 1406 | if( g.argc>=3 ){ |
| 1407 | int i; |
| 1408 | Blob fname; |
| @@ -1422,12 +1431,12 @@ | |
| 1431 | if( zFrom==0 ){ |
| 1432 | fossil_fatal("check-in %s has no parent", zTo); |
| 1433 | } |
| 1434 | } |
| 1435 | diff_begin(&DCfg); |
| 1436 | if( bFromIsDir ){ |
| 1437 | diff_externbase_to_checkout(zFrom, &DCfg, pFileDir); |
| 1438 | }else if( againstUndo ){ |
| 1439 | if( db_lget_int("undo_available",0)==0 ){ |
| 1440 | fossil_print("No undo or redo is available\n"); |
| 1441 | return; |
| 1442 | } |
| 1443 |
+5
-5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -3175,14 +3175,14 @@ | ||
| 3175 | 3175 | ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were |
| 3176 | 3176 | ** /doc/ckout/... |
| 3177 | 3177 | ** --create Create a new REPOSITORY if it does not already exist |
| 3178 | 3178 | ** --errorlog FILE Append HTTP error messages to FILE |
| 3179 | 3179 | ** --extroot DIR Document root for the /ext extension mechanism |
| 3180 | -** --external-baseline DIR External baseline for the initial /ckout page. | |
| 3181 | 3180 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 3182 | 3181 | ** --fossilcmd PATH The pathname of the "fossil" executable on the remote |
| 3183 | 3182 | ** system when REPOSITORY is remote. |
| 3183 | +** --from PATH Use PATH as the diff baseline for the /ckout page | |
| 3184 | 3184 | ** --localauth Enable automatic login for requests from localhost |
| 3185 | 3185 | ** --localhost Listen on 127.0.0.1 only (always true for "ui") |
| 3186 | 3186 | ** --https Indicates that the input is coming through a reverse |
| 3187 | 3187 | ** proxy that has already translated HTTPS into HTTP. |
| 3188 | 3188 | ** --jsmode MODE Determine how JavaScript is delivered with pages. |
| @@ -3251,11 +3251,11 @@ | ||
| 3251 | 3251 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 3252 | 3252 | int findServerArg = 2; /* argv index for find_server_repository() */ |
| 3253 | 3253 | char *zRemote = 0; /* Remote host on which to run "fossil ui" */ |
| 3254 | 3254 | const char *zJsMode; /* The --jsmode parameter */ |
| 3255 | 3255 | const char *zFossilCmd =0; /* Name of "fossil" binary on remote system */ |
| 3256 | - const char *zExBase; /* Value for --external-baseline */ | |
| 3256 | + const char *zFrom; /* Value for --from */ | |
| 3257 | 3257 | |
| 3258 | 3258 | |
| 3259 | 3259 | #if USE_SEE |
| 3260 | 3260 | db_setup_for_saved_encryption_key(); |
| 3261 | 3261 | #endif |
| @@ -3288,16 +3288,16 @@ | ||
| 3288 | 3288 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 3289 | 3289 | Th_InitTraceLog(); |
| 3290 | 3290 | zPort = find_option("port", "P", 1); |
| 3291 | 3291 | isUiCmd = g.argv[1][0]=='u'; |
| 3292 | 3292 | if( isUiCmd ){ |
| 3293 | - zExBase = find_option("external-baseline", 0, 1); | |
| 3293 | + zFrom = find_option("from", 0, 1); | |
| 3294 | 3294 | zInitPage = find_option("page", "p", 1); |
| 3295 | 3295 | if( zInitPage && zInitPage[0]=='/' ) zInitPage++; |
| 3296 | 3296 | zFossilCmd = find_option("fossilcmd", 0, 1); |
| 3297 | - if( zExBase && zInitPage==0 ){ | |
| 3298 | - zInitPage = mprintf("ckout?exbase=%T", zExBase); | |
| 3297 | + if( zFrom && zInitPage==0 ){ | |
| 3298 | + zInitPage = mprintf("ckout?exbase=%T", zFrom); | |
| 3299 | 3299 | } |
| 3300 | 3300 | } |
| 3301 | 3301 | zNotFound = find_option("notfound", 0, 1); |
| 3302 | 3302 | allowRepoList = find_option("repolist",0,0)!=0; |
| 3303 | 3303 | if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1; |
| 3304 | 3304 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3175,14 +3175,14 @@ | |
| 3175 | ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were |
| 3176 | ** /doc/ckout/... |
| 3177 | ** --create Create a new REPOSITORY if it does not already exist |
| 3178 | ** --errorlog FILE Append HTTP error messages to FILE |
| 3179 | ** --extroot DIR Document root for the /ext extension mechanism |
| 3180 | ** --external-baseline DIR External baseline for the initial /ckout page. |
| 3181 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 3182 | ** --fossilcmd PATH The pathname of the "fossil" executable on the remote |
| 3183 | ** system when REPOSITORY is remote. |
| 3184 | ** --localauth Enable automatic login for requests from localhost |
| 3185 | ** --localhost Listen on 127.0.0.1 only (always true for "ui") |
| 3186 | ** --https Indicates that the input is coming through a reverse |
| 3187 | ** proxy that has already translated HTTPS into HTTP. |
| 3188 | ** --jsmode MODE Determine how JavaScript is delivered with pages. |
| @@ -3251,11 +3251,11 @@ | |
| 3251 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 3252 | int findServerArg = 2; /* argv index for find_server_repository() */ |
| 3253 | char *zRemote = 0; /* Remote host on which to run "fossil ui" */ |
| 3254 | const char *zJsMode; /* The --jsmode parameter */ |
| 3255 | const char *zFossilCmd =0; /* Name of "fossil" binary on remote system */ |
| 3256 | const char *zExBase; /* Value for --external-baseline */ |
| 3257 | |
| 3258 | |
| 3259 | #if USE_SEE |
| 3260 | db_setup_for_saved_encryption_key(); |
| 3261 | #endif |
| @@ -3288,16 +3288,16 @@ | |
| 3288 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 3289 | Th_InitTraceLog(); |
| 3290 | zPort = find_option("port", "P", 1); |
| 3291 | isUiCmd = g.argv[1][0]=='u'; |
| 3292 | if( isUiCmd ){ |
| 3293 | zExBase = find_option("external-baseline", 0, 1); |
| 3294 | zInitPage = find_option("page", "p", 1); |
| 3295 | if( zInitPage && zInitPage[0]=='/' ) zInitPage++; |
| 3296 | zFossilCmd = find_option("fossilcmd", 0, 1); |
| 3297 | if( zExBase && zInitPage==0 ){ |
| 3298 | zInitPage = mprintf("ckout?exbase=%T", zExBase); |
| 3299 | } |
| 3300 | } |
| 3301 | zNotFound = find_option("notfound", 0, 1); |
| 3302 | allowRepoList = find_option("repolist",0,0)!=0; |
| 3303 | if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1; |
| 3304 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -3175,14 +3175,14 @@ | |
| 3175 | ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were |
| 3176 | ** /doc/ckout/... |
| 3177 | ** --create Create a new REPOSITORY if it does not already exist |
| 3178 | ** --errorlog FILE Append HTTP error messages to FILE |
| 3179 | ** --extroot DIR Document root for the /ext extension mechanism |
| 3180 | ** --files GLOBLIST Comma-separated list of glob patterns for static files |
| 3181 | ** --fossilcmd PATH The pathname of the "fossil" executable on the remote |
| 3182 | ** system when REPOSITORY is remote. |
| 3183 | ** --from PATH Use PATH as the diff baseline for the /ckout page |
| 3184 | ** --localauth Enable automatic login for requests from localhost |
| 3185 | ** --localhost Listen on 127.0.0.1 only (always true for "ui") |
| 3186 | ** --https Indicates that the input is coming through a reverse |
| 3187 | ** proxy that has already translated HTTPS into HTTP. |
| 3188 | ** --jsmode MODE Determine how JavaScript is delivered with pages. |
| @@ -3251,11 +3251,11 @@ | |
| 3251 | const char *zInitPage = 0; /* Start on this page. --page option */ |
| 3252 | int findServerArg = 2; /* argv index for find_server_repository() */ |
| 3253 | char *zRemote = 0; /* Remote host on which to run "fossil ui" */ |
| 3254 | const char *zJsMode; /* The --jsmode parameter */ |
| 3255 | const char *zFossilCmd =0; /* Name of "fossil" binary on remote system */ |
| 3256 | const char *zFrom; /* Value for --from */ |
| 3257 | |
| 3258 | |
| 3259 | #if USE_SEE |
| 3260 | db_setup_for_saved_encryption_key(); |
| 3261 | #endif |
| @@ -3288,16 +3288,16 @@ | |
| 3288 | g.useLocalauth = find_option("localauth", 0, 0)!=0; |
| 3289 | Th_InitTraceLog(); |
| 3290 | zPort = find_option("port", "P", 1); |
| 3291 | isUiCmd = g.argv[1][0]=='u'; |
| 3292 | if( isUiCmd ){ |
| 3293 | zFrom = find_option("from", 0, 1); |
| 3294 | zInitPage = find_option("page", "p", 1); |
| 3295 | if( zInitPage && zInitPage[0]=='/' ) zInitPage++; |
| 3296 | zFossilCmd = find_option("fossilcmd", 0, 1); |
| 3297 | if( zFrom && zInitPage==0 ){ |
| 3298 | zInitPage = mprintf("ckout?exbase=%T", zFrom); |
| 3299 | } |
| 3300 | } |
| 3301 | zNotFound = find_option("notfound", 0, 1); |
| 3302 | allowRepoList = find_option("repolist",0,0)!=0; |
| 3303 | if( find_option("nocompress",0,0)!=0 ) g.fNoHttpCompress = 1; |
| 3304 |