Fossil SCM

Merge updates from trunk.

mistachkin 2015-07-04 06:05 enhancedUndo merge
Commit 1a4bcadde0a8699765cc4c1b09505efde8a23b23
Parent 3e22d93b68b1d33…
3 files changed +9 -1 +9 -1 +1 -1
~ src/allrepo.c ~ src/allrepo.c ~ src/cache.c
M src/allrepo.c
+9 -1
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
8686
 **
8787
 ** On Win32 systems, the file is named "_fossil" and is located in
8888
 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
8989
 **
9090
 ** Available operations are:
91
+**
92
+** cache Mangages the cache used for potentially expensive web
93
+** pages. Any additional arguments are passed on verbatim
94
+** to the cache command.
9195
 **
9296
 ** changes Shows all local checkouts that have uncommitted changes.
9397
 ** This operation has no additional options.
9498
 **
9599
 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
329333
 return;
330334
 }else if( strncmp(zCmd, "info", n)==0 ){
331335
 zCmd = "info";
332336
 showLabel = 1;
333337
 quiet = 1;
338
+ }else if( strncmp(zCmd, "cache", n)==0 ){
339
+ zCmd = "cache -R";
340
+ showLabel = 1;
341
+ collect_argv(&extra, 3);
334342
 }else{
335343
 fossil_fatal("\"all\" subcommand should be one of: "
336
- "add changes clean dbstat extras fts-config ignore "
344
+ "add cache changes clean dbstat extras fts-config ignore "
337345
 "info list ls pull push rebuild setting sync unset");
338346
 }
339347
 verify_all_options();
340348
 zFossil = quoteFilename(g.nameOfExe);
341349
 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
342350
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
86 **
87 ** On Win32 systems, the file is named "_fossil" and is located in
88 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
89 **
90 ** Available operations are:
 
 
 
 
91 **
92 ** changes Shows all local checkouts that have uncommitted changes.
93 ** This operation has no additional options.
94 **
95 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
329 return;
330 }else if( strncmp(zCmd, "info", n)==0 ){
331 zCmd = "info";
332 showLabel = 1;
333 quiet = 1;
 
 
 
 
334 }else{
335 fossil_fatal("\"all\" subcommand should be one of: "
336 "add changes clean dbstat extras fts-config ignore "
337 "info list ls pull push rebuild setting sync unset");
338 }
339 verify_all_options();
340 zFossil = quoteFilename(g.nameOfExe);
341 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
342
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
86 **
87 ** On Win32 systems, the file is named "_fossil" and is located in
88 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
89 **
90 ** Available operations are:
91 **
92 ** cache Mangages the cache used for potentially expensive web
93 ** pages. Any additional arguments are passed on verbatim
94 ** to the cache command.
95 **
96 ** changes Shows all local checkouts that have uncommitted changes.
97 ** This operation has no additional options.
98 **
99 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
333 return;
334 }else if( strncmp(zCmd, "info", n)==0 ){
335 zCmd = "info";
336 showLabel = 1;
337 quiet = 1;
338 }else if( strncmp(zCmd, "cache", n)==0 ){
339 zCmd = "cache -R";
340 showLabel = 1;
341 collect_argv(&extra, 3);
342 }else{
343 fossil_fatal("\"all\" subcommand should be one of: "
344 "add cache changes clean dbstat extras fts-config ignore "
345 "info list ls pull push rebuild setting sync unset");
346 }
347 verify_all_options();
348 zFossil = quoteFilename(g.nameOfExe);
349 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
350
M src/allrepo.c
+9 -1
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
8686
 **
8787
 ** On Win32 systems, the file is named "_fossil" and is located in
8888
 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
8989
 **
9090
 ** Available operations are:
91
+**
92
+** cache Mangages the cache used for potentially expensive web
93
+** pages. Any additional arguments are passed on verbatim
94
+** to the cache command.
9195
 **
9296
 ** changes Shows all local checkouts that have uncommitted changes.
9397
 ** This operation has no additional options.
9498
 **
9599
 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
329333
 return;
