Fossil SCM

Merge updates from trunk.

mistachkin 2014-06-16 20:01 UTC autoadjust merge

Commit 3c9cca2bd8d012cca4f67b4d7d674ccc747f9897

Parent 40710b7a0549267…

8 files changed +13 -13 +29 -2 +29 -2 +68 -28 +1 -1 +1 -1 +46 +7

~ src/db.c ~ src/info.c ~ src/info.c ~ src/th_main.c ~ src/tkt.c ~ src/tkt.c ~ test/th1.test ~ www/changes.wiki

M src/db.c

+13 -13

		--- src/db.c
		+++ src/db.c
		@@ -715,13 +715,10 @@
715	715	*/
716	716	LOCAL sqlite3 db_open(const char zDbName){
717	717	int rc;
718	718	sqlite3 *db;
719	719
720		-#if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1
721		- zDbName = fossil_utf8_to_filename(zDbName);
722		-#endif
723	720	if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
724	721	rc = sqlite3_open_v2(
725	722	zDbName, &db,
726	723	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
727	724	g.zVfsName
		@@ -795,15 +792,17 @@
795	792	if( g.useAttach ){
796	793	db_detach("configdb");
797	794	g.useAttach = 0;
798	795	g.zConfigDbName = 0;
799	796	}else if( g.dbConfig ){
	797	+ sqlite3_wal_checkpoint(g.dbConfig, 0);
800	798	sqlite3_close(g.dbConfig);
801	799	g.dbConfig = 0;
802	800	g.zConfigDbType = 0;
803	801	g.zConfigDbName = 0;
804	802	}else if( g.db && fossil_strcmp(g.zMainDbType, "configdb")==0 ){
	803	+ sqlite3_wal_checkpoint(g.db, 0);
805	804	sqlite3_close(g.db);
806	805	g.db = 0;
807	806	g.zMainDbType = 0;
808	807	g.zConfigDbName = 0;
809	808	}
		@@ -1231,22 +1230,23 @@
1231	1230	if( reportErrors ){
1232	1231	while( (pStmt = sqlite3_next_stmt(g.db, pStmt))!=0 ){
1233	1232	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1234	1233	}
1235	1234	}
	1235	+ db_close_config();
	1236	+ if( g.db ){
	1237	+ sqlite3_wal_checkpoint(g.db, 0);
	1238	+ sqlite3_close(g.db);
	1239	+ g.db = 0;
	1240	+ g.zMainDbType = 0;
	1241	+ }
1236	1242	g.repositoryOpen = 0;
1237	1243	g.localOpen = 0;
1238		- g.zConfigDbName = NULL;
1239		- sqlite3_wal_checkpoint(g.db, 0);
1240		- sqlite3_close(g.db);
1241		- g.db = 0;
1242		- g.zMainDbType = 0;
1243		- if( g.dbConfig ){
1244		- sqlite3_close(g.dbConfig);
1245		- g.dbConfig = 0;
1246		- g.zConfigDbType = 0;
1247		- }
	1244	+ assert( g.dbConfig==0 );
	1245	+ assert( g.useAttach==0 );
	1246	+ assert( g.zConfigDbName==0 );
	1247	+ assert( g.zConfigDbType==0 );
1248	1248	}
1249	1249
1250	1250
1251	1251	/*
1252	1252	** Create a new empty repository database with the given name.
1253	1253

	--- src/db.c
	+++ src/db.c
	@@ -715,13 +715,10 @@
715	*/
716	LOCAL sqlite3 db_open(const char zDbName){
717	int rc;
718	sqlite3 *db;
719
720	#if defined(__CYGWIN__) && USE_SYSTEM_SQLITE+0!=1
721	zDbName = fossil_utf8_to_filename(zDbName);
722	#endif
723	if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
724	rc = sqlite3_open_v2(
725	zDbName, &db,
726	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
727	g.zVfsName
	@@ -795,15 +792,17 @@
795	if( g.useAttach ){
796	db_detach("configdb");
797	g.useAttach = 0;
798	g.zConfigDbName = 0;
799	}else if( g.dbConfig ){

800	sqlite3_close(g.dbConfig);
801	g.dbConfig = 0;
802	g.zConfigDbType = 0;
803	g.zConfigDbName = 0;
804	}else if( g.db && fossil_strcmp(g.zMainDbType, "configdb")==0 ){

805	sqlite3_close(g.db);
806	g.db = 0;
807	g.zMainDbType = 0;
808	g.zConfigDbName = 0;
809	}
	@@ -1231,22 +1230,23 @@
1231	if( reportErrors ){
1232	while( (pStmt = sqlite3_next_stmt(g.db, pStmt))!=0 ){
1233	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1234	}
1235	}







1236	g.repositoryOpen = 0;
1237	g.localOpen = 0;
1238	g.zConfigDbName = NULL;
1239	sqlite3_wal_checkpoint(g.db, 0);
1240	sqlite3_close(g.db);
1241	g.db = 0;
1242	g.zMainDbType = 0;
1243	if( g.dbConfig ){
1244	sqlite3_close(g.dbConfig);
1245	g.dbConfig = 0;
1246	g.zConfigDbType = 0;
1247	}
1248	}
1249
1250
1251	/*
1252	** Create a new empty repository database with the given name.
1253

	--- src/db.c
	+++ src/db.c
	@@ -715,13 +715,10 @@
715	*/
716	LOCAL sqlite3 db_open(const char zDbName){
717	int rc;
718	sqlite3 *db;
719



720	if( g.fSqlTrace ) fossil_trace("-- sqlite3_open: [%s]\n", zDbName);
721	rc = sqlite3_open_v2(
722	zDbName, &db,
723	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE,
724	g.zVfsName
	@@ -795,15 +792,17 @@
792	if( g.useAttach ){
793	db_detach("configdb");
794	g.useAttach = 0;
795	g.zConfigDbName = 0;
796	}else if( g.dbConfig ){
797	sqlite3_wal_checkpoint(g.dbConfig, 0);
798	sqlite3_close(g.dbConfig);
799	g.dbConfig = 0;
800	g.zConfigDbType = 0;
801	g.zConfigDbName = 0;
802	}else if( g.db && fossil_strcmp(g.zMainDbType, "configdb")==0 ){
803	sqlite3_wal_checkpoint(g.db, 0);
804	sqlite3_close(g.db);
805	g.db = 0;
806	g.zMainDbType = 0;
807	g.zConfigDbName = 0;
808	}
	@@ -1231,22 +1230,23 @@
1230	if( reportErrors ){
1231	while( (pStmt = sqlite3_next_stmt(g.db, pStmt))!=0 ){
1232	fossil_warning("unfinalized SQL statement: [%s]", sqlite3_sql(pStmt));
1233	}
1234	}
1235	db_close_config();
1236	if( g.db ){
1237	sqlite3_wal_checkpoint(g.db, 0);
1238	sqlite3_close(g.db);
1239	g.db = 0;
1240	g.zMainDbType = 0;
1241	}
1242	g.repositoryOpen = 0;
1243	g.localOpen = 0;
1244	assert( g.dbConfig==0 );
1245	assert( g.useAttach==0 );
1246	assert( g.zConfigDbName==0 );
1247	assert( g.zConfigDbType==0 );






1248	}
1249
1250
1251	/*
1252	** Create a new empty repository database with the given name.
1253

M src/info.c

+29 -2

		--- src/info.c
		+++ src/info.c
		@@ -1560,16 +1560,43 @@
1560	1560	@ <blockquote><pre>
1561	1561	hexdump(&content);
1562	1562	@ </pre></blockquote>
1563	1563	style_footer();
1564	1564	}
	1565	+
	1566	+/*
	1567	+** Attempt to lookup the specified checkin and file name into an rid.
	1568	+*/
	1569	+int artifact_from_ci_and_filename(
	1570	+ const char *zCI,
	1571	+ const char *zFilename
	1572	+){
	1573	+ int cirid;
	1574	+ Manifest *pManifest;
	1575	+ ManifestFile *pFile;
	1576	+
	1577	+ if( zCI==0 ) return 0;
	1578	+ if( zFilename==0 ) return 0;
	1579	+ cirid = name_to_rid(zCI);
	1580	+ pManifest = manifest_get(cirid, CFTYPE_MANIFEST, 0);
	1581	+ if( pManifest==0 ) return 0;
	1582	+ manifest_file_rewind(pManifest);
	1583	+ while( (pFile = manifest_file_next(pManifest,0))!=0 ){
	1584	+ if( fossil_strcmp(zFilename, pFile->zName)==0 ){
	1585	+ int rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", pFile->zUuid);
	1586	+ manifest_destroy(pManifest);
	1587	+ return rid;
	1588	+ }
	1589	+ }
	1590	+ return 0;
	1591	+}
1565	1592
1566	1593	/*
1567	1594	** Look for "ci" and "filename" query parameters. If found, try to
1568	1595	** use them to extract the record ID of an artifact for the file.
1569	1596	*/
1570		-int artifact_from_ci_and_filename(void){
	1597	+int artifact_from_ci_and_filename_www(void){
1571	1598	const char *zFilename;
1572	1599	const char *zCI;
1573	1600	int cirid;
1574	1601	Manifest *pManifest;
1575	1602	ManifestFile *pFile;
		@@ -1673,11 +1700,11 @@
1673	1700	int objType;
1674	1701	int asText;
1675	1702	const char *zUuid;
1676	1703
1677	1704	if( P("ci") && P("filename") ){
1678		- rid = artifact_from_ci_and_filename();
	1705	+ rid = artifact_from_ci_and_filename_www();
1679	1706	}
1680	1707	if( rid==0 ){
1681	1708	rid = name_to_rid_www("name");
1682	1709	}
1683	1710
1684	1711

	--- src/info.c
	+++ src/info.c
	@@ -1560,16 +1560,43 @@
1560	@ <blockquote><pre>
1561	hexdump(&content);
1562	@ </pre></blockquote>
1563	style_footer();
1564	}



























1565
1566	/*
1567	** Look for "ci" and "filename" query parameters. If found, try to
1568	** use them to extract the record ID of an artifact for the file.
1569	*/
1570	int artifact_from_ci_and_filename(void){
1571	const char *zFilename;
1572	const char *zCI;
1573	int cirid;
1574	Manifest *pManifest;
1575	ManifestFile *pFile;
	@@ -1673,11 +1700,11 @@
1673	int objType;
1674	int asText;
1675	const char *zUuid;
1676
1677	if( P("ci") && P("filename") ){
1678	rid = artifact_from_ci_and_filename();
1679	}
1680	if( rid==0 ){
1681	rid = name_to_rid_www("name");
1682	}
1683
1684

	--- src/info.c
	+++ src/info.c
	@@ -1560,16 +1560,43 @@
1560	@ <blockquote><pre>
1561	hexdump(&content);
1562	@ </pre></blockquote>
1563	style_footer();
1564	}
1565
1566	/*
1567	** Attempt to lookup the specified checkin and file name into an rid.
1568	*/
1569	int artifact_from_ci_and_filename(
1570	const char *zCI,
1571	const char *zFilename
1572	){
1573	int cirid;
1574	Manifest *pManifest;
1575	ManifestFile *pFile;
1576
1577	if( zCI==0 ) return 0;
1578	if( zFilename==0 ) return 0;
1579	cirid = name_to_rid(zCI);
1580	pManifest = manifest_get(cirid, CFTYPE_MANIFEST, 0);
1581	if( pManifest==0 ) return 0;
1582	manifest_file_rewind(pManifest);
1583	while( (pFile = manifest_file_next(pManifest,0))!=0 ){
1584	if( fossil_strcmp(zFilename, pFile->zName)==0 ){
1585	int rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", pFile->zUuid);
1586	manifest_destroy(pManifest);
1587	return rid;
1588	}
1589	}
1590	return 0;
1591	}
1592
1593	/*
1594	** Look for "ci" and "filename" query parameters. If found, try to
1595	** use them to extract the record ID of an artifact for the file.
1596	*/
1597	int artifact_from_ci_and_filename_www(void){
1598	const char *zFilename;
1599	const char *zCI;
1600	int cirid;
1601	Manifest *pManifest;
1602	ManifestFile *pFile;
	@@ -1673,11 +1700,11 @@
1700	int objType;
1701	int asText;
1702	const char *zUuid;
1703
1704	if( P("ci") && P("filename") ){
1705	rid = artifact_from_ci_and_filename_www();
1706	}
1707	if( rid==0 ){
1708	rid = name_to_rid_www("name");
1709	}
1710
1711

M src/info.c

+29 -2

		--- src/info.c
		+++ src/info.c
		@@ -1560,16 +1560,43 @@
1560	1560	@ <blockquote><pre>
1561	1561	hexdump(&content);
1562	1562	@ </pre></blockquote>
1563	1563	style_footer();
1564	1564	}
	1565	+
	1566	+/*
	1567	+** Attempt to lookup the specified checkin and file name into an rid.
	1568	+*/
	1569	+int artifact_from_ci_and_filename(
	1570	+ const char *zCI,
	1571	+ const char *zFilename
	1572	+){
	1573	+ int cirid;
	1574	+ Manifest *pManifest;
	1575	+ ManifestFile *pFile;
	1576	+
	1577	+ if( zCI==0 ) return 0;
	1578	+ if( zFilename==0 ) return 0;
	1579	+ cirid = name_to_rid(zCI);
	1580	+ pManifest = manifest_get(cirid, CFTYPE_MANIFEST, 0);
	1581	+ if( pManifest==0 ) return 0;
	1582	+ manifest_file_rewind(pManifest);
	1583	+ while( (pFile = manifest_file_next(pManifest,0))!=0 ){
	1584	+ if( fossil_strcmp(zFilename, pFile->zName)==0 ){
	1585	+ int rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", pFile->zUuid);
	1586	+ manifest_destroy(pManifest);
	1587	+ return rid;
	1588	+ }
	1589	+ }
	1590	+ return 0;
	1591	+}
1565	1592
1566	1593	/*
1567	1594	** Look for "ci" and "filename" query parameters. If found, try to
1568	1595	** use them to extract the record ID of an artifact for the file.
1569	1596	*/
1570		-int artifact_from_ci_and_filename(void){
	1597	+int artifact_from_ci_and_filename_www(void){
1571	1598	const char *zFilename;
1572	1599	const char *zCI;
1573	1600	int cirid;
1574	1601	Manifest *pManifest;
1575	1602	ManifestFile *pFile;
		@@ -1673,11 +1700,11 @@
1673	1700	int objType;
1674	1701	int asText;
1675	1702	const char *zUuid;
1676	1703
1677	1704	if( P("ci") && P("filename") ){
1678		- rid = artifact_from_ci_and_filename();
	1705	+ rid = artifact_from_ci_and_filename_www();
1679	1706	}
1680	1707	if( rid==0 ){
1681	1708	rid = name_to_rid_www("name");
1682	1709	}
1683	1710
1684	1711

	--- src/info.c
	+++ src/info.c
	@@ -1560,16 +1560,43 @@
1560	@ <blockquote><pre>
1561	hexdump(&content);
1562	@ </pre></blockquote>
1563	style_footer();
1564	}



























1565
1566	/*
1567	** Look for "ci" and "filename" query parameters. If found, try to
1568	** use them to extract the record ID of an artifact for the file.
1569	*/
1570	int artifact_from_ci_and_filename(void){
1571	const char *zFilename;
1572	const char *zCI;
1573	int cirid;
1574	Manifest *pManifest;
1575	ManifestFile *pFile;
	@@ -1673,11 +1700,11 @@
1673	int objType;
1674	int asText;
1675	const char *zUuid;
1676
1677	if( P("ci") && P("filename") ){
1678	rid = artifact_from_ci_and_filename();
1679	}
1680	if( rid==0 ){
1681	rid = name_to_rid_www("name");
1682	}
1683
1684

	--- src/info.c
	+++ src/info.c
	@@ -1560,16 +1560,43 @@
1560	@ <blockquote><pre>
1561	hexdump(&content);
1562	@ </pre></blockquote>
1563	style_footer();
1564	}
1565
1566	/*
1567	** Attempt to lookup the specified checkin and file name into an rid.
1568	*/
1569	int artifact_from_ci_and_filename(
1570	const char *zCI,
1571	const char *zFilename
1572	){
1573	int cirid;
1574	Manifest *pManifest;
1575	ManifestFile *pFile;
1576
1577	if( zCI==0 ) return 0;
1578	if( zFilename==0 ) return 0;
1579	cirid = name_to_rid(zCI);
1580	pManifest = manifest_get(cirid, CFTYPE_MANIFEST, 0);
1581	if( pManifest==0 ) return 0;
1582	manifest_file_rewind(pManifest);
1583	while( (pFile = manifest_file_next(pManifest,0))!=0 ){
1584	if( fossil_strcmp(zFilename, pFile->zName)==0 ){
1585	int rid = db_int(0, "SELECT rid FROM blob WHERE uuid=%Q", pFile->zUuid);
1586	manifest_destroy(pManifest);
1587	return rid;
1588	}
1589	}
1590	return 0;
1591	}
1592
1593	/*
1594	** Look for "ci" and "filename" query parameters. If found, try to
1595	** use them to extract the record ID of an artifact for the file.
1596	*/
1597	int artifact_from_ci_and_filename_www(void){
1598	const char *zFilename;
1599	const char *zCI;
1600	int cirid;
1601	Manifest *pManifest;
1602	ManifestFile *pFile;
	@@ -1673,11 +1700,11 @@
1700	int objType;
1701	int asText;
1702	const char *zUuid;
1703
1704	if( P("ci") && P("filename") ){
1705	rid = artifact_from_ci_and_filename_www();
1706	}
1707	if( rid==0 ){
1708	rid = name_to_rid_www("name");
1709	}
1710
1711

M src/th_main.c

+68 -28

		--- src/th_main.c
		+++ src/th_main.c
		@@ -139,11 +139,11 @@
139	139	fossil_print("\n------------------- END TRACE LOG -------------------\n");
140	140	}
141	141	}
142	142
143	143	/*
144		-** TH1 command: httpize STRING
	144	+** TH1 command: httpize STRING
145	145	**
146	146	** Escape all characters of STRING which have special meaning in URI
147	147	** components. Return a new string result.
148	148	*/
149	149	static int httpizeCmd(
		@@ -167,11 +167,11 @@
167	167	** True if output is enabled. False if disabled.
168	168	*/
169	169	static int enableOutput = 1;
170	170
171	171	/*
172		-** TH1 command: enable_output BOOLEAN
	172	+** TH1 command: enable_output BOOLEAN
173	173	**
174	174	** Enable or disable the puts and hputs commands.
175	175	*/
176	176	static int enableOutputCmd(
177	177	Th_Interp *interp,
		@@ -242,12 +242,12 @@
242	242	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
243	243	enableOutput = savedEnable;
244	244	}
245	245
246	246	/*
247		-** TH1 command: puts STRING
248		-** TH1 command: html STRING
	247	+** TH1 command: puts STRING
	248	+** TH1 command: html STRING
249	249	**
250	250	** Output STRING escaped for HTML (html) or unchanged (puts).
251	251	*/
252	252	static int putsCmd(
253	253	Th_Interp *interp,
		@@ -262,11 +262,11 @@
262	262	sendText((char)argv[1], argl[1], (unsigned int*)pConvert);
263	263	return TH_OK;
264	264	}
265	265
266	266	/*
267		-** TH1 command: wiki STRING
	267	+** TH1 command: wiki STRING
268	268	**
269	269	** Render the input string as wiki.
270	270	*/
271	271	static int wikiCmd(
272	272	Th_Interp *interp,
		@@ -287,11 +287,11 @@
287	287	}
288	288	return TH_OK;
289	289	}
290	290
291	291	/*
292		-** TH1 command: htmlize STRING
	292	+** TH1 command: htmlize STRING
293	293	**
294	294	** Escape all characters of STRING which have special meaning in HTML.
295	295	** Return a new string result.
296	296	*/
297	297	static int htmlizeCmd(
		@@ -310,11 +310,11 @@
310	310	free(zOut);
311	311	return TH_OK;
312	312	}
313	313
314	314	/*
315		-** TH1 command: date
	315	+** TH1 command: date
316	316	**
317	317	** Return a string which is the current time and date. If the
318	318	** -local option is used, the date appears using localtime instead
319	319	** of UTC.
320	320	*/
		@@ -335,11 +335,11 @@
335	335	free(zOut);
336	336	return TH_OK;
337	337	}
338	338
339	339	/*
340		-** TH1 command: hascap STRING...
	340	+** TH1 command: hascap STRING...
341	341	**
342	342	** Return true if the user has all of the capabilities listed in STRING.
343	343	*/
344	344	static int hascapCmd(
345	345	Th_Interp *interp,
		@@ -361,11 +361,11 @@
361	361	Th_SetResultInt(interp, rc);
362	362	return TH_OK;
363	363	}
364	364
365	365	/*
366		-** TH1 command: hasfeature STRING
	366	+** TH1 command: hasfeature STRING
367	367	**
368	368	** Return true if the fossil binary has the given compile-time feature
369	369	** enabled. The set of features includes:
370	370	**
371	371	** "ssl" = FOSSIL_ENABLE_SSL
		@@ -439,11 +439,11 @@
439	439	return TH_OK;
440	440	}
441	441
442	442
443	443	/*
444		-** TH1 command: tclReady
	444	+** TH1 command: tclReady
445	445	**
446	446	** Return true if the fossil binary has the Tcl integration feature
447	447	** enabled and it is currently available for use by TH1 scripts.
448	448	**
449	449	*/
		@@ -470,11 +470,11 @@
470	470	return TH_OK;
471	471	}
472	472
473	473
474	474	/*
475		-** TH1 command: anycap STRING
	475	+** TH1 command: anycap STRING
476	476	**
477	477	** Return true if the user has any one of the capabilities listed in STRING.
478	478	*/
479	479	static int anycapCmd(
480	480	Th_Interp *interp,
		@@ -497,11 +497,11 @@
497	497	Th_SetResultInt(interp, rc);
498	498	return TH_OK;
499	499	}
500	500
501	501	/*
502		-** TH1 command: combobox NAME TEXT-LIST NUMLINES
	502	+** TH1 command: combobox NAME TEXT-LIST NUMLINES
503	503	**
504	504	** Generate an HTML combobox. NAME is both the name of the
505	505	** CGI parameter and the name of a variable that contains the
506	506	** currently selected value. TEXT-LIST is a list of possible
507	507	** values for the combobox. NUMLINES is 1 for a true combobox.
		@@ -557,11 +557,11 @@
557	557	}
558	558	return TH_OK;
559	559	}
560	560
561	561	/*
562		-** TH1 command: linecount STRING MAX MIN
	562	+** TH1 command: linecount STRING MAX MIN
563	563	**
564	564	** Return one more than the number of \n characters in STRING. But
565	565	** never return less than MIN or more than MAX.
566	566	*/
567	567	static int linecntCmd(
		@@ -592,11 +592,11 @@
592	592	Th_SetResultInt(interp, n);
593	593	return TH_OK;
594	594	}
595	595
596	596	/*
597		-** TH1 command: repository ?BOOLEAN?
	597	+** TH1 command: repository ?BOOLEAN?
598	598	**
599	599	** Return the fully qualified file name of the open repository or an empty
600	600	** string if one is not currently open. Optionally, it will attempt to open
601	601	** the repository if the boolean argument is non-zero.
602	602	*/
		@@ -620,11 +620,11 @@
620	620	Th_SetResult(interp, g.zRepositoryName, -1);
621	621	return TH_OK;
622	622	}
623	623
624	624	/*
625		-** TH1 command: checkout ?BOOLEAN?
	625	+** TH1 command: checkout ?BOOLEAN?
626	626	**
627	627	** Return the fully qualified directory name of the current checkout or an
628	628	** empty string if it is not available. Optionally, it will attempt to find
629	629	** the current checkout, opening the configuration ("user") database and the
630	630	** repository as necessary, if the boolean argument is non-zero.
		@@ -649,11 +649,11 @@
649	649	Th_SetResult(interp, g.zLocalRoot, -1);
650	650	return TH_OK;
651	651	}
652	652
653	653	/*
654		-** TH1 command: trace STRING
	654	+** TH1 command: trace STRING
655	655	**
656	656	** Generate a TH1 trace message if debugging is enabled.
657	657	*/
658	658	static int traceCmd(
659	659	Th_Interp *interp,
		@@ -671,11 +671,11 @@
671	671	Th_SetResult(interp, 0, 0);
672	672	return TH_OK;
673	673	}
674	674
675	675	/*
676		-** TH1 command: getParameter NAME ?DEFAULT?
	676	+** TH1 command: getParameter NAME ?DEFAULT?
677	677	**
678	678	** Return the value of the specified query parameter or the specified default
679	679	** value when there is no matching query parameter.
680	680	*/
681	681	static int getParameterCmd(
		@@ -695,11 +695,11 @@
695	695	Th_SetResult(interp, cgi_parameter(argv[1], zDefault), -1);
696	696	return TH_OK;
697	697	}
698	698
699	699	/*
700		-** TH1 command: setParameter NAME VALUE
	700	+** TH1 command: setParameter NAME VALUE
701	701	**
702	702	** Sets the value of the specified query parameter.
703	703	*/
704	704	static int setParameterCmd(
705	705	Th_Interp *interp,
		@@ -714,11 +714,11 @@
714	714	cgi_replace_parameter(mprintf("%s", argv[1]), mprintf("%s", argv[2]));
715	715	return TH_OK;
716	716	}
717	717
718	718	/*
719		-** TH1 command: render STRING
	719	+** TH1 command: render STRING
720	720	**
721	721	** Renders the template and writes the results.
722	722	*/
723	723	static int renderCmd(
724	724	Th_Interp *interp,
		@@ -735,11 +735,11 @@
735	735	Th_SetResult(interp, 0, 0);
736	736	return rc;
737	737	}
738	738
739	739	/*
740		-** TH1 command: styleHeader TITLE
	740	+** TH1 command: styleHeader TITLE
741	741	**
742	742	** Render the configured style header.
743	743	*/
744	744	static int styleHeaderCmd(
745	745	Th_Interp *interp,
		@@ -760,11 +760,11 @@
760	760	return TH_ERROR;
761	761	}
762	762	}
763	763
764	764	/*
765		-** TH1 command: styleFooter
	765	+** TH1 command: styleFooter
766	766	**
767	767	** Render the configured style footer.
768	768	*/
769	769	static int styleFooterCmd(
770	770	Th_Interp *interp,
		@@ -778,10 +778,49 @@
778	778	}
779	779	if( Th_IsRepositoryOpen() ){
780	780	style_footer();
781	781	Th_SetResult(interp, 0, 0);
782	782	return TH_OK;
	783	+ }else{
	784	+ Th_SetResult(interp, "repository unavailable", -1);
	785	+ return TH_ERROR;
	786	+ }
	787	+}
	788	+
	789	+/*
	790	+** TH1 command: artifact ID ?FILENAME?
	791	+**
	792	+** Attempts to locate the specified artifact and return its contents. An
	793	+** error is generated if the repository is not open or the artifact cannot
	794	+** be found.
	795	+*/
	796	+static int artifactCmd(
	797	+ Th_Interp *interp,
	798	+ void *p,
	799	+ int argc,
	800	+ const char **argv,
	801	+ int *argl
	802	+){
	803	+ if( argc!=2 && argc!=3 ){
	804	+ return Th_WrongNumArgs(interp, "artifact ID ?FILENAME?");
	805	+ }
	806	+ if( Th_IsRepositoryOpen() ){
	807	+ int rid;
	808	+ Blob content;
	809	+ if( argc==3 ){
	810	+ rid = artifact_from_ci_and_filename(argv[1], argv[2]);
	811	+ }else{
	812	+ rid = name_to_rid(argv[1]);
	813	+ }
	814	+ if( rid!=0 && content_get(rid, &content) ){
	815	+ Th_SetResult(interp, blob_str(&content), blob_size(&content));
	816	+ blob_reset(&content);
	817	+ return TH_OK;
	818	+ }else{
	819	+ Th_SetResult(interp, "artifact not found", -1);
	820	+ return TH_ERROR;
	821	+ }
783	822	}else{
784	823	Th_SetResult(interp, "repository unavailable", -1);
785	824	return TH_ERROR;
786	825	}
787	826	}
		@@ -823,11 +862,11 @@
