6cc5354821e… — Fossil SCM

M src/add.c

+4 -4

		--- src/add.c
		+++ src/add.c
		@@ -306,11 +306,11 @@
306	306	if( zIgnoreFlag==0 ){
307	307	zIgnoreFlag = db_get("ignore-glob", 0);
308	308	}
309	309	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
310	310	vid = db_lget_int("checkout",0);
311		- db_begin_transaction();
	311	+ db_begin_write();
312	312	db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
313	313	filename_collation());
314	314	pClean = glob_create(zCleanFlag);
315	315	pIgnore = glob_create(zIgnoreFlag);
316	316	nRoot = strlen(g.zLocalRoot);
		@@ -460,11 +460,11 @@
460	460
461	461	/* We should be done with options.. */
462	462	verify_all_options();
463	463
464	464	db_must_be_within_tree();
465		- db_begin_transaction();
	465	+ db_begin_write();
466	466	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
467	467	removeFiles = 0;
468	468	}else if( softFlag ){
469	469	removeFiles = 0;
470	470	}else if( hardFlag ){
		@@ -662,11 +662,11 @@
662	662	if( zIgnoreFlag==0 ){
663	663	zIgnoreFlag = db_get("ignore-glob", 0);
664	664	}
665	665	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
666	666	vid = db_lget_int("checkout",0);
667		- db_begin_transaction();
	667	+ db_begin_write();
668	668
669	669	/* step 1:
670	670	** Populate the temp table "sfile" with the names of all unmanaged
671	671	** files currently in the check-out, except for files that match the
672	672	** --ignore or ignore-glob patterns and dot-files. Then add all of
		@@ -881,11 +881,11 @@
881	881	}
882	882	if( g.argc<4 ){
883	883	usage("OLDNAME NEWNAME");
884	884	}
885	885	zDest = g.argv[g.argc-1];
886		- db_begin_transaction();
	886	+ db_begin_write();
887	887	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
888	888	moveFiles = 0;
889	889	}else if( softFlag ){
890	890	moveFiles = 0;
891	891	}else if( hardFlag ){
892	892

	--- src/add.c
	+++ src/add.c
	@@ -306,11 +306,11 @@
306	if( zIgnoreFlag==0 ){
307	zIgnoreFlag = db_get("ignore-glob", 0);
308	}
309	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
310	vid = db_lget_int("checkout",0);
311	db_begin_transaction();
312	db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
313	filename_collation());
314	pClean = glob_create(zCleanFlag);
315	pIgnore = glob_create(zIgnoreFlag);
316	nRoot = strlen(g.zLocalRoot);
	@@ -460,11 +460,11 @@
460
461	/* We should be done with options.. */
462	verify_all_options();
463
464	db_must_be_within_tree();
465	db_begin_transaction();
466	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
467	removeFiles = 0;
468	}else if( softFlag ){
469	removeFiles = 0;
470	}else if( hardFlag ){
	@@ -662,11 +662,11 @@
662	if( zIgnoreFlag==0 ){
663	zIgnoreFlag = db_get("ignore-glob", 0);
664	}
665	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
666	vid = db_lget_int("checkout",0);
667	db_begin_transaction();
668
669	/* step 1:
670	** Populate the temp table "sfile" with the names of all unmanaged
671	** files currently in the check-out, except for files that match the
672	** --ignore or ignore-glob patterns and dot-files. Then add all of
	@@ -881,11 +881,11 @@
881	}
882	if( g.argc<4 ){
883	usage("OLDNAME NEWNAME");
884	}
885	zDest = g.argv[g.argc-1];
886	db_begin_transaction();
887	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
888	moveFiles = 0;
889	}else if( softFlag ){
890	moveFiles = 0;
891	}else if( hardFlag ){
892

	--- src/add.c
	+++ src/add.c
	@@ -306,11 +306,11 @@
306	if( zIgnoreFlag==0 ){
307	zIgnoreFlag = db_get("ignore-glob", 0);
308	}
309	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
310	vid = db_lget_int("checkout",0);
311	db_begin_write();
312	db_multi_exec("CREATE TEMP TABLE sfile(pathname TEXT PRIMARY KEY %s)",
313	filename_collation());
314	pClean = glob_create(zCleanFlag);
315	pIgnore = glob_create(zIgnoreFlag);
316	nRoot = strlen(g.zLocalRoot);
	@@ -460,11 +460,11 @@
460
461	/* We should be done with options.. */
462	verify_all_options();
463
464	db_must_be_within_tree();
465	db_begin_write();
466	if( g.argv[1][0]=='f' ){ /* i.e. "forget" */
467	removeFiles = 0;
468	}else if( softFlag ){
469	removeFiles = 0;
470	}else if( hardFlag ){
	@@ -662,11 +662,11 @@
662	if( zIgnoreFlag==0 ){
663	zIgnoreFlag = db_get("ignore-glob", 0);
664	}
665	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
666	vid = db_lget_int("checkout",0);
667	db_begin_write();
668
669	/* step 1:
670	** Populate the temp table "sfile" with the names of all unmanaged
671	** files currently in the check-out, except for files that match the
672	** --ignore or ignore-glob patterns and dot-files. Then add all of
	@@ -881,11 +881,11 @@
881	}
882	if( g.argc<4 ){
883	usage("OLDNAME NEWNAME");
884	}
885	zDest = g.argv[g.argc-1];
886	db_begin_write();
887	if( g.argv[1][0]=='r' ){ /* i.e. "rename" */
888	moveFiles = 0;
889	}else if( softFlag ){
890	moveFiles = 0;
891	}else if( hardFlag ){
892

M src/alerts.c

+1 -1

		--- src/alerts.c
		+++ src/alerts.c
		@@ -211,11 +211,11 @@
211	211	login_check_credentials();
212	212	if( !g.perm.Setup ){
213	213	login_needed(0);
214	214	return;
215	215	}
216		- db_begin_transaction();
	216	+ db_begin_write();
217	217
218	218	alert_submenu_common();
219	219	style_submenu_element("Send Announcement","%R/announce");
220	220	style_header("Email Notification Setup");
221	221	@ <h1>Status</h1>
222	222

	--- src/alerts.c
	+++ src/alerts.c
	@@ -211,11 +211,11 @@
211	login_check_credentials();
212	if( !g.perm.Setup ){
213	login_needed(0);
214	return;
215	}
216	db_begin_transaction();
217
218	alert_submenu_common();
219	style_submenu_element("Send Announcement","%R/announce");
220	style_header("Email Notification Setup");
221	@ <h1>Status</h1>
222

	--- src/alerts.c
	+++ src/alerts.c
	@@ -211,11 +211,11 @@
211	login_check_credentials();
212	if( !g.perm.Setup ){
213	login_needed(0);
214	return;
215	}
216	db_begin_write();
217
218	alert_submenu_common();
219	style_submenu_element("Send Announcement","%R/announce");
220	style_header("Email Notification Setup");
221	@ <h1>Status</h1>
222

M src/allrepo.c

+2 -2

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -301,11 +301,11 @@
301	301	int j;
302	302	Blob fn = BLOB_INITIALIZER;
303	303	Blob sql = BLOB_INITIALIZER;
304	304	useCheckouts = find_option("ckout","c",0)!=0;
305	305	verify_all_options();
306		- db_begin_transaction();
	306	+ db_begin_write();
307	307	for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
308	308	file_canonical_name(g.argv[j], &fn, useCheckouts?1:0);
309	309	blob_append_sql(&sql,
310	310	"DELETE FROM global_config WHERE name GLOB '%s:%q'",
311	311	useCheckouts?"ckout":"repo", blob_str(&fn)
		@@ -324,11 +324,11 @@
324	324	}else if( strncmp(zCmd, "add", n)==0 ){
325	325	int j;
326	326	Blob fn = BLOB_INITIALIZER;
327	327	Blob sql = BLOB_INITIALIZER;
328	328	verify_all_options();
329		- db_begin_transaction();
	329	+ db_begin_write();
330	330	for(j=3; j<g.argc; j++, blob_reset(&fn), blob_reset(&sql)){
331	331	sqlite3 *db;
332	332	int rc;
333	333	const char *z;
334	334	file_canonical_name(g.argv[j], &fn, 0);
335	335

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -301,11 +301,11 @@
301	int j;
302	Blob fn = BLOB_INITIALIZER;
303	Blob sql = BLOB_INITIALIZER;
304	useCheckouts = find_option("ckout","c",0)!=0;
305	verify_all_options();
306	db_begin_transaction();
307	for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
308	file_canonical_name(g.argv[j], &fn, useCheckouts?1:0);
309	blob_append_sql(&sql,
310	"DELETE FROM global_config WHERE name GLOB '%s:%q'",
311	useCheckouts?"ckout":"repo", blob_str(&fn)
	@@ -324,11 +324,11 @@
324	}else if( strncmp(zCmd, "add", n)==0 ){
325	int j;
326	Blob fn = BLOB_INITIALIZER;
327	Blob sql = BLOB_INITIALIZER;
328	verify_all_options();
329	db_begin_transaction();
330	for(j=3; j<g.argc; j++, blob_reset(&fn), blob_reset(&sql)){
331	sqlite3 *db;
332	int rc;
333	const char *z;
334	file_canonical_name(g.argv[j], &fn, 0);
335

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -301,11 +301,11 @@
301	int j;
302	Blob fn = BLOB_INITIALIZER;
303	Blob sql = BLOB_INITIALIZER;
304	useCheckouts = find_option("ckout","c",0)!=0;
305	verify_all_options();
306	db_begin_write();
307	for(j=3; j<g.argc; j++, blob_reset(&sql), blob_reset(&fn)){
308	file_canonical_name(g.argv[j], &fn, useCheckouts?1:0);
309	blob_append_sql(&sql,
310	"DELETE FROM global_config WHERE name GLOB '%s:%q'",
311	useCheckouts?"ckout":"repo", blob_str(&fn)
	@@ -324,11 +324,11 @@
324	}else if( strncmp(zCmd, "add", n)==0 ){
325	int j;
326	Blob fn = BLOB_INITIALIZER;
327	Blob sql = BLOB_INITIALIZER;
328	verify_all_options();
329	db_begin_write();
330	for(j=3; j<g.argc; j++, blob_reset(&fn), blob_reset(&sql)){
331	sqlite3 *db;
332	int rc;
333	const char *z;
334	file_canonical_name(g.argv[j], &fn, 0);
335

M src/attach.c

+2 -2

		--- src/attach.c
		+++ src/attach.c
		@@ -266,11 +266,11 @@
266	266	int rid;
267	267	int i, n;
268	268	int addCompress = 0;
269	269	Manifest *pManifest;
270	270
271		- db_begin_transaction();
	271	+ db_begin_write();
272	272	blob_init(&content, aContent, szContent);
273	273	pManifest = manifest_parse(&content, 0, 0);
274	274	manifest_destroy(pManifest);
275	275	blob_init(&content, aContent, szContent);
276	276	if( pManifest ){
		@@ -501,11 +501,11 @@
501	501	char *zDate;
502	502	Blob manifest;
503	503	Blob cksum;
504	504	const char *zFile = zName;
505	505
506		- db_begin_transaction();
	506	+ db_begin_write();
507	507	blob_zero(&manifest);
508	508	for(i=n=0; zFile[i]; i++){
509	509	if( zFile[i]=='/' \|\| zFile[i]=='\\' ) n = i;
510	510	}
511	511	zFile += n;
512	512

	--- src/attach.c
	+++ src/attach.c
	@@ -266,11 +266,11 @@
266	int rid;
267	int i, n;
268	int addCompress = 0;
269	Manifest *pManifest;
270
271	db_begin_transaction();
272	blob_init(&content, aContent, szContent);
273	pManifest = manifest_parse(&content, 0, 0);
274	manifest_destroy(pManifest);
275	blob_init(&content, aContent, szContent);
276	if( pManifest ){
	@@ -501,11 +501,11 @@
501	char *zDate;
502	Blob manifest;
503	Blob cksum;
504	const char *zFile = zName;
505
506	db_begin_transaction();
507	blob_zero(&manifest);
508	for(i=n=0; zFile[i]; i++){
509	if( zFile[i]=='/' \|\| zFile[i]=='\\' ) n = i;
510	}
511	zFile += n;
512

	--- src/attach.c
	+++ src/attach.c
	@@ -266,11 +266,11 @@
266	int rid;
267	int i, n;
268	int addCompress = 0;
269	Manifest *pManifest;
270
271	db_begin_write();
272	blob_init(&content, aContent, szContent);
273	pManifest = manifest_parse(&content, 0, 0);
274	manifest_destroy(pManifest);
275	blob_init(&content, aContent, szContent);
276	if( pManifest ){
	@@ -501,11 +501,11 @@
501	char *zDate;
502	Blob manifest;
503	Blob cksum;
504	const char *zFile = zName;
505
506	db_begin_write();
507	blob_zero(&manifest);
508	for(i=n=0; zFile[i]; i++){
509	if( zFile[i]=='/' \|\| zFile[i]=='\\' ) n = i;
510	}
511	zFile += n;
512

M src/bisect.c

+1 -1

		--- src/bisect.c
		+++ src/bisect.c
		@@ -410,11 +410,11 @@
410	410	Blob log, id;
411	411	int ridBad = 0;
412	412	int ridGood = 0;
413	413	int cnt = 0, i;
414	414	foundCmd = 1;
415		- db_begin_transaction();
	415	+ db_begin_write();
416	416	zLog = db_lget("bisect-log","");
417	417	blob_init(&log, zLog, -1);
418	418	while( blob_token(&log, &id) ){ cnt++; }
419	419	if( cnt==0 ){
420	420	fossil_fatal("no previous bisect steps to undo");
421	421

	--- src/bisect.c
	+++ src/bisect.c
	@@ -410,11 +410,11 @@
410	Blob log, id;
411	int ridBad = 0;
412	int ridGood = 0;
413	int cnt = 0, i;
414	foundCmd = 1;
415	db_begin_transaction();
416	zLog = db_lget("bisect-log","");
417	blob_init(&log, zLog, -1);
418	while( blob_token(&log, &id) ){ cnt++; }
419	if( cnt==0 ){
420	fossil_fatal("no previous bisect steps to undo");
421

	--- src/bisect.c
	+++ src/bisect.c
	@@ -410,11 +410,11 @@
410	Blob log, id;
411	int ridBad = 0;
412	int ridGood = 0;
413	int cnt = 0, i;
414	foundCmd = 1;
415	db_begin_write();
416	zLog = db_lget("bisect-log","");
417	blob_init(&log, zLog, -1);
418	while( blob_token(&log, &id) ){ cnt++; }
419	if( cnt==0 ){
420	fossil_fatal("no previous bisect steps to undo");
421

M src/branch.c

+1 -1

		--- src/branch.c
		+++ src/branch.c
		@@ -68,11 +68,11 @@
68	68	zBranch)!=0 ){
69	69	fossil_fatal("branch \"%s\" already exists", zBranch);
70	70	}
71	71
72	72	user_select();
73		- db_begin_transaction();
	73	+ db_begin_write();
74	74	rootid = name_to_typed_rid(g.argv[4], "ci");
75	75	if( rootid==0 ){
76	76	fossil_fatal("unable to locate check-in off of which to branch");
77	77	}
78	78
79	79

	--- src/branch.c
	+++ src/branch.c
	@@ -68,11 +68,11 @@
68	zBranch)!=0 ){
69	fossil_fatal("branch \"%s\" already exists", zBranch);
70	}
71
72	user_select();
73	db_begin_transaction();
74	rootid = name_to_typed_rid(g.argv[4], "ci");
75	if( rootid==0 ){
76	fossil_fatal("unable to locate check-in off of which to branch");
77	}
78
79

	--- src/branch.c
	+++ src/branch.c
	@@ -68,11 +68,11 @@
68	zBranch)!=0 ){
69	fossil_fatal("branch \"%s\" already exists", zBranch);
70	}
71
72	user_select();
73	db_begin_write();
74	rootid = name_to_typed_rid(g.argv[4], "ci");
75	if( rootid==0 ){
76	fossil_fatal("unable to locate check-in off of which to branch");
77	}
78
79

M src/bundle.c

+4 -4

		--- src/bundle.c
		+++ src/bundle.c
		@@ -158,11 +158,11 @@
158	158	verify_all_options();
159	159	bundle_attach_file(g.argv[3], "b1", 1);
160	160	db_prepare(&q,
161	161	"INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) "
162	162	"VALUES(NULL, $uuid, $sz, NULL, $data, $filename)");
163		- db_begin_transaction();
	163	+ db_begin_write();
164	164	for(i=4; i<g.argc; i++){
165	165	int sz;
166	166	blob_read_from_file(&content, g.argv[i], ExtFILE);
167	167	sz = blob_size(&content);
168	168	sha1sum_blob(&content, &hash);
		@@ -303,11 +303,11 @@
303	303	describe_artifacts("IN tobundle");
304	304
305	305	if( g.argc!=4 ) usage("export BUNDLE ?OPTIONS?");
306	306	/* Create the new bundle */
307	307	bundle_attach_file(g.argv[3], "b1", 1);
308		- db_begin_transaction();
	308	+ db_begin_write();
309	309
310	310	/* Add 'mtime' and 'project-code' entries to the bconfig table */
311	311	db_multi_exec(
312	312	"INSERT INTO bconfig(bcname,bcvalue)"
313	313	" VALUES('mtime',datetime('now'));"
		@@ -599,11 +599,11 @@
599	599	if( zMissingDeltas && zMissingDeltas[0] ){
600	600	fossil_fatal("delta basis artifacts not found in repository: %s",
601	601	zMissingDeltas);
602	602	}
603	603
604		- db_begin_transaction();
	604	+ db_begin_write();
605	605	db_multi_exec(
606	606	"CREATE TEMP TABLE bix("
607	607	" blobid INTEGER PRIMARY KEY,"
608	608	" delta INTEGER"
609	609	");"
		@@ -639,11 +639,11 @@
639	639	int bTest = find_option("test",0,0)!=0; /* Undocumented --test option */
640	640	const char *zFile = g.argv[3];
641	641	verify_all_options();
642	642	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
643	643	bundle_attach_file(zFile, "b1", 0);
644		- db_begin_transaction();
	644	+ db_begin_write();
645	645
646	646	/* Find all check-ins of the bundle */
647	647	db_multi_exec(
648	648	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
649	649	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
650	650

	--- src/bundle.c
	+++ src/bundle.c
	@@ -158,11 +158,11 @@
158	verify_all_options();
159	bundle_attach_file(g.argv[3], "b1", 1);
160	db_prepare(&q,
161	"INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) "
162	"VALUES(NULL, $uuid, $sz, NULL, $data, $filename)");
163	db_begin_transaction();
164	for(i=4; i<g.argc; i++){
165	int sz;
166	blob_read_from_file(&content, g.argv[i], ExtFILE);
167	sz = blob_size(&content);
168	sha1sum_blob(&content, &hash);
	@@ -303,11 +303,11 @@
303	describe_artifacts("IN tobundle");
304
305	if( g.argc!=4 ) usage("export BUNDLE ?OPTIONS?");
306	/* Create the new bundle */
307	bundle_attach_file(g.argv[3], "b1", 1);
308	db_begin_transaction();
309
310	/* Add 'mtime' and 'project-code' entries to the bconfig table */
311	db_multi_exec(
312	"INSERT INTO bconfig(bcname,bcvalue)"
313	" VALUES('mtime',datetime('now'));"
	@@ -599,11 +599,11 @@
599	if( zMissingDeltas && zMissingDeltas[0] ){
600	fossil_fatal("delta basis artifacts not found in repository: %s",
601	zMissingDeltas);
602	}
603
604	db_begin_transaction();
605	db_multi_exec(
606	"CREATE TEMP TABLE bix("
607	" blobid INTEGER PRIMARY KEY,"
608	" delta INTEGER"
609	");"
	@@ -639,11 +639,11 @@
639	int bTest = find_option("test",0,0)!=0; /* Undocumented --test option */
640	const char *zFile = g.argv[3];
641	verify_all_options();
642	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
643	bundle_attach_file(zFile, "b1", 0);
644	db_begin_transaction();
645
646	/* Find all check-ins of the bundle */
647	db_multi_exec(
648	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
649	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
650

	--- src/bundle.c
	+++ src/bundle.c
	@@ -158,11 +158,11 @@
158	verify_all_options();
159	bundle_attach_file(g.argv[3], "b1", 1);
160	db_prepare(&q,
161	"INSERT INTO bblob(blobid, uuid, sz, delta, data, notes) "
162	"VALUES(NULL, $uuid, $sz, NULL, $data, $filename)");
163	db_begin_write();
164	for(i=4; i<g.argc; i++){
165	int sz;
166	blob_read_from_file(&content, g.argv[i], ExtFILE);
167	sz = blob_size(&content);
168	sha1sum_blob(&content, &hash);
	@@ -303,11 +303,11 @@
303	describe_artifacts("IN tobundle");
304
305	if( g.argc!=4 ) usage("export BUNDLE ?OPTIONS?");
306	/* Create the new bundle */
307	bundle_attach_file(g.argv[3], "b1", 1);
308	db_begin_write();
309
310	/* Add 'mtime' and 'project-code' entries to the bconfig table */
311	db_multi_exec(
312	"INSERT INTO bconfig(bcname,bcvalue)"
313	" VALUES('mtime',datetime('now'));"
	@@ -599,11 +599,11 @@
599	if( zMissingDeltas && zMissingDeltas[0] ){
600	fossil_fatal("delta basis artifacts not found in repository: %s",
601	zMissingDeltas);
602	}
603
604	db_begin_write();
605	db_multi_exec(
606	"CREATE TEMP TABLE bix("
607	" blobid INTEGER PRIMARY KEY,"
608	" delta INTEGER"
609	");"
	@@ -639,11 +639,11 @@
639	int bTest = find_option("test",0,0)!=0; /* Undocumented --test option */
640	const char *zFile = g.argv[3];
641	verify_all_options();
642	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
643	bundle_attach_file(zFile, "b1", 0);
644	db_begin_write();
645
646	/* Find all check-ins of the bundle */
647	db_multi_exec(
648	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
649	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
650

M src/checkin.c

+2 -2

		--- src/checkin.c
		+++ src/checkin.c
		@@ -2241,11 +2241,11 @@
2241	2241	if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
2242	2242	fossil_fatal("no such user: %s", g.zLogin);
2243	2243	}
2244	2244
2245	2245	hasChanges = unsaved_changes(useHash ? CKSIG_HASH : 0);
2246		- db_begin_transaction();
	2246	+ db_begin_write();
2247	2247	db_record_repository_filename(0);
2248	2248	if( hasChanges==0 && !isAMerge && !allowEmpty && !forceFlag ){
2249	2249	fossil_fatal("nothing has changed; use --allow-empty to override");
2250	2250	}
2251	2251
		@@ -2340,11 +2340,11 @@
2340	2340	}
2341	2341	}
2342	2342	}else{
2343	2343	db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
2344	2344	db_end_transaction(0);
2345		- db_begin_transaction();
	2345	+ db_begin_write();
2346	2346	}
2347	2347
2348	2348	/*
2349	2349	** Step 1: Compute an aggregate MD5 checksum over the disk image
2350	2350	** of every file in vid. The file names are part of the checksum.
2351	2351

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2241,11 +2241,11 @@
2241	if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
2242	fossil_fatal("no such user: %s", g.zLogin);
2243	}
2244
2245	hasChanges = unsaved_changes(useHash ? CKSIG_HASH : 0);
2246	db_begin_transaction();
2247	db_record_repository_filename(0);
2248	if( hasChanges==0 && !isAMerge && !allowEmpty && !forceFlag ){
2249	fossil_fatal("nothing has changed; use --allow-empty to override");
2250	}
2251
	@@ -2340,11 +2340,11 @@
2340	}
2341	}
2342	}else{
2343	db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
2344	db_end_transaction(0);
2345	db_begin_transaction();
2346	}
2347
2348	/*
2349	** Step 1: Compute an aggregate MD5 checksum over the disk image
2350	** of every file in vid. The file names are part of the checksum.
2351

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2241,11 +2241,11 @@
2241	if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){
2242	fossil_fatal("no such user: %s", g.zLogin);
2243	}
2244
2245	hasChanges = unsaved_changes(useHash ? CKSIG_HASH : 0);
2246	db_begin_write();
2247	db_record_repository_filename(0);
2248	if( hasChanges==0 && !isAMerge && !allowEmpty && !forceFlag ){
2249	fossil_fatal("nothing has changed; use --allow-empty to override");
2250	}
2251
	@@ -2340,11 +2340,11 @@
2340	}
2341	}
2342	}else{
2343	db_multi_exec("REPLACE INTO vvar VALUES('ci-comment',%B)", &comment);
2344	db_end_transaction(0);
2345	db_begin_write();
2346	}
2347
2348	/*
2349	** Step 1: Compute an aggregate MD5 checksum over the disk image
2350	** of every file in vid. The file names are part of the checksum.
2351

M src/checkout.c

+1 -1

		--- src/checkout.c
		+++ src/checkout.c
		@@ -289,11 +289,11 @@
289	289	int promptFlag; /* True to prompt before overwriting */
290	290	int vid, prior;
291	291	Blob cksum1, cksum1b, cksum2;
292	292
293	293	db_must_be_within_tree();
294		- db_begin_transaction();
	294	+ db_begin_write();
295	295	forceFlag = find_option("force","f",0)!=0;
296	296	forceMissingFlag = find_option("force-missing",0,0)!=0;
297	297	keepFlag = find_option("keep",0,0)!=0;
298	298	latestFlag = find_option("latest",0,0)!=0;
299	299	promptFlag = find_option("prompt",0,0)!=0 \|\| forceFlag==0;
300	300

	--- src/checkout.c
	+++ src/checkout.c
	@@ -289,11 +289,11 @@
289	int promptFlag; /* True to prompt before overwriting */
290	int vid, prior;
291	Blob cksum1, cksum1b, cksum2;
292
293	db_must_be_within_tree();
294	db_begin_transaction();
295	forceFlag = find_option("force","f",0)!=0;
296	forceMissingFlag = find_option("force-missing",0,0)!=0;
297	keepFlag = find_option("keep",0,0)!=0;
298	latestFlag = find_option("latest",0,0)!=0;
299	promptFlag = find_option("prompt",0,0)!=0 \|\| forceFlag==0;
300

	--- src/checkout.c
	+++ src/checkout.c
	@@ -289,11 +289,11 @@
289	int promptFlag; /* True to prompt before overwriting */
290	int vid, prior;
291	Blob cksum1, cksum1b, cksum2;
292
293	db_must_be_within_tree();
294	db_begin_write();
295	forceFlag = find_option("force","f",0)!=0;
296	forceMissingFlag = find_option("force-missing",0,0)!=0;
297	keepFlag = find_option("keep",0,0)!=0;
298	latestFlag = find_option("latest",0,0)!=0;
299	promptFlag = find_option("prompt",0,0)!=0 \|\| forceFlag==0;
300

M src/clone.c

+2 -2

		--- src/clone.c
		+++ src/clone.c
		@@ -172,11 +172,11 @@
172	172	}else{
173	173	db_close_config();
174	174	db_create_repository(g.argv[3]);
175	175	db_open_repository(g.argv[3]);
176	176	db_open_config(0,0);
177		- db_begin_transaction();
	177	+ db_begin_write();
178	178	db_record_repository_filename(g.argv[3]);
179	179	db_initial_setup(0, 0, zDefaultUser);
180	180	user_select();
181	181	db_set("content-schema", CONTENT_SCHEMA, 0);
182	182	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
		@@ -210,11 +210,11 @@
210	210	file_delete(g.argv[3]);
211	211	fossil_fatal("server returned an error - clone aborted");
212	212	}
213	213	db_open_repository(g.argv[3]);
214	214	}
215		- db_begin_transaction();
	215	+ db_begin_write();
216	216	fossil_print("Rebuilding repository meta-data...\n");
217	217	rebuild_db(0, 1, 0);
218	218	if( !noCompress ){
219	219	fossil_print("Extra delta compression... "); fflush(stdout);
220	220	extra_deltification();
221	221

	--- src/clone.c
	+++ src/clone.c
	@@ -172,11 +172,11 @@
172	}else{
173	db_close_config();
174	db_create_repository(g.argv[3]);
175	db_open_repository(g.argv[3]);
176	db_open_config(0,0);
177	db_begin_transaction();
178	db_record_repository_filename(g.argv[3]);
179	db_initial_setup(0, 0, zDefaultUser);
180	user_select();
181	db_set("content-schema", CONTENT_SCHEMA, 0);
182	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
	@@ -210,11 +210,11 @@
210	file_delete(g.argv[3]);
211	fossil_fatal("server returned an error - clone aborted");
212	}
213	db_open_repository(g.argv[3]);
214	}
215	db_begin_transaction();
216	fossil_print("Rebuilding repository meta-data...\n");
217	rebuild_db(0, 1, 0);
218	if( !noCompress ){
219	fossil_print("Extra delta compression... "); fflush(stdout);
220	extra_deltification();
221

	--- src/clone.c
	+++ src/clone.c
	@@ -172,11 +172,11 @@
172	}else{
173	db_close_config();
174	db_create_repository(g.argv[3]);
175	db_open_repository(g.argv[3]);
176	db_open_config(0,0);
177	db_begin_write();
178	db_record_repository_filename(g.argv[3]);
179	db_initial_setup(0, 0, zDefaultUser);
180	user_select();
181	db_set("content-schema", CONTENT_SCHEMA, 0);
182	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
	@@ -210,11 +210,11 @@
210	file_delete(g.argv[3]);
211	fossil_fatal("server returned an error - clone aborted");
212	}
213	db_open_repository(g.argv[3]);
214	}
215	db_begin_write();
216	fossil_print("Rebuilding repository meta-data...\n");
217	rebuild_db(0, 1, 0);
218	if( !noCompress ){
219	fossil_print("Extra delta compression... "); fflush(stdout);
220	extra_deltification();
221

M src/configure.c

+2 -2

		--- src/configure.c
		+++ src/configure.c
		@@ -773,11 +773,11 @@
773	773	\|\| strncmp(zMethod, "merge", n)==0 ){
774	774	Blob in;
775	775	int groupMask;
776	776	if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
777	777	blob_read_from_file(&in, g.argv[3], ExtFILE);
778		- db_begin_transaction();
	778	+ db_begin_write();
779	779	if( zMethod[0]=='i' ){
780	780	groupMask = CONFIGSET_ALL \| CONFIGSET_OVERWRITE;
781	781	}else{
782	782	groupMask = CONFIGSET_ALL;
783	783	}
		@@ -821,11 +821,11 @@
821	821	char *zBackup;
822	822	if( g.argc!=4 ) usage("reset AREA");
823	823	mask = configure_name_to_mask(g.argv[3], 1);
824	824	zBackup = db_text(0,
825	825	"SELECT strftime('config-backup-%%Y%%m%%d%%H%%M%%f','now')");
826		- db_begin_transaction();
	826	+ db_begin_write();
827	827	export_config(mask, g.argv[3], 0, zBackup);
828	828	for(i=0; i<count(aConfig); i++){
829	829	const char *zName = aConfig[i].zName;
830	830	if( (aConfig[i].groupMask & mask)==0 ) continue;
831	831	if( zName[0]!='@' ){
832	832

	--- src/configure.c
	+++ src/configure.c
	@@ -773,11 +773,11 @@
773	\|\| strncmp(zMethod, "merge", n)==0 ){
774	Blob in;
775	int groupMask;
776	if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
777	blob_read_from_file(&in, g.argv[3], ExtFILE);
778	db_begin_transaction();
779	if( zMethod[0]=='i' ){
780	groupMask = CONFIGSET_ALL \| CONFIGSET_OVERWRITE;
781	}else{
782	groupMask = CONFIGSET_ALL;
783	}
	@@ -821,11 +821,11 @@
821	char *zBackup;
822	if( g.argc!=4 ) usage("reset AREA");
823	mask = configure_name_to_mask(g.argv[3], 1);
824	zBackup = db_text(0,
825	"SELECT strftime('config-backup-%%Y%%m%%d%%H%%M%%f','now')");
826	db_begin_transaction();
827	export_config(mask, g.argv[3], 0, zBackup);
828	for(i=0; i<count(aConfig); i++){
829	const char *zName = aConfig[i].zName;
830	if( (aConfig[i].groupMask & mask)==0 ) continue;
831	if( zName[0]!='@' ){
832

	--- src/configure.c
	+++ src/configure.c
	@@ -773,11 +773,11 @@
773	\|\| strncmp(zMethod, "merge", n)==0 ){
774	Blob in;
775	int groupMask;
776	if( g.argc!=4 ) usage(mprintf("%s FILENAME",zMethod));
777	blob_read_from_file(&in, g.argv[3], ExtFILE);
778	db_begin_write();
779	if( zMethod[0]=='i' ){
780	groupMask = CONFIGSET_ALL \| CONFIGSET_OVERWRITE;
781	}else{
782	groupMask = CONFIGSET_ALL;
783	}
	@@ -821,11 +821,11 @@
821	char *zBackup;
822	if( g.argc!=4 ) usage("reset AREA");
823	mask = configure_name_to_mask(g.argv[3], 1);
824	zBackup = db_text(0,
825	"SELECT strftime('config-backup-%%Y%%m%%d%%H%%M%%f','now')");
826	db_begin_write();
827	export_config(mask, g.argv[3], 0, zBackup);
828	for(i=0; i<count(aConfig); i++){
829	const char *zName = aConfig[i].zName;
830	if( (aConfig[i].groupMask & mask)==0 ) continue;
831	if( zName[0]!='@' ){
832

M src/content.c

+4 -4

		--- src/content.c
		+++ src/content.c
		@@ -513,11 +513,11 @@
513	513	int isDephantomize = 0;
514	514
515	515	assert( g.repositoryOpen );
516	516	assert( pBlob!=0 );
517	517	assert( srcId==0 \|\| zUuid!=0 );
518		- db_begin_transaction();
	518	+ db_begin_write();
519	519	if( zUuid==0 ){
520	520	assert( nBlob==0 );
521	521	/* First check the auxiliary hash to see if there is already an artifact
522	522	** that uses the auxiliary hash name */
523	523	hname_hash(pBlob, 1, &hash);
		@@ -659,11 +659,11 @@
659	659	int content_new(const char *zUuid, int isPrivate){
660	660	int rid;
661	661	static Stmt s1, s2, s3;
662	662
663	663	assert( g.repositoryOpen );
664		- db_begin_transaction();
	664	+ db_begin_write();
665	665	if( uuid_is_shunned(zUuid) ){
666	666	db_end_transaction(0);
667	667	return 0;
668	668	}
669	669	db_static_prepare(&s1,
		@@ -870,11 +870,11 @@
870	870	Stmt s1, s2; /* Statements used to create the delta */
871	871	blob_compress(&bestDelta, &bestDelta);
872	872	db_prepare(&s1, "UPDATE blob SET content=:data WHERE rid=%d", rid);
873	873	db_prepare(&s2, "REPLACE INTO delta(rid,srcid)VALUES(%d,%d)", rid, bestSrc);
874	874	db_bind_blob(&s1, ":data", &bestDelta);
875		- db_begin_transaction();
	875	+ db_begin_write();
876	876	db_exec(&s1);
877	877	db_exec(&s2);
878	878	db_end_transaction(0);
879	879	db_finalize(&s1);
880	880	db_finalize(&s2);
		@@ -1233,11 +1233,11 @@
1233	1233	"Continue? (y/N)? ", &x);
1234	1234	c = blob_str(&x)[0];
1235	1235	blob_reset(&x);
1236	1236	if( c!='y' && c!='Y' ) return;
1237	1237	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1238		- db_begin_transaction();
	1238	+ db_begin_write();
1239	1239	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=:rid");
1240	1240	for(i=2; i<g.argc; i++){
1241	1241	int rid = atoi(g.argv[i]);
1242	1242	fossil_print("Erasing artifact %d (%s)\n",
1243	1243	rid, db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid));
1244	1244

	--- src/content.c
	+++ src/content.c
	@@ -513,11 +513,11 @@
513	int isDephantomize = 0;
514
515	assert( g.repositoryOpen );
516	assert( pBlob!=0 );
517	assert( srcId==0 \|\| zUuid!=0 );
518	db_begin_transaction();
519	if( zUuid==0 ){
520	assert( nBlob==0 );
521	/* First check the auxiliary hash to see if there is already an artifact
522	** that uses the auxiliary hash name */
523	hname_hash(pBlob, 1, &hash);
	@@ -659,11 +659,11 @@
659	int content_new(const char *zUuid, int isPrivate){
660	int rid;
661	static Stmt s1, s2, s3;
662
663	assert( g.repositoryOpen );
664	db_begin_transaction();
665	if( uuid_is_shunned(zUuid) ){
666	db_end_transaction(0);
667	return 0;
668	}
669	db_static_prepare(&s1,
	@@ -870,11 +870,11 @@
870	Stmt s1, s2; /* Statements used to create the delta */
871	blob_compress(&bestDelta, &bestDelta);
872	db_prepare(&s1, "UPDATE blob SET content=:data WHERE rid=%d", rid);
873	db_prepare(&s2, "REPLACE INTO delta(rid,srcid)VALUES(%d,%d)", rid, bestSrc);
874	db_bind_blob(&s1, ":data", &bestDelta);
875	db_begin_transaction();
876	db_exec(&s1);
877	db_exec(&s2);
878	db_end_transaction(0);
879	db_finalize(&s1);
880	db_finalize(&s2);
	@@ -1233,11 +1233,11 @@
1233	"Continue? (y/N)? ", &x);
1234	c = blob_str(&x)[0];
1235	blob_reset(&x);
1236	if( c!='y' && c!='Y' ) return;
1237	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1238	db_begin_transaction();
1239	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=:rid");
1240	for(i=2; i<g.argc; i++){
1241	int rid = atoi(g.argv[i]);
1242	fossil_print("Erasing artifact %d (%s)\n",
1243	rid, db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid));
1244

	--- src/content.c
	+++ src/content.c
	@@ -513,11 +513,11 @@
513	int isDephantomize = 0;
514
515	assert( g.repositoryOpen );
516	assert( pBlob!=0 );
517	assert( srcId==0 \|\| zUuid!=0 );
518	db_begin_write();
519	if( zUuid==0 ){
520	assert( nBlob==0 );
521	/* First check the auxiliary hash to see if there is already an artifact
522	** that uses the auxiliary hash name */
523	hname_hash(pBlob, 1, &hash);
	@@ -659,11 +659,11 @@
659	int content_new(const char *zUuid, int isPrivate){
660	int rid;
661	static Stmt s1, s2, s3;
662
663	assert( g.repositoryOpen );
664	db_begin_write();
665	if( uuid_is_shunned(zUuid) ){
666	db_end_transaction(0);
667	return 0;
668	}
669	db_static_prepare(&s1,
	@@ -870,11 +870,11 @@
870	Stmt s1, s2; /* Statements used to create the delta */
871	blob_compress(&bestDelta, &bestDelta);
872	db_prepare(&s1, "UPDATE blob SET content=:data WHERE rid=%d", rid);
873	db_prepare(&s2, "REPLACE INTO delta(rid,srcid)VALUES(%d,%d)", rid, bestSrc);
874	db_bind_blob(&s1, ":data", &bestDelta);
875	db_begin_write();
876	db_exec(&s1);
877	db_exec(&s2);
878	db_end_transaction(0);
879	db_finalize(&s1);
880	db_finalize(&s2);
	@@ -1233,11 +1233,11 @@
1233	"Continue? (y/N)? ", &x);
1234	c = blob_str(&x)[0];
1235	blob_reset(&x);
1236	if( c!='y' && c!='Y' ) return;
1237	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
1238	db_begin_write();
1239	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=:rid");
1240	for(i=2; i<g.argc; i++){
1241	int rid = atoi(g.argv[i]);
1242	fossil_print("Erasing artifact %d (%s)\n",
1243	rid, db_text("", "SELECT uuid FROM blob WHERE rid=%d", rid));
1244

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -2240,11 +2240,11 @@
2240	2240
2241	2241	db_create_repository(g.argv[2]);
2242	2242	db_open_repository(g.argv[2]);
2243	2243	db_open_config(0, 0);
2244	2244	if( zTemplate ) db_attach(zTemplate, "settingSrc");
2245		- db_begin_transaction();
	2245	+ db_begin_write();
2246	2246	if( bUseSha1 ){
2247	2247	g.eHashPolicy = HPOLICY_SHA1;
2248	2248	db_set_int("hash-policy", HPOLICY_SHA1, 0);
2249	2249	}
2250	2250	if( zDate==0 ) zDate = "now";
		@@ -2623,11 +2623,11 @@
2623	2623	z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
2624	2624	}
2625	2625	return z;
2626	2626	}
2627	2627	void db_set(const char zName, const char zValue, int globalFlag){
2628		- db_begin_transaction();
	2628	+ db_begin_write();
2629	2629	if( globalFlag ){
2630	2630	db_swap_connections();
2631	2631	db_multi_exec("REPLACE INTO global_config(name,value) VALUES(%Q,%Q)",
2632	2632	zName, zValue);
2633	2633	db_swap_connections();
		@@ -2639,11 +2639,11 @@
2639	2639	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
2640	2640	}
2641	2641	db_end_transaction(0);
2642	2642	}
2643	2643	void db_unset(const char *zName, int globalFlag){
2644		- db_begin_transaction();
	2644	+ db_begin_write();
2645	2645	if( globalFlag ){
2646	2646	db_swap_connections();
2647	2647	db_multi_exec("DELETE FROM global_config WHERE name=%Q", zName);
2648	2648	db_swap_connections();
2649	2649	}else{
2650	2650

	--- src/db.c
	+++ src/db.c
	@@ -2240,11 +2240,11 @@
2240
2241	db_create_repository(g.argv[2]);
2242	db_open_repository(g.argv[2]);
2243	db_open_config(0, 0);
2244	if( zTemplate ) db_attach(zTemplate, "settingSrc");
2245	db_begin_transaction();
2246	if( bUseSha1 ){
2247	g.eHashPolicy = HPOLICY_SHA1;
2248	db_set_int("hash-policy", HPOLICY_SHA1, 0);
2249	}
2250	if( zDate==0 ) zDate = "now";
	@@ -2623,11 +2623,11 @@
2623	z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
2624	}
2625	return z;
2626	}
2627	void db_set(const char zName, const char zValue, int globalFlag){
2628	db_begin_transaction();
2629	if( globalFlag ){
2630	db_swap_connections();
2631	db_multi_exec("REPLACE INTO global_config(name,value) VALUES(%Q,%Q)",
2632	zName, zValue);
2633	db_swap_connections();
	@@ -2639,11 +2639,11 @@
2639	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
2640	}
2641	db_end_transaction(0);
2642	}
2643	void db_unset(const char *zName, int globalFlag){
2644	db_begin_transaction();
2645	if( globalFlag ){
2646	db_swap_connections();
2647	db_multi_exec("DELETE FROM global_config WHERE name=%Q", zName);
2648	db_swap_connections();
2649	}else{
2650

	--- src/db.c
	+++ src/db.c
	@@ -2240,11 +2240,11 @@
2240
2241	db_create_repository(g.argv[2]);
2242	db_open_repository(g.argv[2]);
2243	db_open_config(0, 0);
2244	if( zTemplate ) db_attach(zTemplate, "settingSrc");
2245	db_begin_write();
2246	if( bUseSha1 ){
2247	g.eHashPolicy = HPOLICY_SHA1;
2248	db_set_int("hash-policy", HPOLICY_SHA1, 0);
2249	}
2250	if( zDate==0 ) zDate = "now";
	@@ -2623,11 +2623,11 @@
2623	z = db_text(0, "SELECT strftime(%Q,%Q,'unixepoch');", zFormat, z);
2624	}
2625	return z;
2626	}
2627	void db_set(const char zName, const char zValue, int globalFlag){
2628	db_begin_write();
2629	if( globalFlag ){
2630	db_swap_connections();
2631	db_multi_exec("REPLACE INTO global_config(name,value) VALUES(%Q,%Q)",
2632	zName, zValue);
2633	db_swap_connections();
	@@ -2639,11 +2639,11 @@
2639	db_multi_exec("DELETE FROM config WHERE name=%Q", zName);
2640	}
2641	db_end_transaction(0);
2642	}
2643	void db_unset(const char *zName, int globalFlag){
2644	db_begin_write();
2645	if( globalFlag ){
2646	db_swap_connections();
2647	db_multi_exec("DELETE FROM global_config WHERE name=%Q", zName);
2648	db_swap_connections();
2649	}else{
2650

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2235,11 +2235,11 @@
2235	2235	}else{
2236	2236	/* Default limit is as much as we can do in 1.000 seconds */
2237	2237	iLimit = 0;
2238	2238	mxTime = current_time_in_milliseconds()+1000;
2239	2239	}
2240		- db_begin_transaction();
	2240	+ db_begin_write();
2241	2241
2242	2242	/* Get the artifact ID for the check-in begin analyzed */
2243	2243	if( zRevision ){
2244	2244	cid = name_to_typed_rid(zRevision, "ci");
2245	2245	}else{
2246	2246

	--- src/diff.c
	+++ src/diff.c
	@@ -2235,11 +2235,11 @@
2235	}else{
2236	/* Default limit is as much as we can do in 1.000 seconds */
2237	iLimit = 0;
2238	mxTime = current_time_in_milliseconds()+1000;
2239	}
2240	db_begin_transaction();
2241
2242	/* Get the artifact ID for the check-in begin analyzed */
2243	if( zRevision ){
2244	cid = name_to_typed_rid(zRevision, "ci");
2245	}else{
2246

	--- src/diff.c
	+++ src/diff.c
	@@ -2235,11 +2235,11 @@
2235	}else{
2236	/* Default limit is as much as we can do in 1.000 seconds */
2237	iLimit = 0;
2238	mxTime = current_time_in_milliseconds()+1000;
2239	}
2240	db_begin_write();
2241
2242	/* Get the artifact ID for the check-in begin analyzed */
2243	if( zRevision ){
2244	cid = name_to_typed_rid(zRevision, "ci");
2245	}else{
2246

M src/event.c

+1 -1

		--- src/event.c
		+++ src/event.c
		@@ -255,11 +255,11 @@
255	255	char *zDate;
256	256	Blob cksum;
257	257	int nrid, n;
258	258
259	259	blob_init(&event, 0, 0);
260		- db_begin_transaction();
	260	+ db_begin_write();
261	261	while( fossil_isspace(zComment[0]) ) zComment++;
262	262	n = strlen(zComment);
263	263	while( n>0 && fossil_isspace(zComment[n-1]) ){ n--; }
264	264	if( n>0 ){
265	265	blob_appendf(&event, "C %#F\n", n, zComment);
266	266

	--- src/event.c
	+++ src/event.c
	@@ -255,11 +255,11 @@
255	char *zDate;
256	Blob cksum;
257	int nrid, n;
258
259	blob_init(&event, 0, 0);
260	db_begin_transaction();
261	while( fossil_isspace(zComment[0]) ) zComment++;
262	n = strlen(zComment);
263	while( n>0 && fossil_isspace(zComment[n-1]) ){ n--; }
264	if( n>0 ){
265	blob_appendf(&event, "C %#F\n", n, zComment);
266

	--- src/event.c
	+++ src/event.c
	@@ -255,11 +255,11 @@
255	char *zDate;
256	Blob cksum;
257	int nrid, n;
258
259	blob_init(&event, 0, 0);
260	db_begin_write();
261	while( fossil_isspace(zComment[0]) ) zComment++;
262	n = strlen(zComment);
263	while( n>0 && fossil_isspace(zComment[n-1]) ){ n--; }
264	if( n>0 ){
265	blob_appendf(&event, "C %#F\n", n, zComment);
266

M src/import.c

+2 -2

		--- src/import.c
		+++ src/import.c
		@@ -1754,11 +1754,11 @@
1754	1754	db_create_repository(g.argv[2]);
1755	1755	}
1756	1756	db_open_repository(g.argv[2]);
1757	1757	db_open_config(0, 0);
1758	1758
1759		- db_begin_transaction();
	1759	+ db_begin_write();
1760	1760	if( !incrFlag ){
1761	1761	db_initial_setup(0, 0, 0);
1762	1762	db_set("main-branch", gimport.zTrunkName, 0);
1763	1763	}
1764	1764
		@@ -1900,11 +1900,11 @@
1900	1900	db_end_transaction(0);
1901	1901	fossil_print(" \r");
1902	1902	if( omitRebuild ){
1903	1903	omitVacuum = 1;
1904	1904	}else{
1905		- db_begin_transaction();
	1905	+ db_begin_write();
1906	1906	fossil_print("Rebuilding repository meta-data...\n");
1907	1907	rebuild_db(0, 1, !incrFlag);
1908	1908	verify_cancel();
1909	1909	db_end_transaction(0);
1910	1910	}
1911	1911

	--- src/import.c
	+++ src/import.c
	@@ -1754,11 +1754,11 @@
1754	db_create_repository(g.argv[2]);
1755	}
1756	db_open_repository(g.argv[2]);
1757	db_open_config(0, 0);
1758
1759	db_begin_transaction();
1760	if( !incrFlag ){
1761	db_initial_setup(0, 0, 0);
1762	db_set("main-branch", gimport.zTrunkName, 0);
1763	}
1764
	@@ -1900,11 +1900,11 @@
1900	db_end_transaction(0);
1901	fossil_print(" \r");
1902	if( omitRebuild ){
1903	omitVacuum = 1;
1904	}else{
1905	db_begin_transaction();
1906	fossil_print("Rebuilding repository meta-data...\n");
1907	rebuild_db(0, 1, !incrFlag);
1908	verify_cancel();
1909	db_end_transaction(0);
1910	}
1911

	--- src/import.c
	+++ src/import.c
	@@ -1754,11 +1754,11 @@
1754	db_create_repository(g.argv[2]);
1755	}
1756	db_open_repository(g.argv[2]);
1757	db_open_config(0, 0);
1758
1759	db_begin_write();
1760	if( !incrFlag ){
1761	db_initial_setup(0, 0, 0);
1762	db_set("main-branch", gimport.zTrunkName, 0);
1763	}
1764
	@@ -1900,11 +1900,11 @@
1900	db_end_transaction(0);
1901	fossil_print(" \r");
1902	if( omitRebuild ){
1903	omitVacuum = 1;
1904	}else{
1905	db_begin_write();
1906	fossil_print("Rebuilding repository meta-data...\n");
1907	rebuild_db(0, 1, !incrFlag);
1908	verify_cancel();
1909	db_end_transaction(0);
1910	}
1911

M src/info.c

+1 -1

		--- src/info.c
		+++ src/info.c
		@@ -2649,11 +2649,11 @@
2649	2649	if( fDryRun ){
2650	2650	assert( g.isHTTP==0 ); /* Only print control artifact in console mode. */
2651	2651	fossil_print("%s", blob_str(ctrl));
2652	2652	blob_reset(ctrl);
2653	2653	}else{
2654		- db_begin_transaction();
	2654	+ db_begin_write();
2655	2655	g.markPrivate = content_is_private(rid);
2656	2656	nrid = content_put(ctrl);
2657	2657	manifest_crosslink(nrid, ctrl, MC_PERMIT_HOOKS);
2658	2658	db_end_transaction(0);
2659	2659	}
2660	2660

	--- src/info.c
	+++ src/info.c
	@@ -2649,11 +2649,11 @@
2649	if( fDryRun ){
2650	assert( g.isHTTP==0 ); /* Only print control artifact in console mode. */
2651	fossil_print("%s", blob_str(ctrl));
2652	blob_reset(ctrl);
2653	}else{
2654	db_begin_transaction();
2655	g.markPrivate = content_is_private(rid);
2656	nrid = content_put(ctrl);
2657	manifest_crosslink(nrid, ctrl, MC_PERMIT_HOOKS);
2658	db_end_transaction(0);
2659	}
2660

	--- src/info.c
	+++ src/info.c
	@@ -2649,11 +2649,11 @@
2649	if( fDryRun ){
2650	assert( g.isHTTP==0 ); /* Only print control artifact in console mode. */
2651	fossil_print("%s", blob_str(ctrl));
2652	blob_reset(ctrl);
2653	}else{
2654	db_begin_write();
2655	g.markPrivate = content_is_private(rid);
2656	nrid = content_put(ctrl);
2657	manifest_crosslink(nrid, ctrl, MC_PERMIT_HOOKS);
2658	db_end_transaction(0);
2659	}
2660

M src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -2103,11 +2103,11 @@
2103	2103	longer than the client timeout, which will cause it to fail (but
2104	2104	it's sqlite3, so it'll fail gracefully).
2105	2105	*/
2106	2106	db_close(1);
2107	2107	db_open_repository(g.zRepositoryName);
2108		- db_begin_transaction();
	2108	+ db_begin_write();
2109	2109	rebuild_db(0, 0, 0);
2110	2110	db_end_transaction(0);
2111	2111	return NULL;
2112	2112	}
2113	2113	}
2114	2114

	--- src/json.c
	+++ src/json.c
	@@ -2103,11 +2103,11 @@
2103	longer than the client timeout, which will cause it to fail (but
2104	it's sqlite3, so it'll fail gracefully).
2105	*/
2106	db_close(1);
2107	db_open_repository(g.zRepositoryName);
2108	db_begin_transaction();
2109	rebuild_db(0, 0, 0);
2110	db_end_transaction(0);
2111	return NULL;
2112	}
2113	}
2114

	--- src/json.c
	+++ src/json.c
	@@ -2103,11 +2103,11 @@
2103	longer than the client timeout, which will cause it to fail (but
2104	it's sqlite3, so it'll fail gracefully).
2105	*/
2106	db_close(1);
2107	db_open_repository(g.zRepositoryName);
2108	db_begin_write();
2109	rebuild_db(0, 0, 0);
2110	db_end_transaction(0);
2111	return NULL;
2112	}
2113	}
2114

M src/json_branch.c

+1 -1

		--- src/json_branch.c
		+++ src/json_branch.c
		@@ -212,11 +212,11 @@
212	212	zBranch)!=0 ){
213	213	zOpt->rcErrMsg = "Branch already exists.";
214	214	return FSL_JSON_E_RESOURCE_ALREADY_EXISTS;
215	215	}
216	216
217		- db_begin_transaction();
	217	+ db_begin_write();
218	218	rootid = name_to_typed_rid(zBasis, "ci");
219	219	if( rootid==0 ){
220	220	zOpt->rcErrMsg = "Basis branch not found.";
221	221	return FSL_JSON_E_RESOURCE_NOT_FOUND;
222	222	}
223	223

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -212,11 +212,11 @@
212	zBranch)!=0 ){
213	zOpt->rcErrMsg = "Branch already exists.";
214	return FSL_JSON_E_RESOURCE_ALREADY_EXISTS;
215	}
216
217	db_begin_transaction();
218	rootid = name_to_typed_rid(zBasis, "ci");
219	if( rootid==0 ){
220	zOpt->rcErrMsg = "Basis branch not found.";
221	return FSL_JSON_E_RESOURCE_NOT_FOUND;
222	}
223

	--- src/json_branch.c
	+++ src/json_branch.c
	@@ -212,11 +212,11 @@
212	zBranch)!=0 ){
213	zOpt->rcErrMsg = "Branch already exists.";
214	return FSL_JSON_E_RESOURCE_ALREADY_EXISTS;
215	}
216
217	db_begin_write();
218	rootid = name_to_typed_rid(zBasis, "ci");
219	if( rootid==0 ){
220	zOpt->rcErrMsg = "Basis branch not found.";
221	return FSL_JSON_E_RESOURCE_NOT_FOUND;
222	}
223

M src/json_tag.c

+2 -2

		--- src/json_tag.c
		+++ src/json_tag.c
		@@ -98,11 +98,11 @@
98	98	zValue = json_find_option_cstr("value",NULL,NULL);
99	99	if(!zValue && !fossil_has_json()){
100	100	zValue = json_command_arg(5);
101	101	}
102	102
103		- db_begin_transaction();
	103	+ db_begin_write();
104	104	tag_add_artifact(zPrefix, zName, zCheckin, zValue,
105	105	1+fPropagate,NULL/DateOvrd/,NULL/UserOvrd/);
106	106	db_end_transaction(0);
107	107
108	108	payV = cson_value_new_object();
		@@ -178,11 +178,11 @@
178	178	}
179	179	}
180	180	/* FIXME?: verify that the tag is currently active. We have no real
181	181	error case unless we do that.
182	182	*/
183		- db_begin_transaction();
	183	+ db_begin_write();
184	184	tag_add_artifact(zPrefix, zName, zCheckin, NULL, 0, 0, 0);
185	185	db_end_transaction(0);
186	186	return NULL;
187	187	}
188	188
189	189

	--- src/json_tag.c
	+++ src/json_tag.c
	@@ -98,11 +98,11 @@
98	zValue = json_find_option_cstr("value",NULL,NULL);
99	if(!zValue && !fossil_has_json()){
100	zValue = json_command_arg(5);
101	}
102
103	db_begin_transaction();
104	tag_add_artifact(zPrefix, zName, zCheckin, zValue,
105	1+fPropagate,NULL/DateOvrd/,NULL/UserOvrd/);
106	db_end_transaction(0);
107
108	payV = cson_value_new_object();
	@@ -178,11 +178,11 @@
178	}
179	}
180	/* FIXME?: verify that the tag is currently active. We have no real
181	error case unless we do that.
182	*/
183	db_begin_transaction();
184	tag_add_artifact(zPrefix, zName, zCheckin, NULL, 0, 0, 0);
185	db_end_transaction(0);
186	return NULL;
187	}
188
189

	--- src/json_tag.c
	+++ src/json_tag.c
	@@ -98,11 +98,11 @@
98	zValue = json_find_option_cstr("value",NULL,NULL);
99	if(!zValue && !fossil_has_json()){
100	zValue = json_command_arg(5);
101	}
102
103	db_begin_write();
104	tag_add_artifact(zPrefix, zName, zCheckin, zValue,
105	1+fPropagate,NULL/DateOvrd/,NULL/UserOvrd/);
106	db_end_transaction(0);
107
108	payV = cson_value_new_object();
	@@ -178,11 +178,11 @@
178	}
179	}
180	/* FIXME?: verify that the tag is currently active. We have no real
181	error case unless we do that.
182	*/
183	db_begin_write();
184	tag_add_artifact(zPrefix, zName, zCheckin, NULL, 0, 0, 0);
185	db_end_transaction(0);
186	return NULL;
187	}
188
189

M src/login.c

+1 -1

		--- src/login.c
		+++ src/login.c
		@@ -1903,11 +1903,11 @@
1903	1903	/* Create all the necessary CONFIG table entries on both the
1904	1904	** other repository and on our own repository.
1905	1905	*/
1906	1906	zSelfProjCode = abbreviated_project_code(zSelfProjCode);
1907	1907	zOtherProjCode = abbreviated_project_code(zOtherProjCode);
1908		- db_begin_transaction();
	1908	+ db_begin_write();
1909	1909	db_multi_exec(
1910	1910	"DELETE FROM \"%w\".config WHERE name GLOB 'peer-*';"
1911	1911	"INSERT INTO \"%w\".config(name,value) VALUES('peer-repo-%q',%Q);"
1912	1912	"INSERT INTO \"%w\".config(name,value) "
1913	1913	" SELECT 'peer-name-%q', value FROM other.config"
1914	1914

	--- src/login.c
	+++ src/login.c
	@@ -1903,11 +1903,11 @@
1903	/* Create all the necessary CONFIG table entries on both the
1904	** other repository and on our own repository.
1905	*/
1906	zSelfProjCode = abbreviated_project_code(zSelfProjCode);
1907	zOtherProjCode = abbreviated_project_code(zOtherProjCode);
1908	db_begin_transaction();
1909	db_multi_exec(
1910	"DELETE FROM \"%w\".config WHERE name GLOB 'peer-*';"
1911	"INSERT INTO \"%w\".config(name,value) VALUES('peer-repo-%q',%Q);"
1912	"INSERT INTO \"%w\".config(name,value) "
1913	" SELECT 'peer-name-%q', value FROM other.config"
1914

	--- src/login.c
	+++ src/login.c
	@@ -1903,11 +1903,11 @@
1903	/* Create all the necessary CONFIG table entries on both the
1904	** other repository and on our own repository.
1905	*/
1906	zSelfProjCode = abbreviated_project_code(zSelfProjCode);
1907	zOtherProjCode = abbreviated_project_code(zOtherProjCode);
1908	db_begin_write();
1909	db_multi_exec(
1910	"DELETE FROM \"%w\".config WHERE name GLOB 'peer-*';"
1911	"INSERT INTO \"%w\".config(name,value) VALUES('peer-repo-%q',%Q);"
1912	"INSERT INTO \"%w\".config(name,value) "
1913	" SELECT 'peer-name-%q', value FROM other.config"
1914

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -2138,11 +2138,11 @@
2138	2138	}else{
2139	2139	if( isDir==0 && fCreate ){
2140	2140	const char *zPassword;
2141	2141	db_create_repository(zRepo);
2142	2142	db_open_repository(zRepo);
2143		- db_begin_transaction();
	2143	+ db_begin_write();
2144	2144	g.eHashPolicy = HPOLICY_AUTO;
2145	2145	db_set_int("hash-policy", HPOLICY_AUTO, 0);
2146	2146	db_initial_setup(0, "now", g.zLogin);
2147	2147	db_end_transaction(0);
2148	2148	fossil_print("project-id: %s\n", db_get("project-code", 0));
2149	2149

	--- src/main.c
	+++ src/main.c
	@@ -2138,11 +2138,11 @@
2138	}else{
2139	if( isDir==0 && fCreate ){
2140	const char *zPassword;
2141	db_create_repository(zRepo);
2142	db_open_repository(zRepo);
2143	db_begin_transaction();
2144	g.eHashPolicy = HPOLICY_AUTO;
2145	db_set_int("hash-policy", HPOLICY_AUTO, 0);
2146	db_initial_setup(0, "now", g.zLogin);
2147	db_end_transaction(0);
2148	fossil_print("project-id: %s\n", db_get("project-code", 0));
2149

	--- src/main.c
	+++ src/main.c
	@@ -2138,11 +2138,11 @@
2138	}else{
2139	if( isDir==0 && fCreate ){
2140	const char *zPassword;
2141	db_create_repository(zRepo);
2142	db_open_repository(zRepo);
2143	db_begin_write();
2144	g.eHashPolicy = HPOLICY_AUTO;
2145	db_set_int("hash-policy", HPOLICY_AUTO, 0);
2146	db_initial_setup(0, "now", g.zLogin);
2147	db_end_transaction(0);
2148	fossil_print("project-id: %s\n", db_get("project-code", 0));
2149

M src/manifest.c

+2 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1806,11 +1806,11 @@
1806	1806	** by the call to manifest_crosslink_end().
1807	1807	*/
1808	1808	void manifest_crosslink_begin(void){
1809	1809	assert( manifest_crosslink_busy==0 );
1810	1810	manifest_crosslink_busy = 1;
1811		- db_begin_transaction();
	1811	+ db_begin_write();
1812	1812	db_multi_exec(
1813	1813	"CREATE TEMP TABLE pending_tkt(uuid TEXT UNIQUE);"
1814	1814	"CREATE TEMP TABLE time_fudge("
1815	1815	" mid INTEGER PRIMARY KEY," /* The rid of a manifest */
1816	1816	" m1 REAL," /* The timestamp on mid */
		@@ -2099,11 +2099,11 @@
2099	2099	fossil_error(1, "cannot fetch baseline for manifest [%S]",
2100	2100	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
2101	2101	}
2102	2102	return 0;
2103	2103	}
2104		- db_begin_transaction();
	2104	+ db_begin_write();
2105	2105	if( p->type==CFTYPE_MANIFEST ){
2106	2106	if( permitHooks ){
2107	2107	zScript = xfer_commit_code();
2108	2108	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
2109	2109	}
2110	2110

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1806,11 +1806,11 @@
1806	** by the call to manifest_crosslink_end().
1807	*/
1808	void manifest_crosslink_begin(void){
1809	assert( manifest_crosslink_busy==0 );
1810	manifest_crosslink_busy = 1;
1811	db_begin_transaction();
1812	db_multi_exec(
1813	"CREATE TEMP TABLE pending_tkt(uuid TEXT UNIQUE);"
1814	"CREATE TEMP TABLE time_fudge("
1815	" mid INTEGER PRIMARY KEY," /* The rid of a manifest */
1816	" m1 REAL," /* The timestamp on mid */
	@@ -2099,11 +2099,11 @@
2099	fossil_error(1, "cannot fetch baseline for manifest [%S]",
2100	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
2101	}
2102	return 0;
2103	}
2104	db_begin_transaction();
2105	if( p->type==CFTYPE_MANIFEST ){
2106	if( permitHooks ){
2107	zScript = xfer_commit_code();
2108	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
2109	}
2110

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1806,11 +1806,11 @@
1806	** by the call to manifest_crosslink_end().
1807	*/
1808	void manifest_crosslink_begin(void){
1809	assert( manifest_crosslink_busy==0 );
1810	manifest_crosslink_busy = 1;
1811	db_begin_write();
1812	db_multi_exec(
1813	"CREATE TEMP TABLE pending_tkt(uuid TEXT UNIQUE);"
1814	"CREATE TEMP TABLE time_fudge("
1815	" mid INTEGER PRIMARY KEY," /* The rid of a manifest */
1816	" m1 REAL," /* The timestamp on mid */
	@@ -2099,11 +2099,11 @@
2099	fossil_error(1, "cannot fetch baseline for manifest [%S]",
2100	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
2101	}
2102	return 0;
2103	}
2104	db_begin_write();
2105	if( p->type==CFTYPE_MANIFEST ){
2106	if( permitHooks ){
2107	zScript = xfer_commit_code();
2108	zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
2109	}
2110

M src/merge.c

+1 -1

		--- src/merge.c
		+++ src/merge.c
		@@ -396,11 +396,11 @@
396	396	print_checkin_description(mid, 12,
397	397	integrateFlag ? "integrate:" : "merge-from:");
398	398	print_checkin_description(pid, 12, "baseline:");
399	399	}
400	400	vfile_check_signature(vid, CKSIG_ENOTFILE);
401		- db_begin_transaction();
	401	+ db_begin_write();
402	402	if( !dryRunFlag ) undo_begin();
403	403	if( load_vfile_from_rid(mid) && !forceMissingFlag ){
404	404	fossil_fatal("missing content, unable to merge");
405	405	}
406	406	if( load_vfile_from_rid(pid) && !forceMissingFlag ){
407	407

	--- src/merge.c
	+++ src/merge.c
	@@ -396,11 +396,11 @@
396	print_checkin_description(mid, 12,
397	integrateFlag ? "integrate:" : "merge-from:");
398	print_checkin_description(pid, 12, "baseline:");
399	}
400	vfile_check_signature(vid, CKSIG_ENOTFILE);
401	db_begin_transaction();
402	if( !dryRunFlag ) undo_begin();
403	if( load_vfile_from_rid(mid) && !forceMissingFlag ){
404	fossil_fatal("missing content, unable to merge");
405	}
406	if( load_vfile_from_rid(pid) && !forceMissingFlag ){
407

	--- src/merge.c
	+++ src/merge.c
	@@ -396,11 +396,11 @@
396	print_checkin_description(mid, 12,
397	integrateFlag ? "integrate:" : "merge-from:");
398	print_checkin_description(pid, 12, "baseline:");
399	}
400	vfile_check_signature(vid, CKSIG_ENOTFILE);
401	db_begin_write();
402	if( !dryRunFlag ) undo_begin();
403	if( load_vfile_from_rid(mid) && !forceMissingFlag ){
404	fossil_fatal("missing content, unable to merge");
405	}
406	if( load_vfile_from_rid(pid) && !forceMissingFlag ){
407

M src/moderate.c

+2 -2

		--- src/moderate.c
		+++ src/moderate.c
		@@ -107,11 +107,11 @@
107	107	Stmt q;
108	108	char *zTktid;
109	109	int attachRid = 0;
110	110	int rid;
111	111	if( !moderation_pending(objid) ) return;
112		- db_begin_transaction();
	112	+ db_begin_write();
113	113	rid = objid;
114	114	while( rid && content_is_private(rid) ){
115	115	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=%d", rid);
116	116	while( db_step(&q)==SQLITE_ROW ){
117	117	int ridUser = db_column_int(&q, 0);
		@@ -149,11 +149,11 @@
149	149	/*
150	150	** Approve an object held for moderation.
151	151	*/
152	152	void moderation_approve(int rid){
153	153	if( !moderation_pending(rid) ) return;
154		- db_begin_transaction();
	154	+ db_begin_write();
155	155	db_multi_exec(
156	156	"DELETE FROM private WHERE rid=%d;"
157	157	"INSERT OR IGNORE INTO unclustered VALUES(%d);"
158	158	"INSERT OR IGNORE INTO unsent VALUES(%d);",
159	159	rid, rid, rid
160	160

	--- src/moderate.c
	+++ src/moderate.c
	@@ -107,11 +107,11 @@
107	Stmt q;
108	char *zTktid;
109	int attachRid = 0;
110	int rid;
111	if( !moderation_pending(objid) ) return;
112	db_begin_transaction();
113	rid = objid;
114	while( rid && content_is_private(rid) ){
115	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=%d", rid);
116	while( db_step(&q)==SQLITE_ROW ){
117	int ridUser = db_column_int(&q, 0);
	@@ -149,11 +149,11 @@
149	/*
150	** Approve an object held for moderation.
151	*/
152	void moderation_approve(int rid){
153	if( !moderation_pending(rid) ) return;
154	db_begin_transaction();
155	db_multi_exec(
156	"DELETE FROM private WHERE rid=%d;"
157	"INSERT OR IGNORE INTO unclustered VALUES(%d);"
158	"INSERT OR IGNORE INTO unsent VALUES(%d);",
159	rid, rid, rid
160

	--- src/moderate.c
	+++ src/moderate.c
	@@ -107,11 +107,11 @@
107	Stmt q;
108	char *zTktid;
109	int attachRid = 0;
110	int rid;
111	if( !moderation_pending(objid) ) return;
112	db_begin_write();
113	rid = objid;
114	while( rid && content_is_private(rid) ){
115	db_prepare(&q, "SELECT rid FROM delta WHERE srcid=%d", rid);
116	while( db_step(&q)==SQLITE_ROW ){
117	int ridUser = db_column_int(&q, 0);
	@@ -149,11 +149,11 @@
149	/*
150	** Approve an object held for moderation.
151	*/
152	void moderation_approve(int rid){
153	if( !moderation_pending(rid) ) return;
154	db_begin_write();
155	db_multi_exec(
156	"DELETE FROM private WHERE rid=%d;"
157	"INSERT OR IGNORE INTO unclustered VALUES(%d);"
158	"INSERT OR IGNORE INTO unsent VALUES(%d);",
159	rid, rid, rid
160

M src/publish.c

+1 -1

		--- src/publish.c
		+++ src/publish.c
		@@ -77,11 +77,11 @@
77	77	int i;
78	78
79	79	db_find_and_open_repository(0,0);
80	80	verify_all_options();
81	81	if( g.argc<3 ) usage("?--only? TAGS...");
82		- db_begin_transaction();
	82	+ db_begin_write();
83	83	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);");
84	84	for(i=2; i<g.argc; i++){
85	85	int rid = name_to_rid(g.argv[i]);
86	86	if( db_exists("SELECT 1 FROM tagxref"
87	87	" WHERE rid=%d AND tagid=%d"
88	88

	--- src/publish.c
	+++ src/publish.c
	@@ -77,11 +77,11 @@
77	int i;
78
79	db_find_and_open_repository(0,0);
80	verify_all_options();
81	if( g.argc<3 ) usage("?--only? TAGS...");
82	db_begin_transaction();
83	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);");
84	for(i=2; i<g.argc; i++){
85	int rid = name_to_rid(g.argv[i]);
86	if( db_exists("SELECT 1 FROM tagxref"
87	" WHERE rid=%d AND tagid=%d"
88

	--- src/publish.c
	+++ src/publish.c
	@@ -77,11 +77,11 @@
77	int i;
78
79	db_find_and_open_repository(0,0);
80	verify_all_options();
81	if( g.argc<3 ) usage("?--only? TAGS...");
82	db_begin_write();
83	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);");
84	for(i=2; i<g.argc; i++){
85	int rid = name_to_rid(g.argv[i]);
86	if( db_exists("SELECT 1 FROM tagxref"
87	" WHERE rid=%d AND tagid=%d"
88

M src/purge.c

+7 -7

		--- src/purge.c
		+++ src/purge.c
		@@ -103,11 +103,11 @@
103	103	int peid = 0; /* New purgeevent ID */
104	104	Stmt q; /* General-use prepared statement */
105	105	char *z;
106	106
107	107	assert( g.repositoryOpen ); /* Main database must already be open */
108		- db_begin_transaction();
	108	+ db_begin_write();
109	109	z = sqlite3_mprintf("IN \"%w\"", zTab);
110	110	describe_artifacts(z);
111	111	sqlite3_free(z);
112	112	describe_artifacts_to_stdout(0, 0);
113	113
		@@ -260,11 +260,11 @@
260	260	** The "fossil publish" command with the (undocumented) --test and
261	261	** --exclusive options can be used for interactiving testing of this
262	262	** function.
263	263	*/
264	264	void find_checkin_associates(const char *zTab, int bExclusive){
265		- db_begin_transaction();
	265	+ db_begin_write();
266	266
267	267	/* Compute the set of files that need to be added to zTab */
268	268	db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab);
269	269	db_multi_exec(
270	270	"INSERT OR IGNORE INTO \"%w_files\"(fid)"
		@@ -535,11 +535,11 @@
535	535	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
536	536	purgeFlags \|= PURGE_EXPLAIN_ONLY;
537	537	}
538	538	if( strncmp(zSubcmd, "artifacts", n)==0 ){
539	539	verify_all_options();
540		- db_begin_transaction();
	540	+ db_begin_write();
541	541	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
542	542	for(i=3; i<g.argc; i++){
543	543	int r = name_to_typed_rid(g.argv[i], "");
544	544	db_multi_exec("INSERT OR IGNORE INTO ok(rid) VALUES(%d);", r);
545	545	}
		@@ -562,11 +562,11 @@
562	562	int vid;
563	563	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
564	564	purgeFlags \|= PURGE_EXPLAIN_ONLY;
565	565	}
566	566	verify_all_options();
567		- db_begin_transaction();
	567	+ db_begin_write();
568	568	if( g.argc<=3 ) usage("checkins TAGS... [OPTIONS]");
569	569	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
570	570	for(i=3; i<g.argc; i++){
571	571	int r = name_to_typed_rid(g.argv[i], "br");
572	572	compute_descendants(r, 1000000000);
		@@ -578,11 +578,11 @@
578	578	find_checkin_associates("ok", 1);
579	579	purge_artifact_list("ok", "", purgeFlags);
580	580	db_end_transaction(0);
581	581	}else if( strncmp(zSubcmd, "files", n)==0 ){
582	582	verify_all_options();
583		- db_begin_transaction();
	583	+ db_begin_write();
584	584	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
585	585	for(i=3; i<g.argc; i++){
586	586	db_multi_exec(
587	587	"INSERT OR IGNORE INTO ok(rid) "
588	588	" SELECT fid FROM mlink, filename"
		@@ -618,11 +618,11 @@
618	618	cReply = blob_str(&ans)[0];
619	619	if( cReply!='y' && cReply!='Y' ){
620	620	fossil_exit(1);
621	621	}
622	622	}
623		- db_begin_transaction();
	623	+ db_begin_write();
624	624	for(i=3; i<g.argc; i++){
625	625	int peid = atoi(g.argv[i]);
626	626	if( !db_exists("SELECT 1 FROM purgeevent WHERE peid=%d",peid) ){
627	627	fossil_fatal("no such purge event: %s", g.argv[i]);
628	628	}
		@@ -638,11 +638,11 @@
638	638	}else if( strncmp(zSubcmd, "undo", n)==0 ){
639	639	int peid;
640	640	if( g.argc!=4 ) usage("undo ID");
641	641	peid = atoi(g.argv[3]);
642	642	if( (purgeFlags & PURGE_EXPLAIN_ONLY)==0 ){
643		- db_begin_transaction();
	643	+ db_begin_write();
644	644	db_multi_exec(
645	645	"CREATE TEMP TABLE ix("
646	646	" piid INTEGER PRIMARY KEY,"
647	647	" srcid INTEGER"
648	648	");"
649	649

	--- src/purge.c
	+++ src/purge.c
	@@ -103,11 +103,11 @@
103	int peid = 0; /* New purgeevent ID */
104	Stmt q; /* General-use prepared statement */
105	char *z;
106
107	assert( g.repositoryOpen ); /* Main database must already be open */
108	db_begin_transaction();
109	z = sqlite3_mprintf("IN \"%w\"", zTab);
110	describe_artifacts(z);
111	sqlite3_free(z);
112	describe_artifacts_to_stdout(0, 0);
113
	@@ -260,11 +260,11 @@
260	** The "fossil publish" command with the (undocumented) --test and
261	** --exclusive options can be used for interactiving testing of this
262	** function.
263	*/
264	void find_checkin_associates(const char *zTab, int bExclusive){
265	db_begin_transaction();
266
267	/* Compute the set of files that need to be added to zTab */
268	db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab);
269	db_multi_exec(
270	"INSERT OR IGNORE INTO \"%w_files\"(fid)"
	@@ -535,11 +535,11 @@
535	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
536	purgeFlags \|= PURGE_EXPLAIN_ONLY;
537	}
538	if( strncmp(zSubcmd, "artifacts", n)==0 ){
539	verify_all_options();
540	db_begin_transaction();
541	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
542	for(i=3; i<g.argc; i++){
543	int r = name_to_typed_rid(g.argv[i], "");
544	db_multi_exec("INSERT OR IGNORE INTO ok(rid) VALUES(%d);", r);
545	}
	@@ -562,11 +562,11 @@
562	int vid;
563	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
564	purgeFlags \|= PURGE_EXPLAIN_ONLY;
565	}
566	verify_all_options();
567	db_begin_transaction();
568	if( g.argc<=3 ) usage("checkins TAGS... [OPTIONS]");
569	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
570	for(i=3; i<g.argc; i++){
571	int r = name_to_typed_rid(g.argv[i], "br");
572	compute_descendants(r, 1000000000);
	@@ -578,11 +578,11 @@
578	find_checkin_associates("ok", 1);
579	purge_artifact_list("ok", "", purgeFlags);
580	db_end_transaction(0);
581	}else if( strncmp(zSubcmd, "files", n)==0 ){
582	verify_all_options();
583	db_begin_transaction();
584	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
585	for(i=3; i<g.argc; i++){
586	db_multi_exec(
587	"INSERT OR IGNORE INTO ok(rid) "
588	" SELECT fid FROM mlink, filename"
	@@ -618,11 +618,11 @@
618	cReply = blob_str(&ans)[0];
619	if( cReply!='y' && cReply!='Y' ){
620	fossil_exit(1);
621	}
622	}
623	db_begin_transaction();
624	for(i=3; i<g.argc; i++){
625	int peid = atoi(g.argv[i]);
626	if( !db_exists("SELECT 1 FROM purgeevent WHERE peid=%d",peid) ){
627	fossil_fatal("no such purge event: %s", g.argv[i]);
628	}
	@@ -638,11 +638,11 @@
638	}else if( strncmp(zSubcmd, "undo", n)==0 ){
639	int peid;
640	if( g.argc!=4 ) usage("undo ID");
641	peid = atoi(g.argv[3]);
642	if( (purgeFlags & PURGE_EXPLAIN_ONLY)==0 ){
643	db_begin_transaction();
644	db_multi_exec(
645	"CREATE TEMP TABLE ix("
646	" piid INTEGER PRIMARY KEY,"
647	" srcid INTEGER"
648	");"
649

	--- src/purge.c
	+++ src/purge.c
	@@ -103,11 +103,11 @@
103	int peid = 0; /* New purgeevent ID */
104	Stmt q; /* General-use prepared statement */
105	char *z;
106
107	assert( g.repositoryOpen ); /* Main database must already be open */
108	db_begin_write();
109	z = sqlite3_mprintf("IN \"%w\"", zTab);
110	describe_artifacts(z);
111	sqlite3_free(z);
112	describe_artifacts_to_stdout(0, 0);
113
	@@ -260,11 +260,11 @@
260	** The "fossil publish" command with the (undocumented) --test and
261	** --exclusive options can be used for interactiving testing of this
262	** function.
263	*/
264	void find_checkin_associates(const char *zTab, int bExclusive){
265	db_begin_write();
266
267	/* Compute the set of files that need to be added to zTab */
268	db_multi_exec("CREATE TEMP TABLE \"%w_files\"(fid INTEGER PRIMARY KEY)",zTab);
269	db_multi_exec(
270	"INSERT OR IGNORE INTO \"%w_files\"(fid)"
	@@ -535,11 +535,11 @@
535	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
536	purgeFlags \|= PURGE_EXPLAIN_ONLY;
537	}
538	if( strncmp(zSubcmd, "artifacts", n)==0 ){
539	verify_all_options();
540	db_begin_write();
541	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
542	for(i=3; i<g.argc; i++){
543	int r = name_to_typed_rid(g.argv[i], "");
544	db_multi_exec("INSERT OR IGNORE INTO ok(rid) VALUES(%d);", r);
545	}
	@@ -562,11 +562,11 @@
562	int vid;
563	if( find_option("explain",0,0)!=0 \|\| find_option("dry-run",0,0)!=0 ){
564	purgeFlags \|= PURGE_EXPLAIN_ONLY;
565	}
566	verify_all_options();
567	db_begin_write();
568	if( g.argc<=3 ) usage("checkins TAGS... [OPTIONS]");
569	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
570	for(i=3; i<g.argc; i++){
571	int r = name_to_typed_rid(g.argv[i], "br");
572	compute_descendants(r, 1000000000);
	@@ -578,11 +578,11 @@
578	find_checkin_associates("ok", 1);
579	purge_artifact_list("ok", "", purgeFlags);
580	db_end_transaction(0);
581	}else if( strncmp(zSubcmd, "files", n)==0 ){
582	verify_all_options();
583	db_begin_write();
584	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
585	for(i=3; i<g.argc; i++){
586	db_multi_exec(
587	"INSERT OR IGNORE INTO ok(rid) "
588	" SELECT fid FROM mlink, filename"
	@@ -618,11 +618,11 @@
618	cReply = blob_str(&ans)[0];
619	if( cReply!='y' && cReply!='Y' ){
620	fossil_exit(1);
621	}
622	}
623	db_begin_write();
624	for(i=3; i<g.argc; i++){
625	int peid = atoi(g.argv[i]);
626	if( !db_exists("SELECT 1 FROM purgeevent WHERE peid=%d",peid) ){
627	fossil_fatal("no such purge event: %s", g.argv[i]);
628	}
	@@ -638,11 +638,11 @@
638	}else if( strncmp(zSubcmd, "undo", n)==0 ){
639	int peid;
640	if( g.argc!=4 ) usage("undo ID");
641	peid = atoi(g.argv[3]);
642	if( (purgeFlags & PURGE_EXPLAIN_ONLY)==0 ){
643	db_begin_write();
644	db_multi_exec(
645	"CREATE TEMP TABLE ix("
646	" piid INTEGER PRIMARY KEY,"
647	" srcid INTEGER"
648	");"
649

M src/rebuild.c

+7 -7

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -41,11 +41,11 @@
41	41	** 2015-01-24 schema change. Create them if necessary. This code
42	42	** can be removed in the future, once all users have upgraded to the
43	43	** 2015-01-24 or later schema.
44	44	*/
45	45	if( !db_table_has_column("repository","mlink","isaux") ){
46		- db_begin_transaction();
	46	+ db_begin_write();
47	47	db_multi_exec(
48	48	"ALTER TABLE repository.mlink ADD COLUMN pmid INTEGER DEFAULT 0;"
49	49	"ALTER TABLE repository.mlink ADD COLUMN isaux BOOLEAN DEFAULT 0;"
50	50	);
51	51	db_end_transaction(0);
		@@ -486,11 +486,11 @@
486	486	Stmt q;
487	487	int aPrev[N_NEIGHBOR];
488	488	int nPrev;
489	489	int rid;
490	490	int prevfnid, fnid;
491		- db_begin_transaction();
	491	+ db_begin_write();
492	492
493	493	/* Look for manifests that have not been deltaed and try to make them
494	494	** children of one of the 5 chronologically subsequent check-ins
495	495	*/
496	496	db_prepare(&q,
		@@ -661,11 +661,11 @@
661	661	}
662	662
663	663	/* We should be done with options.. */
664	664	verify_all_options();
665	665
666		- db_begin_transaction();
	666	+ db_begin_write();
667	667	if( !compressOnlyFlag ){
668	668	search_drop_index();
669	669	ttyOutput = 1;
670	670	errCnt = rebuild_db(randomizeFlag, 1, doClustering);
671	671	reconstruct_private_table();
		@@ -749,11 +749,11 @@
749	749	** repositories. Used to create a "test" repository for development
750	750	** testing by cloning a working project repository.
751	751	*/
752	752	void test_detach_cmd(void){
753	753	db_find_and_open_repository(0, 2);
754		- db_begin_transaction();
	754	+ db_begin_write();
755	755	db_multi_exec(
756	756	"DELETE FROM config WHERE name='last-sync-url';"
757	757	"UPDATE config SET value=lower(hex(randomblob(20)))"
758	758	" WHERE name='project-code';"
759	759	"UPDATE config SET value='detached-' \|\| value"
		@@ -777,11 +777,11 @@
777	777	usage("?REPOSITORY-FILENAME?");
778	778	}
779	779	db_close(1);
780	780	db_open_repository(g.zRepositoryName);
781	781	}
782		- db_begin_transaction();
	782	+ db_begin_write();
783	783	create_cluster();
784	784	db_end_transaction(0);
785	785	}
786	786
787	787	/*
		@@ -898,11 +898,11 @@
898	898	cReply = blob_str(&ans)[0];
899	899	if( cReply!='y' && cReply!='Y' ){
900	900	fossil_exit(1);
901	901	}
902	902	}
903		- db_begin_transaction();
	903	+ db_begin_write();
904	904	if( privateOnly \|\| bVerily ){
905	905	bNeedRebuild = db_exists("SELECT 1 FROM private");
906	906	delete_private_content();
907	907	}
908	908	if( !privateOnly ){
		@@ -1167,11 +1167,11 @@
1167	1167
1168	1168	/* We should be done with options.. */
1169	1169	verify_all_options();
1170	1170
1171	1171	db_open_config(0, 0);
1172		- db_begin_transaction();
	1172	+ db_begin_write();
1173	1173	db_initial_setup(0, 0, 0);
1174	1174
1175	1175	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
1176	1176	recon_read_dir(g.argv[3]);
1177	1177	fossil_print("\nBuilding the Fossil repository...\n");
1178	1178

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -41,11 +41,11 @@
41	** 2015-01-24 schema change. Create them if necessary. This code
42	** can be removed in the future, once all users have upgraded to the
43	** 2015-01-24 or later schema.
44	*/
45	if( !db_table_has_column("repository","mlink","isaux") ){
46	db_begin_transaction();
47	db_multi_exec(
48	"ALTER TABLE repository.mlink ADD COLUMN pmid INTEGER DEFAULT 0;"
49	"ALTER TABLE repository.mlink ADD COLUMN isaux BOOLEAN DEFAULT 0;"
50	);
51	db_end_transaction(0);
	@@ -486,11 +486,11 @@
486	Stmt q;
487	int aPrev[N_NEIGHBOR];
488	int nPrev;
489	int rid;
490	int prevfnid, fnid;
491	db_begin_transaction();
492
493	/* Look for manifests that have not been deltaed and try to make them
494	** children of one of the 5 chronologically subsequent check-ins
495	*/
496	db_prepare(&q,
	@@ -661,11 +661,11 @@
661	}
662
663	/* We should be done with options.. */
664	verify_all_options();
665
666	db_begin_transaction();
667	if( !compressOnlyFlag ){
668	search_drop_index();
669	ttyOutput = 1;
670	errCnt = rebuild_db(randomizeFlag, 1, doClustering);
671	reconstruct_private_table();
	@@ -749,11 +749,11 @@
749	** repositories. Used to create a "test" repository for development
750	** testing by cloning a working project repository.
751	*/
752	void test_detach_cmd(void){
753	db_find_and_open_repository(0, 2);
754	db_begin_transaction();
755	db_multi_exec(
756	"DELETE FROM config WHERE name='last-sync-url';"
757	"UPDATE config SET value=lower(hex(randomblob(20)))"
758	" WHERE name='project-code';"
759	"UPDATE config SET value='detached-' \|\| value"
	@@ -777,11 +777,11 @@
777	usage("?REPOSITORY-FILENAME?");
778	}
779	db_close(1);
780	db_open_repository(g.zRepositoryName);
781	}
782	db_begin_transaction();
783	create_cluster();
784	db_end_transaction(0);
785	}
786
787	/*
	@@ -898,11 +898,11 @@
898	cReply = blob_str(&ans)[0];
899	if( cReply!='y' && cReply!='Y' ){
900	fossil_exit(1);
901	}
902	}
903	db_begin_transaction();
904	if( privateOnly \|\| bVerily ){
905	bNeedRebuild = db_exists("SELECT 1 FROM private");
906	delete_private_content();
907	}
908	if( !privateOnly ){
	@@ -1167,11 +1167,11 @@
1167
1168	/* We should be done with options.. */
1169	verify_all_options();
1170
1171	db_open_config(0, 0);
1172	db_begin_transaction();
1173	db_initial_setup(0, 0, 0);
1174
1175	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
1176	recon_read_dir(g.argv[3]);
1177	fossil_print("\nBuilding the Fossil repository...\n");
1178

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -41,11 +41,11 @@
41	** 2015-01-24 schema change. Create them if necessary. This code
42	** can be removed in the future, once all users have upgraded to the
43	** 2015-01-24 or later schema.
44	*/
45	if( !db_table_has_column("repository","mlink","isaux") ){
46	db_begin_write();
47	db_multi_exec(
48	"ALTER TABLE repository.mlink ADD COLUMN pmid INTEGER DEFAULT 0;"
49	"ALTER TABLE repository.mlink ADD COLUMN isaux BOOLEAN DEFAULT 0;"
50	);
51	db_end_transaction(0);
	@@ -486,11 +486,11 @@
486	Stmt q;
487	int aPrev[N_NEIGHBOR];
488	int nPrev;
489	int rid;
490	int prevfnid, fnid;
491	db_begin_write();
492
493	/* Look for manifests that have not been deltaed and try to make them
494	** children of one of the 5 chronologically subsequent check-ins
495	*/
496	db_prepare(&q,
	@@ -661,11 +661,11 @@
661	}
662
663	/* We should be done with options.. */
664	verify_all_options();
665
666	db_begin_write();
667	if( !compressOnlyFlag ){
668	search_drop_index();
669	ttyOutput = 1;
670	errCnt = rebuild_db(randomizeFlag, 1, doClustering);
671	reconstruct_private_table();
	@@ -749,11 +749,11 @@
749	** repositories. Used to create a "test" repository for development
750	** testing by cloning a working project repository.
751	*/
752	void test_detach_cmd(void){
753	db_find_and_open_repository(0, 2);
754	db_begin_write();
755	db_multi_exec(
756	"DELETE FROM config WHERE name='last-sync-url';"
757	"UPDATE config SET value=lower(hex(randomblob(20)))"
758	" WHERE name='project-code';"
759	"UPDATE config SET value='detached-' \|\| value"
	@@ -777,11 +777,11 @@
777	usage("?REPOSITORY-FILENAME?");
778	}
779	db_close(1);
780	db_open_repository(g.zRepositoryName);
781	}
782	db_begin_write();
783	create_cluster();
784	db_end_transaction(0);
785	}
786
787	/*
	@@ -898,11 +898,11 @@
898	cReply = blob_str(&ans)[0];
899	if( cReply!='y' && cReply!='Y' ){
900	fossil_exit(1);
901	}
902	}
903	db_begin_write();
904	if( privateOnly \|\| bVerily ){
905	bNeedRebuild = db_exists("SELECT 1 FROM private");
906	delete_private_content();
907	}
908	if( !privateOnly ){
	@@ -1167,11 +1167,11 @@
1167
1168	/* We should be done with options.. */
1169	verify_all_options();
1170
1171	db_open_config(0, 0);
1172	db_begin_write();
1173	db_initial_setup(0, 0, 0);
1174
1175	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
1176	recon_read_dir(g.argv[3]);
1177	fossil_print("\nBuilding the Fossil repository...\n");
1178

M src/search.c

+1 -1

		--- src/search.c
		+++ src/search.c
		@@ -1881,11 +1881,11 @@
1881	1881	}
1882	1882	if( iCmd==2 ){
1883	1883	if( g.argc<3 ) usage("index (on\|off)");
1884	1884	iAction = 1 + is_truth(g.argv[3]);
1885	1885	}
1886		- db_begin_transaction();
	1886	+ db_begin_write();
1887	1887
1888	1888	/* Adjust search settings */
1889	1889	if( iCmd==3 \|\| iCmd==4 ){
1890	1890	const char *zCtrl;
1891	1891	if( g.argc<4 ) usage(mprintf("%s STRING",zSubCmd));
1892	1892

	--- src/search.c
	+++ src/search.c
	@@ -1881,11 +1881,11 @@
1881	}
1882	if( iCmd==2 ){
1883	if( g.argc<3 ) usage("index (on\|off)");
1884	iAction = 1 + is_truth(g.argv[3]);
1885	}
1886	db_begin_transaction();
1887
1888	/* Adjust search settings */
1889	if( iCmd==3 \|\| iCmd==4 ){
1890	const char *zCtrl;
1891	if( g.argc<4 ) usage(mprintf("%s STRING",zSubCmd));
1892

	--- src/search.c
	+++ src/search.c
	@@ -1881,11 +1881,11 @@
1881	}
1882	if( iCmd==2 ){
1883	if( g.argc<3 ) usage("index (on\|off)");
1884	iAction = 1 + is_truth(g.argv[3]);
1885	}
1886	db_begin_write();
1887
1888	/* Adjust search settings */
1889	if( iCmd==3 \|\| iCmd==4 ){
1890	const char *zCtrl;
1891	if( g.argc<4 ) usage(mprintf("%s STRING",zSubCmd));
1892

M src/setup.c

+8 -8

		--- src/setup.c
		+++ src/setup.c
		@@ -324,11 +324,11 @@
324	324	login_needed(0);
325	325	return;
326	326	}
327	327
328	328	style_header("Access Control Settings");
329		- db_begin_transaction();
	329	+ db_begin_write();
330	330	@ <form action="%s(g.zTop)/setup_access" method="post"><div>
331	331	login_insert_csrf_secret();
332	332	@ <input type="submit" name="submit" value="Apply Changes" /></p>
333	333	@ <hr />
334	334	multiple_choice_attribute("Redirect to HTTPS",
		@@ -679,11 +679,11 @@
679	679	login_needed(0);
680	680	return;
681	681	}
682	682
683	683	style_header("Timeline Display Preferences");
684		- db_begin_transaction();
	684	+ db_begin_write();
685	685	@ <form action="%s(g.zTop)/setup_timeline" method="post"><div>
686	686	login_insert_csrf_secret();
687	687	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
688	688
689	689	@ <hr />
		@@ -780,11 +780,11 @@
780	780	if(!g.repositoryOpen){
781	781	/* Provide read-only access to versioned settings,
782	782	but only if no repo file was explicitly provided. */
783	783	db_open_local(0);
784	784	}
785		- db_begin_transaction();
	785	+ db_begin_write();
786	786	@ <p>Settings marked with (v) are "versionable" and will be overridden
787	787	@ by the contents of managed files named
788	788	@ "<tt>.fossil-settings/</tt><i>SETTING-NAME</i>".
789	789	@ If the file for a versionable setting exists, the value cannot be
790	790	@ changed on this screen.</p><hr /><p>
		@@ -857,11 +857,11 @@
857	857	login_needed(0);
858	858	return;
859	859	}
860	860
861	861	style_header("WWW Configuration");
862		- db_begin_transaction();
	862	+ db_begin_write();
863	863	@ <form action="%s(g.zTop)/setup_config" method="post"><div>
864	864	login_insert_csrf_secret();
865	865	@ <input type="submit" name="submit" value="Apply Changes" /></p>
866	866	@ <hr />
867	867	entry_attribute("Project Name", 60, "project-name", "pn", "", 0);
		@@ -953,11 +953,11 @@
953	953	login_needed(0);
954	954	return;
955	955	}
956	956
957	957	style_header("Wiki Configuration");
958		- db_begin_transaction();
	958	+ db_begin_write();
959	959	@ <form action="%s(g.zTop)/setup_wiki" method="post"><div>
960	960	login_insert_csrf_secret();
961	961	@ <input type="submit" name="submit" value="Apply Changes" /></p>
962	962	@ <hr />
963	963	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
		@@ -1013,11 +1013,11 @@
1013	1013	login_needed(0);
1014	1014	return;
1015	1015	}
1016	1016
1017	1017	style_header("Moderator For Wiki And Tickets");
1018		- db_begin_transaction();
	1018	+ db_begin_write();
1019	1019	@ <form action="%R/setup_modreq" method="post"><div>
1020	1020	login_insert_csrf_secret();
1021	1021	@ <hr />
1022	1022	onoff_attribute("Moderate ticket changes",
1023	1023	"modreq-tkt", "modreq-tkt", 0, 0);
		@@ -1059,11 +1059,11 @@
1059	1059	login_check_credentials();
1060	1060	if( !g.perm.Admin ){
1061	1061	login_needed(0);
1062	1062	return;
1063	1063	}
1064		- db_begin_transaction();
	1064	+ db_begin_write();
1065	1065	if( P("clear")!=0 && cgi_csrf_safe(1) ){
1066	1066	db_multi_exec("DELETE FROM config WHERE name GLOB 'adunit*'");
1067	1067	cgi_replace_parameter("adunit","");
1068	1068	}
1069	1069
		@@ -1149,11 +1149,11 @@
1149	1149	login_check_credentials();
1150	1150	if( !g.perm.Admin ){
1151	1151	login_needed(0);
1152	1152	return;
1153	1153	}
1154		- db_begin_transaction();
	1154	+ db_begin_write();
1155	1155	if( !cgi_csrf_safe(1) ){
1156	1156	/* Allow no state changes if not safe from CSRF */
1157	1157	}else if( P("setlogo")!=0 && zLogoMime && zLogoMime[0] && szLogoImg>0 ){
1158	1158	Blob img;
1159	1159	Stmt ins;
1160	1160

	--- src/setup.c
	+++ src/setup.c
	@@ -324,11 +324,11 @@
324	login_needed(0);
325	return;
326	}
327
328	style_header("Access Control Settings");
329	db_begin_transaction();
330	@ <form action="%s(g.zTop)/setup_access" method="post"><div>
331	login_insert_csrf_secret();
332	@ <input type="submit" name="submit" value="Apply Changes" /></p>
333	@ <hr />
334	multiple_choice_attribute("Redirect to HTTPS",
	@@ -679,11 +679,11 @@
679	login_needed(0);
680	return;
681	}
682
683	style_header("Timeline Display Preferences");
684	db_begin_transaction();
685	@ <form action="%s(g.zTop)/setup_timeline" method="post"><div>
686	login_insert_csrf_secret();
687	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
688
689	@ <hr />
	@@ -780,11 +780,11 @@
780	if(!g.repositoryOpen){
781	/* Provide read-only access to versioned settings,
782	but only if no repo file was explicitly provided. */
783	db_open_local(0);
784	}
785	db_begin_transaction();
786	@ <p>Settings marked with (v) are "versionable" and will be overridden
787	@ by the contents of managed files named
788	@ "<tt>.fossil-settings/</tt><i>SETTING-NAME</i>".
789	@ If the file for a versionable setting exists, the value cannot be
790	@ changed on this screen.</p><hr /><p>
	@@ -857,11 +857,11 @@
857	login_needed(0);
858	return;
859	}
860
861	style_header("WWW Configuration");
862	db_begin_transaction();
863	@ <form action="%s(g.zTop)/setup_config" method="post"><div>
864	login_insert_csrf_secret();
865	@ <input type="submit" name="submit" value="Apply Changes" /></p>
866	@ <hr />
867	entry_attribute("Project Name", 60, "project-name", "pn", "", 0);
	@@ -953,11 +953,11 @@
953	login_needed(0);
954	return;
955	}
956
957	style_header("Wiki Configuration");
958	db_begin_transaction();
959	@ <form action="%s(g.zTop)/setup_wiki" method="post"><div>
960	login_insert_csrf_secret();
961	@ <input type="submit" name="submit" value="Apply Changes" /></p>
962	@ <hr />
963	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
	@@ -1013,11 +1013,11 @@
1013	login_needed(0);
1014	return;
1015	}
1016
1017	style_header("Moderator For Wiki And Tickets");
1018	db_begin_transaction();
1019	@ <form action="%R/setup_modreq" method="post"><div>
1020	login_insert_csrf_secret();
1021	@ <hr />
1022	onoff_attribute("Moderate ticket changes",
1023	"modreq-tkt", "modreq-tkt", 0, 0);
	@@ -1059,11 +1059,11 @@
1059	login_check_credentials();
1060	if( !g.perm.Admin ){
1061	login_needed(0);
1062	return;
1063	}
1064	db_begin_transaction();
1065	if( P("clear")!=0 && cgi_csrf_safe(1) ){
1066	db_multi_exec("DELETE FROM config WHERE name GLOB 'adunit*'");
1067	cgi_replace_parameter("adunit","");
1068	}
1069
	@@ -1149,11 +1149,11 @@
1149	login_check_credentials();
1150	if( !g.perm.Admin ){
1151	login_needed(0);
1152	return;
1153	}
1154	db_begin_transaction();
1155	if( !cgi_csrf_safe(1) ){
1156	/* Allow no state changes if not safe from CSRF */
1157	}else if( P("setlogo")!=0 && zLogoMime && zLogoMime[0] && szLogoImg>0 ){
1158	Blob img;
1159	Stmt ins;
1160

	--- src/setup.c
	+++ src/setup.c
	@@ -324,11 +324,11 @@
324	login_needed(0);
325	return;
326	}
327
328	style_header("Access Control Settings");
329	db_begin_write();
330	@ <form action="%s(g.zTop)/setup_access" method="post"><div>
331	login_insert_csrf_secret();
332	@ <input type="submit" name="submit" value="Apply Changes" /></p>
333	@ <hr />
334	multiple_choice_attribute("Redirect to HTTPS",
	@@ -679,11 +679,11 @@
679	login_needed(0);
680	return;
681	}
682
683	style_header("Timeline Display Preferences");
684	db_begin_write();
685	@ <form action="%s(g.zTop)/setup_timeline" method="post"><div>
686	login_insert_csrf_secret();
687	@ <p><input type="submit" name="submit" value="Apply Changes" /></p>
688
689	@ <hr />
	@@ -780,11 +780,11 @@
780	if(!g.repositoryOpen){
781	/* Provide read-only access to versioned settings,
782	but only if no repo file was explicitly provided. */
783	db_open_local(0);
784	}
785	db_begin_write();
786	@ <p>Settings marked with (v) are "versionable" and will be overridden
787	@ by the contents of managed files named
788	@ "<tt>.fossil-settings/</tt><i>SETTING-NAME</i>".
789	@ If the file for a versionable setting exists, the value cannot be
790	@ changed on this screen.</p><hr /><p>
	@@ -857,11 +857,11 @@
857	login_needed(0);
858	return;
859	}
860
861	style_header("WWW Configuration");
862	db_begin_write();
863	@ <form action="%s(g.zTop)/setup_config" method="post"><div>
864	login_insert_csrf_secret();
865	@ <input type="submit" name="submit" value="Apply Changes" /></p>
866	@ <hr />
867	entry_attribute("Project Name", 60, "project-name", "pn", "", 0);
	@@ -953,11 +953,11 @@
953	login_needed(0);
954	return;
955	}
956
957	style_header("Wiki Configuration");
958	db_begin_write();
959	@ <form action="%s(g.zTop)/setup_wiki" method="post"><div>
960	login_insert_csrf_secret();
961	@ <input type="submit" name="submit" value="Apply Changes" /></p>
962	@ <hr />
963	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
	@@ -1013,11 +1013,11 @@
1013	login_needed(0);
1014	return;
1015	}
1016
1017	style_header("Moderator For Wiki And Tickets");
1018	db_begin_write();
1019	@ <form action="%R/setup_modreq" method="post"><div>
1020	login_insert_csrf_secret();
1021	@ <hr />
1022	onoff_attribute("Moderate ticket changes",
1023	"modreq-tkt", "modreq-tkt", 0, 0);
	@@ -1059,11 +1059,11 @@
1059	login_check_credentials();
1060	if( !g.perm.Admin ){
1061	login_needed(0);
1062	return;
1063	}
1064	db_begin_write();
1065	if( P("clear")!=0 && cgi_csrf_safe(1) ){
1066	db_multi_exec("DELETE FROM config WHERE name GLOB 'adunit*'");
1067	cgi_replace_parameter("adunit","");
1068	}
1069
	@@ -1149,11 +1149,11 @@
1149	login_check_credentials();
1150	if( !g.perm.Admin ){
1151	login_needed(0);
1152	return;
1153	}
1154	db_begin_write();
1155	if( !cgi_csrf_safe(1) ){
1156	/* Allow no state changes if not safe from CSRF */
1157	}else if( P("setlogo")!=0 && zLogoMime && zLogoMime[0] && szLogoImg>0 ){
1158	Blob img;
1159	Stmt ins;
1160

M src/shun.c

+1 -1

		--- src/shun.c
		+++ src/shun.c
		@@ -59,11 +59,11 @@
59	59	return;
60	60	}
61	61	if( P("rebuild") ){
62	62	db_close(1);
63	63	db_open_repository(g.zRepositoryName);
64		- db_begin_transaction();
	64	+ db_begin_write();
65	65	rebuild_db(0, 0, 0);
66	66	admin_log("Rebuilt database.");
67	67	db_end_transaction(0);
68	68	}
69	69	if( zUuid ){
70	70

	--- src/shun.c
	+++ src/shun.c
	@@ -59,11 +59,11 @@
59	return;
60	}
61	if( P("rebuild") ){
62	db_close(1);
63	db_open_repository(g.zRepositoryName);
64	db_begin_transaction();
65	rebuild_db(0, 0, 0);
66	admin_log("Rebuilt database.");
67	db_end_transaction(0);
68	}
69	if( zUuid ){
70

	--- src/shun.c
	+++ src/shun.c
	@@ -59,11 +59,11 @@
59	return;
60	}
61	if( P("rebuild") ){
62	db_close(1);
63	db_open_repository(g.zRepositoryName);
64	db_begin_write();
65	rebuild_db(0, 0, 0);
66	admin_log("Rebuilt database.");
67	db_end_transaction(0);
68	}
69	if( zUuid ){
70

M src/skins.c

+2 -2

		--- src/skins.c
		+++ src/skins.c
		@@ -463,11 +463,11 @@
463	463	login_check_credentials();
464	464	if( !g.perm.Admin ){
465	465	login_needed(0);
466	466	return;
467	467	}
468		- db_begin_transaction();
	468	+ db_begin_write();
469	469	zCurrent = getSkin(0);
470	470	for(i=0; i<count(aBuiltinSkin); i++){
471	471	aBuiltinSkin[i].zSQL = getSkin(aBuiltinSkin[i].zLabel);
472	472	}
473	473
		@@ -764,11 +764,11 @@
764	764	if( P("revert")!=0 && cgi_csrf_safe(0) ){
765	765	zContent = zDflt;
766	766	isRevert = 1;
767	767	}
768	768
769		- db_begin_transaction();
	769	+ db_begin_write();
770	770	style_header("%s", zTitle);
771	771	for(j=0; j<count(aSkinAttr); j++){
772	772	style_submenu_element(aSkinAttr[j].zSubmenu,
773	773	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
774	774	}
775	775

	--- src/skins.c
	+++ src/skins.c
	@@ -463,11 +463,11 @@
463	login_check_credentials();
464	if( !g.perm.Admin ){
465	login_needed(0);
466	return;
467	}
468	db_begin_transaction();
469	zCurrent = getSkin(0);
470	for(i=0; i<count(aBuiltinSkin); i++){
471	aBuiltinSkin[i].zSQL = getSkin(aBuiltinSkin[i].zLabel);
472	}
473
	@@ -764,11 +764,11 @@
764	if( P("revert")!=0 && cgi_csrf_safe(0) ){
765	zContent = zDflt;
766	isRevert = 1;
767	}
768
769	db_begin_transaction();
770	style_header("%s", zTitle);
771	for(j=0; j<count(aSkinAttr); j++){
772	style_submenu_element(aSkinAttr[j].zSubmenu,
773	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
774	}
775

	--- src/skins.c
	+++ src/skins.c
	@@ -463,11 +463,11 @@
463	login_check_credentials();
464	if( !g.perm.Admin ){
465	login_needed(0);
466	return;
467	}
468	db_begin_write();
469	zCurrent = getSkin(0);
470	for(i=0; i<count(aBuiltinSkin); i++){
471	aBuiltinSkin[i].zSQL = getSkin(aBuiltinSkin[i].zLabel);
472	}
473
	@@ -764,11 +764,11 @@
764	if( P("revert")!=0 && cgi_csrf_safe(0) ){
765	zContent = zDflt;
766	isRevert = 1;
767	}
768
769	db_begin_write();
770	style_header("%s", zTitle);
771	for(j=0; j<count(aSkinAttr); j++){
772	style_submenu_element(aSkinAttr[j].zSubmenu,
773	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
774	}
775

M src/stash.c

+1 -1

		--- src/stash.c
		+++ src/stash.c
		@@ -580,11 +580,11 @@
580	580	int nCmd;
581	581	int stashid = 0;
582	582	undo_capture_command_line();
583	583	db_must_be_within_tree();
584	584	db_open_config(0, 0);
585		- db_begin_transaction();
	585	+ db_begin_write();
586	586	stash_tables_exist_and_current();
587	587	if( g.argc<=2 ){
588	588	zCmd = "save";
589	589	}else{
590	590	zCmd = g.argv[2];
591	591

	--- src/stash.c
	+++ src/stash.c
	@@ -580,11 +580,11 @@
580	int nCmd;
581	int stashid = 0;
582	undo_capture_command_line();
583	db_must_be_within_tree();
584	db_open_config(0, 0);
585	db_begin_transaction();
586	stash_tables_exist_and_current();
587	if( g.argc<=2 ){
588	zCmd = "save";
589	}else{
590	zCmd = g.argv[2];
591

	--- src/stash.c
	+++ src/stash.c
	@@ -580,11 +580,11 @@
580	int nCmd;
581	int stashid = 0;
582	undo_capture_command_line();
583	db_must_be_within_tree();
584	db_open_config(0, 0);
585	db_begin_write();
586	stash_tables_exist_and_current();
587	if( g.argc<=2 ){
588	zCmd = "save";
589	}else{
590	zCmd = g.argv[2];
591

M src/tag.c

+3 -3

		--- src/tag.c
		+++ src/tag.c
		@@ -274,11 +274,11 @@
274	274	if( rid==0 ){
275	275	fossil_fatal("no such object: %s", g.argv[3]);
276	276	}
277	277	g.markPrivate = content_is_private(rid);
278	278	zValue = g.argc==5 ? g.argv[4] : 0;
279		- db_begin_transaction();
	279	+ db_begin_write();
280	280	tag_insert(zTag, tagtype, zValue, -1, 0.0, rid);
281	281	db_end_transaction(0);
282	282	}
283	283
284	284	/*
		@@ -464,11 +464,11 @@
464	464	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
465	465	if( g.argc!=5 && g.argc!=6 ){
466	466	usage("add ?options? TAGNAME CHECK-IN ?VALUE?");
467	467	}
468	468	zValue = g.argc==6 ? g.argv[5] : 0;
469		- db_begin_transaction();
	469	+ db_begin_write();
470	470	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], zValue,
471	471	1+fPropagate+dryRun,zDateOvrd,zUserOvrd);
472	472	db_end_transaction(0);
473	473	}else
474	474
		@@ -485,11 +485,11 @@
485	485	const char *zUserOvrd = find_option("user-override",0,1);
486	486	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
487	487	if( g.argc!=5 ){
488	488	usage("cancel ?options? TAGNAME CHECK-IN");
489	489	}
490		- db_begin_transaction();
	490	+ db_begin_write();
491	491	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun,
492	492	zDateOvrd, zUserOvrd);
493	493	db_end_transaction(0);
494	494	}else
495	495
496	496

	--- src/tag.c
	+++ src/tag.c
	@@ -274,11 +274,11 @@
274	if( rid==0 ){
275	fossil_fatal("no such object: %s", g.argv[3]);
276	}
277	g.markPrivate = content_is_private(rid);
278	zValue = g.argc==5 ? g.argv[4] : 0;
279	db_begin_transaction();
280	tag_insert(zTag, tagtype, zValue, -1, 0.0, rid);
281	db_end_transaction(0);
282	}
283
284	/*
	@@ -464,11 +464,11 @@
464	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
465	if( g.argc!=5 && g.argc!=6 ){
466	usage("add ?options? TAGNAME CHECK-IN ?VALUE?");
467	}
468	zValue = g.argc==6 ? g.argv[5] : 0;
469	db_begin_transaction();
470	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], zValue,
471	1+fPropagate+dryRun,zDateOvrd,zUserOvrd);
472	db_end_transaction(0);
473	}else
474
	@@ -485,11 +485,11 @@
485	const char *zUserOvrd = find_option("user-override",0,1);
486	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
487	if( g.argc!=5 ){
488	usage("cancel ?options? TAGNAME CHECK-IN");
489	}
490	db_begin_transaction();
491	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun,
492	zDateOvrd, zUserOvrd);
493	db_end_transaction(0);
494	}else
495
496

	--- src/tag.c
	+++ src/tag.c
	@@ -274,11 +274,11 @@
274	if( rid==0 ){
275	fossil_fatal("no such object: %s", g.argv[3]);
276	}
277	g.markPrivate = content_is_private(rid);
278	zValue = g.argc==5 ? g.argv[4] : 0;
279	db_begin_write();
280	tag_insert(zTag, tagtype, zValue, -1, 0.0, rid);
281	db_end_transaction(0);
282	}
283
284	/*
	@@ -464,11 +464,11 @@
464	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
465	if( g.argc!=5 && g.argc!=6 ){
466	usage("add ?options? TAGNAME CHECK-IN ?VALUE?");
467	}
468	zValue = g.argc==6 ? g.argv[5] : 0;
469	db_begin_write();
470	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], zValue,
471	1+fPropagate+dryRun,zDateOvrd,zUserOvrd);
472	db_end_transaction(0);
473	}else
474
	@@ -485,11 +485,11 @@
485	const char *zUserOvrd = find_option("user-override",0,1);
486	if( find_option("dryrun","n",0)!=0 ) dryRun = TAG_ADD_DRYRUN;
487	if( g.argc!=5 ){
488	usage("cancel ?options? TAGNAME CHECK-IN");
489	}
490	db_begin_write();
491	tag_add_artifact(zPrefix, g.argv[3], g.argv[4], 0, dryRun,
492	zDateOvrd, zUserOvrd);
493	db_end_transaction(0);
494	}else
495
496

M src/tkt.c

+1 -1

		--- src/tkt.c
		+++ src/tkt.c
		@@ -386,11 +386,11 @@
386	386	** available ticket artifacts.
387	387	*/
388	388	void ticket_rebuild(void){
389	389	Stmt q;
390	390	ticket_create_table(1);
391		- db_begin_transaction();
	391	+ db_begin_write();
392	392	db_prepare(&q,"SELECT tagname FROM tag WHERE tagname GLOB 'tkt-*'");
393	393	while( db_step(&q)==SQLITE_ROW ){
394	394	const char *zName = db_column_text(&q, 0);
395	395	int len;
396	396	zName += 4;
397	397

	--- src/tkt.c
	+++ src/tkt.c
	@@ -386,11 +386,11 @@
386	** available ticket artifacts.
387	*/
388	void ticket_rebuild(void){
389	Stmt q;
390	ticket_create_table(1);
391	db_begin_transaction();
392	db_prepare(&q,"SELECT tagname FROM tag WHERE tagname GLOB 'tkt-*'");
393	while( db_step(&q)==SQLITE_ROW ){
394	const char *zName = db_column_text(&q, 0);
395	int len;
396	zName += 4;
397

	--- src/tkt.c
	+++ src/tkt.c
	@@ -386,11 +386,11 @@
386	** available ticket artifacts.
387	*/
388	void ticket_rebuild(void){
389	Stmt q;
390	ticket_create_table(1);
391	db_begin_write();
392	db_prepare(&q,"SELECT tagname FROM tag WHERE tagname GLOB 'tkt-*'");
393	while( db_step(&q)==SQLITE_ROW ){
394	const char *zName = db_column_text(&q, 0);
395	int len;
396	zName += 4;
397

M src/tktsetup.c

+1 -1

		--- src/tktsetup.c
		+++ src/tktsetup.c
		@@ -891,11 +891,11 @@
891	891
892	892	if( P("setup") ){
893	893	cgi_redirect("tktsetup");
894	894	}
895	895	style_header("Ticket Display On Timelines");
896		- db_begin_transaction();
	896	+ db_begin_write();
897	897	@ <form action="%s(g.zTop)/tktsetup_timeline" method="post"><div>
898	898	login_insert_csrf_secret();
899	899
900	900	@ <hr />
901	901	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t",
902	902

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -891,11 +891,11 @@
891
892	if( P("setup") ){
893	cgi_redirect("tktsetup");
894	}
895	style_header("Ticket Display On Timelines");
896	db_begin_transaction();
897	@ <form action="%s(g.zTop)/tktsetup_timeline" method="post"><div>
898	login_insert_csrf_secret();
899
900	@ <hr />
901	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t",
902

	--- src/tktsetup.c
	+++ src/tktsetup.c
	@@ -891,11 +891,11 @@
891
892	if( P("setup") ){
893	cgi_redirect("tktsetup");
894	}
895	style_header("Ticket Display On Timelines");
896	db_begin_write();
897	@ <form action="%s(g.zTop)/tktsetup_timeline" method="post"><div>
898	login_insert_csrf_secret();
899
900	@ <hr />
901	entry_attribute("Ticket Title", 40, "ticket-title-expr", "t",
902

M src/undo.c

+1 -1

		--- src/undo.c
		+++ src/undo.c
		@@ -461,11 +461,11 @@
461	461	if( !dryRunFlag ){
462	462	dryRunFlag = find_option("explain", 0, 0)!=0;
463	463	}
464	464	db_must_be_within_tree();
465	465	verify_all_options();
466		- db_begin_transaction();
	466	+ db_begin_write();
467	467	undo_available = db_lget_int("undo_available", 0);
468	468	if( dryRunFlag ){
469	469	if( undo_available==0 ){
470	470	fossil_print("No undo or redo is available\n");
471	471	}else{
472	472

	--- src/undo.c
	+++ src/undo.c
	@@ -461,11 +461,11 @@
461	if( !dryRunFlag ){
462	dryRunFlag = find_option("explain", 0, 0)!=0;
463	}
464	db_must_be_within_tree();
465	verify_all_options();
466	db_begin_transaction();
467	undo_available = db_lget_int("undo_available", 0);
468	if( dryRunFlag ){
469	if( undo_available==0 ){
470	fossil_print("No undo or redo is available\n");
471	}else{
472

	--- src/undo.c
	+++ src/undo.c
	@@ -461,11 +461,11 @@
461	if( !dryRunFlag ){
462	dryRunFlag = find_option("explain", 0, 0)!=0;
463	}
464	db_must_be_within_tree();
465	verify_all_options();
466	db_begin_write();
467	undo_available = db_lget_int("undo_available", 0);
468	if( dryRunFlag ){
469	if( undo_available==0 ){
470	fossil_print("No undo or redo is available\n");
471	}else{
472

M src/unversioned.c

+5 -5

		--- src/unversioned.c
		+++ src/unversioned.c
		@@ -293,11 +293,11 @@
293	293	int i;
294	294
295	295	zAs = find_option("as",0,1);
296	296	if( zAs && g.argc!=4 ) usage("add DISKFILE --as UVFILE");
297	297	verify_all_options();
298		- db_begin_transaction();
	298	+ db_begin_write();
299	299	content_rcvid_init("#!fossil unversioned add");
300	300	for(i=3; i<g.argc; i++){
301	301	zIn = zAs ? zAs : g.argv[i];
302	302	if( zIn[0]==0 ){
303	303	zError = "be empty string";
		@@ -318,11 +318,11 @@
318	318	}
319	319	db_end_transaction(0);
320	320	}else if( memcmp(zCmd, "cat", nCmd)==0 ){
321	321	int i;
322	322	verify_all_options();
323		- db_begin_transaction();
	323	+ db_begin_write();
324	324	for(i=3; i<g.argc; i++){
325	325	Blob content;
326	326	if( unversioned_content(g.argv[i], &content)==0 ){
327	327	blob_write_to_file(&content, "-");
328	328	}
		@@ -341,11 +341,11 @@
341	341	zUVFile = g.argv[3];
342	342	zEditor = fossil_text_editor();
343	343	if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable");
344	344	zTFile = fossil_temp_filename();
345	345	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
346		- db_begin_transaction();
	346	+ db_begin_write();
347	347	content_rcvid_init("#!fossil unversioned edit");
348	348	if( unversioned_content(zUVFile, &content) ){
349	349	fossil_fatal("no such uv-file: %Q", zUVFile);
350	350	}
351	351	if( looks_like_binary(&content) ){
		@@ -431,11 +431,11 @@
431	431	sync_unversioned(syncFlags);
432	432	}else if( memcmp(zCmd, "remove", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0
433	433	\|\| memcmp(zCmd, "delete", nCmd)==0 ){
434	434	int i;
435	435	verify_all_options();
436		- db_begin_transaction();
	436	+ db_begin_write();
437	437	for(i=3; i<g.argc; i++){
438	438	db_multi_exec(
439	439	"UPDATE unversioned"
440	440	" SET hash=NULL, content=NULL, mtime=%lld, sz=0 WHERE name=%Q",
441	441	mtime, g.argv[i]
		@@ -449,11 +449,11 @@
449	449	g.argv[2] = "--uv-noop";
450	450	sync_unversioned(syncFlags);
451	451	}else if( memcmp(zCmd, "touch", nCmd)==0 ){
452	452	int i;
453	453	verify_all_options();
454		- db_begin_transaction();
	454	+ db_begin_write();
455	455	for(i=3; i<g.argc; i++){
456	456	db_multi_exec(
457	457	"UPDATE unversioned SET mtime=%lld WHERE name=%Q",
458	458	mtime, g.argv[i]
459	459	);
460	460

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -293,11 +293,11 @@
293	int i;
294
295	zAs = find_option("as",0,1);
296	if( zAs && g.argc!=4 ) usage("add DISKFILE --as UVFILE");
297	verify_all_options();
298	db_begin_transaction();
299	content_rcvid_init("#!fossil unversioned add");
300	for(i=3; i<g.argc; i++){
301	zIn = zAs ? zAs : g.argv[i];
302	if( zIn[0]==0 ){
303	zError = "be empty string";
	@@ -318,11 +318,11 @@
318	}
319	db_end_transaction(0);
320	}else if( memcmp(zCmd, "cat", nCmd)==0 ){
321	int i;
322	verify_all_options();
323	db_begin_transaction();
324	for(i=3; i<g.argc; i++){
325	Blob content;
326	if( unversioned_content(g.argv[i], &content)==0 ){
327	blob_write_to_file(&content, "-");
328	}
	@@ -341,11 +341,11 @@
341	zUVFile = g.argv[3];
342	zEditor = fossil_text_editor();
343	if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable");
344	zTFile = fossil_temp_filename();
345	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
346	db_begin_transaction();
347	content_rcvid_init("#!fossil unversioned edit");
348	if( unversioned_content(zUVFile, &content) ){
349	fossil_fatal("no such uv-file: %Q", zUVFile);
350	}
351	if( looks_like_binary(&content) ){
	@@ -431,11 +431,11 @@
431	sync_unversioned(syncFlags);
432	}else if( memcmp(zCmd, "remove", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0
433	\|\| memcmp(zCmd, "delete", nCmd)==0 ){
434	int i;
435	verify_all_options();
436	db_begin_transaction();
437	for(i=3; i<g.argc; i++){
438	db_multi_exec(
439	"UPDATE unversioned"
440	" SET hash=NULL, content=NULL, mtime=%lld, sz=0 WHERE name=%Q",
441	mtime, g.argv[i]
	@@ -449,11 +449,11 @@
449	g.argv[2] = "--uv-noop";
450	sync_unversioned(syncFlags);
451	}else if( memcmp(zCmd, "touch", nCmd)==0 ){
452	int i;
453	verify_all_options();
454	db_begin_transaction();
455	for(i=3; i<g.argc; i++){
456	db_multi_exec(
457	"UPDATE unversioned SET mtime=%lld WHERE name=%Q",
458	mtime, g.argv[i]
459	);
460

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -293,11 +293,11 @@
293	int i;
294
295	zAs = find_option("as",0,1);
296	if( zAs && g.argc!=4 ) usage("add DISKFILE --as UVFILE");
297	verify_all_options();
298	db_begin_write();
299	content_rcvid_init("#!fossil unversioned add");
300	for(i=3; i<g.argc; i++){
301	zIn = zAs ? zAs : g.argv[i];
302	if( zIn[0]==0 ){
303	zError = "be empty string";
	@@ -318,11 +318,11 @@
318	}
319	db_end_transaction(0);
320	}else if( memcmp(zCmd, "cat", nCmd)==0 ){
321	int i;
322	verify_all_options();
323	db_begin_write();
324	for(i=3; i<g.argc; i++){
325	Blob content;
326	if( unversioned_content(g.argv[i], &content)==0 ){
327	blob_write_to_file(&content, "-");
328	}
	@@ -341,11 +341,11 @@
341	zUVFile = g.argv[3];
342	zEditor = fossil_text_editor();
343	if( zEditor==0 ) fossil_fatal("no text editor - set the VISUAL env variable");
344	zTFile = fossil_temp_filename();
345	if( zTFile==0 ) fossil_fatal("cannot find a temporary filename");
346	db_begin_write();
347	content_rcvid_init("#!fossil unversioned edit");
348	if( unversioned_content(zUVFile, &content) ){
349	fossil_fatal("no such uv-file: %Q", zUVFile);
350	}
351	if( looks_like_binary(&content) ){
	@@ -431,11 +431,11 @@
431	sync_unversioned(syncFlags);
432	}else if( memcmp(zCmd, "remove", nCmd)==0 \|\| memcmp(zCmd, "rm", nCmd)==0
433	\|\| memcmp(zCmd, "delete", nCmd)==0 ){
434	int i;
435	verify_all_options();
436	db_begin_write();
437	for(i=3; i<g.argc; i++){
438	db_multi_exec(
439	"UPDATE unversioned"
440	" SET hash=NULL, content=NULL, mtime=%lld, sz=0 WHERE name=%Q",
441	mtime, g.argv[i]
	@@ -449,11 +449,11 @@
449	g.argv[2] = "--uv-noop";
450	sync_unversioned(syncFlags);
451	}else if( memcmp(zCmd, "touch", nCmd)==0 ){
452	int i;
453	verify_all_options();
454	db_begin_write();
455	for(i=3; i<g.argc; i++){
456	db_multi_exec(
457	"UPDATE unversioned SET mtime=%lld WHERE name=%Q",
458	mtime, g.argv[i]
459	);
460

M src/update.c

+2 -2

		--- src/update.c
		+++ src/update.c
		@@ -226,11 +226,11 @@
226	226
227	227	if( tid==0 ){
228	228	return;
229	229	}
230	230
231		- db_begin_transaction();
	231	+ db_begin_write();
232	232	db_multi_exec(
233	233	"CREATE TEMP TABLE dir_to_delete(name TEXT %s PRIMARY KEY)WITHOUT ROWID",
234	234	filename_collation()
235	235	);
236	236	vfile_check_signature(vid, CKSIG_ENOTFILE);
		@@ -800,11 +800,11 @@
800	800
801	801	/* Get manifests of revert version and (if different) current checkout. */
802	802	pRvManifest = historical_manifest(zRevision);
803	803	pCoManifest = zRevision ? historical_manifest(0) : 0;
804	804
805		- db_begin_transaction();
	805	+ db_begin_write();
806	806	undo_begin();
807	807	db_multi_exec("CREATE TEMP TABLE torevert(name UNIQUE);");
808	808
809	809	if( g.argc>2 ){
810	810	for(i=2; i<g.argc; i++){
811	811

	--- src/update.c
	+++ src/update.c
	@@ -226,11 +226,11 @@
226
227	if( tid==0 ){
228	return;
229	}
230
231	db_begin_transaction();
232	db_multi_exec(
233	"CREATE TEMP TABLE dir_to_delete(name TEXT %s PRIMARY KEY)WITHOUT ROWID",
234	filename_collation()
235	);
236	vfile_check_signature(vid, CKSIG_ENOTFILE);
	@@ -800,11 +800,11 @@
800
801	/* Get manifests of revert version and (if different) current checkout. */
802	pRvManifest = historical_manifest(zRevision);
803	pCoManifest = zRevision ? historical_manifest(0) : 0;
804
805	db_begin_transaction();
806	undo_begin();
807	db_multi_exec("CREATE TEMP TABLE torevert(name UNIQUE);");
808
809	if( g.argc>2 ){
810	for(i=2; i<g.argc; i++){
811

	--- src/update.c
	+++ src/update.c
	@@ -226,11 +226,11 @@
226
227	if( tid==0 ){
228	return;
229	}
230
231	db_begin_write();
232	db_multi_exec(
233	"CREATE TEMP TABLE dir_to_delete(name TEXT %s PRIMARY KEY)WITHOUT ROWID",
234	filename_collation()
235	);
236	vfile_check_signature(vid, CKSIG_ENOTFILE);
	@@ -800,11 +800,11 @@
800
801	/* Get manifests of revert version and (if different) current checkout. */
802	pRvManifest = historical_manifest(zRevision);
803	pCoManifest = zRevision ? historical_manifest(0) : 0;
804
805	db_begin_write();
806	undo_begin();
807	db_multi_exec("CREATE TEMP TABLE torevert(name UNIQUE);");
808
809	if( g.argc>2 ){
810	for(i=2; i<g.argc; i++){
811

M src/vfile.c

+2 -2

		--- src/vfile.c
		+++ src/vfile.c
		@@ -81,11 +81,11 @@
81	81
82	82	if( db_exists("SELECT 1 FROM vfile WHERE vid=%d", vid) ){
83	83	return 0;
84	84	}
85	85
86		- db_begin_transaction();
	86	+ db_begin_write();
87	87	p = manifest_get(vid, CFTYPE_MANIFEST, 0);
88	88	if( p==0 ) {
89	89	db_end_transaction(1);
90	90	return 0;
91	91	}
		@@ -174,11 +174,11 @@
174	174	int nErr = 0;
175	175	Stmt q;
176	176	int useMtime = (cksigFlags & CKSIG_HASH)==0
177	177	&& db_get_boolean("mtime-changes", 1);
178	178
179		- db_begin_transaction();
	179	+ db_begin_write();
180	180	db_prepare(&q, "SELECT id, %Q \|\| pathname,"
181	181	" vfile.mrid, deleted, chnged, uuid, size, mtime,"
182	182	" CASE WHEN isexe THEN %d WHEN islink THEN %d ELSE %d END"
183	183	" FROM vfile LEFT JOIN blob ON vfile.mrid=blob.rid"
184	184	" WHERE vid=%d ", g.zLocalRoot, PERM_EXE, PERM_LNK, PERM_REG,
185	185

	--- src/vfile.c
	+++ src/vfile.c
	@@ -81,11 +81,11 @@
81
82	if( db_exists("SELECT 1 FROM vfile WHERE vid=%d", vid) ){
83	return 0;
84	}
85
86	db_begin_transaction();
87	p = manifest_get(vid, CFTYPE_MANIFEST, 0);
88	if( p==0 ) {
89	db_end_transaction(1);
90	return 0;
91	}
	@@ -174,11 +174,11 @@
174	int nErr = 0;
175	Stmt q;
176	int useMtime = (cksigFlags & CKSIG_HASH)==0
177	&& db_get_boolean("mtime-changes", 1);
178
179	db_begin_transaction();
180	db_prepare(&q, "SELECT id, %Q \|\| pathname,"
181	" vfile.mrid, deleted, chnged, uuid, size, mtime,"
182	" CASE WHEN isexe THEN %d WHEN islink THEN %d ELSE %d END"
183	" FROM vfile LEFT JOIN blob ON vfile.mrid=blob.rid"
184	" WHERE vid=%d ", g.zLocalRoot, PERM_EXE, PERM_LNK, PERM_REG,
185

	--- src/vfile.c
	+++ src/vfile.c
	@@ -81,11 +81,11 @@
81
82	if( db_exists("SELECT 1 FROM vfile WHERE vid=%d", vid) ){
83	return 0;
84	}
85
86	db_begin_write();
87	p = manifest_get(vid, CFTYPE_MANIFEST, 0);
88	if( p==0 ) {
89	db_end_transaction(1);
90	return 0;
91	}
	@@ -174,11 +174,11 @@
174	int nErr = 0;
175	Stmt q;
176	int useMtime = (cksigFlags & CKSIG_HASH)==0
177	&& db_get_boolean("mtime-changes", 1);
178
179	db_begin_write();
180	db_prepare(&q, "SELECT id, %Q \|\| pathname,"
181	" vfile.mrid, deleted, chnged, uuid, size, mtime,"
182	" CASE WHEN isexe THEN %d WHEN islink THEN %d ELSE %d END"
183	" FROM vfile LEFT JOIN blob ON vfile.mrid=blob.rid"
184	" WHERE vid=%d ", g.zLocalRoot, PERM_EXE, PERM_LNK, PERM_REG,
185

M src/wiki.c

+3 -3

		--- src/wiki.c
		+++ src/wiki.c
		@@ -640,11 +640,11 @@
640	640	&& (goodCaptcha = captcha_is_correct(0))
641	641	){
642	642	char *zDate;
643	643	Blob cksum;
644	644	blob_zero(&wiki);
645		- db_begin_transaction();
	645	+ db_begin_write();
646	646	if( isSandbox ){
647	647	db_set("sandbox",zBody,0);
648	648	db_set("sandbox-mimetype",zMimetype,0);
649	649	}else{
650	650	login_verify_csrf_secret();
		@@ -919,11 +919,11 @@
919	919	if( pWiki ){
920	920	blob_append(&body, pWiki->zWiki, -1);
921	921	manifest_destroy(pWiki);
922	922	}
923	923	blob_zero(&wiki);
924		- db_begin_transaction();
	924	+ db_begin_write();
925	925	zDate = date_in_standard_format("now");
926	926	blob_appendf(&wiki, "D %s\n", zDate);
927	927	blob_appendf(&wiki, "L %F\n", zPageName);
928	928	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")!=0 ){
929	929	blob_appendf(&wiki, "N %s\n", zMimetype);
		@@ -1295,11 +1295,11 @@
1295	1295	blob_appendf( &wiki, "W %d\n%s\n", blob_size(pContent),
1296	1296	blob_str(pContent) );
1297	1297	md5sum_blob(&wiki, &cksum);
1298	1298	blob_appendf(&wiki, "Z %b\n", &cksum);
1299	1299	blob_reset(&cksum);
1300		- db_begin_transaction();
	1300	+ db_begin_write();
1301	1301	wiki_put(&wiki, 0, wiki_need_moderation(localUser));
1302	1302	db_end_transaction(0);
1303	1303	return 1;
1304	1304	}
1305	1305
1306	1306

	--- src/wiki.c
	+++ src/wiki.c
	@@ -640,11 +640,11 @@
640	&& (goodCaptcha = captcha_is_correct(0))
641	){
642	char *zDate;
643	Blob cksum;
644	blob_zero(&wiki);
645	db_begin_transaction();
646	if( isSandbox ){
647	db_set("sandbox",zBody,0);
648	db_set("sandbox-mimetype",zMimetype,0);
649	}else{
650	login_verify_csrf_secret();
	@@ -919,11 +919,11 @@
919	if( pWiki ){
920	blob_append(&body, pWiki->zWiki, -1);
921	manifest_destroy(pWiki);
922	}
923	blob_zero(&wiki);
924	db_begin_transaction();
925	zDate = date_in_standard_format("now");
926	blob_appendf(&wiki, "D %s\n", zDate);
927	blob_appendf(&wiki, "L %F\n", zPageName);
928	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")!=0 ){
929	blob_appendf(&wiki, "N %s\n", zMimetype);
	@@ -1295,11 +1295,11 @@
1295	blob_appendf( &wiki, "W %d\n%s\n", blob_size(pContent),
1296	blob_str(pContent) );
1297	md5sum_blob(&wiki, &cksum);
1298	blob_appendf(&wiki, "Z %b\n", &cksum);
1299	blob_reset(&cksum);
1300	db_begin_transaction();
1301	wiki_put(&wiki, 0, wiki_need_moderation(localUser));
1302	db_end_transaction(0);
1303	return 1;
1304	}
1305
1306

	--- src/wiki.c
	+++ src/wiki.c
	@@ -640,11 +640,11 @@
640	&& (goodCaptcha = captcha_is_correct(0))
641	){
642	char *zDate;
643	Blob cksum;
644	blob_zero(&wiki);
645	db_begin_write();
646	if( isSandbox ){
647	db_set("sandbox",zBody,0);
648	db_set("sandbox-mimetype",zMimetype,0);
649	}else{
650	login_verify_csrf_secret();
	@@ -919,11 +919,11 @@
919	if( pWiki ){
920	blob_append(&body, pWiki->zWiki, -1);
921	manifest_destroy(pWiki);
922	}
923	blob_zero(&wiki);
924	db_begin_write();
925	zDate = date_in_standard_format("now");
926	blob_appendf(&wiki, "D %s\n", zDate);
927	blob_appendf(&wiki, "L %F\n", zPageName);
928	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")!=0 ){
929	blob_appendf(&wiki, "N %s\n", zMimetype);
	@@ -1295,11 +1295,11 @@
1295	blob_appendf( &wiki, "W %d\n%s\n", blob_size(pContent),
1296	blob_str(pContent) );
1297	md5sum_blob(&wiki, &cksum);
1298	blob_appendf(&wiki, "Z %b\n", &cksum);
1299	blob_reset(&cksum);
1300	db_begin_write();
1301	wiki_put(&wiki, 0, wiki_need_moderation(localUser));
1302	db_end_transaction(0);
1303	return 1;
1304	}
1305
1306

M src/xfer.c

+2 -2

		--- src/xfer.c
		+++ src/xfer.c
		@@ -1167,11 +1167,11 @@
1167	1167	xfer.maxTime = db_get_int("max-download-time", 30);
1168	1168	if( xfer.maxTime<1 ) xfer.maxTime = 1;
1169	1169	xfer.maxTime += time(NULL);
1170	1170	g.xferPanic = 1;
1171	1171
1172		- db_begin_transaction();
	1172	+ db_begin_write();
1173	1173	db_multi_exec(
1174	1174	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1175	1175	);
1176	1176	manifest_crosslink_begin();
1177	1177	rc = xfer_run_common_script();
		@@ -1802,11 +1802,11 @@
1802	1802	}
1803	1803
1804	1804	while( go ){
1805	1805	int newPhantom = 0;
1806	1806	char *zRandomness;
1807		- db_begin_transaction();
	1807	+ db_begin_write();
1808	1808	db_record_repository_filename(0);
1809	1809	db_multi_exec(
1810	1810	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1811	1811	);
1812	1812	manifest_crosslink_begin();
1813	1813

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1167,11 +1167,11 @@
1167	xfer.maxTime = db_get_int("max-download-time", 30);
1168	if( xfer.maxTime<1 ) xfer.maxTime = 1;
1169	xfer.maxTime += time(NULL);
1170	g.xferPanic = 1;
1171
1172	db_begin_transaction();
1173	db_multi_exec(
1174	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1175	);
1176	manifest_crosslink_begin();
1177	rc = xfer_run_common_script();
	@@ -1802,11 +1802,11 @@
1802	}
1803
1804	while( go ){
1805	int newPhantom = 0;
1806	char *zRandomness;
1807	db_begin_transaction();
1808	db_record_repository_filename(0);
1809	db_multi_exec(
1810	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1811	);
1812	manifest_crosslink_begin();
1813

	--- src/xfer.c
	+++ src/xfer.c
	@@ -1167,11 +1167,11 @@
1167	xfer.maxTime = db_get_int("max-download-time", 30);
1168	if( xfer.maxTime<1 ) xfer.maxTime = 1;
1169	xfer.maxTime += time(NULL);
1170	g.xferPanic = 1;
1171
1172	db_begin_write();
1173	db_multi_exec(
1174	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1175	);
1176	manifest_crosslink_begin();
1177	rc = xfer_run_common_script();
	@@ -1802,11 +1802,11 @@
1802	}
1803
1804	while( go ){
1805	int newPhantom = 0;
1806	char *zRandomness;
1807	db_begin_write();
1808	db_record_repository_filename(0);
1809	db_multi_exec(
1810	"CREATE TEMP TABLE onremote(rid INTEGER PRIMARY KEY);"
1811	);
1812	manifest_crosslink_begin();
1813

Fossil SCM

Keyboard Shortcuts