Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge cleanX |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | cleanX-no-clean-glob |
| Files: | files | file ages | folders |
| SHA1: |
607bc737e755c7bd03c084583804c0a9 |
| User & Date: | jan.nijtmans 2015-11-03 23:50:00.000 |
Context
|
2015-11-04
| ||
| 00:50 | Don't prompt when using -x check-in: e24b5abaf2 user: jan.nijtmans tags: cleanX-no-clean-glob | |
|
2015-11-03
| ||
| 23:50 | merge cleanX check-in: 607bc737e7 user: jan.nijtmans tags: cleanX-no-clean-glob | |
| 22:50 | merge trunk check-in: c7fbeb7aaa user: jan.nijtmans tags: cleanX | |
| 05:47 | merge cleanX check-in: 346d62a411 user: jan.nijtmans tags: cleanX-no-clean-glob | |
Changes
Changes to src/checkin.c.
1 2 3 4 5 6 | /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also ** known as the "2-Clause License" or "FreeBSD License".) | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or ** modify it under the terms of the Simplified BSD License (also ** known as the "2-Clause License" or "FreeBSD License".) ** ** This program is distributed in the hope that it will be useful, ** but without any warranty; without even the implied warranty of ** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ |
| ︙ | ︙ | |||
60 61 62 63 64 65 66 |
(blob_size(&where)>0) ? "OR" : "AND", zName,
filename_collation(), zName, filename_collation(),
zName, filename_collation()
);
}
db_prepare(&q,
| | > | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 |
(blob_size(&where)>0) ? "OR" : "AND", zName,
filename_collation(), zName, filename_collation(),
zName, filename_collation()
);
}
db_prepare(&q,
"SELECT pathname, deleted, chnged,"
" rid, coalesce(origname!=pathname,0), islink"
" FROM vfile "
" WHERE is_selected(id) %s"
" AND (chnged OR deleted OR rid=0 OR pathname!=origname)"
" ORDER BY 1 /*scan*/",
blob_sql_text(&where)
);
blob_zero(&rewrittenPathname);
|
| ︙ | ︙ | |||
433 434 435 436 437 438 439 |
" datetime(checkin_mtime(%d,rid),'unixepoch'%s)"
" FROM vfile %s"
" ORDER BY %s",
vid, timeline_utc(), blob_sql_text(&where), zOrderBy /*safe-for-%s*/
);
}else{
db_prepare(&q,
| | > | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 |
" datetime(checkin_mtime(%d,rid),'unixepoch'%s)"
" FROM vfile %s"
" ORDER BY %s",
vid, timeline_utc(), blob_sql_text(&where), zOrderBy /*safe-for-%s*/
);
}else{
db_prepare(&q,
"SELECT pathname, deleted, rid, chnged,"
" coalesce(origname!=pathname,0), islink"
" FROM vfile %s"
" ORDER BY %s", blob_sql_text(&where), zOrderBy /*safe-for-%s*/
);
}
blob_reset(&where);
while( db_step(&q)==SQLITE_ROW ){
const char *zPathname = db_column_text(&q,0);
|
| ︙ | ︙ | |||
668 669 670 671 672 673 674 675 676 677 678 679 680 681 | ** explicitly exempted via the empty-dirs setting ** or another applicable setting or command line ** argument. Matching files, if any, are removed ** prior to checking for any empty directories; ** therefore, directories that contain only files ** that were removed will be removed as well. ** -f|--force Remove files without prompting. ** -x|--verily WARNING: Removes everything that is not a managed ** file or the repository itself. This option ** implies the --emptydirs and --dotfiles options. ** --disable-undo options. Furthermore, it completely ** disregards ignore-glob settings. ** Compatibile with "git clean -x". ** --ignore <CSG> Ignore files matching patterns from the | > | 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 | ** explicitly exempted via the empty-dirs setting ** or another applicable setting or command line ** argument. Matching files, if any, are removed ** prior to checking for any empty directories; ** therefore, directories that contain only files ** that were removed will be removed as well. ** -f|--force Remove files without prompting. ** -i|--prompt Prompt before removing each file. ** -x|--verily WARNING: Removes everything that is not a managed ** file or the repository itself. This option ** implies the --emptydirs and --dotfiles options. ** --disable-undo options. Furthermore, it completely ** disregards ignore-glob settings. ** Compatibile with "git clean -x". ** --ignore <CSG> Ignore files matching patterns from the |
| ︙ | ︙ | |||
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 716 717 718 719 720 721 722 723 724 |
**
** See also: addremove, extras, status
*/
void clean_cmd(void){
int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
int emptyDirsFlag, dirsOnlyFlag;
int disableUndo, noPrompt;
unsigned scanFlags = 0;
int verilyFlag = 0;
const char *zIgnoreFlag, *zKeepFlag, *zCleanFlag;
Glob *pIgnore, *pKeep, *pClean;
int nRoot;
#ifndef UNDO_SIZE_LIMIT /* TODO: Setting? */
#define UNDO_SIZE_LIMIT (10*1024*1024) /* 10MiB */
#endif
undo_capture_command_line();
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;
}
disableUndo = find_option("disable-undo",0,0)!=0;
noPrompt = find_option("no-prompt",0,0)!=0;
allFileFlag = allDirFlag = 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);
| > > | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 |
**
** See also: addremove, extras, status
*/
void clean_cmd(void){
int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
int emptyDirsFlag, dirsOnlyFlag;
int disableUndo, noPrompt;
int alwaysPrompt = 0;
unsigned scanFlags = 0;
int verilyFlag = 0;
const char *zIgnoreFlag, *zKeepFlag, *zCleanFlag;
Glob *pIgnore, *pKeep, *pClean;
int nRoot;
#ifndef UNDO_SIZE_LIMIT /* TODO: Setting? */
#define UNDO_SIZE_LIMIT (10*1024*1024) /* 10MiB */
#endif
undo_capture_command_line();
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;
}
disableUndo = find_option("disable-undo",0,0)!=0;
noPrompt = find_option("no-prompt",0,0)!=0;
alwaysPrompt = find_option("prompt","i",0)!=0;
allFileFlag = allDirFlag = 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);
|
| ︙ | ︙ | |||
767 768 769 770 771 772 773 774 |
fossil_print("KEPT file \"%s\" not removed (due to --keep"
" or \"keep-glob\")\n", zName+nRoot);
}
continue;
}
if( !dryRunFlag
&& !(verilyFlag && glob_match(pIgnore, zName+nRoot)) ){
int undoRc = UNDO_NONE;
| > > > > > > > > > > > > > > > > > | < | | | | | | > | | 772 773 774 775 776 777 778 779 780 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 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 |
fossil_print("KEPT file \"%s\" not removed (due to --keep"
" or \"keep-glob\")\n", zName+nRoot);
}
continue;
}
if( !dryRunFlag
&& !(verilyFlag && glob_match(pIgnore, zName+nRoot)) ){
char *zPrompt = 0;
char cReply;
Blob ans = empty_blob;
int undoRc = UNDO_NONE;
if( alwaysPrompt ){
zPrompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
zName+nRoot);
prompt_user(zPrompt, &ans);
fossil_free(zPrompt);
cReply = fossil_toupper(blob_str(&ans)[0]);
blob_reset(&ans);
if( cReply=='N' ) continue;
if( cReply=='A' ){
allFileFlag = 1;
alwaysPrompt = 0;
}else{
undoRc = UNDO_SAVED_OK;
}
}else if( !disableUndo ){
undoRc = undo_maybe_save(zName+nRoot, UNDO_SIZE_LIMIT);
}
if( undoRc!=UNDO_SAVED_OK ){
if( allFileFlag ){
cReply = 'Y';
}else if( !noPrompt ){
Blob ans;
zPrompt = mprintf("\nWARNING: Deletion of this file will "
"not be undoable via the 'undo'\n"
" command because %s.\n\n"
"Remove unmanaged file \"%s\" (a=all/y/N)? ",
undo_save_message(undoRc), zName+nRoot);
prompt_user(zPrompt, &ans);
fossil_free(zPrompt);
cReply = blob_str(&ans)[0];
blob_reset(&ans);
}else{
cReply = 'N';
}
if( cReply=='a' || cReply=='A' ){
allFileFlag = 1;
}else if( cReply!='y' && cReply!='Y' ){
continue;
}
}
}
if( dryRunFlag || file_delete(zName)==0 ){
if( verboseFlag || dryRunFlag ){
fossil_print("Removed unmanaged file: %s\n", zName+nRoot);
}
}else{
fossil_print("Could not remove file: %s\n", zName+nRoot);
}
}
db_finalize(&q);
if( !dryRunFlag && !disableUndo ) undo_finish();
}
if( emptyDirsFlag ){
|
| ︙ | ︙ |
Changes to src/db.c.
| ︙ | ︙ | |||
2245 2246 2247 2248 2249 2250 2251 |
if( g.argc==4 ){
g.zOpenRevision = g.argv[3];
}else if( db_exists("SELECT 1 FROM event WHERE type='ci'") ){
g.zOpenRevision = db_get("main-branch", "trunk");
}
}
| < < < < < < > > > > > | 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 |
if( g.argc==4 ){
g.zOpenRevision = g.argv[3];
}else if( db_exists("SELECT 1 FROM event WHERE type='ci'") ){
g.zOpenRevision = db_get("main-branch", "trunk");
}
}
#if defined(_WIN32) || defined(__CYGWIN__)
# define LOCALDB_NAME "./_FOSSIL_"
#else
# define LOCALDB_NAME "./.fslckout"
#endif
db_init_database(LOCALDB_NAME, zLocalSchema,
#ifdef FOSSIL_LOCAL_WAL
"COMMIT; PRAGMA journal_mode=WAL; BEGIN;",
#endif
(char*)0);
db_delete_on_failure(LOCALDB_NAME);
db_open_local(0);
if( g.zOpenRevision ){
/* Since the repository is open and we know the revision now,
** refresh the allow-symlinks flag. */
g.allowSymlinks = db_get_boolean("allow-symlinks", 0);
}
db_lset("repository", g.argv[2]);
db_record_repository_filename(g.argv[2]);
db_lset_int("checkout", 0);
azNewArgv[0] = g.argv[0];
g.argv = azNewArgv;
if( !emptyFlag ){
g.argc = 3;
|
| ︙ | ︙ | |||
2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 |
const char *def; /* Default value */
};
#endif /* INTERFACE */
const Setting aSetting[] = {
{ "access-log", 0, 0, 0, 0, "off" },
{ "admin-log", 0, 0, 0, 0, "off" },
{ "allow-symlinks", 0, 0, 1, 0, "off" },
{ "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
{ "auto-hyperlink", 0, 0, 0, 0, "on", },
{ "auto-shun", 0, 0, 0, 0, "on" },
{ "autosync", 0, 0, 0, 0, "on" },
{ "autosync-tries", 0, 16, 0, 0, "1" },
{ "binary-glob", 0, 40, 1, 0, "" },
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
| > > > > | 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 |
const char *def; /* Default value */
};
#endif /* INTERFACE */
const Setting aSetting[] = {
{ "access-log", 0, 0, 0, 0, "off" },
{ "admin-log", 0, 0, 0, 0, "off" },
#if defined(_WIN32)
{ "allow-symlinks", 0, 0, 1, 0, "off" },
#else
{ "allow-symlinks", 0, 0, 1, 0, "on" },
#endif
{ "auto-captcha", "autocaptcha", 0, 0, 0, "on" },
{ "auto-hyperlink", 0, 0, 0, 0, "on", },
{ "auto-shun", 0, 0, 0, 0, "on" },
{ "autosync", 0, 0, 0, 0, "on" },
{ "autosync-tries", 0, 16, 0, 0, "1" },
{ "binary-glob", 0, 40, 1, 0, "" },
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__DARWIN__) || \
|
| ︙ | ︙ |