823	862	}
824	863	#endif
825	864	}
826	865
827	866	/*
828		-** TH1 command: utime
	867	+** TH1 command: utime
829	868	**
830	869	** Return the number of microseconds of CPU time consumed by the current
831	870	** process in user space.
832	871	*/
833	872	static int utimeCmd(
		@@ -844,11 +883,11 @@
844	883	Th_SetResult(interp, zUTime, -1);
845	884	return TH_OK;
846	885	}
847	886
848	887	/*
849		-** TH1 command: stime
	888	+** TH1 command: stime
850	889	**
851	890	** Return the number of microseconds of CPU time consumed by the current
852	891	** process in system space.
853	892	*/
854	893	static int stimeCmd(
		@@ -866,11 +905,11 @@
866	905	return TH_OK;
867	906	}
868	907
869	908
870	909	/*
871		-** TH1 command: randhex N
	910	+** TH1 command: randhex N
872	911	**
873	912	** Return N*2 random hexadecimal digits with N<50. If N is omitted,
874	913	** use a value of 10.
875	914	*/
876	915	static int randhexCmd(
		@@ -900,11 +939,11 @@
900	939	Th_SetResult(interp, (const char *)zOut, -1);
901	940	return TH_OK;
902	941	}
903	942
904	943	/*
905		-** TH1 command: query SQL CODE
	944	+** TH1 command: query SQL CODE
906	945	**
907	946	** Run the SQL query given by the SQL argument. For each row in the result
908	947	** set, run CODE.
909	948	**
910	949	** In SQL, parameters such as $var are filled in using the value of variable
		@@ -982,11 +1021,11 @@
982	1021	}
983	1022	return res;
984	1023	}
985	1024
986	1025	/*
987		-** TH1 command: setting name
	1026	+** TH1 command: setting name
988	1027	**
989	1028	** Gets and returns the value of the specified Fossil setting.
990	1029	*/
991	1030	#define SETTING_WRONGNUMARGS "setting ?-strict? ?--? name"
992	1031	static int settingCmd(
		@@ -1027,11 +1066,11 @@
1027	1066	}
1028	1067	return rc;
1029	1068	}
1030	1069
1031	1070	/*
1032		-** TH1 command: regexp ?-nocase? ?--? exp string
	1071	+** TH1 command: regexp ?-nocase? ?--? exp string
1033	1072	**
1034	1073	** Checks the string against the specified regular expression and returns
1035	1074	** non-zero if it matches. If the regular expression is invalid or cannot
1036	1075	** be compiled, an error will be generated.
1037	1076	*/
		@@ -1070,11 +1109,11 @@
