Fossil SCM
Alternative implementation to the improved "remove directory" error message.
Commit
8c9f949a3f3024eb15d11142051c67538c61d03c
Parent
3cc4cd55d8a5469…
1 file changed
+4
+4
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -204,10 +204,14 @@ | ||
| 204 | 204 | char *zName; |
| 205 | 205 | char *zPath; |
| 206 | 206 | Blob pathname; |
| 207 | 207 | |
| 208 | 208 | zName = mprintf("%/", g.argv[i]); |
| 209 | + if( file_isdir(zName) ){ | |
| 210 | + fossil_fatal("cannot remove directories -" | |
| 211 | + " remove individual files instead"); | |
| 212 | + } | |
| 209 | 213 | file_tree_name(zName, &pathname, 1); |
| 210 | 214 | zPath = blob_str(&pathname); |
| 211 | 215 | if( !db_exists( |
| 212 | 216 | "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ |
| 213 | 217 | fossil_fatal("not in the repository: %s", zName); |
| 214 | 218 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -204,10 +204,14 @@ | |
| 204 | char *zName; |
| 205 | char *zPath; |
| 206 | Blob pathname; |
| 207 | |
| 208 | zName = mprintf("%/", g.argv[i]); |
| 209 | file_tree_name(zName, &pathname, 1); |
| 210 | zPath = blob_str(&pathname); |
| 211 | if( !db_exists( |
| 212 | "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ |
| 213 | fossil_fatal("not in the repository: %s", zName); |
| 214 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -204,10 +204,14 @@ | |
| 204 | char *zName; |
| 205 | char *zPath; |
| 206 | Blob pathname; |
| 207 | |
| 208 | zName = mprintf("%/", g.argv[i]); |
| 209 | if( file_isdir(zName) ){ |
| 210 | fossil_fatal("cannot remove directories -" |
| 211 | " remove individual files instead"); |
| 212 | } |
| 213 | file_tree_name(zName, &pathname, 1); |
| 214 | zPath = blob_str(&pathname); |
| 215 | if( !db_exists( |
| 216 | "SELECT 1 FROM vfile WHERE pathname=%Q AND NOT deleted", zPath) ){ |
| 217 | fossil_fatal("not in the repository: %s", zName); |
| 218 |