b5aa3bfe88d… — Fossil SCM

M src/db.c

+2 -1

		--- src/db.c
		+++ src/db.c
		@@ -1310,11 +1310,12 @@
1310	1310	sha1sum_step_text(zContent, n);
1311	1311	sha1sum_finish(&out);
1312	1312	sqlite3_snprintf(sizeof(zHash), zHash, "%s", blob_str(&out));
1313	1313	blob_reset(&out);
1314	1314	db_multi_exec(
1315		- "INSERT OR IGNORE INTO concealed VALUES(%Q,%#Q)",
	1315	+ "INSERT OR IGNORE INTO concealed(hash,content,mtime)"
	1316	+ " VALUES(%Q,%#Q,now())",
1316	1317	zHash, n, zContent
1317	1318	);
1318	1319	}
1319	1320	return zHash;
1320	1321	}
1321	1322

	--- src/db.c
	+++ src/db.c
	@@ -1310,11 +1310,12 @@
1310	sha1sum_step_text(zContent, n);
1311	sha1sum_finish(&out);
1312	sqlite3_snprintf(sizeof(zHash), zHash, "%s", blob_str(&out));
1313	blob_reset(&out);
1314	db_multi_exec(
1315	"INSERT OR IGNORE INTO concealed VALUES(%Q,%#Q)",

1316	zHash, n, zContent
1317	);
1318	}
1319	return zHash;
1320	}
1321

	--- src/db.c
	+++ src/db.c
	@@ -1310,11 +1310,12 @@
1310	sha1sum_step_text(zContent, n);
1311	sha1sum_finish(&out);
1312	sqlite3_snprintf(sizeof(zHash), zHash, "%s", blob_str(&out));
1313	blob_reset(&out);
1314	db_multi_exec(
1315	"INSERT OR IGNORE INTO concealed(hash,content,mtime)"
1316	" VALUES(%Q,%#Q,now())",
1317	zHash, n, zContent
1318	);
1319	}
1320	return zHash;
1321	}
1322

M src/report.c

+9 -3

		--- src/report.c
		+++ src/report.c
		@@ -360,19 +360,25 @@
360	360	}else if( (zTitle = trim_string(zTitle))[0]==0 ){
361	361	zErr = "Please supply a title";
362	362	}else{
363	363	zErr = verify_sql_statement(zSQL);
364	364	}
	365	+ if( zErr==0
	366	+ && db_exists("SELECT 1 FROM reportfmt WHERE title=%Q and rn<>%d",
	367	+ zTitle, rn)
	368	+ ){
	369	+ zErr = mprintf("There is already another report named \"%h\"", zTitle);
	370	+ }
365	371	if( zErr==0 ){
366	372	login_verify_csrf_secret();
367	373	if( rn>0 ){
368	374	db_multi_exec("UPDATE reportfmt SET title=%Q, sqlcode=%Q,"
369		- " owner=%Q, cols=%Q WHERE rn=%d",
	375	+ " owner=%Q, cols=%Q, mtime=now() WHERE rn=%d",
370	376	zTitle, zSQL, zOwner, zClrKey, rn);
371	377	}else{
372		- db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols) "
373		- "VALUES(%Q,%Q,%Q,%Q)",
	378	+ db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) "
	379	+ "VALUES(%Q,%Q,%Q,%Q,now())",
374	380	zTitle, zSQL, zOwner, zClrKey);
375	381	rn = db_last_insert_rowid();
376	382	}
377	383	cgi_redirect(mprintf("rptview?rn=%d", rn));
378	384	return;
379	385

	--- src/report.c
	+++ src/report.c
	@@ -360,19 +360,25 @@
360	}else if( (zTitle = trim_string(zTitle))[0]==0 ){
361	zErr = "Please supply a title";
362	}else{
363	zErr = verify_sql_statement(zSQL);
364	}