1070	1109	re_free(pRe);
1071	1110	return rc;
1072	1111	}
1073	1112
1074	1113	/*
1075		-** TH1 command: http ?-asynchronous? ?--? url ?payload?
	1114	+** TH1 command: http ?-asynchronous? ?--? url ?payload?
1076	1115	**
1077	1116	** Perform an HTTP or HTTPS request for the specified URL. If a
1078	1117	** payload is present, it will be interpreted as text/plain and
1079	1118	** the POST method will be used; otherwise, the GET method will
1080	1119	** be used. Upon success, if the -asynchronous option is used, an
		@@ -1244,10 +1283,11 @@
1244	1283	const char *zName;
1245	1284	Th_CommandProc xProc;
1246	1285	void *pContext;
1247	1286	} aCommand[] = {
1248	1287	{"anycap", anycapCmd, 0},
	1288	+ {"artifact", artifactCmd, 0},
1249	1289	{"checkout", checkoutCmd, 0},
1250	1290	{"combobox", comboboxCmd, 0},
1251	1291	{"date", dateCmd, 0},
1252	1292	{"decorate", wikiCmd, (void*)&aFlags[2]},
1253	1293	{"enable_output", enableOutputCmd, 0},
1254	1294

	--- src/th_main.c
	+++ src/th_main.c
	@@ -139,11 +139,11 @@
139	fossil_print("\n------------------- END TRACE LOG -------------------\n");
140	}
141	}
142
143	/*
144	** TH1 command: httpize STRING
145	**
146	** Escape all characters of STRING which have special meaning in URI
147	** components. Return a new string result.
148	*/
149	static int httpizeCmd(
	@@ -167,11 +167,11 @@
167	** True if output is enabled. False if disabled.
168	*/
169	static int enableOutput = 1;
170
171	/*
172	** TH1 command: enable_output BOOLEAN
173	**
174	** Enable or disable the puts and hputs commands.
175	*/
176	static int enableOutputCmd(
177	Th_Interp *interp,
	@@ -242,12 +242,12 @@
242	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
243	enableOutput = savedEnable;
244	}
245
246	/*
247	** TH1 command: puts STRING
248	** TH1 command: html STRING
249	**
250	** Output STRING escaped for HTML (html) or unchanged (puts).
251	*/
252	static int putsCmd(
253	Th_Interp *interp,
	@@ -262,11 +262,11 @@
262	sendText((char)argv[1], argl[1], (unsigned int*)pConvert);
263	return TH_OK;
264	}
265
266	/*
267	** TH1 command: wiki STRING
268	**
269	** Render the input string as wiki.
270	*/
271	static int wikiCmd(
272	Th_Interp *interp,
	@@ -287,11 +287,11 @@
287	}
288	return TH_OK;
289	}
290
291	/*
292	** TH1 command: htmlize STRING
293	**
294	** Escape all characters of STRING which have special meaning in HTML.
295	** Return a new string result.
296	*/
297	static int htmlizeCmd(
	@@ -310,11 +310,11 @@
310	free(zOut);
311	return TH_OK;
312	}
313
314	/*
315	** TH1 command: date
316	**
317	** Return a string which is the current time and date. If the
318	** -local option is used, the date appears using localtime instead
319	** of UTC.
320	*/
	@@ -335,11 +335,11 @@
