Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | No longer assume -f with -x|--verily, as everything matching --ignore will not be prompted for anyway. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | cleanX |
Files: | files | file ages | folders |
SHA1: |
f870407c8cc61bb3dcf420f4a1668462 |
User & Date: | jan.nijtmans 2015-04-30 22:03:00.000 |
Context
2015-05-04
| ||
21:10 | merge trunk ... (check-in: 857ab8ae user: jan.nijtmans tags: cleanX) | |
2015-04-30
| ||
22:03 | No longer assume -f with -x|--verily, as everything matching --ignore will not be prompted for anyway. ... (check-in: f870407c user: jan.nijtmans tags: cleanX) | |
21:53 | Remove no-longer used allow-clean-x setting ... (check-in: 330c88eb user: jan.nijtmans tags: cleanX) | |
Changes
Deleted .fossil-settings/clean-glob.
|
| < < < < < < < < < < < < < < < < < |
Changes to .fossil-settings/ignore-glob.
1 2 3 4 5 | compat/openssl* compat/tcl* fossil fossil.exe win/fossil.exe | > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | compat/openssl* compat/tcl* *.a *.lib *.manifest *.o *.obj *.pdb *.res Makefile bld/* wbld/* win/*.c win/*.h win/*.exe win/headers win/linkopts autoconfig.h config.log fossil fossil.exe win/fossil.exe |
Changes to src/checkin.c.
︙ | ︙ | |||
632 633 634 635 636 637 638 | ** specified by the --clean option. No file that matches glob patterns ** specified by --ignore or --keep will ever be deleted. The default ** values for --clean, --ignore, and --keep are determined by the ** (versionable) clean-glob, ignore-glob, and keep-glob settings. ** Files and subdirectories whose names begin with "." are automatically ** ignored unless the --dotfiles option is used. ** | | | 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 | ** specified by the --clean option. No file that matches glob patterns ** specified by --ignore or --keep will ever be deleted. The default ** values for --clean, --ignore, and --keep are determined by the ** (versionable) clean-glob, ignore-glob, and keep-glob settings. ** Files and subdirectories whose names begin with "." are automatically ** ignored unless the --dotfiles option is used. ** ** The --verily option ignores the ignore-glob setting and turns on **--dotfiles, and --emptydirs. Use the --verily option when you ** really want to clean up everything. ** ** Options: ** --allckouts Check for empty directories within any checkouts ** that may be nested within the current one. This ** option should be used with great care because the |
︙ | ︙ | |||
674 675 676 677 678 679 680 | ** deleted. ** --temp Remove only Fossil-generated temporary files. ** -v|--verbose Show all files as they are removed. ** ** See also: addremove, extras, status */ void clean_cmd(void){ | | | | | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 | ** deleted. ** --temp Remove only Fossil-generated temporary files. ** -v|--verbose Show all files as they are removed. ** ** See also: addremove, extras, status */ void clean_cmd(void){ int allFileFlag, dryRunFlag, verboseFlag; int emptyDirsFlag, dirsOnlyFlag; unsigned scanFlags = 0; int verilyFlag; const char *zIgnoreFlag, *zKeepFlag, *zCleanFlag; Glob *pIgnore, *pKeep, *pClean; int nRoot; dryRunFlag = find_option("dry-run","n",0)!=0; if( !dryRunFlag ){ dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ } if( !dryRunFlag ){ dryRunFlag = find_option("whatif",0,0)!=0; } allFileFlag = find_option("force","f",0)!=0; dirsOnlyFlag = find_option("dirsonly",0,0)!=0; emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; zIgnoreFlag = find_option("ignore",0,1); verboseFlag = find_option("verbose","v",0)!=0; zKeepFlag = find_option("keep",0,1); zCleanFlag = find_option("clean",0,1); db_must_be_within_tree(); if( find_option("verily","x",0)!=0 ){ verilyFlag = 1; emptyDirsFlag = 1; scanFlags |= SCAN_ALL; zCleanFlag = 0; } if( zIgnoreFlag==0 ){ zIgnoreFlag = db_get("ignore-glob", 0); } |
︙ | ︙ | |||
781 782 783 784 785 786 787 | } if( emptyDirsFlag ){ Glob *pEmptyDirs = glob_create(db_get("empty-dirs", 0)); Stmt q; Blob root; blob_init(&root, g.zLocalRoot, nRoot - 1); vfile_dir_scan(&root, blob_size(&root), scanFlags, | | < < < < < < < < < < < < < < < < < < < < < < < | 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 | } if( emptyDirsFlag ){ Glob *pEmptyDirs = glob_create(db_get("empty-dirs", 0)); Stmt q; Blob root; blob_init(&root, g.zLocalRoot, nRoot - 1); vfile_dir_scan(&root, blob_size(&root), scanFlags, verilyFlag ? 0 : pIgnore, pEmptyDirs); blob_reset(&root); db_prepare(&q, "SELECT %Q || x FROM dscan_temp" " WHERE x NOT IN (%s) AND y = 0" " ORDER BY 1 DESC", g.zLocalRoot, fossil_all_reserved_names(0) ); while( db_step(&q)==SQLITE_ROW ){ const char *zName = db_column_text(&q, 0); if( glob_match(pKeep, zName+nRoot) ){ if( verboseFlag || verilyFlag ){ fossil_print("KEPT directory \"%s\" not removed (due to --keep" " or \"keep-glob\")\n", zName+nRoot); } continue; } if( dryRunFlag || file_rmdir(zName)==0 ){ if( verboseFlag || dryRunFlag ){ fossil_print("Removed unmanaged directory: %s\n", zName+nRoot); } }else if( verboseFlag ){ fossil_print("Could not remove directory: %s\n", zName+nRoot); } |
︙ | ︙ |