Fossil SCM
Imply the --emptydirs option automatically when the --dirsonly option is used.
Commit
0ecb9500028e7ce665e87125bd715e1d0c4d690f
Parent
4f2bad8396b3b83…
1 file changed
+3
-2
+3
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -515,11 +515,12 @@ | ||
| 515 | 515 | ** empty-dirs setting (and other applicable settings) |
| 516 | 516 | ** belonging to the other repositories, if any, will |
| 517 | 517 | ** not be checked. |
| 518 | 518 | ** --case-sensitive <BOOL> override case-sensitive setting |
| 519 | 519 | ** --dirsonly Only remove empty directories. No files will |
| 520 | -** be removed. | |
| 520 | +** be removed. Using this option will automatically | |
| 521 | +** enable the --emptydirs option as well. | |
| 521 | 522 | ** --dotfiles Include files beginning with a dot ("."). |
| 522 | 523 | ** --emptydirs Remove any empty directories that are not |
| 523 | 524 | ** explicitly exempted via the empty-dirs setting |
| 524 | 525 | ** or another applicable setting or command line |
| 525 | 526 | ** argument. Matching files, if any, are removed |
| @@ -550,12 +551,12 @@ | ||
| 550 | 551 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 551 | 552 | if( !dryRunFlag ){ |
| 552 | 553 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 553 | 554 | } |
| 554 | 555 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 555 | - emptyDirsFlag = find_option("emptydirs","d",0)!=0; | |
| 556 | 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | + emptyDirsFlag = dirsOnlyFlag || find_option("emptydirs","d",0)!=0; | |
| 557 | 558 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 558 | 559 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 559 | 560 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 560 | 561 | zIgnoreFlag = find_option("ignore",0,1); |
| 561 | 562 | verboseFlag = find_option("verbose","v",0)!=0; |
| 562 | 563 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -515,11 +515,12 @@ | |
| 515 | ** empty-dirs setting (and other applicable settings) |
| 516 | ** belonging to the other repositories, if any, will |
| 517 | ** not be checked. |
| 518 | ** --case-sensitive <BOOL> override case-sensitive setting |
| 519 | ** --dirsonly Only remove empty directories. No files will |
| 520 | ** be removed. |
| 521 | ** --dotfiles Include files beginning with a dot ("."). |
| 522 | ** --emptydirs Remove any empty directories that are not |
| 523 | ** explicitly exempted via the empty-dirs setting |
| 524 | ** or another applicable setting or command line |
| 525 | ** argument. Matching files, if any, are removed |
| @@ -550,12 +551,12 @@ | |
| 550 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 551 | if( !dryRunFlag ){ |
| 552 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 553 | } |
| 554 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 555 | emptyDirsFlag = find_option("emptydirs","d",0)!=0; |
| 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 558 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 559 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 560 | zIgnoreFlag = find_option("ignore",0,1); |
| 561 | verboseFlag = find_option("verbose","v",0)!=0; |
| 562 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -515,11 +515,12 @@ | |
| 515 | ** empty-dirs setting (and other applicable settings) |
| 516 | ** belonging to the other repositories, if any, will |
| 517 | ** not be checked. |
| 518 | ** --case-sensitive <BOOL> override case-sensitive setting |
| 519 | ** --dirsonly Only remove empty directories. No files will |
| 520 | ** be removed. Using this option will automatically |
| 521 | ** enable the --emptydirs option as well. |
| 522 | ** --dotfiles Include files beginning with a dot ("."). |
| 523 | ** --emptydirs Remove any empty directories that are not |
| 524 | ** explicitly exempted via the empty-dirs setting |
| 525 | ** or another applicable setting or command line |
| 526 | ** argument. Matching files, if any, are removed |
| @@ -550,12 +551,12 @@ | |
| 551 | dryRunFlag = find_option("dry-run","n",0)!=0; |
| 552 | if( !dryRunFlag ){ |
| 553 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 554 | } |
| 555 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | emptyDirsFlag = dirsOnlyFlag || find_option("emptydirs","d",0)!=0; |
| 558 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 559 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 560 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 561 | zIgnoreFlag = find_option("ignore",0,1); |
| 562 | verboseFlag = find_option("verbose","v",0)!=0; |
| 563 |