335	free(zOut);
336	return TH_OK;
337	}
338
339	/*
340	** TH1 command: hascap STRING...
341	**
342	** Return true if the user has all of the capabilities listed in STRING.
343	*/
344	static int hascapCmd(
345	Th_Interp *interp,
	@@ -361,11 +361,11 @@
361	Th_SetResultInt(interp, rc);
362	return TH_OK;
363	}
364
365	/*
366	** TH1 command: hasfeature STRING
367	**
368	** Return true if the fossil binary has the given compile-time feature
369	** enabled. The set of features includes:
370	**
371	** "ssl" = FOSSIL_ENABLE_SSL
	@@ -439,11 +439,11 @@
439	return TH_OK;
440	}
441
442
443	/*
444	** TH1 command: tclReady
445	**
446	** Return true if the fossil binary has the Tcl integration feature
447	** enabled and it is currently available for use by TH1 scripts.
448	**
449	*/
	@@ -470,11 +470,11 @@
470	return TH_OK;
471	}
472
473
474	/*
475	** TH1 command: anycap STRING
476	**
477	** Return true if the user has any one of the capabilities listed in STRING.
478	*/
479	static int anycapCmd(
480	Th_Interp *interp,
	@@ -497,11 +497,11 @@
497	Th_SetResultInt(interp, rc);
498	return TH_OK;
499	}
500
501	/*
502	** TH1 command: combobox NAME TEXT-LIST NUMLINES
503	**
504	** Generate an HTML combobox. NAME is both the name of the
505	** CGI parameter and the name of a variable that contains the
506	** currently selected value. TEXT-LIST is a list of possible
507	** values for the combobox. NUMLINES is 1 for a true combobox.
	@@ -557,11 +557,11 @@
557	}
558	return TH_OK;
559	}
560
561	/*
562	** TH1 command: linecount STRING MAX MIN
563	**
564	** Return one more than the number of \n characters in STRING. But
565	** never return less than MIN or more than MAX.
566	*/
567	static int linecntCmd(
	@@ -592,11 +592,11 @@
592	Th_SetResultInt(interp, n);
593	return TH_OK;
594	}
595
596	/*
597	** TH1 command: repository ?BOOLEAN?
598	**
599	** Return the fully qualified file name of the open repository or an empty
600	** string if one is not currently open. Optionally, it will attempt to open
601	** the repository if the boolean argument is non-zero.
602	*/
	@@ -620,11 +620,11 @@
