Fossil SCM
Fix inconsistent naming between the 'fossil extras' and 'fossil all extra' commands. Add the --showfile option to the 'fossil all' command.
Commit
7afbb70310c7b0b7442771a83426c830e6ef6f83
Parent
cf0b0e50632ea70…
3 files changed
+2
-2
+12
-7
+6
-6
+2
-2
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -25,11 +25,11 @@ | ||
| 25 | 25 | #include "cygsup.h" |
| 26 | 26 | |
| 27 | 27 | /* |
| 28 | 28 | ** This routine returns the names of files in a working checkout that |
| 29 | 29 | ** are created by Fossil itself, and hence should not be added, deleted, |
| 30 | -** or merge, and should be omitted from "clean" and "extra" lists. | |
| 30 | +** or merge, and should be omitted from "clean" and "extras" lists. | |
| 31 | 31 | ** |
| 32 | 32 | ** Return the N-th name. The first name has N==0. When all names have |
| 33 | 33 | ** been used, return 0. |
| 34 | 34 | */ |
| 35 | 35 | const char *fossil_reserved_name(int N, int omitRepo){ |
| @@ -461,11 +461,11 @@ | ||
| 461 | 461 | ** |
| 462 | 462 | ** Do all necessary "add" and "rm" commands to synchronize the repository |
| 463 | 463 | ** with the content of the working checkout: |
| 464 | 464 | ** |
| 465 | 465 | ** * All files in the checkout but not in the repository (that is, |
| 466 | -** all files displayed using the "extra" command) are added as | |
| 466 | +** all files displayed using the "extras" command) are added as | |
| 467 | 467 | ** if by the "add" command. |
| 468 | 468 | ** |
| 469 | 469 | ** * All files in the repository but missing from the checkout (that is, |
| 470 | 470 | ** all files that show as MISSING with the "status" command) are |
| 471 | 471 | ** removed as if by the "rm" command. |
| 472 | 472 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | #include "cygsup.h" |
| 26 | |
| 27 | /* |
| 28 | ** This routine returns the names of files in a working checkout that |
| 29 | ** are created by Fossil itself, and hence should not be added, deleted, |
| 30 | ** or merge, and should be omitted from "clean" and "extra" lists. |
| 31 | ** |
| 32 | ** Return the N-th name. The first name has N==0. When all names have |
| 33 | ** been used, return 0. |
| 34 | */ |
| 35 | const char *fossil_reserved_name(int N, int omitRepo){ |
| @@ -461,11 +461,11 @@ | |
| 461 | ** |
| 462 | ** Do all necessary "add" and "rm" commands to synchronize the repository |
| 463 | ** with the content of the working checkout: |
| 464 | ** |
| 465 | ** * All files in the checkout but not in the repository (that is, |
| 466 | ** all files displayed using the "extra" command) are added as |
| 467 | ** if by the "add" command. |
| 468 | ** |
| 469 | ** * All files in the repository but missing from the checkout (that is, |
| 470 | ** all files that show as MISSING with the "status" command) are |
| 471 | ** removed as if by the "rm" command. |
| 472 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -25,11 +25,11 @@ | |
| 25 | #include "cygsup.h" |
| 26 | |
| 27 | /* |
| 28 | ** This routine returns the names of files in a working checkout that |
| 29 | ** are created by Fossil itself, and hence should not be added, deleted, |
| 30 | ** or merge, and should be omitted from "clean" and "extras" lists. |
| 31 | ** |
| 32 | ** Return the N-th name. The first name has N==0. When all names have |
| 33 | ** been used, return 0. |
| 34 | */ |
| 35 | const char *fossil_reserved_name(int N, int omitRepo){ |
| @@ -461,11 +461,11 @@ | |
| 461 | ** |
| 462 | ** Do all necessary "add" and "rm" commands to synchronize the repository |
| 463 | ** with the content of the working checkout: |
| 464 | ** |
| 465 | ** * All files in the checkout but not in the repository (that is, |
| 466 | ** all files displayed using the "extras" command) are added as |
| 467 | ** if by the "add" command. |
| 468 | ** |
| 469 | ** * All files in the repository but missing from the checkout (that is, |
| 470 | ** all files that show as MISSING with the "status" command) are |
| 471 | ** removed as if by the "rm" command. |
| 472 |
+12
-7
| --- src/allrepo.c | ||
| +++ src/allrepo.c | ||
| @@ -76,11 +76,11 @@ | ||
| 76 | 76 | |
| 77 | 77 | |
| 78 | 78 | /* |
| 79 | 79 | ** COMMAND: all |
| 80 | 80 | ** |
| 81 | -** Usage: %fossil all (changes|clean|extra|ignore|list|ls|pull|push|rebuild|sync) | |
| 81 | +** Usage: %fossil all (changes|clean|extras|ignore|list|ls|pull|push|rebuild|sync) | |
| 82 | 82 | ** |
| 83 | 83 | ** The ~/.fossil file records the location of all repositories for a |
| 84 | 84 | ** user. This command performs certain operations on all repositories |
| 85 | 85 | ** that can be useful before or after a period of disconnected operation. |
| 86 | 86 | ** |
| @@ -99,16 +99,16 @@ | ||
| 99 | 99 | ** and the --whatif option to carefully review the files to |
| 100 | 100 | ** be deleted beforehand is highly recommended. The command |
| 101 | 101 | ** line options supported by the clean command itself, if any |
| 102 | 102 | ** are present, are passed along verbatim. |
| 103 | 103 | ** |
| 104 | -** extra Shows extra files from all local checkouts. The command | |
| 104 | +** extras Shows "extra" files from all local checkouts. The command | |
| 105 | 105 | ** line options supported by the extra command itself, if any |
| 106 | 106 | ** are present, are passed along verbatim. |
| 107 | 107 | ** |
| 108 | 108 | ** ignore Arguments are repositories that should be ignored by |
| 109 | -** subsequent clean, extra, list, pull, push, rebuild, and | |
| 109 | +** subsequent clean, extras, list, pull, push, rebuild, and | |
| 110 | 110 | ** sync operations. The -c|--ckout option causes the listed |
| 111 | 111 | ** local checkouts to be ignored instead. |
| 112 | 112 | ** |
| 113 | 113 | ** list | ls Display the location of all repositories. The -c|--ckout |
| 114 | 114 | ** option causes all local checkouts to be listed instead. |
| @@ -136,10 +136,11 @@ | ||
| 136 | 136 | ** when one of the following commands are run against the repository: |
| 137 | 137 | ** clone, info, pull, push, or sync. Even previously ignored repositories |
| 138 | 138 | ** are added back to the list of repositories by these commands. |
| 139 | 139 | ** |
| 140 | 140 | ** Options: |
| 141 | +** --showfile Show the repository or checkout being operated upon. | |
| 141 | 142 | ** --dontstop Continue with other repositories even after an error. |
| 142 | 143 | ** --dry-run If given, display instead of run actions. |
| 143 | 144 | */ |
| 144 | 145 | void all_cmd(void){ |
| 145 | 146 | int n; |
| @@ -150,10 +151,11 @@ | ||
| 150 | 151 | char *zQFilename; |
| 151 | 152 | Blob extra; |
| 152 | 153 | int useCheckouts = 0; |
| 153 | 154 | int quiet = 0; |
| 154 | 155 | int dryRunFlag = 0; |
| 156 | + int showFile = find_option("showfile",0,0)!=0; | |
| 155 | 157 | int stopOnError = find_option("dontstop",0,0)==0; |
| 156 | 158 | int rc; |
| 157 | 159 | int nToDel = 0; |
| 158 | 160 | |
| 159 | 161 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| @@ -160,11 +162,11 @@ | ||
| 160 | 162 | if( !dryRunFlag ){ |
| 161 | 163 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 162 | 164 | } |
| 163 | 165 | |
| 164 | 166 | if( g.argc<3 ){ |
| 165 | - usage("changes|clean|extra|ignore|list|ls|pull|push|rebuild|sync"); | |
| 167 | + usage("changes|clean|extras|ignore|list|ls|pull|push|rebuild|sync"); | |
| 166 | 168 | } |
| 167 | 169 | n = strlen(g.argv[2]); |
| 168 | 170 | db_open_config(1); |
| 169 | 171 | blob_zero(&extra); |
| 170 | 172 | zCmd = g.argv[2]; |
| @@ -185,12 +187,12 @@ | ||
| 185 | 187 | collect_argument_value(&extra, "keep"); |
| 186 | 188 | collect_argument(&extra, "temp",0); |
| 187 | 189 | collect_argument(&extra, "verbose","v"); |
| 188 | 190 | collect_argument(&extra, "whatif",0); |
| 189 | 191 | useCheckouts = 1; |
| 190 | - }else if( strncmp(zCmd, "extra", n)==0 ){ | |
| 191 | - zCmd = "extra --chdir"; | |
| 192 | + }else if( strncmp(zCmd, "extras", n)==0 ){ | |
| 193 | + zCmd = "extras --chdir"; | |
| 192 | 194 | collect_argument(&extra, "abs-paths",0); |
| 193 | 195 | collect_argument_value(&extra, "case-sensitive"); |
| 194 | 196 | collect_argument(&extra, "dotfiles",0); |
| 195 | 197 | collect_argument_value(&extra, "ignore"); |
| 196 | 198 | collect_argument(&extra, "rel-paths",0); |
| @@ -254,11 +256,11 @@ | ||
| 254 | 256 | } |
| 255 | 257 | db_end_transaction(0); |
| 256 | 258 | return; |
| 257 | 259 | }else{ |
| 258 | 260 | fossil_fatal("\"all\" subcommand should be one of: " |
| 259 | - "changes clean extra ignore list ls push pull rebuild sync"); | |
| 261 | + "changes clean extras ignore list ls push pull rebuild sync"); | |
| 260 | 262 | } |
| 261 | 263 | verify_all_options(); |
| 262 | 264 | zFossil = quoteFilename(g.nameOfExe); |
| 263 | 265 | if( useCheckouts ){ |
| 264 | 266 | db_prepare(&q, |
| @@ -287,10 +289,13 @@ | ||
| 287 | 289 | continue; |
| 288 | 290 | } |
| 289 | 291 | if( zCmd[0]=='l' ){ |
| 290 | 292 | fossil_print("%s\n", zFilename); |
| 291 | 293 | continue; |
| 294 | + }else if( showFile ){ | |
| 295 | + fossil_print("%s: %s\n", useCheckouts ? "checkout" : "repository", | |
| 296 | + zFilename); | |
| 292 | 297 | } |
| 293 | 298 | zQFilename = quoteFilename(zFilename); |
| 294 | 299 | zSyscmd = mprintf("%s %s %s%s", |
| 295 | 300 | zFossil, zCmd, zQFilename, blob_str(&extra)); |
| 296 | 301 | if( !quiet || dryRunFlag ){ |
| 297 | 302 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -76,11 +76,11 @@ | |
| 76 | |
| 77 | |
| 78 | /* |
| 79 | ** COMMAND: all |
| 80 | ** |
| 81 | ** Usage: %fossil all (changes|clean|extra|ignore|list|ls|pull|push|rebuild|sync) |
| 82 | ** |
| 83 | ** The ~/.fossil file records the location of all repositories for a |
| 84 | ** user. This command performs certain operations on all repositories |
| 85 | ** that can be useful before or after a period of disconnected operation. |
| 86 | ** |
| @@ -99,16 +99,16 @@ | |
| 99 | ** and the --whatif option to carefully review the files to |
| 100 | ** be deleted beforehand is highly recommended. The command |
| 101 | ** line options supported by the clean command itself, if any |
| 102 | ** are present, are passed along verbatim. |
| 103 | ** |
| 104 | ** extra Shows extra files from all local checkouts. The command |
| 105 | ** line options supported by the extra command itself, if any |
| 106 | ** are present, are passed along verbatim. |
| 107 | ** |
| 108 | ** ignore Arguments are repositories that should be ignored by |
| 109 | ** subsequent clean, extra, list, pull, push, rebuild, and |
| 110 | ** sync operations. The -c|--ckout option causes the listed |
| 111 | ** local checkouts to be ignored instead. |
| 112 | ** |
| 113 | ** list | ls Display the location of all repositories. The -c|--ckout |
| 114 | ** option causes all local checkouts to be listed instead. |
| @@ -136,10 +136,11 @@ | |
| 136 | ** when one of the following commands are run against the repository: |
| 137 | ** clone, info, pull, push, or sync. Even previously ignored repositories |
| 138 | ** are added back to the list of repositories by these commands. |
| 139 | ** |
| 140 | ** Options: |
| 141 | ** --dontstop Continue with other repositories even after an error. |
| 142 | ** --dry-run If given, display instead of run actions. |
| 143 | */ |
| 144 | void all_cmd(void){ |
| 145 | int n; |
| @@ -150,10 +151,11 @@ | |
| 150 | char *zQFilename; |
| 151 | Blob extra; |
| 152 | int useCheckouts = 0; |
| 153 | int quiet = 0; |
| 154 | int dryRunFlag = 0; |
| 155 | int stopOnError = find_option("dontstop",0,0)==0; |
| 156 | int rc; |
| 157 | int nToDel = 0; |
| 158 | |
| 159 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| @@ -160,11 +162,11 @@ | |
| 160 | if( !dryRunFlag ){ |
| 161 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 162 | } |
| 163 | |
| 164 | if( g.argc<3 ){ |
| 165 | usage("changes|clean|extra|ignore|list|ls|pull|push|rebuild|sync"); |
| 166 | } |
| 167 | n = strlen(g.argv[2]); |
| 168 | db_open_config(1); |
| 169 | blob_zero(&extra); |
| 170 | zCmd = g.argv[2]; |
| @@ -185,12 +187,12 @@ | |
| 185 | collect_argument_value(&extra, "keep"); |
| 186 | collect_argument(&extra, "temp",0); |
| 187 | collect_argument(&extra, "verbose","v"); |
| 188 | collect_argument(&extra, "whatif",0); |
| 189 | useCheckouts = 1; |
| 190 | }else if( strncmp(zCmd, "extra", n)==0 ){ |
| 191 | zCmd = "extra --chdir"; |
| 192 | collect_argument(&extra, "abs-paths",0); |
| 193 | collect_argument_value(&extra, "case-sensitive"); |
| 194 | collect_argument(&extra, "dotfiles",0); |
| 195 | collect_argument_value(&extra, "ignore"); |
| 196 | collect_argument(&extra, "rel-paths",0); |
| @@ -254,11 +256,11 @@ | |
| 254 | } |
| 255 | db_end_transaction(0); |
| 256 | return; |
| 257 | }else{ |
| 258 | fossil_fatal("\"all\" subcommand should be one of: " |
| 259 | "changes clean extra ignore list ls push pull rebuild sync"); |
| 260 | } |
| 261 | verify_all_options(); |
| 262 | zFossil = quoteFilename(g.nameOfExe); |
| 263 | if( useCheckouts ){ |
| 264 | db_prepare(&q, |
| @@ -287,10 +289,13 @@ | |
| 287 | continue; |
| 288 | } |
| 289 | if( zCmd[0]=='l' ){ |
| 290 | fossil_print("%s\n", zFilename); |
| 291 | continue; |
| 292 | } |
| 293 | zQFilename = quoteFilename(zFilename); |
| 294 | zSyscmd = mprintf("%s %s %s%s", |
| 295 | zFossil, zCmd, zQFilename, blob_str(&extra)); |
| 296 | if( !quiet || dryRunFlag ){ |
| 297 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -76,11 +76,11 @@ | |
| 76 | |
| 77 | |
| 78 | /* |
| 79 | ** COMMAND: all |
| 80 | ** |
| 81 | ** Usage: %fossil all (changes|clean|extras|ignore|list|ls|pull|push|rebuild|sync) |
| 82 | ** |
| 83 | ** The ~/.fossil file records the location of all repositories for a |
| 84 | ** user. This command performs certain operations on all repositories |
| 85 | ** that can be useful before or after a period of disconnected operation. |
| 86 | ** |
| @@ -99,16 +99,16 @@ | |
| 99 | ** and the --whatif option to carefully review the files to |
| 100 | ** be deleted beforehand is highly recommended. The command |
| 101 | ** line options supported by the clean command itself, if any |
| 102 | ** are present, are passed along verbatim. |
| 103 | ** |
| 104 | ** extras Shows "extra" files from all local checkouts. The command |
| 105 | ** line options supported by the extra command itself, if any |
| 106 | ** are present, are passed along verbatim. |
| 107 | ** |
| 108 | ** ignore Arguments are repositories that should be ignored by |
| 109 | ** subsequent clean, extras, list, pull, push, rebuild, and |
| 110 | ** sync operations. The -c|--ckout option causes the listed |
| 111 | ** local checkouts to be ignored instead. |
| 112 | ** |
| 113 | ** list | ls Display the location of all repositories. The -c|--ckout |
| 114 | ** option causes all local checkouts to be listed instead. |
| @@ -136,10 +136,11 @@ | |
| 136 | ** when one of the following commands are run against the repository: |
| 137 | ** clone, info, pull, push, or sync. Even previously ignored repositories |
| 138 | ** are added back to the list of repositories by these commands. |
| 139 | ** |
| 140 | ** Options: |
| 141 | ** --showfile Show the repository or checkout being operated upon. |
| 142 | ** --dontstop Continue with other repositories even after an error. |
| 143 | ** --dry-run If given, display instead of run actions. |
| 144 | */ |
| 145 | void all_cmd(void){ |
| 146 | int n; |
| @@ -150,10 +151,11 @@ | |
| 151 | char *zQFilename; |
| 152 | Blob extra; |
| 153 | int useCheckouts = 0; |
| 154 | int quiet = 0; |
| 155 | int dryRunFlag = 0; |
| 156 | int showFile = find_option("showfile",0,0)!=0; |
| 157 | int stopOnError = find_option("dontstop",0,0)==0; |
| 158 | int rc; |
| 159 | int nToDel = 0; |
| 160 | |
| 161 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| @@ -160,11 +162,11 @@ | |
| 162 | if( !dryRunFlag ){ |
| 163 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 164 | } |
| 165 | |
| 166 | if( g.argc<3 ){ |
| 167 | usage("changes|clean|extras|ignore|list|ls|pull|push|rebuild|sync"); |
| 168 | } |
| 169 | n = strlen(g.argv[2]); |
| 170 | db_open_config(1); |
| 171 | blob_zero(&extra); |
| 172 | zCmd = g.argv[2]; |
| @@ -185,12 +187,12 @@ | |
| 187 | collect_argument_value(&extra, "keep"); |
| 188 | collect_argument(&extra, "temp",0); |
| 189 | collect_argument(&extra, "verbose","v"); |
| 190 | collect_argument(&extra, "whatif",0); |
| 191 | useCheckouts = 1; |
| 192 | }else if( strncmp(zCmd, "extras", n)==0 ){ |
| 193 | zCmd = "extras --chdir"; |
| 194 | collect_argument(&extra, "abs-paths",0); |
| 195 | collect_argument_value(&extra, "case-sensitive"); |
| 196 | collect_argument(&extra, "dotfiles",0); |
| 197 | collect_argument_value(&extra, "ignore"); |
| 198 | collect_argument(&extra, "rel-paths",0); |
| @@ -254,11 +256,11 @@ | |
| 256 | } |
| 257 | db_end_transaction(0); |
| 258 | return; |
| 259 | }else{ |
| 260 | fossil_fatal("\"all\" subcommand should be one of: " |
| 261 | "changes clean extras ignore list ls push pull rebuild sync"); |
| 262 | } |
| 263 | verify_all_options(); |
| 264 | zFossil = quoteFilename(g.nameOfExe); |
| 265 | if( useCheckouts ){ |
| 266 | db_prepare(&q, |
| @@ -287,10 +289,13 @@ | |
| 289 | continue; |
| 290 | } |
| 291 | if( zCmd[0]=='l' ){ |
| 292 | fossil_print("%s\n", zFilename); |
| 293 | continue; |
| 294 | }else if( showFile ){ |
| 295 | fossil_print("%s: %s\n", useCheckouts ? "checkout" : "repository", |
| 296 | zFilename); |
| 297 | } |
| 298 | zQFilename = quoteFilename(zFilename); |
| 299 | zSyscmd = mprintf("%s %s %s%s", |
| 300 | zFossil, zCmd, zQFilename, blob_str(&extra)); |
| 301 | if( !quiet || dryRunFlag ){ |
| 302 |
+6
-6
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -179,11 +179,11 @@ | ||
| 179 | 179 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 180 | 180 | ** than relying on file mtimes. |
| 181 | 181 | ** --header Identify the repository if there are changes |
| 182 | 182 | ** -v|--verbose Say "(none)" if there are no changes |
| 183 | 183 | ** |
| 184 | -** See also: extra, ls, status | |
| 184 | +** See also: extras, ls, status | |
| 185 | 185 | */ |
| 186 | 186 | void changes_cmd(void){ |
| 187 | 187 | Blob report; |
| 188 | 188 | int vid; |
| 189 | 189 | int useSha1sum = find_option("sha1sum", 0, 0)!=0; |
| @@ -223,11 +223,11 @@ | ||
| 223 | 223 | ** --rel-paths Display pathnames relative to the current working |
| 224 | 224 | ** directory. |
| 225 | 225 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 226 | 226 | ** than relying on file mtimes. |
| 227 | 227 | ** |
| 228 | -** See also: changes, extra, ls | |
| 228 | +** See also: changes, extras, ls | |
| 229 | 229 | */ |
| 230 | 230 | void status_cmd(void){ |
| 231 | 231 | int vid; |
| 232 | 232 | db_must_be_within_tree(); |
| 233 | 233 | /* 012345678901234 */ |
| @@ -255,11 +255,11 @@ | ||
| 255 | 255 | ** |
| 256 | 256 | ** Options: |
| 257 | 257 | ** --age Show when each file was committed |
| 258 | 258 | ** -v|--verbose Provide extra information about each file. |
| 259 | 259 | ** |
| 260 | -** See also: changes, extra, status | |
| 260 | +** See also: changes, extras, status | |
| 261 | 261 | */ |
| 262 | 262 | void ls_cmd(void){ |
| 263 | 263 | int vid; |
| 264 | 264 | Stmt q; |
| 265 | 265 | int verboseFlag; |
| @@ -439,11 +439,11 @@ | ||
| 439 | 439 | ** --rel-paths Display pathnames relative to the current working |
| 440 | 440 | ** directory. |
| 441 | 441 | ** |
| 442 | 442 | ** See also: changes, clean, status |
| 443 | 443 | */ |
| 444 | -void extra_cmd(void){ | |
| 444 | +void extras_cmd(void){ | |
| 445 | 445 | Stmt q; |
| 446 | 446 | const char *zIgnoreFlag = find_option("ignore",0,1); |
| 447 | 447 | unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0; |
| 448 | 448 | int cwdRelative = 0; |
| 449 | 449 | Glob *pIgnore; |
| @@ -536,11 +536,11 @@ | ||
| 536 | 536 | ** list of glob patterns. |
| 537 | 537 | ** -n|--dry-run If given, display instead of run actions. |
| 538 | 538 | ** --temp Remove only Fossil-generated temporary files. |
| 539 | 539 | ** -v|--verbose Show all files as they are removed. |
| 540 | 540 | ** |
| 541 | -** See also: addremove, extra, status | |
| 541 | +** See also: addremove, extras, status | |
| 542 | 542 | */ |
| 543 | 543 | void clean_cmd(void){ |
| 544 | 544 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 545 | 545 | int emptyDirsFlag, dirsOnlyFlag; |
| 546 | 546 | unsigned scanFlags = 0; |
| @@ -1408,11 +1408,11 @@ | ||
| 1408 | 1408 | ** --private do not sync changes and their descendants |
| 1409 | 1409 | ** --sha1sum verify file status using SHA1 hashing rather |
| 1410 | 1410 | ** than relying on file mtimes |
| 1411 | 1411 | ** --tag TAG-NAME assign given tag TAG-NAME to the checkin |
| 1412 | 1412 | ** |
| 1413 | -** See also: branch, changes, checkout, extra, sync | |
| 1413 | +** See also: branch, changes, checkout, extras, sync | |
| 1414 | 1414 | */ |
| 1415 | 1415 | void commit_cmd(void){ |
| 1416 | 1416 | int hasChanges; /* True if unsaved changes exist */ |
| 1417 | 1417 | int vid; /* blob-id of parent version */ |
| 1418 | 1418 | int nrid; /* blob-id of a modified file */ |
| 1419 | 1419 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 180 | ** than relying on file mtimes. |
| 181 | ** --header Identify the repository if there are changes |
| 182 | ** -v|--verbose Say "(none)" if there are no changes |
| 183 | ** |
| 184 | ** See also: extra, ls, status |
| 185 | */ |
| 186 | void changes_cmd(void){ |
| 187 | Blob report; |
| 188 | int vid; |
| 189 | int useSha1sum = find_option("sha1sum", 0, 0)!=0; |
| @@ -223,11 +223,11 @@ | |
| 223 | ** --rel-paths Display pathnames relative to the current working |
| 224 | ** directory. |
| 225 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 226 | ** than relying on file mtimes. |
| 227 | ** |
| 228 | ** See also: changes, extra, ls |
| 229 | */ |
| 230 | void status_cmd(void){ |
| 231 | int vid; |
| 232 | db_must_be_within_tree(); |
| 233 | /* 012345678901234 */ |
| @@ -255,11 +255,11 @@ | |
| 255 | ** |
| 256 | ** Options: |
| 257 | ** --age Show when each file was committed |
| 258 | ** -v|--verbose Provide extra information about each file. |
| 259 | ** |
| 260 | ** See also: changes, extra, status |
| 261 | */ |
| 262 | void ls_cmd(void){ |
| 263 | int vid; |
| 264 | Stmt q; |
| 265 | int verboseFlag; |
| @@ -439,11 +439,11 @@ | |
| 439 | ** --rel-paths Display pathnames relative to the current working |
| 440 | ** directory. |
| 441 | ** |
| 442 | ** See also: changes, clean, status |
| 443 | */ |
| 444 | void extra_cmd(void){ |
| 445 | Stmt q; |
| 446 | const char *zIgnoreFlag = find_option("ignore",0,1); |
| 447 | unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0; |
| 448 | int cwdRelative = 0; |
| 449 | Glob *pIgnore; |
| @@ -536,11 +536,11 @@ | |
| 536 | ** list of glob patterns. |
| 537 | ** -n|--dry-run If given, display instead of run actions. |
| 538 | ** --temp Remove only Fossil-generated temporary files. |
| 539 | ** -v|--verbose Show all files as they are removed. |
| 540 | ** |
| 541 | ** See also: addremove, extra, status |
| 542 | */ |
| 543 | void clean_cmd(void){ |
| 544 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 545 | int emptyDirsFlag, dirsOnlyFlag; |
| 546 | unsigned scanFlags = 0; |
| @@ -1408,11 +1408,11 @@ | |
| 1408 | ** --private do not sync changes and their descendants |
| 1409 | ** --sha1sum verify file status using SHA1 hashing rather |
| 1410 | ** than relying on file mtimes |
| 1411 | ** --tag TAG-NAME assign given tag TAG-NAME to the checkin |
| 1412 | ** |
| 1413 | ** See also: branch, changes, checkout, extra, sync |
| 1414 | */ |
| 1415 | void commit_cmd(void){ |
| 1416 | int hasChanges; /* True if unsaved changes exist */ |
| 1417 | int vid; /* blob-id of parent version */ |
| 1418 | int nrid; /* blob-id of a modified file */ |
| 1419 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -179,11 +179,11 @@ | |
| 179 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 180 | ** than relying on file mtimes. |
| 181 | ** --header Identify the repository if there are changes |
| 182 | ** -v|--verbose Say "(none)" if there are no changes |
| 183 | ** |
| 184 | ** See also: extras, ls, status |
| 185 | */ |
| 186 | void changes_cmd(void){ |
| 187 | Blob report; |
| 188 | int vid; |
| 189 | int useSha1sum = find_option("sha1sum", 0, 0)!=0; |
| @@ -223,11 +223,11 @@ | |
| 223 | ** --rel-paths Display pathnames relative to the current working |
| 224 | ** directory. |
| 225 | ** --sha1sum Verify file status using SHA1 hashing rather |
| 226 | ** than relying on file mtimes. |
| 227 | ** |
| 228 | ** See also: changes, extras, ls |
| 229 | */ |
| 230 | void status_cmd(void){ |
| 231 | int vid; |
| 232 | db_must_be_within_tree(); |
| 233 | /* 012345678901234 */ |
| @@ -255,11 +255,11 @@ | |
| 255 | ** |
| 256 | ** Options: |
| 257 | ** --age Show when each file was committed |
| 258 | ** -v|--verbose Provide extra information about each file. |
| 259 | ** |
| 260 | ** See also: changes, extras, status |
| 261 | */ |
| 262 | void ls_cmd(void){ |
| 263 | int vid; |
| 264 | Stmt q; |
| 265 | int verboseFlag; |
| @@ -439,11 +439,11 @@ | |
| 439 | ** --rel-paths Display pathnames relative to the current working |
| 440 | ** directory. |
| 441 | ** |
| 442 | ** See also: changes, clean, status |
| 443 | */ |
| 444 | void extras_cmd(void){ |
| 445 | Stmt q; |
| 446 | const char *zIgnoreFlag = find_option("ignore",0,1); |
| 447 | unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0; |
| 448 | int cwdRelative = 0; |
| 449 | Glob *pIgnore; |
| @@ -536,11 +536,11 @@ | |
| 536 | ** list of glob patterns. |
| 537 | ** -n|--dry-run If given, display instead of run actions. |
| 538 | ** --temp Remove only Fossil-generated temporary files. |
| 539 | ** -v|--verbose Show all files as they are removed. |
| 540 | ** |
| 541 | ** See also: addremove, extras, status |
| 542 | */ |
| 543 | void clean_cmd(void){ |
| 544 | int allFileFlag, allDirFlag, dryRunFlag, verboseFlag; |
| 545 | int emptyDirsFlag, dirsOnlyFlag; |
| 546 | unsigned scanFlags = 0; |
| @@ -1408,11 +1408,11 @@ | |
| 1408 | ** --private do not sync changes and their descendants |
| 1409 | ** --sha1sum verify file status using SHA1 hashing rather |
| 1410 | ** than relying on file mtimes |
| 1411 | ** --tag TAG-NAME assign given tag TAG-NAME to the checkin |
| 1412 | ** |
| 1413 | ** See also: branch, changes, checkout, extras, sync |
| 1414 | */ |
| 1415 | void commit_cmd(void){ |
| 1416 | int hasChanges; /* True if unsaved changes exist */ |
| 1417 | int vid; /* blob-id of parent version */ |
| 1418 | int nrid; /* blob-id of a modified file */ |
| 1419 |