365	if( zErr==0 ){
366	login_verify_csrf_secret();
367	if( rn>0 ){
368	db_multi_exec("UPDATE reportfmt SET title=%Q, sqlcode=%Q,"
369	" owner=%Q, cols=%Q WHERE rn=%d",
370	zTitle, zSQL, zOwner, zClrKey, rn);
371	}else{
372	db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols) "
373	"VALUES(%Q,%Q,%Q,%Q)",
374	zTitle, zSQL, zOwner, zClrKey);
375	rn = db_last_insert_rowid();
376	}
377	cgi_redirect(mprintf("rptview?rn=%d", rn));
378	return;
379

	--- src/report.c
	+++ src/report.c
	@@ -360,19 +360,25 @@
360	}else if( (zTitle = trim_string(zTitle))[0]==0 ){
361	zErr = "Please supply a title";
362	}else{
363	zErr = verify_sql_statement(zSQL);
364	}
365	if( zErr==0
366	&& db_exists("SELECT 1 FROM reportfmt WHERE title=%Q and rn<>%d",
367	zTitle, rn)
368	){
369	zErr = mprintf("There is already another report named \"%h\"", zTitle);
370	}
371	if( zErr==0 ){
372	login_verify_csrf_secret();
373	if( rn>0 ){
374	db_multi_exec("UPDATE reportfmt SET title=%Q, sqlcode=%Q,"
375	" owner=%Q, cols=%Q, mtime=now() WHERE rn=%d",
376	zTitle, zSQL, zOwner, zClrKey, rn);
377	}else{
378	db_multi_exec("INSERT INTO reportfmt(title,sqlcode,owner,cols,mtime) "
379	"VALUES(%Q,%Q,%Q,%Q,now())",
380	zTitle, zSQL, zOwner, zClrKey);
381	rn = db_last_insert_rowid();
382	}
383	cgi_redirect(mprintf("rptview?rn=%d", rn));
384	return;
385

M src/shun.c

+1 -1

		--- src/shun.c
		+++ src/shun.c
		@@ -85,11 +85,11 @@
85	85	if( zUuid && P("add") ){
86	86	int rid, tagid;
87	87	login_verify_csrf_secret();
88	88	db_multi_exec(
89	89	"INSERT OR IGNORE INTO shun(uuid,mtime)"
90		- " VALUES('%s', strftime('%%s','now'))", zUuid);
	90	+ " VALUES('%s', now())", zUuid);
91	91	@ <p class="shunned">Artifact
92	92	@ <a href="%s(g.zTop)/artifact/%s(zUuid)">%s(zUuid)</a> has been
93	93	@ shunned. It will no longer be pushed.
94	94	@ It will be removed from the repository the next time the respository
95	95	@ is rebuilt using the <b>fossil rebuild</b> command-line</p>
96	96

	--- src/shun.c
	+++ src/shun.c
	@@ -85,11 +85,11 @@
85	if( zUuid && P("add") ){
86	int rid, tagid;
87	login_verify_csrf_secret();
88	db_multi_exec(
89	"INSERT OR IGNORE INTO shun(uuid,mtime)"
90	" VALUES('%s', strftime('%%s','now'))", zUuid);
91	@ <p class="shunned">Artifact
92	@ <a href="%s(g.zTop)/artifact/%s(zUuid)">%s(zUuid)</a> has been
93	@ shunned. It will no longer be pushed.
94	@ It will be removed from the repository the next time the respository
95	@ is rebuilt using the <b>fossil rebuild</b> command-line</p>
96

	--- src/shun.c
	+++ src/shun.c
	@@ -85,11 +85,11 @@
85	if( zUuid && P("add") ){
86	int rid, tagid;
87	login_verify_csrf_secret();
88	db_multi_exec(
89	"INSERT OR IGNORE INTO shun(uuid,mtime)"
90	" VALUES('%s', now())", zUuid);
91	@ <p class="shunned">Artifact
92	@ <a href="%s(g.zTop)/artifact/%s(zUuid)">%s(zUuid)</a> has been
93	@ shunned. It will no longer be pushed.
94	@ It will be removed from the repository the next time the respository
95	@ is rebuilt using the <b>fossil rebuild</b> command-line</p>
96

Fossil SCM