620	Th_SetResult(interp, g.zRepositoryName, -1);
621	return TH_OK;
622	}
623
624	/*
625	** TH1 command: checkout ?BOOLEAN?
626	**
627	** Return the fully qualified directory name of the current checkout or an
628	** empty string if it is not available. Optionally, it will attempt to find
629	** the current checkout, opening the configuration ("user") database and the
630	** repository as necessary, if the boolean argument is non-zero.
	@@ -649,11 +649,11 @@
649	Th_SetResult(interp, g.zLocalRoot, -1);
650	return TH_OK;
651	}
652
653	/*
654	** TH1 command: trace STRING
655	**
656	** Generate a TH1 trace message if debugging is enabled.
657	*/
658	static int traceCmd(
659	Th_Interp *interp,
	@@ -671,11 +671,11 @@
671	Th_SetResult(interp, 0, 0);
672	return TH_OK;
673	}
674
675	/*
676	** TH1 command: getParameter NAME ?DEFAULT?
677	**
678	** Return the value of the specified query parameter or the specified default
679	** value when there is no matching query parameter.
680	*/
681	static int getParameterCmd(
	@@ -695,11 +695,11 @@
695	Th_SetResult(interp, cgi_parameter(argv[1], zDefault), -1);
696	return TH_OK;
697	}
698
699	/*
700	** TH1 command: setParameter NAME VALUE
701	**
702	** Sets the value of the specified query parameter.
703	*/
704	static int setParameterCmd(
705	Th_Interp *interp,
	@@ -714,11 +714,11 @@
714	cgi_replace_parameter(mprintf("%s", argv[1]), mprintf("%s", argv[2]));
715	return TH_OK;
716	}
717
718	/*
719	** TH1 command: render STRING
720	**
721	** Renders the template and writes the results.
722	*/
723	static int renderCmd(
724	Th_Interp *interp,
	@@ -735,11 +735,11 @@
735	Th_SetResult(interp, 0, 0);
736	return rc;
737	}
738
739	/*
740	** TH1 command: styleHeader TITLE
741	**
742	** Render the configured style header.
743	*/
744	static int styleHeaderCmd(
745	Th_Interp *interp,
	@@ -760,11 +760,11 @@
760	return TH_ERROR;
761	}
762	}
763
764	/*
765	** TH1 command: styleFooter
766	**
767	** Render the configured style footer.
768	*/
769	static int styleFooterCmd(
770	Th_Interp *interp,
	@@ -778,10 +778,49 @@
778	}
779	if( Th_IsRepositoryOpen() ){
780	style_footer();
781	Th_SetResult(interp, 0, 0);
782	return TH_OK;







































783	}else{
784	Th_SetResult(interp, "repository unavailable", -1);
785	return TH_ERROR;
786	}
787	}
	@@ -823,11 +862,11 @@
