a5dc5332d4d… — Fossil SCM

M src/checkin.c

+2 -2

		--- src/checkin.c
		+++ src/checkin.c
		@@ -203,12 +203,12 @@
203	203	int vid;
204	204	db_must_be_within_tree();
205	205	/* 012345678901234 */
206	206	fossil_print("repository: %s\n", db_repository_filename());
207	207	fossil_print("local-root: %s\n", g.zLocalRoot);
208		- if( g.configDbName ){
209		- fossil_print("config-db: %s\n", g.configDbName);
	208	+ if( g.zConfigDbName ){
	209	+ fossil_print("config-db: %s\n", g.zConfigDbName);
210	210	}
211	211	vid = db_lget_int("checkout", 0);
212	212	if( vid ){
213	213	show_common_info(vid, "checkout:", 1, 1);
214	214	}
215	215

	--- src/checkin.c
	+++ src/checkin.c
	@@ -203,12 +203,12 @@
203	int vid;
204	db_must_be_within_tree();
205	/* 012345678901234 */
206	fossil_print("repository: %s\n", db_repository_filename());
207	fossil_print("local-root: %s\n", g.zLocalRoot);
208	if( g.configDbName ){
209	fossil_print("config-db: %s\n", g.configDbName);
210	}
211	vid = db_lget_int("checkout", 0);
212	if( vid ){
213	show_common_info(vid, "checkout:", 1, 1);
214	}
215

	--- src/checkin.c
	+++ src/checkin.c
	@@ -203,12 +203,12 @@
203	int vid;
204	db_must_be_within_tree();
205	/* 012345678901234 */
206	fossil_print("repository: %s\n", db_repository_filename());
207	fossil_print("local-root: %s\n", g.zLocalRoot);
208	if( g.zConfigDbName ){
209	fossil_print("config-db: %s\n", g.zConfigDbName);
210	}
211	vid = db_lget_int("checkout", 0);
212	if( vid ){
213	show_common_info(vid, "checkout:", 1, 1);
214	}
215

M src/db.c

+6 -6

		--- src/db.c
		+++ src/db.c
		@@ -792,11 +792,11 @@
792	792	** case, invoke this routine with useAttach as 1.
793	793	*/
794	794	void db_open_config(int useAttach){
795	795	char *zDbName;
796	796	char *zHome;
797		- if( g.configDbName ) return;
	797	+ if( g.zConfigDbName ) return;
798	798	#if defined(_WIN32) \|\| defined(__CYGWIN__)
799	799	zHome = fossil_getenv("LOCALAPPDATA");
800	800	if( zHome==0 ){
801	801	zHome = fossil_getenv("APPDATA");
802	802	if( zHome==0 ){
		@@ -844,11 +844,11 @@
844	844	}else{
845	845	g.useAttach = 0;
846	846	g.dbConfig = db_open(zDbName);
847	847	g.zConfigDbType = "configdb";
848	848	}
849		- g.configDbName = zDbName;
	849	+ g.zConfigDbName = zDbName;
850	850	}
851	851
852	852
853	853	/*
854	854	** Returns TRUE if zTable exists in the local database but lacks column
		@@ -1204,11 +1204,11 @@
1204	1204	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1205	1205	}
1206	1206	}
1207	1207	g.repositoryOpen = 0;
1208	1208	g.localOpen = 0;
1209		- g.configDbName = NULL;
	1209	+ g.zConfigDbName = NULL;
1210	1210	sqlite3_wal_checkpoint(g.db, 0);
1211	1211	sqlite3_close(g.db);
1212	1212	g.db = 0;
1213	1213	g.zMainDbType = 0;
1214	1214	if( g.dbConfig ){
		@@ -1767,11 +1767,11 @@
1767	1767	}
1768	1768	}
1769	1769	if( g.repositoryOpen ){
1770	1770	z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
1771	1771	}
1772		- if( z==0 && g.configDbName ){
	1772	+ if( z==0 && g.zConfigDbName ){
1773	1773	db_swap_connections();
1774	1774	z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
1775	1775	db_swap_connections();
1776	1776	}
1777	1777	if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){
		@@ -1814,11 +1814,11 @@
1814	1814	}
1815	1815	db_end_transaction(0);
1816	1816	}
1817	1817	int db_is_global(const char *zName){
1818	1818	int rc = 0;
1819		- if( g.configDbName ){
	1819	+ if( g.zConfigDbName ){
1820	1820	db_swap_connections();
1821	1821	rc = db_exists("SELECT 1 FROM global_config WHERE name=%Q", zName);
1822	1822	db_swap_connections();
1823	1823	}
1824	1824	return rc;
		@@ -1835,11 +1835,11 @@
1835	1835	}
1836	1836	db_finalize(&q);
1837	1837	}else{
1838	1838	rc = SQLITE_DONE;
1839	1839	}
1840		- if( rc==SQLITE_DONE && g.configDbName ){
	1840	+ if( rc==SQLITE_DONE && g.zConfigDbName ){
1841	1841	db_swap_connections();
1842	1842	v = db_int(dflt, "SELECT value FROM global_config WHERE name=%Q", zName);
1843	1843	db_swap_connections();
1844	1844	}
1845	1845	return v;
1846	1846

	--- src/db.c
	+++ src/db.c
	@@ -792,11 +792,11 @@
792	** case, invoke this routine with useAttach as 1.
793	*/
794	void db_open_config(int useAttach){
795	char *zDbName;
796	char *zHome;
797	if( g.configDbName ) return;
798	#if defined(_WIN32) \|\| defined(__CYGWIN__)
799	zHome = fossil_getenv("LOCALAPPDATA");
800	if( zHome==0 ){
801	zHome = fossil_getenv("APPDATA");
802	if( zHome==0 ){
	@@ -844,11 +844,11 @@
844	}else{
845	g.useAttach = 0;
846	g.dbConfig = db_open(zDbName);
847	g.zConfigDbType = "configdb";
848	}
849	g.configDbName = zDbName;
850	}
851
852
853	/*
854	** Returns TRUE if zTable exists in the local database but lacks column
	@@ -1204,11 +1204,11 @@
1204	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1205	}
1206	}
1207	g.repositoryOpen = 0;
1208	g.localOpen = 0;
1209	g.configDbName = NULL;
1210	sqlite3_wal_checkpoint(g.db, 0);
1211	sqlite3_close(g.db);
1212	g.db = 0;
1213	g.zMainDbType = 0;
1214	if( g.dbConfig ){
	@@ -1767,11 +1767,11 @@
1767	}
1768	}
1769	if( g.repositoryOpen ){
1770	z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
1771	}
1772	if( z==0 && g.configDbName ){
1773	db_swap_connections();
1774	z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
1775	db_swap_connections();
1776	}
1777	if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){
	@@ -1814,11 +1814,11 @@
1814	}
1815	db_end_transaction(0);
1816	}
1817	int db_is_global(const char *zName){
1818	int rc = 0;
1819	if( g.configDbName ){
1820	db_swap_connections();
1821	rc = db_exists("SELECT 1 FROM global_config WHERE name=%Q", zName);
1822	db_swap_connections();
1823	}
1824	return rc;
	@@ -1835,11 +1835,11 @@
1835	}
1836	db_finalize(&q);
1837	}else{
1838	rc = SQLITE_DONE;
1839	}
1840	if( rc==SQLITE_DONE && g.configDbName ){
1841	db_swap_connections();
1842	v = db_int(dflt, "SELECT value FROM global_config WHERE name=%Q", zName);
1843	db_swap_connections();
1844	}
1845	return v;
1846

	--- src/db.c
	+++ src/db.c
	@@ -792,11 +792,11 @@
792	** case, invoke this routine with useAttach as 1.
793	*/
794	void db_open_config(int useAttach){
795	char *zDbName;
796	char *zHome;
797	if( g.zConfigDbName ) return;
798	#if defined(_WIN32) \|\| defined(__CYGWIN__)
799	zHome = fossil_getenv("LOCALAPPDATA");
800	if( zHome==0 ){
801	zHome = fossil_getenv("APPDATA");
802	if( zHome==0 ){
	@@ -844,11 +844,11 @@
844	}else{
845	g.useAttach = 0;
846	g.dbConfig = db_open(zDbName);
847	g.zConfigDbType = "configdb";
848	}
849	g.zConfigDbName = zDbName;
850	}
851
852
853	/*
854	** Returns TRUE if zTable exists in the local database but lacks column
	@@ -1204,11 +1204,11 @@
1204	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1205	}
1206	}
1207	g.repositoryOpen = 0;
1208	g.localOpen = 0;
1209	g.zConfigDbName = NULL;
1210	sqlite3_wal_checkpoint(g.db, 0);
1211	sqlite3_close(g.db);
1212	g.db = 0;
1213	g.zMainDbType = 0;
1214	if( g.dbConfig ){
	@@ -1767,11 +1767,11 @@
1767	}
1768	}
1769	if( g.repositoryOpen ){
1770	z = db_text(0, "SELECT value FROM config WHERE name=%Q", zName);
1771	}
1772	if( z==0 && g.zConfigDbName ){
1773	db_swap_connections();
1774	z = db_text(0, "SELECT value FROM global_config WHERE name=%Q", zName);
1775	db_swap_connections();
1776	}
1777	if( ctrlSetting!=0 && ctrlSetting->versionable && g.localOpen ){
	@@ -1814,11 +1814,11 @@
1814	}
1815	db_end_transaction(0);
1816	}
1817	int db_is_global(const char *zName){
1818	int rc = 0;
1819	if( g.zConfigDbName ){
1820	db_swap_connections();
1821	rc = db_exists("SELECT 1 FROM global_config WHERE name=%Q", zName);
1822	db_swap_connections();
1823	}
1824	return rc;
	@@ -1835,11 +1835,11 @@
1835	}
1836	db_finalize(&q);
1837	}else{
1838	rc = SQLITE_DONE;
1839	}
1840	if( rc==SQLITE_DONE && g.zConfigDbName ){
1841	db_swap_connections();
1842	v = db_int(dflt, "SELECT value FROM global_config WHERE name=%Q", zName);
1843	db_swap_connections();
1844	}
1845	return v;
1846

M src/info.c

+2 -2

		--- src/info.c
		+++ src/info.c
		@@ -198,12 +198,12 @@
198	198	if( g.localOpen ){
199	199	fossil_print("repository: %s\n", db_repository_filename());
200	200	fossil_print("local-root: %s\n", g.zLocalRoot);
201	201	}
202	202	if( bDetail ) extraRepoInfo();
203		- if( g.configDbName ){
204		- fossil_print("config-db: %s\n", g.configDbName);
	203	+ if( g.zConfigDbName ){
	204	+ fossil_print("config-db: %s\n", g.zConfigDbName);
205	205	}
206	206	fossil_print("project-code: %s\n", db_get("project-code", ""));
207	207	vid = g.localOpen ? db_lget_int("checkout", 0) : 0;
208	208	if( vid ){
209	209	show_common_info(vid, "checkout:", 1, 1);
210	210

	--- src/info.c
	+++ src/info.c
	@@ -198,12 +198,12 @@
198	if( g.localOpen ){
199	fossil_print("repository: %s\n", db_repository_filename());
200	fossil_print("local-root: %s\n", g.zLocalRoot);
201	}
202	if( bDetail ) extraRepoInfo();
203	if( g.configDbName ){
204	fossil_print("config-db: %s\n", g.configDbName);
205	}
206	fossil_print("project-code: %s\n", db_get("project-code", ""));
207	vid = g.localOpen ? db_lget_int("checkout", 0) : 0;
208	if( vid ){
209	show_common_info(vid, "checkout:", 1, 1);
210

	--- src/info.c
	+++ src/info.c
	@@ -198,12 +198,12 @@
198	if( g.localOpen ){
199	fossil_print("repository: %s\n", db_repository_filename());
200	fossil_print("local-root: %s\n", g.zLocalRoot);
201	}
202	if( bDetail ) extraRepoInfo();
203	if( g.zConfigDbName ){
204	fossil_print("config-db: %s\n", g.zConfigDbName);
205	}
206	fossil_print("project-code: %s\n", db_get("project-code", ""));
207	vid = g.localOpen ? db_lget_int("checkout", 0) : 0;
208	if( vid ){
209	show_common_info(vid, "checkout:", 1, 1);
210

M src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -1372,11 +1372,11 @@
1372	1372	#define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
1373	1373	VAL(capabilities, json_cap_value());
1374	1374	INT(g, argc);
1375	1375	INT(g, isConst);
1376	1376	INT(g, useAttach);
1377		- CSTR(g, configDbName);
	1377	+ CSTR(g, zConfigDbName);
1378	1378	INT(g, repositoryOpen);
1379	1379	INT(g, localOpen);
1380	1380	INT(g, minPrefix);
1381	1381	INT(g, fSqlTrace);
1382	1382	INT(g, fSqlStats);
1383	1383

	--- src/json.c
	+++ src/json.c
	@@ -1372,11 +1372,11 @@
1372	#define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
1373	VAL(capabilities, json_cap_value());
1374	INT(g, argc);
1375	INT(g, isConst);
1376	INT(g, useAttach);
1377	CSTR(g, configDbName);
1378	INT(g, repositoryOpen);
1379	INT(g, localOpen);
1380	INT(g, minPrefix);
1381	INT(g, fSqlTrace);
1382	INT(g, fSqlStats);
1383

	--- src/json.c
	+++ src/json.c
	@@ -1372,11 +1372,11 @@
1372	#define VAL(K,V) cson_object_set(o, #K, (V) ? (V) : cson_value_null())
1373	VAL(capabilities, json_cap_value());
1374	INT(g, argc);
1375	INT(g, isConst);
1376	INT(g, useAttach);
1377	CSTR(g, zConfigDbName);
1378	INT(g, repositoryOpen);
1379	INT(g, localOpen);
1380	INT(g, minPrefix);
1381	INT(g, fSqlTrace);
1382	INT(g, fSqlStats);
1383

M src/main.c

+1 -1

		--- src/main.c
		+++ src/main.c
		@@ -114,11 +114,11 @@
114	114	char nameOfExe; / Full path of executable. */
115	115	int isConst; /* True if the output is unchanging */
116	116	sqlite3 db; / The connection to the databases */
117	117	sqlite3 dbConfig; / Separate connection for global_config table */
118	118	int useAttach; /* True if global_config is attached to repository */
119		- const char configDbName; / Path of the config database. NULL if not open */
	119	+ const char zConfigDbName;/ Path of the config database. NULL if not open */
120	120	sqlite3_int64 now; /* Seconds since 1970 */
121	121	int repositoryOpen; /* True if the main repository database is open */
122	122	char zRepositoryName; / Name of the repository database */
123	123	const char zMainDbType;/ "configdb", "localdb", or "repository" */
124	124	const char zConfigDbType; / "configdb", "localdb", or "repository" */
125	125

	--- src/main.c
	+++ src/main.c
	@@ -114,11 +114,11 @@
114	char nameOfExe; / Full path of executable. */
115	int isConst; /* True if the output is unchanging */
116	sqlite3 db; / The connection to the databases */
117	sqlite3 dbConfig; / Separate connection for global_config table */
118	int useAttach; /* True if global_config is attached to repository */
119	const char configDbName; / Path of the config database. NULL if not open */
120	sqlite3_int64 now; /* Seconds since 1970 */
121	int repositoryOpen; /* True if the main repository database is open */
122	char zRepositoryName; / Name of the repository database */
123	const char zMainDbType;/ "configdb", "localdb", or "repository" */
124	const char zConfigDbType; / "configdb", "localdb", or "repository" */
125

	--- src/main.c
	+++ src/main.c
	@@ -114,11 +114,11 @@
114	char nameOfExe; / Full path of executable. */
115	int isConst; /* True if the output is unchanging */
116	sqlite3 db; / The connection to the databases */
117	sqlite3 dbConfig; / Separate connection for global_config table */
118	int useAttach; /* True if global_config is attached to repository */
119	const char zConfigDbName;/ Path of the config database. NULL if not open */
120	sqlite3_int64 now; /* Seconds since 1970 */
121	int repositoryOpen; /* True if the main repository database is open */
122	char zRepositoryName; / Name of the repository database */
123	const char zMainDbType;/ "configdb", "localdb", or "repository" */
124	const char zConfigDbType; / "configdb", "localdb", or "repository" */
125

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -1678,11 +1678,11 @@
1678	1678	@
1679	1679	@ <p>Only a the first statement in the entry box will be run.
1680	1680	@ Any subsequent statements will be silently ignored.</p>
1681	1681	@
1682	1682	@ <p>Database names:<ul><li>repository → %s(db_name("repository"))
1683		- if( g.configDbName ){
	1683	+ if( g.zConfigDbName ){
1684	1684	@ <li>config → %s(db_name("configdb"))
1685	1685	}
1686	1686	if( g.localOpen ){
1687	1687	@ <li>local-checkout → %s(db_name("localdb"))
1688	1688	}
1689	1689

	--- src/setup.c
	+++ src/setup.c
	@@ -1678,11 +1678,11 @@
1678	@
1679	@ <p>Only a the first statement in the entry box will be run.
1680	@ Any subsequent statements will be silently ignored.</p>
1681	@
1682	@ <p>Database names:<ul><li>repository → %s(db_name("repository"))
1683	if( g.configDbName ){
1684	@ <li>config → %s(db_name("configdb"))
1685	}
1686	if( g.localOpen ){
1687	@ <li>local-checkout → %s(db_name("localdb"))
1688	}
1689

	--- src/setup.c
	+++ src/setup.c
	@@ -1678,11 +1678,11 @@
1678	@
1679	@ <p>Only a the first statement in the entry box will be run.
1680	@ Any subsequent statements will be silently ignored.</p>
1681	@
1682	@ <p>Database names:<ul><li>repository → %s(db_name("repository"))
1683	if( g.zConfigDbName ){
1684	@ <li>config → %s(db_name("configdb"))
1685	}
1686	if( g.localOpen ){
1687	@ <li>local-checkout → %s(db_name("localdb"))
1688	}
1689

Fossil SCM

Keyboard Shortcuts