Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch arjen-doc-updates Through [7df226540d] Excluding Merge-Ins
This is equivalent to a diff from a257fde3ba to 7df226540d
|
2011-05-24
| ||
| 12:00 | Merge the latest trunk changes into the arjen-doc-updates branch. ... (check-in: 5d4ef37a9d user: drh tags: arjen-doc-updates) | |
| 07:27 | Extended the online help for the commit, close, configure, clone and checkout commands ... (check-in: 7df226540d user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-26
| ||
| 06:37 | Online help for several commands edited - as found in allrepo.c, bisect.c, branch.c and checkin.c. Note: "commit" still to be edited ... (check-in: e66fe70c7f user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-13
| ||
| 11:35 | Update test cases for file_simplify_name(). ... (check-in: 553f0a973a user: drh tags: trunk) | |
| 10:23 | Online help for the first few commands edited - to help with very long explanations, the command is summarised at the end for those who just want to check the precise options ... (check-in: 1f851f8467 user: Arjen Markus tags: arjen-doc-updates) | |
|
2011-04-12
| ||
| 23:41 | Merge support for login-groups and single sign-on into the trunk. ... (check-in: a257fde3ba user: drh tags: trunk) | |
| 23:37 | Fix a bug in single sign-on. Add comments to the login source code. ... (Closed-Leaf check-in: 9df4dcb5e1 user: drh tags: login-groups) | |
| 02:25 | Update the built-in SQLite version to the 3.7.6 release. ... (check-in: 4dde79b9e6 user: drh tags: trunk) | |
Changes to BUILD.txt.
1 2 3 4 5 6 7 8 9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | - + + + + + + + + - + - + | All of the source code for fossil is contained in the src/ subdirectory. But there is a lot of generated code, so you will probably want to use the Makefile. To do a complete build on unix, just type: make On a windows box, use one of the Makefiles in the win/ subdirectory, according to your compiler and environment. For example: |
Changes to src/add.c.
| ︙ | |||
210 211 212 213 214 215 216 | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | - + - - + + - - - + + + + - - + + + + + + + |
db_finalize(&q);
db_multi_exec("DELETE FROM sfile");
}
/*
** COMMAND: add
**
|
| ︙ | |||
338 339 340 341 342 343 344 | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | - - + + - + - + + + + | blob_reset(&path); } /* ** COMMAND: rm ** COMMAND: delete ** |
| ︙ | |||
380 381 382 383 384 385 386 | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | - + - + + + + + | /* ** COMMAND: addremove ** ** Usage: %fossil addremove ?--dotfiles? ?--ignore GLOBPATTERN? ?--test? ** ** Do all necessary "add" and "rm" commands to synchronize the repository |
| ︙ | |||
434 435 436 437 438 439 440 | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | - + - + |
/* now we read the complete file structure into a temp table */
vfile_scan(0, &path, blob_size(&path), allFlag);
if( file_tree_name(g.zRepositoryName, &repo, 0) ){
db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
}
/* step 1: search for extra files */
|
| ︙ | |||
497 498 499 500 501 502 503 | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | - + + - + + + + + | /* ** COMMAND: mv ** COMMAND: rename ** ** Usage: %fossil mv|rename OLDNAME NEWNAME ** or: %fossil mv|rename OLDNAME... DIR ** |
| ︙ |
Changes to src/allrepo.c.
| ︙ | |||
52 53 54 55 56 57 58 59 60 61 62 63 64 65 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | + + + | ** COMMAND: all ** ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) ** ** The ~/.fossil file records the location of all repositories for a ** user. This command performs certain operations on all repositories ** that can be useful before or after a period of disconnected operation. ** ** The rebuild subcommand is especially useful if the repositories were built ** with an older version of fossil. ** ** On Win32 systems, the file is named "_fossil" and is located in ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%. ** ** Available operations are: ** ** ignore Arguments are repositories that should be ignored |
| ︙ | |||
75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | + + + + + - + |
**
** sync Run a "sync" on all repositories
**
** Respositories are automatically added to the set of known repositories
** when one of the following commands against the repository: clone, info,
** pull, push, or sync. Even previously ignored repositories are added back
** to the list of repositories by these commands.
**
**
** SUMMARY: fossil all subcommand|subcommand repository1 ?repository2 ...?
** Subcommands: list, ls, pull push, rebuild or sync
** Or: ignore repository1 ...
*/
void all_cmd(void){
int n;
Stmt q;
const char *zCmd;
char *zSyscmd;
char *zFossil;
char *zQFilename;
int nMissing;
int stopOnError = find_option("dontstop",0,0)==0;
int rc;
|
| ︙ | |||
148 149 150 151 152 153 154 | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | - + |
free(zSyscmd);
free(zQFilename);
if( stopOnError && rc ){
nMissing = 0;
break;
}
}
|
| ︙ |
Changes to src/bisect.c.
| ︙ | |||
89 90 91 92 93 94 95 | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | - + + + | } /* ** COMMAND: bisect ** ** Usage: %fossil bisect SUBCOMMAND ... ** |
| ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | + + + + + |
**
** Reinitialize a bisect session. This cancels prior bisect history
** and allows a bisect session to start over from the beginning.
**
** fossil bisect vlist
**
** List the versions in between "bad" and "good".
**
** SUMMARY: fossil bisect subcommand ...
** Subcommands: bad, good ?VERSION?
** Or: next, reset, vlist
** Or: options ?NAME? ?VALUE?
*/
void bisect_cmd(void){
int n;
const char *zCmd;
db_must_be_within_tree();
if( g.argc<3 ){
usage("bisect SUBCOMMAND ARGS...");
|
| ︙ |
Changes to src/branch.c.
| ︙ | |||
38 39 40 41 42 43 44 | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | - + - + - + | const char *zColor; /* Color of the new branch */ Blob branch; /* manifest for the new branch */ Manifest *pParent; /* Parsed parent manifest */ Blob mcksum; /* Self-checksum on the manifest */ const char *zDateOvrd; /* Override date string */ const char *zUserOvrd; /* Override user name */ int isPrivate = 0; /* True if the branch should be private */ |
| ︙ | |||
130 131 132 133 134 135 136 | 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | - + |
" ORDER BY tagname",
rootid);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(&branch, "T -%F *\n", zTag);
}
db_finalize(&q);
|
| ︙ | |||
170 171 172 173 174 175 176 | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | - + |
fossil_nameofexe(), zBranch
);
}
/* Commit */
db_end_transaction(0);
|
| ︙ | |||
194 195 196 197 198 199 200 201 202 203 204 205 206 207 | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | + + + + + |
** --private option makes the branch private.
**
** %fossil branch list
** %fossil branch ls
**
** List all branches
**
**
** SUMMARY: fossil branch subcommand ...
** Subcommands: new branchname basis ?-R|-repository file? ?--bgcolor color?
** ?--private?
** Or: list, ls
*/
void branch_cmd(void){
int n;
const char *zCmd = "list";
db_find_and_open_repository(0, 0);
if( g.argc<2 ){
usage("new|list|ls ...");
|
| ︙ | |||
320 321 322 323 324 325 326 | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | - + |
** This routine is called while for each check-in that is rendered by
** the timeline of a "brlist" page. Add some additional hyperlinks
** to the end of the line.
*/
static void brtimeline_extra(int rid){
Stmt q;
if( !g.okHistory ) return;
|
| ︙ |
Changes to src/checkin.c.
| ︙ | |||
35 36 37 38 39 40 41 | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | - + |
Blob *report, /* Append the status report here */
const char *zPrefix, /* Prefix on each line of the report */
int missingIsFatal /* MISSING and NOT_A_FILE are fatal errors */
){
Stmt q;
int nPrefix = strlen(zPrefix);
int nErr = 0;
|
| ︙ | |||
105 106 107 108 109 110 111 112 113 114 115 116 117 118 | 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | + + + |
** Report on the edit status of all files in the current checkout.
** See also the "status" and "extra" commands.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
**
**
** SUMMARY: fossil changes ?--sha1sum?
*/
void changes_cmd(void){
Blob report;
int vid;
int useSha1sum = find_option("sha1sum", 0, 0)!=0;
db_must_be_within_tree();
blob_zero(&report);
|
| ︙ | |||
129 130 131 132 133 134 135 136 137 138 139 140 141 142 | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | + + + |
**
** Report on the status of the current checkout.
**
** Options:
**
** --sha1sum Verify file status using SHA1 hashing rather
** than relying on file mtimes.
**
**
** SUMMARY: fossil status ?--sha1sum?
*/
void status_cmd(void){
int vid;
db_must_be_within_tree();
/* 012345678901234 */
printf("repository: %s\n", db_lget("repository",""));
printf("local-root: %s\n", g.zLocalRoot);
|
| ︙ | |||
151 152 153 154 155 156 157 158 159 160 161 162 163 164 | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | + + + |
/*
** COMMAND: ls
**
** Usage: %fossil ls [-l]
**
** Show the names of all files in the current checkout. The -l provides
** extra information about each file.
**
**
** SUMMARY: fossil ls ?-l?
*/
void ls_cmd(void){
int vid;
Stmt q;
int isBrief;
isBrief = find_option("l","l", 0)==0;
|
| ︙ | |||
255 256 257 258 259 260 261 | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 | - + - + + + + + - + | } } /* ** COMMAND: extras ** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN? ** |
| ︙ | |||
306 307 308 309 310 311 312 | 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 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 | + + - + - + - + + + + + - + | /* ** COMMAND: clean ** Usage: %fossil clean ?--force? ?--dotfiles? ?--ignore GLOBPATTERN? ** ** Delete all "extra" files in the source tree. "Extra" files are ** files that are not officially part of the checkout. See also ** the "extras" command. ** |
| ︙ | |||
515 516 517 518 519 520 521 | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 | - + - + |
}
g.aCommitFile[ii-2] = 0;
}
}
/*
** Return true if the check-in with RID=rid is a leaf.
|
| ︙ | |||
557 558 559 560 561 562 563 | 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 | - + |
" Use -f to override.", zUuid, zDate);
}
#endif
}
/*
** zDate should be a valid date string. Convert this string into the
|
| ︙ | |||
639 640 641 642 643 644 645 | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 | - + |
int isexe = db_column_int(&q, 4);
int isSelected = db_column_int(&q, 5);
const char *zPerm;
int cmp;
#if !defined(_WIN32)
/* For unix, extract the "executable" permission bit directly from
** the filesystem. On windows, the "executable" bit is retained
|
| ︙ | |||
731 732 733 734 735 736 737 | 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 | - + |
" ORDER BY tagname",
vid, zBranch);
while( db_step(&q)==SQLITE_ROW ){
const char *zTag = db_column_text(&q, 0);
blob_appendf(pOut, "T -%F *\n", zTag);
}
db_finalize(&q);
|
| ︙ | |||
774 775 776 777 778 779 780 | 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 | - + |
if( lastNl>1000 ) return; /* Binary if any line longer than 1000 */
}
}
if( nCrNl ){
char c;
file_relative_name(zFilename, &fname);
blob_zero(&ans);
|
| ︙ | |||
798 799 800 801 802 803 804 | 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 | - + | ** COMMAND: ci ** COMMAND: commit ** ** Usage: %fossil commit ?OPTIONS? ?FILE...? ** ** Create a new version containing all of the changes in the current ** checkout. You will be prompted to enter a check-in comment unless |
| ︙ | |||
820 821 822 823 824 825 826 | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 | - + + + + + + + + + + + - + | ** option appears. A check-in is not allowed against a closed check-in. ** ** The --private option creates a private check-in that is never synced. ** Children of private check-ins are automatically private. ** ** the --tag option applies the symbolic tag name to the check-in. ** |
| ︙ | |||
864 865 866 867 868 869 870 | 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | - + | const char *zTag; /* Symbolic tag to apply to this check-in */ Blob manifest; /* Manifest in baseline form */ Blob muuid; /* Manifest uuid */ Blob cksum1, cksum2; /* Before and after commit checksums */ Blob cksum1b; /* Checksum recorded in the manifest */ int szD; /* Size of the delta manifest */ int szB; /* Size of the baseline manifest */ |
| ︙ | |||
958 959 960 961 962 963 964 | 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 | - + - + - + |
user_select();
/*
** Check that the user exists.
*/
if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
fossil_fatal("no such user: %s", g.zLogin);
}
|
| ︙ | |||
1024 1025 1026 1027 1028 1029 1030 | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 | - + |
}
}else{
db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
db_end_transaction(0);
db_begin_transaction();
}
|
| ︙ | |||
1126 1127 1128 1129 1130 1131 1132 | 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 | - + |
prompt_user("unable to sign manifest. continue (y/N)? ", &ans);
if( blob_str(&ans)[0]!='y' ){
fossil_exit(1);
}
}
/* If the --test option is specified, output the manifest file
|
| ︙ | |||
1158 1159 1160 1161 1162 1163 1164 | 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 | - + |
blob_zero(&muuid);
blob_appendf(&muuid, "%s\n", zUuid);
blob_write_to_file(&muuid, zManifestFile);
free(zManifestFile);
blob_reset(&muuid);
}
|
| ︙ | |||
1182 1183 1184 1185 1186 1187 1188 | 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 | - + - + - + |
vfile_aggregate_checksum_repository(nvid, &cksum2);
if( blob_compare(&cksum1, &cksum2) ){
vfile_compare_repository_to_disk(nvid);
fossil_fatal("working checkout does not match what would have ended "
"up in the repository: %b versus %b",
&cksum1, &cksum2);
}
|
Changes to src/checkout.c.
| ︙ | |||
164 165 166 167 168 169 170 | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 | - + + + + - + |
}
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
unlink(zManFile);
free(zManFile);
}
}
|
| ︙ | |||
278 279 280 281 282 283 284 | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | - + + + | /* ** COMMAND: close ** ** Usage: %fossil close ?-f|--force? ** ** The opposite of "open". Close the current database connection. |
Changes to src/clone.c.
| ︙ | |||
25 26 27 28 29 30 31 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | - + + - - + | /* ** COMMAND: clone ** ** Usage: %fossil clone ?OPTIONS? URL FILENAME ** ** Make a clone of a repository specified by URL in the local |
| ︙ |
Changes to src/configure.c.
| ︙ | |||
55 56 57 58 59 60 61 | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | - + |
{ "user", CONFIGSET_USER, "Users and privilege settings" },
{ "all", CONFIGSET_ALL, "All of the above" },
};
/*
** The following is a list of settings that we are willing to
|
| ︙ | |||
145 146 147 148 149 150 151 | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | - + - + - + |
** evaluated will populate the corresponding table with data.
*/
void configure_render_special_name(const char *zName, Blob *pOut){
Stmt q;
if( fossil_strcmp(zName, "@shun")==0 ){
db_prepare(&q, "SELECT uuid FROM shun");
while( db_step(&q)==SQLITE_ROW ){
|
| ︙ | |||
257 258 259 260 261 262 263 | 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | - + |
@ info TEXT, -- contact information
@ photo BLOB -- JPEG image of this user
@ );
@ INSERT INTO _xfer_reportfmt SELECT * FROM reportfmt;
@ INSERT INTO _xfer_user SELECT * FROM user;
;
db_multi_exec(zSQL1);
|
| ︙ | |||
337 338 339 340 341 342 343 | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | - + - + - + |
int mask, /* Mask indicating which configuration to export */
const char *zMask, /* Name of the configuration */
const char *zFilename /* Write into this file */
){
int i;
Blob out;
blob_zero(&out);
|
| ︙ | |||
393 394 395 396 397 398 399 | 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | - + + + + + + + + + + + + + + + + + - + | ** the current configuration. Existing values take priority over ** values read from FILENAME. ** ** %fossil configuration pull AREA ?URL? ** ** Pull and install the configuration from a different server ** identified by URL. If no URL is specified, then the default |
| ︙ | |||
472 473 474 475 476 477 478 | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | - + |
}
}else
if( strncmp(zMethod, "reset", n)==0 ){
int mask, i;
char *zBackup;
if( g.argc!=4 ) usage("reset AREA");
mask = find_area(g.argv[3]);
|
| ︙ | |||
494 495 496 497 498 499 500 | 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | - + |
db_multi_exec("DELETE FROM shun");
}else if( fossil_strcmp(zName,"@reportfmt")==0 ){
db_multi_exec("DELETE FROM reportfmt");
}
}
db_end_transaction(0);
printf("Configuration reset to factory defaults.\n");
|
Changes to src/merge.c.
| ︙ | |||
24 25 26 27 28 29 30 | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - - - + + + | /* ** COMMAND: merge ** ** Usage: %fossil merge [--cherrypick] [--backout] VERSION ** |
| ︙ | |||
281 282 283 284 285 286 287 | 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 | - + |
db_multi_exec("UPDATE fv SET idm=0 WHERE idm=%d", idm);
}
db_finalize(&q);
/*
** Add to V files that are not in V or P but are in M
*/
|
| ︙ | |||
305 306 307 308 309 310 311 | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 | - + - + |
printf("ADDED %s\n", zName);
if( !nochangeFlag ){
undo_save(zName);
vfile_to_disk(0, idm, 0, 0);
}
}
db_finalize(&q);
|
| ︙ | |||
455 456 457 458 459 460 461 | 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | - + |
/* Report on conflicts
*/
if( nConflict && !nochangeFlag ){
printf("WARNING: merge conflicts - see messages above for details.\n");
}
|