Fossil SCM

PoC for the previous check-in: use UUIDs for project-code and server-code.

danield 2025-07-07 15:16 gen-uuid

Commit e38c068029173d4597eb66cf4a60853301ccd240d6ed814b3e892617a510735b

Parent 9472f708c99b432…

3 files changed +3 -2 +3 -2 +3 -2

M src/clone.c

+3 -2

		--- src/clone.c
		+++ src/clone.c
		@@ -255,12 +255,13 @@
255	255	blob_reset(&fn);
256	256	}
257	257	db_unprotect(PROTECT_CONFIG);
258	258	db_multi_exec(
259	259	"REPLACE INTO config(name,value,mtime)"
260		- " VALUES('server-code', lower(hex(randomblob(20))), now());"
261		- "DELETE FROM config WHERE name='project-code';"
	260	+ " VALUES('server-code', %Q, now());"
	261	+ "DELETE FROM config WHERE name='project-code';",
	262	+ fossil_generate_uuid()
262	263	);
263	264	db_protect_pop();
264	265	url_enable_proxy(0);
265	266	clone_ssh_db_set_options();
266	267	url_get_password_if_needed();
267	268

	--- src/clone.c
	+++ src/clone.c
	@@ -255,12 +255,13 @@
255	blob_reset(&fn);
256	}
257	db_unprotect(PROTECT_CONFIG);
258	db_multi_exec(
259	"REPLACE INTO config(name,value,mtime)"
260	" VALUES('server-code', lower(hex(randomblob(20))), now());"
261	"DELETE FROM config WHERE name='project-code';"

262	);
263	db_protect_pop();
264	url_enable_proxy(0);
265	clone_ssh_db_set_options();
266	url_get_password_if_needed();
267

	--- src/clone.c
	+++ src/clone.c
	@@ -255,12 +255,13 @@
255	blob_reset(&fn);
256	}
257	db_unprotect(PROTECT_CONFIG);
258	db_multi_exec(
259	"REPLACE INTO config(name,value,mtime)"
260	" VALUES('server-code', %Q, now());"
261	"DELETE FROM config WHERE name='project-code';",
262	fossil_generate_uuid()
263	);
264	db_protect_pop();
265	url_enable_proxy(0);
266	clone_ssh_db_set_options();
267	url_get_password_if_needed();
268

M src/db.c

+3 -2

		--- src/db.c
		+++ src/db.c
		@@ -3208,13 +3208,14 @@
3208	3208	db_set("content-schema", CONTENT_SCHEMA, 0);
3209	3209	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
3210	3210	db_set("rebuilt", get_version(), 0);
3211	3211	db_multi_exec(
3212	3212	"INSERT INTO config(name,value,mtime)"
3213		- " VALUES('server-code', lower(hex(randomblob(20))),now());"
	3213	+ " VALUES('server-code', %Q, now());"
3214	3214	"INSERT INTO config(name,value,mtime)"
3215		- " VALUES('project-code', lower(hex(randomblob(20))),now());"
	3215	+ " VALUES('project-code', %Q, now());",
	3216	+ fossil_generate_uuid(), fossil_generate_uuid()
3216	3217	);
3217	3218	db_create_default_users(0, zDefaultUser);
3218	3219	if( zDefaultUser ) g.zLogin = zDefaultUser;
3219	3220	user_select();
3220	3221
3221	3222

	--- src/db.c
	+++ src/db.c
	@@ -3208,13 +3208,14 @@
3208	db_set("content-schema", CONTENT_SCHEMA, 0);
3209	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
3210	db_set("rebuilt", get_version(), 0);
3211	db_multi_exec(
3212	"INSERT INTO config(name,value,mtime)"
3213	" VALUES('server-code', lower(hex(randomblob(20))),now());"
3214	"INSERT INTO config(name,value,mtime)"
3215	" VALUES('project-code', lower(hex(randomblob(20))),now());"

3216	);
3217	db_create_default_users(0, zDefaultUser);
3218	if( zDefaultUser ) g.zLogin = zDefaultUser;
3219	user_select();
3220
3221

	--- src/db.c
	+++ src/db.c
	@@ -3208,13 +3208,14 @@
3208	db_set("content-schema", CONTENT_SCHEMA, 0);
3209	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
3210	db_set("rebuilt", get_version(), 0);
3211	db_multi_exec(
3212	"INSERT INTO config(name,value,mtime)"
3213	" VALUES('server-code', %Q, now());"
3214	"INSERT INTO config(name,value,mtime)"
3215	" VALUES('project-code', %Q, now());",
3216	fossil_generate_uuid(), fossil_generate_uuid()
3217	);
3218	db_create_default_users(0, zDefaultUser);
3219	if( zDefaultUser ) g.zLogin = zDefaultUser;
3220	user_select();
3221
3222

M src/rebuild.c

+3 -2

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -893,14 +893,15 @@
893	893	" ('sync-*'),"
894	894	" ('syncfrom:*'),"
895	895	" ('syncwith:*'),"
896	896	" ('ssl-*')"
897	897	") SELECT name FROM config, pattern WHERE name GLOB x);"
898		- "UPDATE config SET value=lower(hex(randomblob(20)))"
	898	+ "UPDATE config SET value=%Q"
899	899	" WHERE name='project-code';"
900	900	"UPDATE config SET value='detached-' \|\| value"
901		- " WHERE name='project-name' AND value NOT GLOB 'detached-*';"
	901	+ " WHERE name='project-name' AND value NOT GLOB 'detached-*';",
	902	+ fossil_generate_uuid()
902	903	);
903	904	db_protect_pop();
904	905	db_end_transaction(0);
905	906	fossil_print("New project code: %s\n", db_get("project-code",""));
906	907	}
907	908

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -893,14 +893,15 @@
893	" ('sync-*'),"
894	" ('syncfrom:*'),"
895	" ('syncwith:*'),"
896	" ('ssl-*')"
897	") SELECT name FROM config, pattern WHERE name GLOB x);"
898	"UPDATE config SET value=lower(hex(randomblob(20)))"
899	" WHERE name='project-code';"
900	"UPDATE config SET value='detached-' \|\| value"
901	" WHERE name='project-name' AND value NOT GLOB 'detached-*';"

902	);
903	db_protect_pop();
904	db_end_transaction(0);
905	fossil_print("New project code: %s\n", db_get("project-code",""));
906	}
907

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -893,14 +893,15 @@
893	" ('sync-*'),"
894	" ('syncfrom:*'),"
895	" ('syncwith:*'),"
896	" ('ssl-*')"
897	") SELECT name FROM config, pattern WHERE name GLOB x);"
898	"UPDATE config SET value=%Q"
899	" WHERE name='project-code';"
900	"UPDATE config SET value='detached-' \|\| value"
901	" WHERE name='project-name' AND value NOT GLOB 'detached-*';",
902	fossil_generate_uuid()
903	);
904	db_protect_pop();
905	db_end_transaction(0);
906	fossil_print("New project code: %s\n", db_get("project-code",""));
907	}
908