Fossil SCM

For now, silence messages about kept files being skipped during clean.

mistachkin 2013-05-30 21:59 trunk

Commit 45675bdd924e7a688431c143626efcbb8be88119

Parent 67c9cd12ad2ab63…

1 file changed +2 -6

M src/checkin.c

+2 -6

		--- src/checkin.c
		+++ src/checkin.c
		@@ -452,11 +452,12 @@
452	452	n = strlen(g.zLocalRoot);
453	453	blob_init(&path, g.zLocalRoot, n-1);
454	454	pIgnore = glob_create(zIgnoreFlag);
455	455	pKeep = glob_create(zKeepFlag);
456	456	pClean = glob_create(zCleanFlag);
457		- vfile_scan(&path, blob_size(&path), scanFlags, pIgnore);
	457	+ vfile_scan2(&path, blob_size(&path), scanFlags, pIgnore, pKeep);
	458	+ glob_free(pKeep);
458	459	glob_free(pIgnore);
459	460	db_prepare(&q,
460	461	"SELECT %Q \|\| x FROM sfile"
461	462	" WHERE x NOT IN (%s)"
462	463	" ORDER BY 1",
		@@ -466,14 +467,10 @@
466	467	db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
467	468	}
468	469	db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
469	470	while( db_step(&q)==SQLITE_ROW ){
470	471	const char *zName = db_column_text(&q, 0);
471		- if( glob_match(pKeep, zName+n) ){
472		- fossil_print("WARNING: KEPT file \"%s\" not removed\n");
473		- continue;
474		- }
475	472	if( !allFlag && !dryRunFlag && !glob_match(pClean, zName+n) ){
476	473	Blob ans;
477	474	char cReply;
478	475	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
479	476	zName+n);
		@@ -494,11 +491,10 @@
494	491	if( !dryRunFlag ){
495	492	file_delete(zName);
496	493	}
497	494	}
498	495	glob_free(pClean);
499		- glob_free(pKeep);
500	496	db_finalize(&q);
501	497	}
502	498
503	499	/*
504	500	** Prompt the user for a check-in or stash comment (given in pPrompt),
505	501

	--- src/checkin.c
	+++ src/checkin.c
	@@ -452,11 +452,12 @@
452	n = strlen(g.zLocalRoot);
453	blob_init(&path, g.zLocalRoot, n-1);
454	pIgnore = glob_create(zIgnoreFlag);
455	pKeep = glob_create(zKeepFlag);
456	pClean = glob_create(zCleanFlag);
457	vfile_scan(&path, blob_size(&path), scanFlags, pIgnore);

458	glob_free(pIgnore);
459	db_prepare(&q,
460	"SELECT %Q \|\| x FROM sfile"
461	" WHERE x NOT IN (%s)"
462	" ORDER BY 1",
	@@ -466,14 +467,10 @@
466	db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
467	}
468	db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
469	while( db_step(&q)==SQLITE_ROW ){
470	const char *zName = db_column_text(&q, 0);
471	if( glob_match(pKeep, zName+n) ){
472	fossil_print("WARNING: KEPT file \"%s\" not removed\n");
473	continue;
474	}
475	if( !allFlag && !dryRunFlag && !glob_match(pClean, zName+n) ){
476	Blob ans;
477	char cReply;
478	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
479	zName+n);
	@@ -494,11 +491,10 @@
494	if( !dryRunFlag ){
495	file_delete(zName);
496	}
497	}
498	glob_free(pClean);
499	glob_free(pKeep);
500	db_finalize(&q);
501	}
502
503	/*
504	** Prompt the user for a check-in or stash comment (given in pPrompt),
505

	--- src/checkin.c
	+++ src/checkin.c
	@@ -452,11 +452,12 @@
452	n = strlen(g.zLocalRoot);
453	blob_init(&path, g.zLocalRoot, n-1);
454	pIgnore = glob_create(zIgnoreFlag);
455	pKeep = glob_create(zKeepFlag);
456	pClean = glob_create(zCleanFlag);
457	vfile_scan2(&path, blob_size(&path), scanFlags, pIgnore, pKeep);
458	glob_free(pKeep);
459	glob_free(pIgnore);
460	db_prepare(&q,
461	"SELECT %Q \|\| x FROM sfile"
462	" WHERE x NOT IN (%s)"
463	" ORDER BY 1",
	@@ -466,14 +467,10 @@
467	db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
468	}
469	db_multi_exec("DELETE FROM sfile WHERE x IN (SELECT pathname FROM vfile)");
470	while( db_step(&q)==SQLITE_ROW ){
471	const char *zName = db_column_text(&q, 0);




472	if( !allFlag && !dryRunFlag && !glob_match(pClean, zName+n) ){
473	Blob ans;
474	char cReply;
475	char *prompt = mprintf("Remove unmanaged file \"%s\" (a=all/y/N)? ",
476	zName+n);
	@@ -494,11 +491,10 @@
491	if( !dryRunFlag ){
492	file_delete(zName);
493	}
494	}
495	glob_free(pClean);

496	db_finalize(&q);
497	}
498
499	/*
500	** Prompt the user for a check-in or stash comment (given in pPrompt),
501