Index: src/checkin.c ================================================================== --- src/checkin.c +++ src/checkin.c @@ -383,16 +383,15 @@ ** cannot be undone. ** ** You will be prompted before removing each eligible file unless the ** --force flag is in use or it matches the --clean option. The ** GLOBPATTERN specified by the "ignore-glob" setting is used if the -** --ignore option is omitted, the same with "clean-glob" and --clean -** as well as "keep-glob" and --keep. If you are sure you wish to -** remove all "extra" files except the ones specified with --ignore -** and --keep, you can specify the optional -f|--force flag and no -** prompts will be issued. If a file matches both --keep and --clean, -** --keep takes precedence. +** --ignore option is omitted, the same with "clean-glob" and --clean. +** If you are sure you wish to remove all "extra" files except the +** ones specified with --ignore, you can specify the optional +** -f|--force flag and no prompts will be issued. If a file matches +** both --ignore and --clean, --ignore takes precedence. ** ** Files and subdirectories whose names begin with "." are ** normally kept. They are handled if the "--dotfiles" option ** is used. ** @@ -402,25 +401,23 @@ ** -f|--force Remove files without prompting ** --clean never prompt for files matching this ** comma separated list of glob patterns. ** --ignore ignore files matching patterns from the ** comma separated list of glob patterns. -** --keep keep files matching this comma separated -** list of glob patterns. ** -n|--dry-run If given, display instead of run actions ** --temp Remove only Fossil-generated temporary files ** ** See also: addremove, extra, status */ void clean_cmd(void){ int allFlag; unsigned scanFlags = 0; - const char *zIgnoreFlag, *zKeepFlag, *zCleanFlag; + const char *zIgnoreFlag, *zCleanFlag; Blob path, repo; Stmt q; int n; - Glob *pIgnore, *pKeep, *pClean; + Glob *pIgnore, *pClean; int dryRunFlag = 0; allFlag = find_option("force","f",0)!=0; if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; @@ -427,32 +424,26 @@ zIgnoreFlag = find_option("ignore",0,1); dryRunFlag = find_option("dry-run","n",0)!=0; if( !dryRunFlag ){ dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ } - zKeepFlag = find_option("keep",0,1); zCleanFlag = find_option("clean",0,1); capture_case_sensitive_option(); db_must_be_within_tree(); if( zIgnoreFlag==0 ){ zIgnoreFlag = db_get("ignore-glob", 0); } - if( zKeepFlag==0 ){ - zKeepFlag = db_get("keep-glob", 0); - } if( zCleanFlag==0 ){ zCleanFlag = db_get("clean-glob", 0); } db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)", filename_collation()); n = strlen(g.zLocalRoot); blob_init(&path, g.zLocalRoot, n-1); pIgnore = glob_create(zIgnoreFlag); - pKeep = glob_create(zKeepFlag); pClean = glob_create(zCleanFlag); - vfile_scan2(&path, blob_size(&path), scanFlags, pIgnore, pKeep); - glob_free(pKeep); + vfile_scan(&path, blob_size(&path), scanFlags, pIgnore); glob_free(pIgnore); db_prepare(&q, "SELECT %Q || x FROM sfile" " WHERE x NOT IN (%s)" " ORDER BY 1", Index: src/configure.c ================================================================== --- src/configure.c +++ src/configure.c @@ -103,11 +103,10 @@ { "project-description", CONFIGSET_PROJ }, { "manifest", CONFIGSET_PROJ }, { "binary-glob", CONFIGSET_PROJ }, { "clean-glob", CONFIGSET_PROJ }, { "ignore-glob", CONFIGSET_PROJ }, - { "keep-glob", CONFIGSET_PROJ }, { "crnl-glob", CONFIGSET_PROJ }, { "encoding-glob", CONFIGSET_PROJ }, { "empty-dirs", CONFIGSET_PROJ }, { "allow-symlinks", CONFIGSET_PROJ }, Index: src/db.c ================================================================== --- src/db.c +++ src/db.c @@ -2111,11 +2111,10 @@ { "gdiff-command", 0, 40, 0, "gdiff" }, { "gmerge-command",0, 40, 0, "" }, { "http-port", 0, 16, 0, "8080" }, { "https-login", 0, 0, 0, "off" }, { "ignore-glob", 0, 40, 1, "" }, - { "keep-glob", 0, 40, 1, "" }, { "localauth", 0, 0, 0, "off" }, { "main-branch", 0, 40, 0, "trunk" }, { "manifest", 0, 0, 1, "off" }, { "max-upload", 0, 25, 0, "250000" }, { "mtime-changes", 0, 0, 0, "on" }, @@ -2249,14 +2248,10 @@ ** ignore-glob The VALUE is a comma or newline-separated list of GLOB ** (versionable) patterns specifying files that the "add", "addremove", ** "clean", and "extra" commands will ignore. ** Example: *.log customCode.c notes.txt ** -** keep-glob The VALUE is a comma or newline-separated list of GLOB -** (versionable) patterns specifying files that the "clean" command will -** keep. -** ** localauth If enabled, require that HTTP connections from ** 127.0.0.1 be authenticated by password. If ** false, all HTTP requests from localhost have ** unrestricted access to the repository. ** Index: src/json_config.c ================================================================== --- src/json_config.c +++ src/json_config.c @@ -67,11 +67,10 @@ { "manifest", CONFIGSET_PROJ }, { "binary-glob", CONFIGSET_PROJ }, { "clean-glob", CONFIGSET_PROJ }, { "encoding-glob", CONFIGSET_PROJ }, { "ignore-glob", CONFIGSET_PROJ }, -{ "keep-glob", CONFIGSET_PROJ }, { "crnl-glob", CONFIGSET_PROJ }, { "empty-dirs", CONFIGSET_PROJ }, { "allow-symlinks", CONFIGSET_PROJ }, { "ticket-table", CONFIGSET_TKT },