Fossil SCM

Fix harmless compiler warnings. Update the custom MinGW makefile. Make feature reporting consistent for 'markdown', which is now always enabled.

mistachkin 2020-10-18 18:38 trunk

Commit 750879ead431429cff743baec3d437a9be4a1abe19cb00e550ecdf0bcebabeb6

Parent 0af477224547fea…

6 files changed +2 -1 +1 +1 -1 +1 -1 +1 -1 +39

~ src/file.c ~ src/main.c ~ src/merge3.c ~ src/printf.c ~ src/timeline.c ~ win/Makefile.mingw.mistachkin

M src/file.c

+2 -1

		--- src/file.c
		+++ src/file.c
		@@ -1308,17 +1308,18 @@
1308	1308	int reset
1309	1309	){
1310	1310	char zBuf[200];
1311	1311	char *z;
1312	1312	Blob x;
	1313	+ char *zFull;
1313	1314	int rc;
1314	1315	sqlite3_int64 iMtime;
1315	1316	struct fossilStat testFileStat;
1316	1317	memset(zBuf, 0, sizeof(zBuf));
1317	1318	blob_zero(&x);
1318	1319	file_canonical_name(zPath, &x, slash);
1319		- char *zFull = blob_str(&x);
	1320	+ zFull = blob_str(&x);
1320	1321	fossil_print("[%s] -> [%s]\n", zPath, zFull);
1321	1322	memset(&testFileStat, 0, sizeof(struct fossilStat));
1322	1323	rc = fossil_stat(zPath, &testFileStat, 0);
1323	1324	fossil_print(" stat_rc = %d\n", rc);
1324	1325	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", testFileStat.st_size);
1325	1326

	--- src/file.c
	+++ src/file.c
	@@ -1308,17 +1308,18 @@
1308	int reset
1309	){
1310	char zBuf[200];
1311	char *z;
1312	Blob x;

1313	int rc;
1314	sqlite3_int64 iMtime;
1315	struct fossilStat testFileStat;
1316	memset(zBuf, 0, sizeof(zBuf));
1317	blob_zero(&x);
1318	file_canonical_name(zPath, &x, slash);
1319	char *zFull = blob_str(&x);
1320	fossil_print("[%s] -> [%s]\n", zPath, zFull);
1321	memset(&testFileStat, 0, sizeof(struct fossilStat));
1322	rc = fossil_stat(zPath, &testFileStat, 0);
1323	fossil_print(" stat_rc = %d\n", rc);
1324	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", testFileStat.st_size);
1325

	--- src/file.c
	+++ src/file.c
	@@ -1308,17 +1308,18 @@
1308	int reset
1309	){
1310	char zBuf[200];
1311	char *z;
1312	Blob x;
1313	char *zFull;
1314	int rc;
1315	sqlite3_int64 iMtime;
1316	struct fossilStat testFileStat;
1317	memset(zBuf, 0, sizeof(zBuf));
1318	blob_zero(&x);
1319	file_canonical_name(zPath, &x, slash);
1320	zFull = blob_str(&x);
1321	fossil_print("[%s] -> [%s]\n", zPath, zFull);
1322	memset(&testFileStat, 0, sizeof(struct fossilStat));
1323	rc = fossil_stat(zPath, &testFileStat, 0);
1324	fossil_print(" stat_rc = %d\n", rc);
1325	sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", testFileStat.st_size);
1326

M src/main.c

		--- src/main.c
		+++ src/main.c
		@@ -1217,10 +1217,11 @@
1217	1217	blob_append(pOut, "FOSSIL_ENABLE_TCL_PRIVATE_STUBS\n", -1);
1218	1218	#endif
1219	1219	#if defined(FOSSIL_ENABLE_JSON)
1220	1220	blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
1221	1221	#endif
	1222	+ blob_append(pOut, "MARKDOWN\n", -1);
1222	1223	#if defined(BROKEN_MINGW_CMDLINE)
1223	1224	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
1224	1225	#else
1225	1226	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
1226	1227	#endif
1227	1228

	--- src/main.c
	+++ src/main.c
	@@ -1217,10 +1217,11 @@
1217	blob_append(pOut, "FOSSIL_ENABLE_TCL_PRIVATE_STUBS\n", -1);
1218	#endif
1219	#if defined(FOSSIL_ENABLE_JSON)
1220	blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
1221	#endif

1222	#if defined(BROKEN_MINGW_CMDLINE)
1223	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
1224	#else
1225	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
1226	#endif
1227

	--- src/main.c
	+++ src/main.c
	@@ -1217,10 +1217,11 @@
1217	blob_append(pOut, "FOSSIL_ENABLE_TCL_PRIVATE_STUBS\n", -1);
1218	#endif
1219	#if defined(FOSSIL_ENABLE_JSON)
1220	blob_appendf(pOut, "JSON (API %s)\n", FOSSIL_JSON_API_VERSION);
1221	#endif
1222	blob_append(pOut, "MARKDOWN\n", -1);
1223	#if defined(BROKEN_MINGW_CMDLINE)
1224	blob_append(pOut, "MBCS_COMMAND_LINE\n", -1);
1225	#else
1226	blob_append(pOut, "UNICODE_COMMAND_LINE\n", -1);
1227	#endif
1228

M src/merge3.c

+1 -1

		--- src/merge3.c
		+++ src/merge3.c
		@@ -195,10 +195,11 @@
195	195	int aC2; / Changes from pPivot to pV2 */
196	196	int i1, i2; /* Index into aC1[] and aC2[] */
197	197	int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */
198	198	int limit1, limit2; /* Sizes of aC1[] and aC2[] */
199	199	int nConflict = 0; /* Number of merge conflicts seen so far */
	200	+ int useCrLf = 0;
200	201
201	202	blob_zero(pOut); /* Merge results stored in pOut */
202	203
203	204	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
204	205	** keep it in the output. This should be secure enough not to cause
		@@ -211,11 +212,10 @@
211	212
212	213	/* Check once to see if both pV1 and pV2 contains CR/LF endings.
213	214	** If true, CR/LF pair will be used later to append the
214	215	** boundary markers for merge conflicts.
215	216	*/
216		- int useCrLf = 0;
217	217	if( contains_crlf(pV1) && contains_crlf(pV2) ){
218	218	useCrLf = 1;
219	219	}
220	220
221	221	/* Compute the edits that occur from pPivot => pV1 (into aC1)
222	222

	--- src/merge3.c
	+++ src/merge3.c
	@@ -195,10 +195,11 @@
195	int aC2; / Changes from pPivot to pV2 */
196	int i1, i2; /* Index into aC1[] and aC2[] */
197	int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */
198	int limit1, limit2; /* Sizes of aC1[] and aC2[] */
199	int nConflict = 0; /* Number of merge conflicts seen so far */

200
201	blob_zero(pOut); /* Merge results stored in pOut */
202
203	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
204	** keep it in the output. This should be secure enough not to cause
	@@ -211,11 +212,10 @@
211
212	/* Check once to see if both pV1 and pV2 contains CR/LF endings.
213	** If true, CR/LF pair will be used later to append the
214	** boundary markers for merge conflicts.
215	*/
216	int useCrLf = 0;
217	if( contains_crlf(pV1) && contains_crlf(pV2) ){
218	useCrLf = 1;
219	}
220
221	/* Compute the edits that occur from pPivot => pV1 (into aC1)
222

	--- src/merge3.c
	+++ src/merge3.c
	@@ -195,10 +195,11 @@
195	int aC2; / Changes from pPivot to pV2 */
196	int i1, i2; /* Index into aC1[] and aC2[] */
197	int nCpy, nDel, nIns; /* Number of lines to copy, delete, or insert */
198	int limit1, limit2; /* Sizes of aC1[] and aC2[] */
199	int nConflict = 0; /* Number of merge conflicts seen so far */
200	int useCrLf = 0;
201
202	blob_zero(pOut); /* Merge results stored in pOut */
203
204	/* If both pV1 and pV2 start with a UTF-8 byte-order-mark (BOM),
205	** keep it in the output. This should be secure enough not to cause
	@@ -211,11 +212,10 @@
212
213	/* Check once to see if both pV1 and pV2 contains CR/LF endings.
214	** If true, CR/LF pair will be used later to append the
215	** boundary markers for merge conflicts.
216	*/

217	if( contains_crlf(pV1) && contains_crlf(pV2) ){
218	useCrLf = 1;
219	}
220
221	/* Compute the edits that occur from pPivot => pV1 (into aC1)
222

M src/printf.c

+1 -1

		--- src/printf.c
		+++ src/printf.c
		@@ -1149,15 +1149,15 @@
1149	1149	abort();
1150	1150	exit(rc);
1151	1151	}
1152	1152	NORETURN void fossil_fatal(const char *zFormat, ...){
1153	1153	static int once = 0;
	1154	+ va_list ap;
1154	1155	char *z;
1155	1156	int rc = 1;
1156	1157	if( once ) exit(1);
1157	1158	once = 1;
1158		- va_list ap;
1159	1159	mainInFatalError = 1;
1160	1160	va_start(ap, zFormat);
1161	1161	z = vmprintf(zFormat, ap);
1162	1162	va_end(ap);
1163	1163	rc = fossil_print_error(rc, z);
1164	1164

	--- src/printf.c
	+++ src/printf.c
	@@ -1149,15 +1149,15 @@
1149	abort();
1150	exit(rc);
1151	}
1152	NORETURN void fossil_fatal(const char *zFormat, ...){
1153	static int once = 0;

1154	char *z;
1155	int rc = 1;
1156	if( once ) exit(1);
1157	once = 1;
1158	va_list ap;
1159	mainInFatalError = 1;
1160	va_start(ap, zFormat);
1161	z = vmprintf(zFormat, ap);
1162	va_end(ap);
1163	rc = fossil_print_error(rc, z);
1164

	--- src/printf.c
	+++ src/printf.c
	@@ -1149,15 +1149,15 @@
1149	abort();
1150	exit(rc);
1151	}
1152	NORETURN void fossil_fatal(const char *zFormat, ...){
1153	static int once = 0;
1154	va_list ap;
1155	char *z;
1156	int rc = 1;
1157	if( once ) exit(1);
1158	once = 1;

1159	mainInFatalError = 1;
1160	va_start(ap, zFormat);
1161	z = vmprintf(zFormat, ap);
1162	va_end(ap);
1163	rc = fossil_print_error(rc, z);
1164

M src/timeline.c

+1 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -2075,11 +2075,11 @@
2075	2075	addFileGlobDescription(zChng, &desc);
2076	2076	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2077	2077	/* If p= or d= is present, ignore all other parameters other than n= */
2078	2078	char *zUuid;
2079	2079	const char *zCiName;
2080		- int np, nd;
	2080	+ int np = 0, nd;
2081	2081	const char *zBackTo = 0;
2082	2082	int ridBackTo = 0;
2083	2083
2084	2084	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2085	2085	if( p_rid && d_rid ){
2086	2086

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2075,11 +2075,11 @@
2075	addFileGlobDescription(zChng, &desc);
2076	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2077	/* If p= or d= is present, ignore all other parameters other than n= */
2078	char *zUuid;
2079	const char *zCiName;
2080	int np, nd;
2081	const char *zBackTo = 0;
2082	int ridBackTo = 0;
2083
2084	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2085	if( p_rid && d_rid ){
2086

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2075,11 +2075,11 @@
2075	addFileGlobDescription(zChng, &desc);
2076	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2077	/* If p= or d= is present, ignore all other parameters other than n= */
2078	char *zUuid;
2079	const char *zCiName;
2080	int np = 0, nd;
2081	const char *zBackTo = 0;
2082	int ridBackTo = 0;
2083
2084	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2085	if( p_rid && d_rid ){
2086

M win/Makefile.mingw.mistachkin

+39

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -485,10 +485,11 @@
485	485	$(SRCDIR)/http_socket.c \
486	486	$(SRCDIR)/http_ssl.c \
487	487	$(SRCDIR)/http_transport.c \
488	488	$(SRCDIR)/import.c \
489	489	$(SRCDIR)/info.c \
	490	+ $(SRCDIR)/interwiki.c \
490	491	$(SRCDIR)/json.c \
491	492	$(SRCDIR)/json_artifact.c \
492	493	$(SRCDIR)/json_branch.c \
493	494	$(SRCDIR)/json_config.c \
494	495	$(SRCDIR)/json_diff.c \
		@@ -515,10 +516,12 @@
515	516	$(SRCDIR)/merge3.c \
516	517	$(SRCDIR)/moderate.c \
517	518	$(SRCDIR)/name.c \
518	519	$(SRCDIR)/path.c \
519	520	$(SRCDIR)/piechart.c \
	521	+ $(SRCDIR)/pikchr.c \
	522	+ $(SRCDIR)/pikchrshow.c \
520	523	$(SRCDIR)/pivot.c \
521	524	$(SRCDIR)/popen.c \
522	525	$(SRCDIR)/pqueue.c \
523	526	$(SRCDIR)/printf.c \
524	527	$(SRCDIR)/publish.c \
		@@ -641,14 +644,17 @@
641	644	$(SRCDIR)/fossil.dom.js \
642	645	$(SRCDIR)/fossil.fetch.js \
643	646	$(SRCDIR)/fossil.numbered-lines.js \
644	647	$(SRCDIR)/fossil.page.fileedit.js \
645	648	$(SRCDIR)/fossil.page.forumpost.js \
	649	+ $(SRCDIR)/fossil.page.pikchrshow.js \
646	650	$(SRCDIR)/fossil.page.wikiedit.js \
	651	+ $(SRCDIR)/fossil.pikchr.js \
647	652	$(SRCDIR)/fossil.popupwidget.js \
648	653	$(SRCDIR)/fossil.storage.js \
649	654	$(SRCDIR)/fossil.tabs.js \
	655	+ $(SRCDIR)/fossil.wikiedit-wysiwyg.js \
650	656	$(SRCDIR)/graph.js \
651	657	$(SRCDIR)/href.js \
652	658	$(SRCDIR)/login.js \
653	659	$(SRCDIR)/markdown.md \
654	660	$(SRCDIR)/menu.js \
		@@ -737,10 +743,11 @@
737	743	$(OBJDIR)/http_socket_.c \
738	744	$(OBJDIR)/http_ssl_.c \
739	745	$(OBJDIR)/http_transport_.c \
740	746	$(OBJDIR)/import_.c \
741	747	$(OBJDIR)/info_.c \
	748	+ $(OBJDIR)/interwiki_.c \
742	749	$(OBJDIR)/json_.c \
743	750	$(OBJDIR)/json_artifact_.c \
744	751	$(OBJDIR)/json_branch_.c \
745	752	$(OBJDIR)/json_config_.c \
746	753	$(OBJDIR)/json_diff_.c \
		@@ -767,10 +774,12 @@
767	774	$(OBJDIR)/merge3_.c \
768	775	$(OBJDIR)/moderate_.c \
769	776	$(OBJDIR)/name_.c \
770	777	$(OBJDIR)/path_.c \
771	778	$(OBJDIR)/piechart_.c \
	779	+ $(OBJDIR)/pikchr_.c \
	780	+ $(OBJDIR)/pikchrshow_.c \
772	781	$(OBJDIR)/pivot_.c \
773	782	$(OBJDIR)/popen_.c \
774	783	$(OBJDIR)/pqueue_.c \
775	784	$(OBJDIR)/printf_.c \
776	785	$(OBJDIR)/publish_.c \
		@@ -882,10 +891,11 @@
882	891	$(OBJDIR)/http_socket.o \
883	892	$(OBJDIR)/http_ssl.o \
884	893	$(OBJDIR)/http_transport.o \
885	894	$(OBJDIR)/import.o \
886	895	$(OBJDIR)/info.o \
	896	+ $(OBJDIR)/interwiki.o \
887	897	$(OBJDIR)/json.o \
888	898	$(OBJDIR)/json_artifact.o \
889	899	$(OBJDIR)/json_branch.o \
890	900	$(OBJDIR)/json_config.o \
891	901	$(OBJDIR)/json_diff.o \
		@@ -912,10 +922,12 @@
912	922	$(OBJDIR)/merge3.o \
913	923	$(OBJDIR)/moderate.o \
914	924	$(OBJDIR)/name.o \
915	925	$(OBJDIR)/path.o \
916	926	$(OBJDIR)/piechart.o \
	927	+ $(OBJDIR)/pikchr.o \
	928	+ $(OBJDIR)/pikchrshow.o \
917	929	$(OBJDIR)/pivot.o \
918	930	$(OBJDIR)/popen.o \
919	931	$(OBJDIR)/pqueue.o \
920	932	$(OBJDIR)/printf.o \
921	933	$(OBJDIR)/publish.o \
		@@ -1242,10 +1254,11 @@
1242	1254	$(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1243	1255	$(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1244	1256	$(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1245	1257	$(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1246	1258	$(OBJDIR)/info_.c:$(OBJDIR)/info.h \
	1259	+ $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1247	1260	$(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1248	1261	$(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1249	1262	$(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1250	1263	$(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1251	1264	$(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
		@@ -1272,10 +1285,12 @@
1272	1285	$(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1273	1286	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1274	1287	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1275	1288	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1276	1289	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
	1290	+ $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
	1291	+ $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1277	1292	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1278	1293	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1279	1294	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1280	1295	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1281	1296	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
		@@ -1806,10 +1821,18 @@
1806	1821
1807	1822	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1808	1823	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1809	1824
1810	1825	$(OBJDIR)/info.h: $(OBJDIR)/headers
	1826	+
	1827	+$(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(TRANSLATE)
	1828	+ $(TRANSLATE) $(SRCDIR)/interwiki.c >$@
	1829	+
	1830	+$(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
	1831	+ $(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
	1832	+
	1833	+$(OBJDIR)/interwiki.h: $(OBJDIR)/headers
1811	1834
1812	1835	$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
1813	1836	$(TRANSLATE) $(SRCDIR)/json.c >$@
1814	1837
1815	1838	$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
		@@ -2046,10 +2069,26 @@
2046	2069
2047	2070	$(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
2048	2071	$(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
2049	2072
2050	2073	$(OBJDIR)/piechart.h: $(OBJDIR)/headers
	2074	+
	2075	+$(OBJDIR)/pikchr_.c: $(SRCDIR)/pikchr.c $(TRANSLATE)
	2076	+ $(TRANSLATE) $(SRCDIR)/pikchr.c >$@
	2077	+
	2078	+$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
	2079	+ $(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
	2080	+
	2081	+$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
	2082	+
	2083	+$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
	2084	+ $(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
	2085	+
	2086	+$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
	2087	+ $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
	2088	+
	2089	+$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
2051	2090
2052	2091	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2053	2092	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2054	2093
2055	2094	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2056	2095

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -485,10 +485,11 @@
485	$(SRCDIR)/http_socket.c \
486	$(SRCDIR)/http_ssl.c \
487	$(SRCDIR)/http_transport.c \
488	$(SRCDIR)/import.c \
489	$(SRCDIR)/info.c \

490	$(SRCDIR)/json.c \
491	$(SRCDIR)/json_artifact.c \
492	$(SRCDIR)/json_branch.c \
493	$(SRCDIR)/json_config.c \
494	$(SRCDIR)/json_diff.c \
	@@ -515,10 +516,12 @@
515	$(SRCDIR)/merge3.c \
516	$(SRCDIR)/moderate.c \
517	$(SRCDIR)/name.c \
518	$(SRCDIR)/path.c \
519	$(SRCDIR)/piechart.c \


520	$(SRCDIR)/pivot.c \
521	$(SRCDIR)/popen.c \
522	$(SRCDIR)/pqueue.c \
523	$(SRCDIR)/printf.c \
524	$(SRCDIR)/publish.c \
	@@ -641,14 +644,17 @@
641	$(SRCDIR)/fossil.dom.js \
642	$(SRCDIR)/fossil.fetch.js \
643	$(SRCDIR)/fossil.numbered-lines.js \
644	$(SRCDIR)/fossil.page.fileedit.js \
645	$(SRCDIR)/fossil.page.forumpost.js \

646	$(SRCDIR)/fossil.page.wikiedit.js \

647	$(SRCDIR)/fossil.popupwidget.js \
648	$(SRCDIR)/fossil.storage.js \
649	$(SRCDIR)/fossil.tabs.js \

650	$(SRCDIR)/graph.js \
651	$(SRCDIR)/href.js \
652	$(SRCDIR)/login.js \
653	$(SRCDIR)/markdown.md \
654	$(SRCDIR)/menu.js \
	@@ -737,10 +743,11 @@
737	$(OBJDIR)/http_socket_.c \
738	$(OBJDIR)/http_ssl_.c \
739	$(OBJDIR)/http_transport_.c \
740	$(OBJDIR)/import_.c \
741	$(OBJDIR)/info_.c \

742	$(OBJDIR)/json_.c \
743	$(OBJDIR)/json_artifact_.c \
744	$(OBJDIR)/json_branch_.c \
745	$(OBJDIR)/json_config_.c \
746	$(OBJDIR)/json_diff_.c \
	@@ -767,10 +774,12 @@
767	$(OBJDIR)/merge3_.c \
768	$(OBJDIR)/moderate_.c \
769	$(OBJDIR)/name_.c \
770	$(OBJDIR)/path_.c \
771	$(OBJDIR)/piechart_.c \


772	$(OBJDIR)/pivot_.c \
773	$(OBJDIR)/popen_.c \
774	$(OBJDIR)/pqueue_.c \
775	$(OBJDIR)/printf_.c \
776	$(OBJDIR)/publish_.c \
	@@ -882,10 +891,11 @@
882	$(OBJDIR)/http_socket.o \
883	$(OBJDIR)/http_ssl.o \
884	$(OBJDIR)/http_transport.o \
885	$(OBJDIR)/import.o \
886	$(OBJDIR)/info.o \

887	$(OBJDIR)/json.o \
888	$(OBJDIR)/json_artifact.o \
889	$(OBJDIR)/json_branch.o \
890	$(OBJDIR)/json_config.o \
891	$(OBJDIR)/json_diff.o \
	@@ -912,10 +922,12 @@
912	$(OBJDIR)/merge3.o \
913	$(OBJDIR)/moderate.o \
914	$(OBJDIR)/name.o \
915	$(OBJDIR)/path.o \
916	$(OBJDIR)/piechart.o \


917	$(OBJDIR)/pivot.o \
918	$(OBJDIR)/popen.o \
919	$(OBJDIR)/pqueue.o \
920	$(OBJDIR)/printf.o \
921	$(OBJDIR)/publish.o \
	@@ -1242,10 +1254,11 @@
1242	$(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1243	$(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1244	$(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1245	$(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1246	$(OBJDIR)/info_.c:$(OBJDIR)/info.h \

1247	$(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1248	$(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1249	$(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1250	$(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1251	$(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
	@@ -1272,10 +1285,12 @@
1272	$(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1273	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1274	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1275	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1276	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \


1277	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1278	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1279	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1280	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1281	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -1806,10 +1821,18 @@
1806
1807	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1808	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1809
1810	$(OBJDIR)/info.h: $(OBJDIR)/headers








1811
1812	$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
1813	$(TRANSLATE) $(SRCDIR)/json.c >$@
1814
1815	$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
	@@ -2046,10 +2069,26 @@
2046
2047	$(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
2048	$(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
2049
2050	$(OBJDIR)/piechart.h: $(OBJDIR)/headers
















2051
2052	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2053	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2054
2055	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2056

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -485,10 +485,11 @@
485	$(SRCDIR)/http_socket.c \
486	$(SRCDIR)/http_ssl.c \
487	$(SRCDIR)/http_transport.c \
488	$(SRCDIR)/import.c \
489	$(SRCDIR)/info.c \
490	$(SRCDIR)/interwiki.c \
491	$(SRCDIR)/json.c \
492	$(SRCDIR)/json_artifact.c \
493	$(SRCDIR)/json_branch.c \
494	$(SRCDIR)/json_config.c \
495	$(SRCDIR)/json_diff.c \
	@@ -515,10 +516,12 @@
516	$(SRCDIR)/merge3.c \
517	$(SRCDIR)/moderate.c \
518	$(SRCDIR)/name.c \
519	$(SRCDIR)/path.c \
520	$(SRCDIR)/piechart.c \
521	$(SRCDIR)/pikchr.c \
522	$(SRCDIR)/pikchrshow.c \
523	$(SRCDIR)/pivot.c \
524	$(SRCDIR)/popen.c \
525	$(SRCDIR)/pqueue.c \
526	$(SRCDIR)/printf.c \
527	$(SRCDIR)/publish.c \
	@@ -641,14 +644,17 @@
644	$(SRCDIR)/fossil.dom.js \
645	$(SRCDIR)/fossil.fetch.js \
646	$(SRCDIR)/fossil.numbered-lines.js \
647	$(SRCDIR)/fossil.page.fileedit.js \
648	$(SRCDIR)/fossil.page.forumpost.js \
649	$(SRCDIR)/fossil.page.pikchrshow.js \
650	$(SRCDIR)/fossil.page.wikiedit.js \
651	$(SRCDIR)/fossil.pikchr.js \
652	$(SRCDIR)/fossil.popupwidget.js \
653	$(SRCDIR)/fossil.storage.js \
654	$(SRCDIR)/fossil.tabs.js \
655	$(SRCDIR)/fossil.wikiedit-wysiwyg.js \
656	$(SRCDIR)/graph.js \
657	$(SRCDIR)/href.js \
658	$(SRCDIR)/login.js \
659	$(SRCDIR)/markdown.md \
660	$(SRCDIR)/menu.js \
	@@ -737,10 +743,11 @@
743	$(OBJDIR)/http_socket_.c \
744	$(OBJDIR)/http_ssl_.c \
745	$(OBJDIR)/http_transport_.c \
746	$(OBJDIR)/import_.c \
747	$(OBJDIR)/info_.c \
748	$(OBJDIR)/interwiki_.c \
749	$(OBJDIR)/json_.c \
750	$(OBJDIR)/json_artifact_.c \
751	$(OBJDIR)/json_branch_.c \
752	$(OBJDIR)/json_config_.c \
753	$(OBJDIR)/json_diff_.c \
	@@ -767,10 +774,12 @@
774	$(OBJDIR)/merge3_.c \
775	$(OBJDIR)/moderate_.c \
776	$(OBJDIR)/name_.c \
777	$(OBJDIR)/path_.c \
778	$(OBJDIR)/piechart_.c \
779	$(OBJDIR)/pikchr_.c \
780	$(OBJDIR)/pikchrshow_.c \
781	$(OBJDIR)/pivot_.c \
782	$(OBJDIR)/popen_.c \
783	$(OBJDIR)/pqueue_.c \
784	$(OBJDIR)/printf_.c \
785	$(OBJDIR)/publish_.c \
	@@ -882,10 +891,11 @@
891	$(OBJDIR)/http_socket.o \
892	$(OBJDIR)/http_ssl.o \
893	$(OBJDIR)/http_transport.o \
894	$(OBJDIR)/import.o \
895	$(OBJDIR)/info.o \
896	$(OBJDIR)/interwiki.o \
897	$(OBJDIR)/json.o \
898	$(OBJDIR)/json_artifact.o \
899	$(OBJDIR)/json_branch.o \
900	$(OBJDIR)/json_config.o \
901	$(OBJDIR)/json_diff.o \
	@@ -912,10 +922,12 @@
922	$(OBJDIR)/merge3.o \
923	$(OBJDIR)/moderate.o \
924	$(OBJDIR)/name.o \
925	$(OBJDIR)/path.o \
926	$(OBJDIR)/piechart.o \
927	$(OBJDIR)/pikchr.o \
928	$(OBJDIR)/pikchrshow.o \
929	$(OBJDIR)/pivot.o \
930	$(OBJDIR)/popen.o \
931	$(OBJDIR)/pqueue.o \
932	$(OBJDIR)/printf.o \
933	$(OBJDIR)/publish.o \
	@@ -1242,10 +1254,11 @@
1254	$(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1255	$(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1256	$(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1257	$(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1258	$(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1259	$(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1260	$(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1261	$(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1262	$(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1263	$(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1264	$(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
	@@ -1272,10 +1285,12 @@
1285	$(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1286	$(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1287	$(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1288	$(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1289	$(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1290	$(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1291	$(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1292	$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1293	$(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1294	$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1295	$(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1296	$(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
	@@ -1806,10 +1821,18 @@
1821
1822	$(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
1823	$(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
1824
1825	$(OBJDIR)/info.h: $(OBJDIR)/headers
1826
1827	$(OBJDIR)/interwiki_.c: $(SRCDIR)/interwiki.c $(TRANSLATE)
1828	$(TRANSLATE) $(SRCDIR)/interwiki.c >$@
1829
1830	$(OBJDIR)/interwiki.o: $(OBJDIR)/interwiki_.c $(OBJDIR)/interwiki.h $(SRCDIR)/config.h
1831	$(XTCC) -o $(OBJDIR)/interwiki.o -c $(OBJDIR)/interwiki_.c
1832
1833	$(OBJDIR)/interwiki.h: $(OBJDIR)/headers
1834
1835	$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(TRANSLATE)
1836	$(TRANSLATE) $(SRCDIR)/json.c >$@
1837
1838	$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
	@@ -2046,10 +2069,26 @@
2069
2070	$(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
2071	$(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
2072
2073	$(OBJDIR)/piechart.h: $(OBJDIR)/headers
2074
2075	$(OBJDIR)/pikchr_.c: $(SRCDIR)/pikchr.c $(TRANSLATE)
2076	$(TRANSLATE) $(SRCDIR)/pikchr.c >$@
2077
2078	$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2079	$(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2080
2081	$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
2082
2083	$(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
2084	$(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
2085
2086	$(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
2087	$(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
2088
2089	$(OBJDIR)/pikchrshow.h: $(OBJDIR)/headers
2090
2091	$(OBJDIR)/pivot_.c: $(SRCDIR)/pivot.c $(TRANSLATE)
2092	$(TRANSLATE) $(SRCDIR)/pivot.c >$@
2093
2094	$(OBJDIR)/pivot.o: $(OBJDIR)/pivot_.c $(OBJDIR)/pivot.h $(SRCDIR)/config.h
2095

Fossil SCM

Keyboard Shortcuts