Fossil SCM
Merge the accidental fork.
Commit
d13fc6a6b79e71bda3a82792a2fd7654a17a2087
Parent
9a4a5dec3d0a9a1…
1 file changed
+1
-1
+1
-1
| --- src/allrepo.c | ||
| +++ src/allrepo.c | ||
| @@ -173,11 +173,10 @@ | ||
| 173 | 173 | int useCheckouts = 0; |
| 174 | 174 | int quiet = 0; |
| 175 | 175 | int dryRunFlag = 0; |
| 176 | 176 | int showFile = find_option("showfile",0,0)!=0; |
| 177 | 177 | int stopOnError = find_option("dontstop",0,0)==0; |
| 178 | - int rc; | |
| 179 | 178 | int nToDel = 0; |
| 180 | 179 | int showLabel = 0; |
| 181 | 180 | |
| 182 | 181 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 183 | 182 | if( !dryRunFlag ){ |
| @@ -378,10 +377,11 @@ | ||
| 378 | 377 | ); |
| 379 | 378 | } |
| 380 | 379 | db_multi_exec("CREATE TEMP TABLE toDel(x TEXT)"); |
| 381 | 380 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 382 | 381 | while( db_step(&q)==SQLITE_ROW ){ |
| 382 | + int rc; | |
| 383 | 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | 384 | #if !USE_SEE |
| 385 | 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| 386 | 386 | #endif |
| 387 | 387 | if( file_access(zFilename, F_OK) |
| 388 | 388 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -173,11 +173,10 @@ | |
| 173 | int useCheckouts = 0; |
| 174 | int quiet = 0; |
| 175 | int dryRunFlag = 0; |
| 176 | int showFile = find_option("showfile",0,0)!=0; |
| 177 | int stopOnError = find_option("dontstop",0,0)==0; |
| 178 | int rc; |
| 179 | int nToDel = 0; |
| 180 | int showLabel = 0; |
| 181 | |
| 182 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 183 | if( !dryRunFlag ){ |
| @@ -378,10 +377,11 @@ | |
| 378 | ); |
| 379 | } |
| 380 | db_multi_exec("CREATE TEMP TABLE toDel(x TEXT)"); |
| 381 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 382 | while( db_step(&q)==SQLITE_ROW ){ |
| 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | #if !USE_SEE |
| 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| 386 | #endif |
| 387 | if( file_access(zFilename, F_OK) |
| 388 |
| --- src/allrepo.c | |
| +++ src/allrepo.c | |
| @@ -173,11 +173,10 @@ | |
| 173 | int useCheckouts = 0; |
| 174 | int quiet = 0; |
| 175 | int dryRunFlag = 0; |
| 176 | int showFile = find_option("showfile",0,0)!=0; |
| 177 | int stopOnError = find_option("dontstop",0,0)==0; |
| 178 | int nToDel = 0; |
| 179 | int showLabel = 0; |
| 180 | |
| 181 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 182 | if( !dryRunFlag ){ |
| @@ -378,10 +377,11 @@ | |
| 377 | ); |
| 378 | } |
| 379 | db_multi_exec("CREATE TEMP TABLE toDel(x TEXT)"); |
| 380 | db_prepare(&q, "SELECT name, tag FROM repolist ORDER BY 1"); |
| 381 | while( db_step(&q)==SQLITE_ROW ){ |
| 382 | int rc; |
| 383 | const char *zFilename = db_column_text(&q, 0); |
| 384 | #if !USE_SEE |
| 385 | if( sqlite3_strglob("*.efossil", zFilename)==0 ) continue; |
| 386 | #endif |
| 387 | if( file_access(zFilename, F_OK) |
| 388 |