Fossil SCM
Let --keep/"keep-glob" survive a --verily (contrary to --ignore/"ignore-glob")
Commit
32ed3663a1a6cdd198d6bd07b2e35cef94c8dfb1
Parent
897acdc89fe903e…
1 file changed
+5
-5
+5
-5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -659,17 +659,18 @@ | ||
| 659 | 659 | ** therefore, directories that contain only files |
| 660 | 660 | ** that were removed will be removed as well. |
| 661 | 661 | ** -f|--force Remove files without prompting. |
| 662 | 662 | ** -x|--verily Remove everything that is not a managed file or |
| 663 | 663 | ** the repository itself. Implies -f --emptydirs |
| 664 | -** --dotfiles --ignore '' --keep ''. | |
| 664 | +** --dotfiles --ignore ''. | |
| 665 | 665 | ** --clean <CSG> Never prompt for files matching this |
| 666 | 666 | ** comma separated list of glob patterns. |
| 667 | 667 | ** --ignore <CSG> Ignore files matching patterns from the |
| 668 | 668 | ** comma separated list of glob patterns. |
| 669 | -** --keep <CSG> Keep files matching this comma separated | |
| 670 | -** list of glob patterns. | |
| 669 | +** --keep <CSG> Ignore files matching this comma separated | |
| 670 | +** list of glob patterns too, but this option | |
| 671 | +** even survives the --verily option. | |
| 671 | 672 | ** -n|--dry-run If given, display instead of run actions. |
| 672 | 673 | ** --temp Remove only Fossil-generated temporary files. |
| 673 | 674 | ** -v|--verbose Show all files as they are removed. |
| 674 | 675 | ** |
| 675 | 676 | ** See also: addremove, extras, status |
| @@ -703,18 +704,17 @@ | ||
| 703 | 704 | db_must_be_within_tree(); |
| 704 | 705 | if( find_option("verily","x",0)!=0 ){ |
| 705 | 706 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 706 | 707 | emptyDirsFlag = 1; |
| 707 | 708 | scanFlags |= SCAN_ALL; |
| 708 | - zKeepFlag = 0; | |
| 709 | 709 | zIgnoreFlag = 0; |
| 710 | 710 | zCleanFlag = 0; |
| 711 | 711 | } |
| 712 | 712 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 713 | 713 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 714 | 714 | } |
| 715 | - if( zKeepFlag==0 && !verilyFlag ){ | |
| 715 | + if( zKeepFlag==0 ){ | |
| 716 | 716 | zKeepFlag = db_get("keep-glob", 0); |
| 717 | 717 | } |
| 718 | 718 | if( zCleanFlag==0 && !verilyFlag ){ |
| 719 | 719 | zCleanFlag = db_get("clean-glob", 0); |
| 720 | 720 | } |
| 721 | 721 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -659,17 +659,18 @@ | |
| 659 | ** therefore, directories that contain only files |
| 660 | ** that were removed will be removed as well. |
| 661 | ** -f|--force Remove files without prompting. |
| 662 | ** -x|--verily Remove everything that is not a managed file or |
| 663 | ** the repository itself. Implies -f --emptydirs |
| 664 | ** --dotfiles --ignore '' --keep ''. |
| 665 | ** --clean <CSG> Never prompt for files matching this |
| 666 | ** comma separated list of glob patterns. |
| 667 | ** --ignore <CSG> Ignore files matching patterns from the |
| 668 | ** comma separated list of glob patterns. |
| 669 | ** --keep <CSG> Keep files matching this comma separated |
| 670 | ** list of glob patterns. |
| 671 | ** -n|--dry-run If given, display instead of run actions. |
| 672 | ** --temp Remove only Fossil-generated temporary files. |
| 673 | ** -v|--verbose Show all files as they are removed. |
| 674 | ** |
| 675 | ** See also: addremove, extras, status |
| @@ -703,18 +704,17 @@ | |
| 703 | db_must_be_within_tree(); |
| 704 | if( find_option("verily","x",0)!=0 ){ |
| 705 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 706 | emptyDirsFlag = 1; |
| 707 | scanFlags |= SCAN_ALL; |
| 708 | zKeepFlag = 0; |
| 709 | zIgnoreFlag = 0; |
| 710 | zCleanFlag = 0; |
| 711 | } |
| 712 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 713 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 714 | } |
| 715 | if( zKeepFlag==0 && !verilyFlag ){ |
| 716 | zKeepFlag = db_get("keep-glob", 0); |
| 717 | } |
| 718 | if( zCleanFlag==0 && !verilyFlag ){ |
| 719 | zCleanFlag = db_get("clean-glob", 0); |
| 720 | } |
| 721 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -659,17 +659,18 @@ | |
| 659 | ** therefore, directories that contain only files |
| 660 | ** that were removed will be removed as well. |
| 661 | ** -f|--force Remove files without prompting. |
| 662 | ** -x|--verily Remove everything that is not a managed file or |
| 663 | ** the repository itself. Implies -f --emptydirs |
| 664 | ** --dotfiles --ignore ''. |
| 665 | ** --clean <CSG> Never prompt for files matching this |
| 666 | ** comma separated list of glob patterns. |
| 667 | ** --ignore <CSG> Ignore files matching patterns from the |
| 668 | ** comma separated list of glob patterns. |
| 669 | ** --keep <CSG> Ignore files matching this comma separated |
| 670 | ** list of glob patterns too, but this option |
| 671 | ** even survives the --verily option. |
| 672 | ** -n|--dry-run If given, display instead of run actions. |
| 673 | ** --temp Remove only Fossil-generated temporary files. |
| 674 | ** -v|--verbose Show all files as they are removed. |
| 675 | ** |
| 676 | ** See also: addremove, extras, status |
| @@ -703,18 +704,17 @@ | |
| 704 | db_must_be_within_tree(); |
| 705 | if( find_option("verily","x",0)!=0 ){ |
| 706 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 707 | emptyDirsFlag = 1; |
| 708 | scanFlags |= SCAN_ALL; |
| 709 | zIgnoreFlag = 0; |
| 710 | zCleanFlag = 0; |
| 711 | } |
| 712 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 713 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 714 | } |
| 715 | if( zKeepFlag==0 ){ |
| 716 | zKeepFlag = db_get("keep-glob", 0); |
| 717 | } |
| 718 | if( zCleanFlag==0 && !verilyFlag ){ |
| 719 | zCleanFlag = db_get("clean-glob", 0); |
| 720 | } |
| 721 |