Fossil SCM
Restore the --soft/--hard option processing for mv/rm, which was removed by mistake.
Commit
86212ecee3853da2f07cad046d36dd1a7a464aca
Parent
3c941ddc3674cd0…
1 file changed
+16
+16
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -434,21 +434,29 @@ | ||
| 434 | 434 | */ |
| 435 | 435 | void delete_cmd(void){ |
| 436 | 436 | int i; |
| 437 | 437 | int removeFiles; |
| 438 | 438 | int dryRunFlag; |
| 439 | + int softFlag; | |
| 440 | + int hardFlag; | |
| 439 | 441 | Stmt loop; |
| 440 | 442 | |
| 441 | 443 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 444 | + softFlag = find_option("soft",0,0)!=0; | |
| 445 | + hardFlag = find_option("hard",0,0)!=0; | |
| 442 | 446 | |
| 443 | 447 | /* We should be done with options.. */ |
| 444 | 448 | verify_all_options(); |
| 445 | 449 | |
| 446 | 450 | db_must_be_within_tree(); |
| 447 | 451 | db_begin_transaction(); |
| 448 | 452 | if( g.argv[1][0]=='f' ){ /* i.e. "forget" */ |
| 449 | 453 | removeFiles = 0; |
| 454 | + }else if( softFlag ){ | |
| 455 | + removeFiles = 0; | |
| 456 | + }else if( hardFlag ){ | |
| 457 | + removeFiles = 1; | |
| 450 | 458 | }else{ |
| 451 | 459 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 452 | 460 | removeFiles = db_get_boolean("mv-rm-files",0); |
| 453 | 461 | #else |
| 454 | 462 | removeFiles = FOSSIL_MV_RM_FILE; |
| @@ -810,16 +818,20 @@ | ||
| 810 | 818 | void mv_cmd(void){ |
| 811 | 819 | int i; |
| 812 | 820 | int vid; |
| 813 | 821 | int moveFiles; |
| 814 | 822 | int dryRunFlag; |
| 823 | + int softFlag; | |
| 824 | + int hardFlag; | |
| 815 | 825 | char *zDest; |
| 816 | 826 | Blob dest; |
| 817 | 827 | Stmt q; |
| 818 | 828 | |
| 819 | 829 | db_must_be_within_tree(); |
| 820 | 830 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 831 | + softFlag = find_option("soft",0,0)!=0; | |
| 832 | + hardFlag = find_option("hard",0,0)!=0; | |
| 821 | 833 | |
| 822 | 834 | /* We should be done with options.. */ |
| 823 | 835 | verify_all_options(); |
| 824 | 836 | |
| 825 | 837 | vid = db_lget_int("checkout", 0); |
| @@ -831,10 +843,14 @@ | ||
| 831 | 843 | } |
| 832 | 844 | zDest = g.argv[g.argc-1]; |
| 833 | 845 | db_begin_transaction(); |
| 834 | 846 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 835 | 847 | moveFiles = 0; |
| 848 | + }else if( softFlag ){ | |
| 849 | + moveFiles = 0; | |
| 850 | + }else if( hardFlag ){ | |
| 851 | + moveFiles = 1; | |
| 836 | 852 | }else{ |
| 837 | 853 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 838 | 854 | moveFiles = db_get_boolean("mv-rm-files",0); |
| 839 | 855 | #else |
| 840 | 856 | moveFiles = FOSSIL_MV_RM_FILE; |
| 841 | 857 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -434,21 +434,29 @@ | |
| 434 | */ |
| 435 | void delete_cmd(void){ |
| 436 | int i; |
| 437 | int removeFiles; |
| 438 | int dryRunFlag; |
| 439 | Stmt loop; |
| 440 | |
| 441 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 442 | |
| 443 | /* We should be done with options.. */ |
| 444 | verify_all_options(); |
| 445 | |
| 446 | db_must_be_within_tree(); |
| 447 | db_begin_transaction(); |
| 448 | if( g.argv[1][0]=='f' ){ /* i.e. "forget" */ |
| 449 | removeFiles = 0; |
| 450 | }else{ |
| 451 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 452 | removeFiles = db_get_boolean("mv-rm-files",0); |
| 453 | #else |
| 454 | removeFiles = FOSSIL_MV_RM_FILE; |
| @@ -810,16 +818,20 @@ | |
| 810 | void mv_cmd(void){ |
| 811 | int i; |
| 812 | int vid; |
| 813 | int moveFiles; |
| 814 | int dryRunFlag; |
| 815 | char *zDest; |
| 816 | Blob dest; |
| 817 | Stmt q; |
| 818 | |
| 819 | db_must_be_within_tree(); |
| 820 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 821 | |
| 822 | /* We should be done with options.. */ |
| 823 | verify_all_options(); |
| 824 | |
| 825 | vid = db_lget_int("checkout", 0); |
| @@ -831,10 +843,14 @@ | |
| 831 | } |
| 832 | zDest = g.argv[g.argc-1]; |
| 833 | db_begin_transaction(); |
| 834 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 835 | moveFiles = 0; |
| 836 | }else{ |
| 837 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 838 | moveFiles = db_get_boolean("mv-rm-files",0); |
| 839 | #else |
| 840 | moveFiles = FOSSIL_MV_RM_FILE; |
| 841 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -434,21 +434,29 @@ | |
| 434 | */ |
| 435 | void delete_cmd(void){ |
| 436 | int i; |
| 437 | int removeFiles; |
| 438 | int dryRunFlag; |
| 439 | int softFlag; |
| 440 | int hardFlag; |
| 441 | Stmt loop; |
| 442 | |
| 443 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 444 | softFlag = find_option("soft",0,0)!=0; |
| 445 | hardFlag = find_option("hard",0,0)!=0; |
| 446 | |
| 447 | /* We should be done with options.. */ |
| 448 | verify_all_options(); |
| 449 | |
| 450 | db_must_be_within_tree(); |
| 451 | db_begin_transaction(); |
| 452 | if( g.argv[1][0]=='f' ){ /* i.e. "forget" */ |
| 453 | removeFiles = 0; |
| 454 | }else if( softFlag ){ |
| 455 | removeFiles = 0; |
| 456 | }else if( hardFlag ){ |
| 457 | removeFiles = 1; |
| 458 | }else{ |
| 459 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 460 | removeFiles = db_get_boolean("mv-rm-files",0); |
| 461 | #else |
| 462 | removeFiles = FOSSIL_MV_RM_FILE; |
| @@ -810,16 +818,20 @@ | |
| 818 | void mv_cmd(void){ |
| 819 | int i; |
| 820 | int vid; |
| 821 | int moveFiles; |
| 822 | int dryRunFlag; |
| 823 | int softFlag; |
| 824 | int hardFlag; |
| 825 | char *zDest; |
| 826 | Blob dest; |
| 827 | Stmt q; |
| 828 | |
| 829 | db_must_be_within_tree(); |
| 830 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 831 | softFlag = find_option("soft",0,0)!=0; |
| 832 | hardFlag = find_option("hard",0,0)!=0; |
| 833 | |
| 834 | /* We should be done with options.. */ |
| 835 | verify_all_options(); |
| 836 | |
| 837 | vid = db_lget_int("checkout", 0); |
| @@ -831,10 +843,14 @@ | |
| 843 | } |
| 844 | zDest = g.argv[g.argc-1]; |
| 845 | db_begin_transaction(); |
| 846 | if( g.argv[1][0]=='r' ){ /* i.e. "rename" */ |
| 847 | moveFiles = 0; |
| 848 | }else if( softFlag ){ |
| 849 | moveFiles = 0; |
| 850 | }else if( hardFlag ){ |
| 851 | moveFiles = 1; |
| 852 | }else{ |
| 853 | #if FOSSIL_ENABLE_LEGACY_MV_RM |
| 854 | moveFiles = db_get_boolean("mv-rm-files",0); |
| 855 | #else |
| 856 | moveFiles = FOSSIL_MV_RM_FILE; |
| 857 |