330334
 }else if( strncmp(zCmd, "info", n)==0 ){
331335
 zCmd = "info";
332336
 showLabel = 1;
333337
 quiet = 1;
338
+ }else if( strncmp(zCmd, "cache", n)==0 ){
339
+ zCmd = "cache -R";
340
+ showLabel = 1;
341
+ collect_argv(&extra, 3);
334342
 }else{
335343
 fossil_fatal("\"all\" subcommand should be one of: "
336
- "add changes clean dbstat extras fts-config ignore "
344
+ "add cache changes clean dbstat extras fts-config ignore "
337345
 "info list ls pull push rebuild setting sync unset");
338346
 }
339347
 verify_all_options();
340348
 zFossil = quoteFilename(g.nameOfExe);
341349
 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
342350
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
86 **
87 ** On Win32 systems, the file is named "_fossil" and is located in
88 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
89 **
90 ** Available operations are:
 
 
 
 
91 **
92 ** changes Shows all local checkouts that have uncommitted changes.
93 ** This operation has no additional options.
94 **
95 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
329 return;
330 }else if( strncmp(zCmd, "info", n)==0 ){
331 zCmd = "info";
332 showLabel = 1;
333 quiet = 1;
 
 
 
 
334 }else{
335 fossil_fatal("\"all\" subcommand should be one of: "
336 "add changes clean dbstat extras fts-config ignore "
337 "info list ls pull push rebuild setting sync unset");
338 }
339 verify_all_options();
340 zFossil = quoteFilename(g.nameOfExe);
341 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
342
--- src/allrepo.c
+++ src/allrepo.c
@@ -86,10 +86,14 @@
86 **
87 ** On Win32 systems, the file is named "_fossil" and is located in
88 ** %LOCALAPPDATA%, %APPDATA% or %HOMEPATH%.
89 **
90 ** Available operations are:
91 **
92 ** cache Mangages the cache used for potentially expensive web
93 ** pages. Any additional arguments are passed on verbatim
94 ** to the cache command.
95 **
96 ** changes Shows all local checkouts that have uncommitted changes.
97 ** This operation has no additional options.
98 **
99 ** clean Delete all "extra" files in all local checkouts. Extreme
@@ -329,13 +333,17 @@
333 return;
334 }else if( strncmp(zCmd, "info", n)==0 ){
335 zCmd = "info";
336 showLabel = 1;
337 quiet = 1;
338 }else if( strncmp(zCmd, "cache", n)==0 ){
339 zCmd = "cache -R";
340 showLabel = 1;
341 collect_argv(&extra, 3);
342 }else{
343 fossil_fatal("\"all\" subcommand should be one of: "
344 "add cache changes clean dbstat extras fts-config ignore "
345 "info list ls pull push rebuild setting sync unset");
346 }
347 verify_all_options();
348 zFossil = quoteFilename(g.nameOfExe);
349 db_multi_exec("CREATE TEMP TABLE repolist(name,tag);");
350
M src/cache.c
+1 -1
--- src/cache.c
+++ src/cache.c
@@ -240,11 +240,11 @@
240240
 /*
241241
 ** COMMAND: cache*
242242
 ** Usage: %fossil cache SUBCOMMAND
243243
 **
244244
 ** Manage the cache used for potentially expensive web pages such as
245
-** /zip and /tarball. SUBCOMMAND an be:
245
+** /zip and /tarball. SUBCOMMAND can be:
246246
 **
247247
 ** clear Remove all entries from the cache.
248248
 **
249249
 ** init Create the cache file if it does not already exists.
250250
 **
251251
--- src/cache.c
+++ src/cache.c
@@ -240,11 +240,11 @@
240 /*
241 ** COMMAND: cache*
242 ** Usage: %fossil cache SUBCOMMAND
243 **
244 ** Manage the cache used for potentially expensive web pages such as
245 ** /zip and /tarball. SUBCOMMAND an be:
246 **
247 ** clear Remove all entries from the cache.
248 **
249 ** init Create the cache file if it does not already exists.
250 **
251
--- src/cache.c
+++ src/cache.c
@@ -240,11 +240,11 @@
240 /*
241 ** COMMAND: cache*
242 ** Usage: %fossil cache SUBCOMMAND
243 **
244 ** Manage the cache used for potentially expensive web pages such as
245 ** /zip and /tarball. SUBCOMMAND can be:
246 **
247 ** clear Remove all entries from the cache.
248 **
249 ** init Create the cache file if it does not already exists.
250 **
251

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button