Overview
SHA1 Hash: | 6b85fd173e5c90ad0c24c4146249a28ff8d2ab18 |
---|---|
Date: | 2008-05-10 18:01:52 |
User: | drh |
Comment: | Help message cleanup. Automatically delete cloned database files if the clone fails. |
Timelines: | ancestors | descendants | both | trunk |
Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[hide diffs]Modified src/add.c from [ce8cf09189] to [5acaff69fc].
@@ -31,12 +31,13 @@ /* ** COMMAND: add ** ** Usage: %fossil add FILE... -** Add one or more files to the current checkout such that these files -** will be inserted into the repository at the next commit. +** +** Make arrangements to add one or more files to the current checkout +** at the next commit. */ void add_cmd(void){ int i; int vid;
Modified src/checkin.c from [a39c0a7df2] to [e7a974d371].
@@ -75,10 +75,11 @@ /* ** COMMAND: changes ** ** Usage: %fossil changes +** ** Report on the edit status of all files in the current checkout. ** See also the "status" and "extra" commands. */ void changes_cmd(void){ Blob report; @@ -91,11 +92,13 @@ blob_write_to_file(&report, "-"); } /* ** COMMAND: status +** ** Usage: %fossil status +** ** Report on the status of the current checkout. */ void status_cmd(void){ int vid; db_must_be_within_tree(); @@ -110,11 +113,13 @@ changes_cmd(); } /* ** COMMAND: ls +** ** Usage: %fossil ls +** ** Show the names of all files in the current checkout */ void ls_cmd(void){ int vid; Stmt q; @@ -143,10 +148,11 @@ } /* ** COMMAND: extra ** Usage: %fossil extra +** ** Print a list of all files in the source tree that are not part of ** the current checkout. See also the "clean" command. */ void extra_cmd(void){ Blob path; @@ -166,11 +172,12 @@ db_finalize(&q); } /* ** COMMAND: clean -** Usage: %fossil clean ?-all +** Usage: %fossil clean ?-all? +** ** Delete all "extra" files in the source tree. "Extra" files are ** files that are not officially part of the checkout. See also ** the "extra" command. This operation cannot be undone. ** ** You will be prompted before removing each file. If you are
Modified src/checkout.c from [d833774799] to [b372b89d4e].
@@ -134,10 +134,11 @@ /* ** COMMAND: checkout ** ** Usage: %fossil checkout VERSION ?-f|--force? +** ** Check out a version specified on the command-line. This command ** will not overwrite edited files in the current checkout unless ** the --force option appears on the command-line. ** ** See also the "update" command. @@ -190,10 +191,11 @@ /* ** 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 changed in the ** current check-out. */ void close_cmd(void){
Modified src/db.c from [c776b3bd01] to [fdcc320716].
@@ -75,10 +75,11 @@ db_force_rollback(); exit(1); } static int nBegin = 0; /* Nesting depth of BEGIN */ +static int isNewRepo = 0; /* True if the repository is newly created */ static int doRollback = 0; /* True to force a rollback */ static int nCommitHook = 0; /* Number of commit hooks */ static struct sCommitHook { int (*xHook)(void); /* Functions to call at db_end_transaction() */ int sequence; /* Call functions in sequence order */ @@ -124,10 +125,14 @@ } } void db_force_rollback(void){ if( nBegin ){ sqlite3_exec(g.db, "ROLLBACK", 0, 0, 0); + if( isNewRepo ){ + db_close(); + unlink(g.zRepositoryName); + } } nBegin = 0; } /* @@ -730,10 +735,11 @@ zFilename, zRepositorySchema1, zRepositorySchema2, (char*)0 ); + isNewRepo = 1; } /* ** Fill an empty repository database with the basic information for a ** repository. This function is shared between 'create_repository_cmd' @@ -804,10 +810,11 @@ /* ** COMMAND: new ** ** Usage: %fossil new FILENAME +** ** Create a repository for a new project in the file named FILENAME. ** This command is distinct from "clone". The "clone" command makes ** a copy of an existing project. This command starts a new project. */ void create_repository_cmd(void){ @@ -1113,17 +1120,17 @@ ** diff. If undefined, text diff will be used. */ void setting_cmd(void){ static const char *azName[] = { "autosync", - "pgp-command", + "diff-command", "editor", + "gdiff-command", "localauth", "omitsign", - "proxy", - "diff-command", - "gdiff-command", + "pgp-command", + "proxy", }; int i; int globalFlag = find_option("global","g",0)!=0; int unsetFlag = g.argv[1][0]=='u'; db_find_and_open_repository(0);
Modified src/descendents.c from [44bebd8abf] to [aaa2bf991f].
@@ -131,10 +131,11 @@ /* ** COMMAND: descendents ** ** Usage: %fossil descendents ?UUID? +** ** Find all leaf descendents of the current version or of the ** specified version. */ void descendents_cmd(void){ Stmt q; @@ -160,10 +161,11 @@ /* ** COMMAND: leaves ** ** Usage: %fossil leaves +** ** Find leaves of all branches. */ void branches_cmd(void){ Stmt q;
Modified src/main.c from [ee65ecd97a] to [42f0720d46].
@@ -364,10 +364,11 @@ /* ** COMMAND: test-commands ** ** Usage: %fossil test-commands +** ** List all commands used for testing and debugging. */ void cmd_test_cmd_list(void){ int i, nCmd; const char *aCmd[count(aCommand)]; @@ -382,10 +383,11 @@ /* ** COMMAND: help ** ** Usage: %fossil help COMMAND +** ** Display information on how to use COMMAND */ void help_cmd(void){ int rc, idx; const char *z;