823	}
824	#endif
825	}
826
827	/*
828	** TH1 command: utime
829	**
830	** Return the number of microseconds of CPU time consumed by the current
831	** process in user space.
832	*/
833	static int utimeCmd(
	@@ -844,11 +883,11 @@
844	Th_SetResult(interp, zUTime, -1);
845	return TH_OK;
846	}
847
848	/*
849	** TH1 command: stime
850	**
851	** Return the number of microseconds of CPU time consumed by the current
852	** process in system space.
853	*/
854	static int stimeCmd(
	@@ -866,11 +905,11 @@
866	return TH_OK;
867	}
868
869
870	/*
871	** TH1 command: randhex N
872	**
873	** Return N*2 random hexadecimal digits with N<50. If N is omitted,
874	** use a value of 10.
875	*/
876	static int randhexCmd(
	@@ -900,11 +939,11 @@
900	Th_SetResult(interp, (const char *)zOut, -1);
901	return TH_OK;
902	}
903
904	/*
905	** TH1 command: query SQL CODE
906	**
907	** Run the SQL query given by the SQL argument. For each row in the result
908	** set, run CODE.
909	**
910	** In SQL, parameters such as $var are filled in using the value of variable
	@@ -982,11 +1021,11 @@
982	}
983	return res;
984	}
985
986	/*
987	** TH1 command: setting name
988	**
989	** Gets and returns the value of the specified Fossil setting.
990	*/
991	#define SETTING_WRONGNUMARGS "setting ?-strict? ?--? name"
992	static int settingCmd(
	@@ -1027,11 +1066,11 @@
1027	}
1028	return rc;
1029	}
1030
1031	/*
1032	** TH1 command: regexp ?-nocase? ?--? exp string
1033	**
1034	** Checks the string against the specified regular expression and returns
1035	** non-zero if it matches. If the regular expression is invalid or cannot
1036	** be compiled, an error will be generated.
1037	*/
	@@ -1070,11 +1109,11 @@
1070	re_free(pRe);
1071	return rc;
1072	}
1073
1074	/*
1075	** TH1 command: http ?-asynchronous? ?--? url ?payload?
1076	**
1077	** Perform an HTTP or HTTPS request for the specified URL. If a
1078	** payload is present, it will be interpreted as text/plain and
1079	** the POST method will be used; otherwise, the GET method will
1080	** be used. Upon success, if the -asynchronous option is used, an
	@@ -1244,10 +1283,11 @@
1244	const char *zName;
1245	Th_CommandProc xProc;
1246	void *pContext;
1247	} aCommand[] = {
1248	{"anycap", anycapCmd, 0},

1249	{"checkout", checkoutCmd, 0},
1250	{"combobox", comboboxCmd, 0},
1251	{"date", dateCmd, 0},
1252	{"decorate", wikiCmd, (void*)&aFlags[2]},
1253	{"enable_output", enableOutputCmd, 0},
1254

	--- src/th_main.c
	+++ src/th_main.c
	@@ -139,11 +139,11 @@
139	fossil_print("\n------------------- END TRACE LOG -------------------\n");
140	}
141	}
142
143	/*
144	** TH1 command: httpize STRING
145	**
146	** Escape all characters of STRING which have special meaning in URI
147	** components. Return a new string result.
148	*/
149	static int httpizeCmd(
	@@ -167,11 +167,11 @@
167	** True if output is enabled. False if disabled.
168	*/
169	static int enableOutput = 1;
170
171	/*
172	** TH1 command: enable_output BOOLEAN
173	**
174	** Enable or disable the puts and hputs commands.
175	*/
176	static int enableOutputCmd(
177	Th_Interp *interp,
	@@ -242,12 +242,12 @@
242	sendText(forceCgi \|\| g.cgiOutput ? "</p>" : "\n", -1, 0);
243	enableOutput = savedEnable;
244	}
245
246	/*
247	** TH1 command: puts STRING
248	** TH1 command: html STRING
249	**
250	** Output STRING escaped for HTML (html) or unchanged (puts).
251	*/
252	static int putsCmd(
253	Th_Interp *interp,
	@@ -262,11 +262,11 @@
262	sendText((char)argv[1], argl[1], (unsigned int*)pConvert);
263	return TH_OK;
264	}
265
266	/*
267	** TH1 command: wiki STRING
268	**
269	** Render the input string as wiki.
270	*/
271	static int wikiCmd(
272	Th_Interp *interp,
	@@ -287,11 +287,11 @@
287	}
288	return TH_OK;
289	}
290
291	/*
292	** TH1 command: htmlize STRING
293	**
294	** Escape all characters of STRING which have special meaning in HTML.
295	** Return a new string result.
296	*/
297	static int htmlizeCmd(
	@@ -310,11 +310,11 @@
310	free(zOut);
311	return TH_OK;
312	}
313
314	/*
315	** TH1 command: date
316	**
317	** Return a string which is the current time and date. If the
318	** -local option is used, the date appears using localtime instead
319	** of UTC.
320	*/
	@@ -335,11 +335,11 @@
335	free(zOut);
336	return TH_OK;
337	}
338
339	/*
340	** TH1 command: hascap STRING...
341	**
342	** Return true if the user has all of the capabilities listed in STRING.
343	*/
344	static int hascapCmd(
345	Th_Interp *interp,
	@@ -361,11 +361,11 @@
361	Th_SetResultInt(interp, rc);
362	return TH_OK;
363	}
364
365	/*
366	** TH1 command: hasfeature STRING
367	**
368	** Return true if the fossil binary has the given compile-time feature
369	** enabled. The set of features includes:
370	**
371	** "ssl" = FOSSIL_ENABLE_SSL
	@@ -439,11 +439,11 @@
439	return TH_OK;
440	}
441
442
443	/*
444	** TH1 command: tclReady
445	**
446	** Return true if the fossil binary has the Tcl integration feature
447	** enabled and it is currently available for use by TH1 scripts.
448	**
449	*/
	@@ -470,11 +470,11 @@
470	return TH_OK;
471	}
472
473
474	/*
475	** TH1 command: anycap STRING
476	**
477	** Return true if the user has any one of the capabilities listed in STRING.
478	*/
479	static int anycapCmd(
480	Th_Interp *interp,
	@@ -497,11 +497,11 @@
497	Th_SetResultInt(interp, rc);
498	return TH_OK;
499	}
500
501	/*
502	** TH1 command: combobox NAME TEXT-LIST NUMLINES
503	**
504	** Generate an HTML combobox. NAME is both the name of the
505	** CGI parameter and the name of a variable that contains the
506	** currently selected value. TEXT-LIST is a list of possible
507	** values for the combobox. NUMLINES is 1 for a true combobox.
	@@ -557,11 +557,11 @@
557	}
558	return TH_OK;
559	}
560
561	/*
562	** TH1 command: linecount STRING MAX MIN
563	**
564	** Return one more than the number of \n characters in STRING. But
565	** never return less than MIN or more than MAX.
566	*/
567	static int linecntCmd(
	@@ -592,11 +592,11 @@
592	Th_SetResultInt(interp, n);
593	return TH_OK;
594	}
595
596	/*
597	** TH1 command: repository ?BOOLEAN?
598	**
599	** Return the fully qualified file name of the open repository or an empty
600	** string if one is not currently open. Optionally, it will attempt to open
601	** the repository if the boolean argument is non-zero.
602	*/
	@@ -620,11 +620,11 @@
