Fossil SCM

More consistancy in using <br /> and <hr /> HTML tags

jan.nijtmans 2016-06-17 09:45 trunk

Commit 63220d9403f97b649dbb2f1f66e71bd1ff9892a3

Parent e2a280fc890e2c7…

5 files changed +1 -1 +2 -2 +2 -2 +4 -4 +14 -14

~ src/diff.c ~ src/style.c ~ src/tkt.c ~ src/user.c ~ src/wiki.c

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2377,11 +2377,11 @@
2377	2377	}
2378	2378	}
2379	2379	#endif
2380	2380	}
2381	2381	@ </ol>
2382		- @ <hr>
	2382	+ @ <hr />
2383	2383	}
2384	2384	if( !ann.bLimit ){
2385	2385	@ <h2>Origin for each line in
2386	2386	@ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a>
2387	2387	@ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2>
2388	2388

	--- src/diff.c
	+++ src/diff.c
	@@ -2377,11 +2377,11 @@
2377	}
2378	}
2379	#endif
2380	}
2381	@ </ol>
2382	@ <hr>
2383	}
2384	if( !ann.bLimit ){
2385	@ <h2>Origin for each line in
2386	@ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a>
2387	@ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2>
2388

	--- src/diff.c
	+++ src/diff.c
	@@ -2377,11 +2377,11 @@
2377	}
2378	}
2379	#endif
2380	}
2381	@ </ol>
2382	@ <hr />
2383	}
2384	if( !ann.bLimit ){
2385	@ <h2>Origin for each line in
2386	@ %z(href("%R/finfo?name=%h&ci=%!S", zFilename, zCI))%h(zFilename)</a>
2387	@ from check-in %z(href("%R/info/%!S",zCI))%S(zCI)</a>:</h2>
2388

M src/style.c

+2 -2

		--- src/style.c
		+++ src/style.c
		@@ -1604,15 +1604,15 @@
1604	1604	if( i>0 ){
1605	1605	@ anonymous-adds = %s(zCap)<br />
1606	1606	}
1607	1607	@ g.zRepositoryName = %h(g.zRepositoryName)<br />
1608	1608	@ load_average() = %f(load_average())<br />
1609		- @ <hr>
	1609	+ @ <hr />
1610	1610	P("HTTP_USER_AGENT");
1611	1611	cgi_print_all(showAll);
1612	1612	if( showAll && blob_size(&g.httpHeader)>0 ){
1613		- @ <hr>
	1613	+ @ <hr />
1614	1614	@ <pre>
1615	1615	@ %h(blob_str(&g.httpHeader))
1616	1616	@ </pre>
1617	1617	}
1618	1618	if( g.perm.Setup ){
1619	1619

	--- src/style.c
	+++ src/style.c
	@@ -1604,15 +1604,15 @@
1604	if( i>0 ){
1605	@ anonymous-adds = %s(zCap)<br />
1606	}
1607	@ g.zRepositoryName = %h(g.zRepositoryName)<br />
1608	@ load_average() = %f(load_average())<br />
1609	@ <hr>
1610	P("HTTP_USER_AGENT");
1611	cgi_print_all(showAll);
1612	if( showAll && blob_size(&g.httpHeader)>0 ){
1613	@ <hr>
1614	@ <pre>
1615	@ %h(blob_str(&g.httpHeader))
1616	@ </pre>
1617	}
1618	if( g.perm.Setup ){
1619

	--- src/style.c
	+++ src/style.c
	@@ -1604,15 +1604,15 @@
1604	if( i>0 ){
1605	@ anonymous-adds = %s(zCap)<br />
1606	}
1607	@ g.zRepositoryName = %h(g.zRepositoryName)<br />
1608	@ load_average() = %f(load_average())<br />
1609	@ <hr />
1610	P("HTTP_USER_AGENT");
1611	cgi_print_all(showAll);
1612	if( showAll && blob_size(&g.httpHeader)>0 ){
1613	@ <hr />
1614	@ <pre>
1615	@ %h(blob_str(&g.httpHeader))
1616	@ </pre>
1617	}
1618	if( g.perm.Setup ){
1619

M src/tkt.c

+2 -2

		--- src/tkt.c
		+++ src/tkt.c
		@@ -657,11 +657,11 @@
657	657	@ <div style="color:blue">
658	658	@ <p>Ticket artifact that would have been submitted:</p>
659	659	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
660	660	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
661	661	@ </div>
662		- @ <hr>
	662	+ @ <hr />
663	663	return TH_OK;
664	664	}else{
665	665	if( g.thTrace ){
666	666	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
667	667	"}<br />\n",
		@@ -1080,11 +1080,11 @@
1080	1080	** limited with a new WHERE-condition.
1081	1081	** example: Report lists a column # with the uuid
1082	1082	** TICKETFILTER may be [#]='uuuuuuuuu'
1083	1083	** example: Report only lists rows with status not open
1084	1084	** TICKETFILTER: status != 'open'
1085		-**
	1085	+**
1086	1086	** If --quote is used, the tickets are encoded by quoting special
1087	1087	** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r,
1088	1088	** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1089	1089	** Otherwise, the simplified encoding as on the show report raw page
1090	1090	** in the GUI is used. This has no effect in JSON mode.
1091	1091

	--- src/tkt.c
	+++ src/tkt.c
	@@ -657,11 +657,11 @@
657	@ <div style="color:blue">
658	@ <p>Ticket artifact that would have been submitted:</p>
659	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
660	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
661	@ </div>
662	@ <hr>
663	return TH_OK;
664	}else{
665	if( g.thTrace ){
666	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
667	"}<br />\n",
	@@ -1080,11 +1080,11 @@
1080	** limited with a new WHERE-condition.
1081	** example: Report lists a column # with the uuid
1082	** TICKETFILTER may be [#]='uuuuuuuuu'
1083	** example: Report only lists rows with status not open
1084	** TICKETFILTER: status != 'open'
1085	**
1086	** If --quote is used, the tickets are encoded by quoting special
1087	** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r,
1088	** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1089	** Otherwise, the simplified encoding as on the show report raw page
1090	** in the GUI is used. This has no effect in JSON mode.
1091

	--- src/tkt.c
	+++ src/tkt.c
	@@ -657,11 +657,11 @@
657	@ <div style="color:blue">
658	@ <p>Ticket artifact that would have been submitted:</p>
659	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
660	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
661	@ </div>
662	@ <hr />
663	return TH_OK;
664	}else{
665	if( g.thTrace ){
666	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
667	"}<br />\n",
	@@ -1080,11 +1080,11 @@
1080	** limited with a new WHERE-condition.
1081	** example: Report lists a column # with the uuid
1082	** TICKETFILTER may be [#]='uuuuuuuuu'
1083	** example: Report only lists rows with status not open
1084	** TICKETFILTER: status != 'open'
1085	**
1086	** If --quote is used, the tickets are encoded by quoting special
1087	** chars (space -> \\s, tab -> \\t, newline -> \\n, cr -> \\r,
1088	** formfeed -> \\f, vtab -> \\v, nul -> \\0, \\ -> \\\\).
1089	** Otherwise, the simplified encoding as on the show report raw page
1090	** in the GUI is used. This has no effect in JSON mode.
1091

M src/user.c

+4 -4

		--- src/user.c
		+++ src/user.c
		@@ -428,18 +428,18 @@
428	428	fossil_fatal("cannot determine user");
429	429	}
430	430
431	431	/*
432	432	** COMMAND: test-usernames
433		-**
434		-** Usage: %fossil test-usernames
	433	+**
	434	+** Usage: %fossil test-usernames
435	435	**
436	436	** Print details about sources of fossil usernames.
437	437	*/
438	438	void test_usernames_cmd(void){
439	439	db_find_and_open_repository(0, 0);
440		-
	440	+
441	441	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
442	442	fossil_print("Initial g.userUid: %d\n", g.userUid);
443	443	fossil_print("checkout default-user: %s\n", g.localOpen ?
444	444	db_lget("default-user","") : "<<no open checkout>>");
445	445	fossil_print("default-user: %s\n", db_get("default-user",""));
		@@ -571,11 +571,11 @@
571	571	style_submenu_element("All", "All entries",
572	572	"%s/access_log?n=10000000", g.zTop);
573	573	}
574	574	@ </tbody></table></center>
575	575	db_finalize(&q);
576		- @ <hr>
	576	+ @ <hr />
577	577	@ <form method="post" action="%s(g.zTop)/access_log">
578	578	@ <label><input type="checkbox" name="delold">
579	579	@ Delete all but the most recent 200 entries</input></label>
580	580	@ <input type="submit" name="deloldbtn" value="Delete"></input>
581	581	@ </form>
582	582

	--- src/user.c
	+++ src/user.c
	@@ -428,18 +428,18 @@
428	fossil_fatal("cannot determine user");
429	}
430
431	/*
432	** COMMAND: test-usernames
433	**
434	** Usage: %fossil test-usernames
435	**
436	** Print details about sources of fossil usernames.
437	*/
438	void test_usernames_cmd(void){
439	db_find_and_open_repository(0, 0);
440
441	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
442	fossil_print("Initial g.userUid: %d\n", g.userUid);
443	fossil_print("checkout default-user: %s\n", g.localOpen ?
444	db_lget("default-user","") : "<<no open checkout>>");
445	fossil_print("default-user: %s\n", db_get("default-user",""));
	@@ -571,11 +571,11 @@
571	style_submenu_element("All", "All entries",
572	"%s/access_log?n=10000000", g.zTop);
573	}
574	@ </tbody></table></center>
575	db_finalize(&q);
576	@ <hr>
577	@ <form method="post" action="%s(g.zTop)/access_log">
578	@ <label><input type="checkbox" name="delold">
579	@ Delete all but the most recent 200 entries</input></label>
580	@ <input type="submit" name="deloldbtn" value="Delete"></input>
581	@ </form>
582

	--- src/user.c
	+++ src/user.c
	@@ -428,18 +428,18 @@
428	fossil_fatal("cannot determine user");
429	}
430
431	/*
432	** COMMAND: test-usernames
433	**
434	** Usage: %fossil test-usernames
435	**
436	** Print details about sources of fossil usernames.
437	*/
438	void test_usernames_cmd(void){
439	db_find_and_open_repository(0, 0);
440
441	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
442	fossil_print("Initial g.userUid: %d\n", g.userUid);
443	fossil_print("checkout default-user: %s\n", g.localOpen ?
444	db_lget("default-user","") : "<<no open checkout>>");
445	fossil_print("default-user: %s\n", db_get("default-user",""));
	@@ -571,11 +571,11 @@
571	style_submenu_element("All", "All entries",
572	"%s/access_log?n=10000000", g.zTop);
573	}
574	@ </tbody></table></center>
575	db_finalize(&q);
576	@ <hr />
577	@ <form method="post" action="%s(g.zTop)/access_log">
578	@ <label><input type="checkbox" name="delold">
579	@ Delete all but the most recent 200 entries</input></label>
580	@ <input type="submit" name="deloldbtn" value="Delete"></input>
581	@ </form>
582

M src/wiki.c

+14 -14

		--- src/wiki.c
		+++ src/wiki.c
		@@ -137,11 +137,11 @@
137	137	** Only allow certain mimetypes through.
138	138	** All others become "text/x-fossil-wiki"
139	139	*/
140	140	const char wiki_filter_mimetypes(const char zMimetype){
141	141	if( zMimetype!=0 ){
142		- int i;
	142	+ int i;
143	143	for(i=0; i<sizeof(azStyles)/sizeof(azStyles[0]); i+=3){
144	144	if( fossil_strcmp(zMimetype,azStyles[i+2])==0 ){
145	145	return azStyles[i];
146	146	}
147	147	}
		@@ -682,11 +682,11 @@
682	682	zDate = db_text(0, "SELECT datetime('now')");
683	683	zRemark = PD("r","");
684	684	zUser = PD("u",g.zLogin);
685	685	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){
686	686	zId = db_text(0, "SELECT lower(hex(randomblob(8)))");
687		- blob_appendf(p, "\n\n<hr><div id=\"%s\"><i>On %s UTC %h",
	687	+ blob_appendf(p, "\n\n<hr /><div id=\"%s\"><i>On %s UTC %h",
688	688	zId, zDate, login_name());
689	689	if( zUser[0] && fossil_strcmp(zUser,login_name()) ){
690	690	blob_appendf(p, " (claiming to be %h)", zUser);
691	691	}
692	692	blob_appendf(p, " added:</i><br />\n%s</div id=\"%s\">", zRemark, zId);
		@@ -803,13 +803,13 @@
803	803	}
804	804	if( P("preview")!=0 ){
805	805	Blob preview;
806	806	blob_zero(&preview);
807	807	appendRemark(&preview, zMimetype);
808		- @ Preview:<hr>
	808	+ @ Preview:<hr />
809	809	wiki_render_by_mimetype(&preview, zMimetype);
810		- @ <hr>
	810	+ @ <hr />
811	811	blob_reset(&preview);
812	812	}
813	813	zUser = PD("u", g.zLogin);
814	814	form_begin(0, "%R/wikiappend");
815	815	login_insert_csrf_secret();
		@@ -1167,22 +1167,22 @@
1167	1167	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1168	1168	**
1169	1169	** Run various subcommands to work with wiki entries or tech notes.
1170	1170	**
1171	1171	** %fossil wiki export PAGENAME ?FILE?
1172		-** %fossil wiki export ?FILE? -t\|--technote DATETIME\|TECHNOTE-ID
	1172	+** %fossil wiki export ?FILE? -t\|--technote DATETIME\|TECHNOTE-ID
1173	1173	**
1174	1174	** Sends the latest version of either a wiki page or of a tech note
1175		-** to the given file or standard output.
	1175	+** to the given file or standard output.
1176	1176	** If PAGENAME is provided, the wiki page will be output. For
1177		-** a tech note either DATETIME or TECHNOTE-ID must be specified. If
	1177	+** a tech note either DATETIME or TECHNOTE-ID must be specified. If
1178	1178	** DATETIME is used, the most recently modified tech note with that
1179	1179	** DATETIME will be sent.
1180	1180	**
1181	1181	** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1182		-**
1183		-** Create a new or commit changes to an existing wiki page or
	1182	+**
	1183	+** Create a new or commit changes to an existing wiki page or
1184	1184	** technote from FILE or from standard input. PAGENAME is the
1185	1185	** name of the wiki entry or the timeline comment of the
1186	1186	** technote.
1187	1187	**
1188	1188	** Options:
		@@ -1208,11 +1208,11 @@
1208	1208	**
1209	1209	** %fossil wiki list ?OPTIONS?
1210	1210	** %fossil wiki ls ?OPTIONS?
1211	1211	**
1212	1212	** Lists all wiki entries, one per line, ordered
1213		-** case-insensitively by name.
	1213	+** case-insensitively by name.
1214	1214	**
1215	1215	** Options:
1216	1216	** -t\|--technote Technotes will be listed instead of
1217	1217	** pages. The technotes will be in order
1218	1218	** of timestamp with the most recent
		@@ -1308,11 +1308,11 @@
1308	1308	}else{
1309	1309	blob_read_from_file(&content, g.argv[4]);
1310	1310	}
1311	1311	if( !zMimeType \|\| !*zMimeType ){
1312	1312	/* Try to deduce the mime type based on the prior version. */
1313		- if ( !zETime ){
	1313	+ if ( !zETime ){
1314	1314	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
1315	1315	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
1316	1316	" ORDER BY x.mtime DESC LIMIT 1",
1317	1317	zPageName
1318	1318	);
		@@ -1334,11 +1334,11 @@
1334	1334	if ( !zETime ){
1335	1335	fossil_fatal("wiki page %s already exists", zPageName);
1336	1336	}else{
1337	1337	/* Creating a tech note with same timestamp is permitted
1338	1338	and should create a new tech note */
1339		- rid = 0;
	1339	+ rid = 0;
1340	1340	}
1341	1341	}else if( g.argv[2][1]=='o' && rid == 0 ){
1342	1342	if ( !zETime ){
1343	1343	fossil_fatal("no such wiki page: %s", zPageName);
1344	1344	}else{
		@@ -1396,11 +1396,11 @@
1396	1396	" AND e.tagid IS NOT NULL"
1397	1397	" AND t.tagid=e.tagid"
1398	1398	" ORDER BY e.mtime DESC /sort/"
1399	1399	);
1400	1400	}
1401		-
	1401	+
1402	1402	while( db_step(&q)==SQLITE_ROW ){
1403	1403	const char *zName = db_column_text(&q, 0);
1404	1404	if( showIds ){
1405	1405	const char *zUuid = db_column_text(&q, 1);
1406	1406	fossil_print("%s ",zUuid);
		@@ -1421,11 +1421,11 @@
1421	1421	** COMMAND: test-markdown-render
1422	1422	**
1423	1423	** Usage: %fossil test-markdown-render FILE
1424	1424	**
1425	1425	** Render markdown wiki from FILE to stdout.
1426		-**
	1426	+**
1427	1427	*/
1428	1428	void test_markdown_render(void){
1429	1429	Blob in, out;
1430	1430	db_find_and_open_repository(0,0);
1431	1431	verify_all_options();
1432	1432

	--- src/wiki.c
	+++ src/wiki.c
	@@ -137,11 +137,11 @@
137	** Only allow certain mimetypes through.
138	** All others become "text/x-fossil-wiki"
139	*/
140	const char wiki_filter_mimetypes(const char zMimetype){
141	if( zMimetype!=0 ){
142	int i;
143	for(i=0; i<sizeof(azStyles)/sizeof(azStyles[0]); i+=3){
144	if( fossil_strcmp(zMimetype,azStyles[i+2])==0 ){
145	return azStyles[i];
146	}
147	}
	@@ -682,11 +682,11 @@
682	zDate = db_text(0, "SELECT datetime('now')");
683	zRemark = PD("r","");
684	zUser = PD("u",g.zLogin);
685	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){
686	zId = db_text(0, "SELECT lower(hex(randomblob(8)))");
687	blob_appendf(p, "\n\n<hr><div id=\"%s\"><i>On %s UTC %h",
688	zId, zDate, login_name());
689	if( zUser[0] && fossil_strcmp(zUser,login_name()) ){
690	blob_appendf(p, " (claiming to be %h)", zUser);
691	}
692	blob_appendf(p, " added:</i><br />\n%s</div id=\"%s\">", zRemark, zId);
	@@ -803,13 +803,13 @@
803	}
804	if( P("preview")!=0 ){
805	Blob preview;
806	blob_zero(&preview);
807	appendRemark(&preview, zMimetype);
808	@ Preview:<hr>
809	wiki_render_by_mimetype(&preview, zMimetype);
810	@ <hr>
811	blob_reset(&preview);
812	}
813	zUser = PD("u", g.zLogin);
814	form_begin(0, "%R/wikiappend");
815	login_insert_csrf_secret();
	@@ -1167,22 +1167,22 @@
1167	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1168	**
1169	** Run various subcommands to work with wiki entries or tech notes.
1170	**
1171	** %fossil wiki export PAGENAME ?FILE?
1172	** %fossil wiki export ?FILE? -t\|--technote DATETIME\|TECHNOTE-ID
1173	**
1174	** Sends the latest version of either a wiki page or of a tech note
1175	** to the given file or standard output.
1176	** If PAGENAME is provided, the wiki page will be output. For
1177	** a tech note either DATETIME or TECHNOTE-ID must be specified. If
1178	** DATETIME is used, the most recently modified tech note with that
1179	** DATETIME will be sent.
1180	**
1181	** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1182	**
1183	** Create a new or commit changes to an existing wiki page or
1184	** technote from FILE or from standard input. PAGENAME is the
1185	** name of the wiki entry or the timeline comment of the
1186	** technote.
1187	**
1188	** Options:
	@@ -1208,11 +1208,11 @@
1208	**
1209	** %fossil wiki list ?OPTIONS?
1210	** %fossil wiki ls ?OPTIONS?
1211	**
1212	** Lists all wiki entries, one per line, ordered
1213	** case-insensitively by name.
1214	**
1215	** Options:
1216	** -t\|--technote Technotes will be listed instead of
1217	** pages. The technotes will be in order
1218	** of timestamp with the most recent
	@@ -1308,11 +1308,11 @@
1308	}else{
1309	blob_read_from_file(&content, g.argv[4]);
1310	}
1311	if( !zMimeType \|\| !*zMimeType ){
1312	/* Try to deduce the mime type based on the prior version. */
1313	if ( !zETime ){
1314	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
1315	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
1316	" ORDER BY x.mtime DESC LIMIT 1",
1317	zPageName
1318	);
	@@ -1334,11 +1334,11 @@
1334	if ( !zETime ){
1335	fossil_fatal("wiki page %s already exists", zPageName);
1336	}else{
1337	/* Creating a tech note with same timestamp is permitted
1338	and should create a new tech note */
1339	rid = 0;
1340	}
1341	}else if( g.argv[2][1]=='o' && rid == 0 ){
1342	if ( !zETime ){
1343	fossil_fatal("no such wiki page: %s", zPageName);
1344	}else{
	@@ -1396,11 +1396,11 @@
1396	" AND e.tagid IS NOT NULL"
1397	" AND t.tagid=e.tagid"
1398	" ORDER BY e.mtime DESC /sort/"
1399	);
1400	}
1401
1402	while( db_step(&q)==SQLITE_ROW ){
1403	const char *zName = db_column_text(&q, 0);
1404	if( showIds ){
1405	const char *zUuid = db_column_text(&q, 1);
1406	fossil_print("%s ",zUuid);
	@@ -1421,11 +1421,11 @@
1421	** COMMAND: test-markdown-render
1422	**
1423	** Usage: %fossil test-markdown-render FILE
1424	**
1425	** Render markdown wiki from FILE to stdout.
1426	**
1427	*/
1428	void test_markdown_render(void){
1429	Blob in, out;
1430	db_find_and_open_repository(0,0);
1431	verify_all_options();
1432

	--- src/wiki.c
	+++ src/wiki.c
	@@ -137,11 +137,11 @@
137	** Only allow certain mimetypes through.
138	** All others become "text/x-fossil-wiki"
139	*/
140	const char wiki_filter_mimetypes(const char zMimetype){
141	if( zMimetype!=0 ){
142	int i;
143	for(i=0; i<sizeof(azStyles)/sizeof(azStyles[0]); i+=3){
144	if( fossil_strcmp(zMimetype,azStyles[i+2])==0 ){
145	return azStyles[i];
146	}
147	}
	@@ -682,11 +682,11 @@
682	zDate = db_text(0, "SELECT datetime('now')");
683	zRemark = PD("r","");
684	zUser = PD("u",g.zLogin);
685	if( fossil_strcmp(zMimetype, "text/x-fossil-wiki")==0 ){
686	zId = db_text(0, "SELECT lower(hex(randomblob(8)))");
687	blob_appendf(p, "\n\n<hr /><div id=\"%s\"><i>On %s UTC %h",
688	zId, zDate, login_name());
689	if( zUser[0] && fossil_strcmp(zUser,login_name()) ){
690	blob_appendf(p, " (claiming to be %h)", zUser);
691	}
692	blob_appendf(p, " added:</i><br />\n%s</div id=\"%s\">", zRemark, zId);
	@@ -803,13 +803,13 @@
803	}
804	if( P("preview")!=0 ){
805	Blob preview;
806	blob_zero(&preview);
807	appendRemark(&preview, zMimetype);
808	@ Preview:<hr />
809	wiki_render_by_mimetype(&preview, zMimetype);
810	@ <hr />
811	blob_reset(&preview);
812	}
813	zUser = PD("u", g.zLogin);
814	form_begin(0, "%R/wikiappend");
815	login_insert_csrf_secret();
	@@ -1167,22 +1167,22 @@
1167	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1168	**
1169	** Run various subcommands to work with wiki entries or tech notes.
1170	**
1171	** %fossil wiki export PAGENAME ?FILE?
1172	** %fossil wiki export ?FILE? -t\|--technote DATETIME\|TECHNOTE-ID
1173	**
1174	** Sends the latest version of either a wiki page or of a tech note
1175	** to the given file or standard output.
1176	** If PAGENAME is provided, the wiki page will be output. For
1177	** a tech note either DATETIME or TECHNOTE-ID must be specified. If
1178	** DATETIME is used, the most recently modified tech note with that
1179	** DATETIME will be sent.
1180	**
1181	** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1182	**
1183	** Create a new or commit changes to an existing wiki page or
1184	** technote from FILE or from standard input. PAGENAME is the
1185	** name of the wiki entry or the timeline comment of the
1186	** technote.
1187	**
1188	** Options:
	@@ -1208,11 +1208,11 @@
1208	**
1209	** %fossil wiki list ?OPTIONS?
1210	** %fossil wiki ls ?OPTIONS?
1211	**
1212	** Lists all wiki entries, one per line, ordered
1213	** case-insensitively by name.
1214	**
1215	** Options:
1216	** -t\|--technote Technotes will be listed instead of
1217	** pages. The technotes will be in order
1218	** of timestamp with the most recent
	@@ -1308,11 +1308,11 @@
1308	}else{
1309	blob_read_from_file(&content, g.argv[4]);
1310	}
1311	if( !zMimeType \|\| !*zMimeType ){
1312	/* Try to deduce the mime type based on the prior version. */
1313	if ( !zETime ){
1314	rid = db_int(0, "SELECT x.rid FROM tag t, tagxref x"
1315	" WHERE x.tagid=t.tagid AND t.tagname='wiki-%q'"
1316	" ORDER BY x.mtime DESC LIMIT 1",
1317	zPageName
1318	);
	@@ -1334,11 +1334,11 @@
1334	if ( !zETime ){
1335	fossil_fatal("wiki page %s already exists", zPageName);
1336	}else{
1337	/* Creating a tech note with same timestamp is permitted
1338	and should create a new tech note */
1339	rid = 0;
1340	}
1341	}else if( g.argv[2][1]=='o' && rid == 0 ){
1342	if ( !zETime ){
1343	fossil_fatal("no such wiki page: %s", zPageName);
1344	}else{
	@@ -1396,11 +1396,11 @@
1396	" AND e.tagid IS NOT NULL"
1397	" AND t.tagid=e.tagid"
1398	" ORDER BY e.mtime DESC /sort/"
1399	);
1400	}
1401
1402	while( db_step(&q)==SQLITE_ROW ){
1403	const char *zName = db_column_text(&q, 0);
1404	if( showIds ){
1405	const char *zUuid = db_column_text(&q, 1);
1406	fossil_print("%s ",zUuid);
	@@ -1421,11 +1421,11 @@
1421	** COMMAND: test-markdown-render
1422	**
1423	** Usage: %fossil test-markdown-render FILE
1424	**
1425	** Render markdown wiki from FILE to stdout.
1426	**
1427	*/
1428	void test_markdown_render(void){
1429	Blob in, out;
1430	db_find_and_open_repository(0,0);
1431	verify_all_options();
1432

Fossil SCM

Keyboard Shortcuts