Fossil SCM
Emit diagnostic messages after the file operations have been done, not before.
Commit
1dad8acaa2d44f2255cb754f8c1f50209bb76acd
Parent
dfc3dfa59cae37c…
1 file changed
+2
-2
+2
-2
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -352,14 +352,14 @@ | ||
| 352 | 352 | ){ |
| 353 | 353 | Stmt remove; |
| 354 | 354 | db_prepare(&remove, "SELECT x FROM fremove ORDER BY x;"); |
| 355 | 355 | while( db_step(&remove)==SQLITE_ROW ){ |
| 356 | 356 | const char *zOldName = db_column_text(&remove, 0); |
| 357 | - fossil_print("REMOVED %s\n", zOldName); | |
| 358 | 357 | if( !dryRunFlag ){ |
| 359 | 358 | file_delete(zOldName); |
| 360 | 359 | } |
| 360 | + fossil_print("REMOVED %s\n", zOldName); | |
| 361 | 361 | } |
| 362 | 362 | db_finalize(&remove); |
| 363 | 363 | db_multi_exec("DROP TABLE fremove;"); |
| 364 | 364 | } |
| 365 | 365 | |
| @@ -682,19 +682,19 @@ | ||
| 682 | 682 | Stmt move; |
| 683 | 683 | db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;"); |
| 684 | 684 | while( db_step(&move)==SQLITE_ROW ){ |
| 685 | 685 | const char *zOldName = db_column_text(&move, 0); |
| 686 | 686 | const char *zNewName = db_column_text(&move, 1); |
| 687 | - fossil_print("MOVED %s %s\n", zOldName, zNewName); | |
| 688 | 687 | if( !dryRunFlag ){ |
| 689 | 688 | if( file_wd_islink(zOldName) ){ |
| 690 | 689 | symlink_copy(zOldName, zNewName); |
| 691 | 690 | }else{ |
| 692 | 691 | file_copy(zOldName, zNewName); |
| 693 | 692 | } |
| 694 | 693 | file_delete(zOldName); |
| 695 | 694 | } |
| 695 | + fossil_print("MOVED %s %s\n", zOldName, zNewName); | |
| 696 | 696 | } |
| 697 | 697 | db_finalize(&move); |
| 698 | 698 | db_multi_exec("DROP TABLE fmove;"); |
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -352,14 +352,14 @@ | |
| 352 | ){ |
| 353 | Stmt remove; |
| 354 | db_prepare(&remove, "SELECT x FROM fremove ORDER BY x;"); |
| 355 | while( db_step(&remove)==SQLITE_ROW ){ |
| 356 | const char *zOldName = db_column_text(&remove, 0); |
| 357 | fossil_print("REMOVED %s\n", zOldName); |
| 358 | if( !dryRunFlag ){ |
| 359 | file_delete(zOldName); |
| 360 | } |
| 361 | } |
| 362 | db_finalize(&remove); |
| 363 | db_multi_exec("DROP TABLE fremove;"); |
| 364 | } |
| 365 | |
| @@ -682,19 +682,19 @@ | |
| 682 | Stmt move; |
| 683 | db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;"); |
| 684 | while( db_step(&move)==SQLITE_ROW ){ |
| 685 | const char *zOldName = db_column_text(&move, 0); |
| 686 | const char *zNewName = db_column_text(&move, 1); |
| 687 | fossil_print("MOVED %s %s\n", zOldName, zNewName); |
| 688 | if( !dryRunFlag ){ |
| 689 | if( file_wd_islink(zOldName) ){ |
| 690 | symlink_copy(zOldName, zNewName); |
| 691 | }else{ |
| 692 | file_copy(zOldName, zNewName); |
| 693 | } |
| 694 | file_delete(zOldName); |
| 695 | } |
| 696 | } |
| 697 | db_finalize(&move); |
| 698 | db_multi_exec("DROP TABLE fmove;"); |
| 699 | } |
| 700 | |
| 701 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -352,14 +352,14 @@ | |
| 352 | ){ |
| 353 | Stmt remove; |
| 354 | db_prepare(&remove, "SELECT x FROM fremove ORDER BY x;"); |
| 355 | while( db_step(&remove)==SQLITE_ROW ){ |
| 356 | const char *zOldName = db_column_text(&remove, 0); |
| 357 | if( !dryRunFlag ){ |
| 358 | file_delete(zOldName); |
| 359 | } |
| 360 | fossil_print("REMOVED %s\n", zOldName); |
| 361 | } |
| 362 | db_finalize(&remove); |
| 363 | db_multi_exec("DROP TABLE fremove;"); |
| 364 | } |
| 365 | |
| @@ -682,19 +682,19 @@ | |
| 682 | Stmt move; |
| 683 | db_prepare(&move, "SELECT x, y FROM fmove ORDER BY x;"); |
| 684 | while( db_step(&move)==SQLITE_ROW ){ |
| 685 | const char *zOldName = db_column_text(&move, 0); |
| 686 | const char *zNewName = db_column_text(&move, 1); |
| 687 | if( !dryRunFlag ){ |
| 688 | if( file_wd_islink(zOldName) ){ |
| 689 | symlink_copy(zOldName, zNewName); |
| 690 | }else{ |
| 691 | file_copy(zOldName, zNewName); |
| 692 | } |
| 693 | file_delete(zOldName); |
| 694 | } |
| 695 | fossil_print("MOVED %s %s\n", zOldName, zNewName); |
| 696 | } |
| 697 | db_finalize(&move); |
| 698 | db_multi_exec("DROP TABLE fmove;"); |
| 699 | } |
| 700 | |
| 701 |