620	Th_SetResult(interp, g.zRepositoryName, -1);
621	return TH_OK;
622	}
623
624	/*
625	** TH1 command: checkout ?BOOLEAN?
626	**
627	** Return the fully qualified directory name of the current checkout or an
628	** empty string if it is not available. Optionally, it will attempt to find
629	** the current checkout, opening the configuration ("user") database and the
630	** repository as necessary, if the boolean argument is non-zero.
	@@ -649,11 +649,11 @@
649	Th_SetResult(interp, g.zLocalRoot, -1);
650	return TH_OK;
651	}
652
653	/*
654	** TH1 command: trace STRING
655	**
656	** Generate a TH1 trace message if debugging is enabled.
657	*/
658	static int traceCmd(
659	Th_Interp *interp,
	@@ -671,11 +671,11 @@
671	Th_SetResult(interp, 0, 0);
672	return TH_OK;
673	}
674
675	/*
676	** TH1 command: getParameter NAME ?DEFAULT?
677	**
678	** Return the value of the specified query parameter or the specified default
679	** value when there is no matching query parameter.
680	*/
681	static int getParameterCmd(
	@@ -695,11 +695,11 @@
695	Th_SetResult(interp, cgi_parameter(argv[1], zDefault), -1);
696	return TH_OK;
697	}
698
699	/*
700	** TH1 command: setParameter NAME VALUE
701	**
702	** Sets the value of the specified query parameter.
703	*/
704	static int setParameterCmd(
705	Th_Interp *interp,
	@@ -714,11 +714,11 @@
714	cgi_replace_parameter(mprintf("%s", argv[1]), mprintf("%s", argv[2]));
715	return TH_OK;
716	}
717
718	/*
719	** TH1 command: render STRING
720	**
721	** Renders the template and writes the results.
722	*/
723	static int renderCmd(
724	Th_Interp *interp,
	@@ -735,11 +735,11 @@
735	Th_SetResult(interp, 0, 0);
736	return rc;
737	}
738
739	/*
740	** TH1 command: styleHeader TITLE
741	**
742	** Render the configured style header.
743	*/
744	static int styleHeaderCmd(
745	Th_Interp *interp,
	@@ -760,11 +760,11 @@
760	return TH_ERROR;
761	}
762	}
763
764	/*
765	** TH1 command: styleFooter
766	**
767	** Render the configured style footer.
768	*/
769	static int styleFooterCmd(
770	Th_Interp *interp,
	@@ -778,10 +778,49 @@
778	}
779	if( Th_IsRepositoryOpen() ){
780	style_footer();
781	Th_SetResult(interp, 0, 0);
782	return TH_OK;
783	}else{
784	Th_SetResult(interp, "repository unavailable", -1);
785	return TH_ERROR;
786	}
787	}
788
789	/*
790	** TH1 command: artifact ID ?FILENAME?
791	**
792	** Attempts to locate the specified artifact and return its contents. An
793	** error is generated if the repository is not open or the artifact cannot
794	** be found.
795	*/
796	static int artifactCmd(
797	Th_Interp *interp,
798	void *p,
799	int argc,
800	const char **argv,
801	int *argl
802	){
803	if( argc!=2 && argc!=3 ){
804	return Th_WrongNumArgs(interp, "artifact ID ?FILENAME?");
805	}
806	if( Th_IsRepositoryOpen() ){
807	int rid;
808	Blob content;
809	if( argc==3 ){
810	rid = artifact_from_ci_and_filename(argv[1], argv[2]);
811	}else{
812	rid = name_to_rid(argv[1]);
813	}
814	if( rid!=0 && content_get(rid, &content) ){
815	Th_SetResult(interp, blob_str(&content), blob_size(&content));
816	blob_reset(&content);
817	return TH_OK;
818	}else{
819	Th_SetResult(interp, "artifact not found", -1);
820	return TH_ERROR;
821	}
822	}else{
823	Th_SetResult(interp, "repository unavailable", -1);
824	return TH_ERROR;
825	}
826	}
	@@ -823,11 +862,11 @@
862	}
863	#endif
864	}
865
866	/*
867	** TH1 command: utime
868	**
869	** Return the number of microseconds of CPU time consumed by the current
870	** process in user space.
871	*/
872	static int utimeCmd(
	@@ -844,11 +883,11 @@
883	Th_SetResult(interp, zUTime, -1);
884	return TH_OK;
885	}
886
887	/*
888	** TH1 command: stime
889	**
890	** Return the number of microseconds of CPU time consumed by the current
891	** process in system space.
892	*/
893	static int stimeCmd(
	@@ -866,11 +905,11 @@
905	return TH_OK;
906	}
907
908
909	/*
910	** TH1 command: randhex N
911	**
912	** Return N*2 random hexadecimal digits with N<50. If N is omitted,
913	** use a value of 10.
914	*/
915	static int randhexCmd(
	@@ -900,11 +939,11 @@
939	Th_SetResult(interp, (const char *)zOut, -1);
940	return TH_OK;
941	}
942
943	/*
944	** TH1 command: query SQL CODE
945	**
946	** Run the SQL query given by the SQL argument. For each row in the result
947	** set, run CODE.
948	**
949	** In SQL, parameters such as $var are filled in using the value of variable
	@@ -982,11 +1021,11 @@
1021	}
1022	return res;
1023	}
1024
1025	/*
1026	** TH1 command: setting name
1027	**
1028	** Gets and returns the value of the specified Fossil setting.
1029	*/
1030	#define SETTING_WRONGNUMARGS "setting ?-strict? ?--? name"
1031	static int settingCmd(
	@@ -1027,11 +1066,11 @@
1066	}
1067	return rc;
1068	}
1069
1070	/*
1071	** TH1 command: regexp ?-nocase? ?--? exp string
1072	**
1073	** Checks the string against the specified regular expression and returns
1074	** non-zero if it matches. If the regular expression is invalid or cannot
1075	** be compiled, an error will be generated.
1076	*/
	@@ -1070,11 +1109,11 @@
