Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Extended the online help for the commit, close, configure, clone and checkout commands |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | arjen-doc-updates |
Files: | files | file ages | folders |
SHA1: |
7df226540de76325323251311d3730cf |
User & Date: | Arjen Markus 2011-05-24 07:27:46.896 |
Context
2011-05-24
| ||
12:00 | Merge the latest trunk changes into the arjen-doc-updates branch. ... (check-in: 5d4ef37a user: drh tags: arjen-doc-updates) | |
07:27 | Extended the online help for the commit, close, configure, clone and checkout commands ... (check-in: 7df22654 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: e66fe70c user: Arjen Markus tags: arjen-doc-updates) | |
Changes
Changes to src/checkin.c.
︙ | ︙ | |||
839 840 841 842 843 844 845 | ** 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. ** | | > > > > > > > > > > | 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 | ** 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. ** ** Notes: ** - If you commit without the --branch option, the last branch (or the ** trunk) will be used. ** - If you do not specify a commit message or an empty message, the commit ** will be aborted. ** - fossil prefers text files in the UNIX format (line-endings only "LF"). ** If it encounters text files in the Windows format (CRLF), it will ** warn about that. ** (File that are considered binary are stored as-is) ** ** SUMMARY: fossil commit ?OPTIONS? ?FILE...? ** Options: ** --comment|-m COMMENT-TEXT ** --message-file|-M COMMENT-FILE ** --branch NEW-BRANCH-NAME ** --bgcolor COLOR ** --nosign ** --force|-f ** --private |
︙ | ︙ |
Changes to src/checkout.c.
︙ | ︙ | |||
164 165 166 167 168 169 170 | } if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){ zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); unlink(zManFile); free(zManFile); } } | | > > > | | 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); } } } /* ** COMMAND: checkout ** COMMAND: co ** ** Usage: %fossil checkout VERSION ?-f|--force? ?--keep? ** ** Check out a version specified on the command-line. This command ** will abort if there are edited files in the current checkout unless ** the --force option appears on the command-line. The --keep option ** leaves files on disk unchanged, except the manifest and manifest.uuid ** files. ** ** The --latest flag can be used in place of VERSION to checkout the ** latest version in the repository. ** ** See also the "update" command. ** ** SUMMARY: fossil checkout VERSION ?-f|--force? ?--keep? ** Note: VERSION can also be --latest */ void checkout_cmd(void){ int forceFlag; /* Force checkout even if edits exist */ int keepFlag; /* Do not change any files on disk */ int latestFlag; /* Checkout the latest version */ char *zVers; /* Version to checkout */ int promptFlag; /* True to prompt before overwriting */ int vid, prior; Blob cksum1, cksum1b, cksum2; db_must_be_within_tree(); db_begin_transaction(); forceFlag = find_option("force","f",0)!=0; keepFlag = find_option("keep",0,0)!=0; latestFlag = find_option("latest",0,0)!=0; promptFlag = find_option("prompt",0,0)!=0; /* Prompt user before overwrite */ if( (latestFlag!=0 && g.argc!=2) || (latestFlag==0 && g.argc!=3) ){ |
︙ | ︙ | |||
278 279 280 281 282 283 284 | /* ** COMMAND: close ** ** Usage: %fossil close ?-f|--force? ** ** The opposite of "open". Close the current database connection. | | > > | 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. ** Require a -f or --force flag if there are unsaved changes in the ** current check-out. ** ** SUMMARY: fossil close ?-f|--force? */ void close_cmd(void){ int forceFlag = find_option("force","f",0)!=0; db_must_be_within_tree(); if( !forceFlag && unsaved_changes()==1 ){ fossil_fatal("there are unsaved changes in the current checkout"); } unlink_local_database(1); db_close(1); unlink_local_database(0); } |
Changes to src/clone.c.
︙ | ︙ | |||
25 26 27 28 29 30 31 | /* ** COMMAND: clone ** ** Usage: %fossil clone ?OPTIONS? URL FILENAME ** ** Make a clone of a repository specified by URL in the local | | > < | | 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 ** file named FILENAME. ** ** By default, your current login name is used to create the default ** admin user. This can be overridden using the -A|--admin-user ** parameter. ** ** SUMMARY: fossil clone ?OPTIONS? URL FILENAME ** Options: ** --admin-user|-A USERNAME Make USERNAME the administrator ** --private Also clone private branches ** */ void clone_cmd(void){ char *zPassword; const char *zDefaultUser; /* Optional name of the default user */ int nErr = 0; int bPrivate; /* Also clone private branches */ |
︙ | ︙ |
Changes to src/configure.c.
︙ | ︙ | |||
55 56 57 58 59 60 61 | { "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 | | | 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 ** transfer. ** ** Setting names that begin with an alphabetic characters refer to ** single entries in the CONFIG table. Setting names that begin with ** "@" are for special processing. */ static struct { const char *zName; /* Name of the configuration parameter */ |
︙ | ︙ | |||
145 146 147 148 149 150 151 | ** 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 ){ | | | | | 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 ){ blob_appendf(pOut, "INSERT OR IGNORE INTO shun VALUES('%s');\n", db_column_text(&q, 0) ); } db_finalize(&q); }else if( fossil_strcmp(zName, "@reportfmt")==0 ){ db_prepare(&q, "SELECT title, cols, sqlcode FROM reportfmt"); while( db_step(&q)==SQLITE_ROW ){ blob_appendf(pOut, "INSERT INTO _xfer_reportfmt(title,cols,sqlcode)" " VALUES(%Q,%Q,%Q);\n", db_column_text(&q, 0), db_column_text(&q, 1), db_column_text(&q, 2) ); } db_finalize(&q); }else if( fossil_strcmp(zName, "@user")==0 ){ db_prepare(&q, "SELECT login, CASE WHEN length(pw)==40 THEN pw END," " cap, info, quote(photo) FROM user"); while( db_step(&q)==SQLITE_ROW ){ blob_appendf(pOut, "INSERT INTO _xfer_user(login,pw,cap,info,photo)" " VALUES(%Q,%Q,%Q,%Q,%s);\n", db_column_text(&q, 0), db_column_text(&q, 1), |
︙ | ︙ | |||
257 258 259 260 261 262 263 | @ 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); | | | 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); /* When the replace flag is set, add triggers that run the first time ** that new data is seen. The triggers run only once and delete all the ** existing data. */ if( replaceFlag ){ static const char zSQL2[] = @ CREATE TRIGGER _xfer_r1 BEFORE INSERT ON _xfer_reportfmt |
︙ | ︙ | |||
337 338 339 340 341 342 343 | 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); | | | | | 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); blob_appendf(&out, "-- The \"%s\" configuration exported from\n" "-- repository \"%s\"\n" "-- on %s\n", zMask, g.zRepositoryName, db_text(0, "SELECT datetime('now')") ); for(i=0; i<count(aConfig); i++){ if( (aConfig[i].groupMask & mask)!=0 ){ const char *zName = aConfig[i].zName; if( zName[0]!='@' ){ char *zValue = db_text(0, "SELECT quote(value) FROM config WHERE name=%Q", zName); if( zValue ){ blob_appendf(&out,"REPLACE INTO config VALUES(%Q,%s);\n", zName, zValue); } free(zValue); }else{ configure_render_special_name(zName, &out); } } |
︙ | ︙ | |||
393 394 395 396 397 398 399 | ** 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 | | > > > > > > > > > > > > > > > > | | 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 ** server is used. ** ** %fossil configuration push AREA ?URL? ** ** Push the local configuration into the remote server identified ** by URL. Admin privilege is required on the remote server for ** this to work. ** ** %fossil configuration reset AREA ** ** Restore the configuration to the default. AREA as above. ** ** WARNING: Do not import, merge, or pull configurations from an untrusted ** source. The inbound configuration is not checked for safety and can ** introduce security vulnerabilities. ** ** ** SUMMARY: fossil configure METHOD ... ?-R|--repository REPOSITORY? ** Where: METHOD = export, import, merge, pull, push or reset ** ** For methods export, pull, push and reset: ** ** fossil configure METHOD AREA ?FILENAME|URL? ?-R|--repository REPOSITORY? ** ** AREA = all email project shun skin ticket user ** ** FILENAME used with methods export, URL used with the others ** ** For methods import and merge ** ** fossil configure METHOD FILENAME -R|--repository REPOSITORY? */ void configuration_cmd(void){ int n; const char *zMethod; if( g.argc<3 ){ usage("export|import|merge|pull|reset ..."); } db_find_and_open_repository(0, 0); zMethod = g.argv[2]; n = strlen(zMethod); if( strncmp(zMethod, "export", n)==0 ){ int mask; if( g.argc!=5 ){ usage("export AREA FILENAME"); } mask = find_area(g.argv[3]); export_config(mask, g.argv[3], g.argv[4]); }else if( strncmp(zMethod, "import", n)==0 || strncmp(zMethod, "merge", n)==0 ){ Blob in; if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod)); blob_read_from_file(&in, g.argv[3]); db_begin_transaction(); configure_prepare_to_receive(zMethod[0]=='i'); db_multi_exec("%s", blob_str(&in)); |
︙ | ︙ | |||
472 473 474 475 476 477 478 | } }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]); | | | 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]); zBackup = db_text(0, "SELECT strftime('config-backup-%%Y%%m%%d%%H%%M%%f','now')"); db_begin_transaction(); export_config(mask, g.argv[3], zBackup); for(i=0; i<count(aConfig); i++){ const char *zName = aConfig[i].zName; if( (aConfig[i].groupMask & mask)==0 ) continue; if( zName[0]!='@' ){ |
︙ | ︙ | |||
494 495 496 497 498 499 500 | 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"); | | | 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"); printf("To recover, use: %s %s import %s\n", fossil_nameofexe(), g.argv[1], zBackup); }else { fossil_fatal("METHOD should be one of:" " export import merge pull push reset"); } } |