Fossil SCM
Fix a C++-ism.
Commit
820a1a1a534f32bfff50d9eddd28b5aaf918e3a3
Parent
ff4cc5fae2e88f9…
1 file changed
+9
-10
+9
-10
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -188,20 +188,19 @@ | ||
| 188 | 188 | " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')" |
| 189 | 189 | " ORDER BY 1", g.zLocalRoot); |
| 190 | 190 | while( db_step(&q)==SQLITE_ROW ){ |
| 191 | 191 | if( allFlag ){ |
| 192 | 192 | unlink(db_column_text(&q, 0)); |
| 193 | - continue; | |
| 194 | - } | |
| 195 | - | |
| 196 | - Blob ans; | |
| 197 | - char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ", | |
| 198 | - db_column_text(&q, 0)); | |
| 199 | - blob_zero(&ans); | |
| 200 | - prompt_user(prompt, &ans); | |
| 201 | - if( blob_str(&ans)[0]=='y' ){ | |
| 202 | - unlink(db_column_text(&q, 0)); | |
| 193 | + }else{ | |
| 194 | + Blob ans; | |
| 195 | + char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ", | |
| 196 | + db_column_text(&q, 0)); | |
| 197 | + blob_zero(&ans); | |
| 198 | + prompt_user(prompt, &ans); | |
| 199 | + if( blob_str(&ans)[0]=='y' ){ | |
| 200 | + unlink(db_column_text(&q, 0)); | |
| 201 | + } | |
| 203 | 202 | } |
| 204 | 203 | } |
| 205 | 204 | db_finalize(&q); |
| 206 | 205 | } |
| 207 | 206 | |
| 208 | 207 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -188,20 +188,19 @@ | |
| 188 | " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')" |
| 189 | " ORDER BY 1", g.zLocalRoot); |
| 190 | while( db_step(&q)==SQLITE_ROW ){ |
| 191 | if( allFlag ){ |
| 192 | unlink(db_column_text(&q, 0)); |
| 193 | continue; |
| 194 | } |
| 195 | |
| 196 | Blob ans; |
| 197 | char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ", |
| 198 | db_column_text(&q, 0)); |
| 199 | blob_zero(&ans); |
| 200 | prompt_user(prompt, &ans); |
| 201 | if( blob_str(&ans)[0]=='y' ){ |
| 202 | unlink(db_column_text(&q, 0)); |
| 203 | } |
| 204 | } |
| 205 | db_finalize(&q); |
| 206 | } |
| 207 | |
| 208 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -188,20 +188,19 @@ | |
| 188 | " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')" |
| 189 | " ORDER BY 1", g.zLocalRoot); |
| 190 | while( db_step(&q)==SQLITE_ROW ){ |
| 191 | if( allFlag ){ |
| 192 | unlink(db_column_text(&q, 0)); |
| 193 | }else{ |
| 194 | Blob ans; |
| 195 | char *prompt = mprintf("remove unmanaged file \"%s\" [y/N]? ", |
| 196 | db_column_text(&q, 0)); |
| 197 | blob_zero(&ans); |
| 198 | prompt_user(prompt, &ans); |
| 199 | if( blob_str(&ans)[0]=='y' ){ |
| 200 | unlink(db_column_text(&q, 0)); |
| 201 | } |
| 202 | } |
| 203 | } |
| 204 | db_finalize(&q); |
| 205 | } |
| 206 | |
| 207 |