1109	re_free(pRe);
1110	return rc;
1111	}
1112
1113	/*
1114	** TH1 command: http ?-asynchronous? ?--? url ?payload?
1115	**
1116	** Perform an HTTP or HTTPS request for the specified URL. If a
1117	** payload is present, it will be interpreted as text/plain and
1118	** the POST method will be used; otherwise, the GET method will
1119	** be used. Upon success, if the -asynchronous option is used, an
	@@ -1244,10 +1283,11 @@
1283	const char *zName;
1284	Th_CommandProc xProc;
1285	void *pContext;
1286	} aCommand[] = {
1287	{"anycap", anycapCmd, 0},
1288	{"artifact", artifactCmd, 0},
1289	{"checkout", checkoutCmd, 0},
1290	{"combobox", comboboxCmd, 0},
1291	{"date", dateCmd, 0},
1292	{"decorate", wikiCmd, (void*)&aFlags[2]},
1293	{"enable_output", enableOutputCmd, 0},
1294

M src/tkt.c

+1 -1

		--- src/tkt.c
		+++ src/tkt.c
		@@ -474,11 +474,11 @@
474	474
475	475	style_footer();
476	476	}
477	477
478	478	/*
479		-** TH1 command: append_field FIELD STRING
	479	+** TH1 command: append_field FIELD STRING
480	480	**
481	481	** FIELD is the name of a database column to which we might want
482	482	** to append text. STRING is the text to be appended to that
483	483	** column. The append does not actually occur until the
484	484	** submit_ticket command is run.
485	485

	--- src/tkt.c
	+++ src/tkt.c
	@@ -474,11 +474,11 @@
474
475	style_footer();
476	}
477
478	/*
479	** TH1 command: append_field FIELD STRING
480	**
481	** FIELD is the name of a database column to which we might want
482	** to append text. STRING is the text to be appended to that
483	** column. The append does not actually occur until the
484	** submit_ticket command is run.
485

	--- src/tkt.c
	+++ src/tkt.c
	@@ -474,11 +474,11 @@
474
475	style_footer();
476	}
477
478	/*
479	** TH1 command: append_field FIELD STRING
480	**
481	** FIELD is the name of a database column to which we might want
482	** to append text. STRING is the text to be appended to that
483	** column. The append does not actually occur until the
484	** submit_ticket command is run.
485

M src/tkt.c

+1 -1

		--- src/tkt.c
		+++ src/tkt.c
		@@ -474,11 +474,11 @@
474	474
475	475	style_footer();
476	476	}
477	477
478	478	/*
479		-** TH1 command: append_field FIELD STRING
	479	+** TH1 command: append_field FIELD STRING
480	480	**
481	481	** FIELD is the name of a database column to which we might want
482	482	** to append text. STRING is the text to be appended to that
483	483	** column. The append does not actually occur until the
484	484	** submit_ticket command is run.
485	485

	--- src/tkt.c
	+++ src/tkt.c
	@@ -474,11 +474,11 @@
474
475	style_footer();
476	}
477
478	/*
479	** TH1 command: append_field FIELD STRING
480	**
481	** FIELD is the name of a database column to which we might want
482	** to append text. STRING is the text to be appended to that
483	** column. The append does not actually occur until the
484	** submit_ticket command is run.
485

	--- src/tkt.c
	+++ src/tkt.c
	@@ -474,11 +474,11 @@
474
475	style_footer();
476	}
477
478	/*
479	** TH1 command: append_field FIELD STRING
480	**
481	** FIELD is the name of a database column to which we might want
482	** to append text. STRING is the text to be appended to that
483	** column. The append does not actually occur until the
484	** submit_ticket command is run.
485

M test/th1.test

+46

		--- test/th1.test
		+++ test/th1.test
		@@ -630,5 +630,51 @@
630	630
631	631	###############################################################################
632	632
633	633	fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4 defValue4"
634	634	test th1-set-parameter-7 {$RESULT eq {value5}}
	635	+
	636	+###############################################################################
	637	+
	638	+fossil test-th-eval "artifact"
	639	+test th1-artifact-1 {$RESULT eq \
	640	+ {TH_ERROR: wrong # args: should be "artifact ID ?FILENAME?"}}
	641	+
	642	+###############################################################################
	643	+
	644	+fossil test-th-eval "artifact tip"
	645	+test th1-artifact-2 {$RESULT eq {TH_ERROR: repository unavailable}}
	646	+
	647	+###############################################################################
	648	+
	649	+fossil test-th-eval --th-open-config "artifact tip"
	650	+test th1-artifact-3 {[regexp -- {F test/th1\.test [0-9a-f]{40}} $RESULT]}
	651	+
	652	+###############################################################################
	653	+
	654	+fossil test-th-eval "artifact 0000000000"
	655	+test th1-artifact-4 {$RESULT eq {TH_ERROR: repository unavailable}}
	656	+
	657	+###############################################################################
	658	+
	659	+fossil test-th-eval --th-open-config "artifact 0000000000"
	660	+test th1-artifact-5 {$RESULT eq {TH_ERROR: artifact not found}}
	661	+
	662	+###############################################################################
	663	+
	664	+fossil test-th-eval "artifact tip test/th1.test"
	665	+test th1-artifact-6 {$RESULT eq {TH_ERROR: repository unavailable}}
	666	+
	667	+###############################################################################
	668	+
	669	+fossil test-th-eval --th-open-config "artifact tip test/th1.test"
	670	+test th1-artifact-7 {[regexp -- {th1-artifact-7} $RESULT]}
	671	+
	672	+###############################################################################
	673	+
	674	+fossil test-th-eval "artifact 0000000000 test/th1.test"
	675	+test th1-artifact-8 {$RESULT eq {TH_ERROR: repository unavailable}}
	676	+
	677	+###############################################################################
	678	+
	679	+fossil test-th-eval --th-open-config "artifact 0000000000 test/th1.test"
	680	+test th1-artifact-9 {$RESULT eq {TH_ERROR: artifact not found}}
635	681

	--- test/th1.test
	+++ test/th1.test
	@@ -630,5 +630,51 @@
630
631	###############################################################################
632
633	fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4 defValue4"
634	test th1-set-parameter-7 {$RESULT eq {value5}}














































635

	--- test/th1.test
	+++ test/th1.test
	@@ -630,5 +630,51 @@
630
631	###############################################################################
632
633	fossil test-th-eval "setParameter test4 value4; setParameter test4 value5; getParameter test4 defValue4"
634	test th1-set-parameter-7 {$RESULT eq {value5}}
635
636	###############################################################################
637
638	fossil test-th-eval "artifact"
639	test th1-artifact-1 {$RESULT eq \
640	{TH_ERROR: wrong # args: should be "artifact ID ?FILENAME?"}}
641
642	###############################################################################
643
644	fossil test-th-eval "artifact tip"
645	test th1-artifact-2 {$RESULT eq {TH_ERROR: repository unavailable}}
646
647	###############################################################################
648
649	fossil test-th-eval --th-open-config "artifact tip"
650	test th1-artifact-3 {[regexp -- {F test/th1\.test [0-9a-f]{40}} $RESULT]}
651
652	###############################################################################
653
654	fossil test-th-eval "artifact 0000000000"
655	test th1-artifact-4 {$RESULT eq {TH_ERROR: repository unavailable}}
656
657	###############################################################################
658
659	fossil test-th-eval --th-open-config "artifact 0000000000"
660	test th1-artifact-5 {$RESULT eq {TH_ERROR: artifact not found}}
661
662	###############################################################################
663
664	fossil test-th-eval "artifact tip test/th1.test"
665	test th1-artifact-6 {$RESULT eq {TH_ERROR: repository unavailable}}
666
667	###############################################################################
668
669	fossil test-th-eval --th-open-config "artifact tip test/th1.test"
670	test th1-artifact-7 {[regexp -- {th1-artifact-7} $RESULT]}
671
672	###############################################################################
673
674	fossil test-th-eval "artifact 0000000000 test/th1.test"
675	test th1-artifact-8 {$RESULT eq {TH_ERROR: repository unavailable}}
676
677	###############################################################################
678
679	fossil test-th-eval --th-open-config "artifact 0000000000 test/th1.test"
680	test th1-artifact-9 {$RESULT eq {TH_ERROR: artifact not found}}
681

M www/changes.wiki

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -4,10 +4,17 @@
4	4	* Add setting to control the number of times autosync will be tried before
5	5	returning an error.
6	6	* Add the "fossil fusefs DIRECTORY" command that mounts a Fuse Filesystem
7	7	at the given DIRECTORY and populates it with read-only copies of all
8	8	historical check-ins. This only works on systems that support FuseFS.
	9	+ * Support customization of commands and webpages, including the ability to
	10	+ add new ones, via the "TH1 hooks" feature. Disabled by default. Enabled
	11	+ via a compile-time option.
	12	+ * Add the <nowiki>[checkout], [render], [styleHeader], [styleFooter],
	13	+ [trace], [getParameter], [setParameter], and [artifact]</nowiki> commands
	14	+ to TH1, primarily for use by TH1 hooks.
	15	+ * Bring in the latest version of autosetup from upstream.
9	16
10	17	<h2>Changes For Version 1.29 (2014-06-12)</h2>
11	18	* Add the ability to display content, diffs and annotations for UTF16
12	19	text files in the web interface.
13	20	* Add the "SaveAs..." and "Invert" buttons
14	21

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -4,10 +4,17 @@
4	* Add setting to control the number of times autosync will be tried before
5	returning an error.
6	* Add the "fossil fusefs DIRECTORY" command that mounts a Fuse Filesystem
7	at the given DIRECTORY and populates it with read-only copies of all
8	historical check-ins. This only works on systems that support FuseFS.







9
10	<h2>Changes For Version 1.29 (2014-06-12)</h2>
11	* Add the ability to display content, diffs and annotations for UTF16
12	text files in the web interface.
13	* Add the "SaveAs..." and "Invert" buttons
14

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -4,10 +4,17 @@
4	* Add setting to control the number of times autosync will be tried before
5	returning an error.
6	* Add the "fossil fusefs DIRECTORY" command that mounts a Fuse Filesystem
7	at the given DIRECTORY and populates it with read-only copies of all
8	historical check-ins. This only works on systems that support FuseFS.
9	* Support customization of commands and webpages, including the ability to
10	add new ones, via the "TH1 hooks" feature. Disabled by default. Enabled
11	via a compile-time option.
12	* Add the <nowiki>[checkout], [render], [styleHeader], [styleFooter],
13	[trace], [getParameter], [setParameter], and [artifact]</nowiki> commands
14	to TH1, primarily for use by TH1 hooks.
15	* Bring in the latest version of autosetup from upstream.
16
17	<h2>Changes For Version 1.29 (2014-06-12)</h2>
18	* Add the ability to display content, diffs and annotations for UTF16
19	text files in the web interface.
20	* Add the "SaveAs..." and "Invert" buttons
21

Fossil SCM

Keyboard Shortcuts