Fossil SCM
Store filename in intermediate variable
Commit
d7afa8f15342d18f7bb8213dc0568e11de5220be
Parent
982f9ec738fb181…
1 file changed
+5
-4
+5
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -452,29 +452,30 @@ | ||
| 452 | 452 | if( file_tree_name(g.zRepositoryName, &repo, 0) ){ |
| 453 | 453 | db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo); |
| 454 | 454 | } |
| 455 | 455 | db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)"); |
| 456 | 456 | while( db_step(&q)==SQLITE_ROW ){ |
| 457 | + const char *zName = db_column_text(&q, 0); | |
| 457 | 458 | if( dryRunFlag ){ |
| 458 | 459 | fossil_print("%s\n", db_column_text(&q,0)); |
| 459 | 460 | continue; |
| 460 | - }else if( !allFlag && !glob_match(pIgnore, db_column_text(&q, 0)+n) ){ | |
| 461 | + }else if( !allFlag && !glob_match(pIgnore, zName+n) ){ | |
| 461 | 462 | Blob ans; |
| 462 | 463 | char cReply; |
| 463 | 464 | char *prompt = mprintf("remove unmanaged file \"%s\" (a=all/y/N)? ", |
| 464 | - db_column_text(&q, 0)); | |
| 465 | + zName+n); | |
| 465 | 466 | blob_zero(&ans); |
| 466 | 467 | prompt_user(prompt, &ans); |
| 467 | 468 | cReply = blob_str(&ans)[0]; |
| 468 | 469 | if( cReply=='a' || cReply=='A' ){ |
| 469 | 470 | allFlag = 1; |
| 470 | 471 | }else if( cReply!='y' && cReply!='Y' ){ |
| 471 | 472 | continue; |
| 472 | 473 | } |
| 473 | 474 | } |
| 474 | - fossil_print("removed unmanaged file \"%s\"\n", db_column_text(&q,0)); | |
| 475 | - file_delete(db_column_text(&q, 0)); | |
| 475 | + fossil_print("removed unmanaged file \"%s\"\n", zName+n); | |
| 476 | + file_delete(zName); | |
| 476 | 477 | } |
| 477 | 478 | glob_free(pIgnore); |
| 478 | 479 | db_finalize(&q); |
| 479 | 480 | } |
| 480 | 481 | |
| 481 | 482 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -452,29 +452,30 @@ | |
| 452 | if( file_tree_name(g.zRepositoryName, &repo, 0) ){ |
| 453 | db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo); |
| 454 | } |
| 455 | db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)"); |
| 456 | while( db_step(&q)==SQLITE_ROW ){ |
| 457 | if( dryRunFlag ){ |
| 458 | fossil_print("%s\n", db_column_text(&q,0)); |
| 459 | continue; |
| 460 | }else if( !allFlag && !glob_match(pIgnore, db_column_text(&q, 0)+n) ){ |
| 461 | Blob ans; |
| 462 | char cReply; |
| 463 | char *prompt = mprintf("remove unmanaged file \"%s\" (a=all/y/N)? ", |
| 464 | db_column_text(&q, 0)); |
| 465 | blob_zero(&ans); |
| 466 | prompt_user(prompt, &ans); |
| 467 | cReply = blob_str(&ans)[0]; |
| 468 | if( cReply=='a' || cReply=='A' ){ |
| 469 | allFlag = 1; |
| 470 | }else if( cReply!='y' && cReply!='Y' ){ |
| 471 | continue; |
| 472 | } |
| 473 | } |
| 474 | fossil_print("removed unmanaged file \"%s\"\n", db_column_text(&q,0)); |
| 475 | file_delete(db_column_text(&q, 0)); |
| 476 | } |
| 477 | glob_free(pIgnore); |
| 478 | db_finalize(&q); |
| 479 | } |
| 480 | |
| 481 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -452,29 +452,30 @@ | |
| 452 | if( file_tree_name(g.zRepositoryName, &repo, 0) ){ |
| 453 | db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo); |
| 454 | } |
| 455 | db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)"); |
| 456 | while( db_step(&q)==SQLITE_ROW ){ |
| 457 | const char *zName = db_column_text(&q, 0); |
| 458 | if( dryRunFlag ){ |
| 459 | fossil_print("%s\n", db_column_text(&q,0)); |
| 460 | continue; |
| 461 | }else if( !allFlag && !glob_match(pIgnore, zName+n) ){ |
| 462 | Blob ans; |
| 463 | char cReply; |
| 464 | char *prompt = mprintf("remove unmanaged file \"%s\" (a=all/y/N)? ", |
| 465 | zName+n); |
| 466 | blob_zero(&ans); |
| 467 | prompt_user(prompt, &ans); |
| 468 | cReply = blob_str(&ans)[0]; |
| 469 | if( cReply=='a' || cReply=='A' ){ |
| 470 | allFlag = 1; |
| 471 | }else if( cReply!='y' && cReply!='Y' ){ |
| 472 | continue; |
| 473 | } |
| 474 | } |
| 475 | fossil_print("removed unmanaged file \"%s\"\n", zName+n); |
| 476 | file_delete(zName); |
| 477 | } |
| 478 | glob_free(pIgnore); |
| 479 | db_finalize(&q); |
| 480 | } |
| 481 | |
| 482 |