Fossil SCM

rebase

jan.nijtmans 2013-05-02 13:52 UTC trunk merge

Commit e89269e51b9de9861bb193e1e6c9b3c542648466

Parent e09d84f297f3018…

4 files changed +26 -25 +8 -8 +8 -8 +12 -7

~ src/cgi.c ~ src/event.c ~ src/event.c ~ src/info.c

M src/cgi.c

+26 -25

		--- src/cgi.c
		+++ src/cgi.c
		@@ -258,11 +258,11 @@
258	258	zTok = strtok_r(0, ",\"",&zPos)){}
259	259	fossil_free(zBuf);
260	260	if(zTok) return 1;
261	261	}
262	262	}
263		-
	263	+
264	264	return 0;
265	265	}
266	266	#endif
267	267
268	268	/*
		@@ -465,11 +465,11 @@
465	465	** must be made of zValue.
466	466	*/
467	467	void cgi_setenv(const char zName, const char zValue){
468	468	cgi_set_parameter_nocopy(zName, mprintf("%s",zValue));
469	469	}
470		-
	470	+
471	471
472	472	/*
473	473	** Add a list of query parameters or cookies to the parameter set.
474	474	**
475	475	** Each parameter is of the form NAME=VALUE. Both the NAME and the
		@@ -498,24 +498,25 @@
498	498	while( *z ){
499	499	char *zName;
500	500	char *zValue;
501	501	while( fossil_isspace(*z) ){ z++; }
502	502	zName = z;
503		- while( z && z!='=' && *z!=terminator ){ z++; }
504		- if( *z=='=' ){
505		- *z = 0;
506		- z++;
507		- zValue = z;
508		- while( z && z!=terminator ){ z++; }
509		- if( *z ){
510		- *z = 0;
511		- z++;
512		- }
	503	+ zValue = 0;
	504	+ while( *z ){
	505	+ if( *z==terminator ){
	506	+ *z++ = 0; break;
	507	+ }
	508	+ if( !zValue && (*z=='=') ){
	509	+ *z = 0;
	510	+ zValue = z+1;
	511	+ }
	512	+ z++;
	513	+ }
	514	+ if( zValue ){
513	515	dehttpize(zValue);
514	516	}else{
515		- if( z ){ z++ = 0; }
516		- zValue = "";
	517	+ zValue = zName;
517	518	}
518	519	if( fossil_islower(zName[0]) ){
519	520	cgi_set_parameter_nocopy(zName, zValue);
520	521	}
521	522	#ifdef FOSSIL_ENABLE_JSON
		@@ -582,11 +583,11 @@
582	583	break;
583	584	}
584	585	}
585	586	*pz = &z[i];
586	587	get_line_from_string(pz, pLen);
587		- return z;
	588	+ return z;
588	589	}
589	590
590	591	/*
591	592	** Tokenize a line of text into as many as nArg tokens. Make
592	593	** azArg[] point to the start of each token.
		@@ -689,11 +690,11 @@
689	690	cgi_set_parameter_nocopy(mprintf("%s:mimetype",zName), z);
690	691	}
691	692	}
692	693	}
693	694	}
694		- }
	695	+ }
695	696	}
696	697
697	698
698	699	#ifdef FOSSIL_ENABLE_JSON
699	700	/*
		@@ -833,11 +834,11 @@
833	834	z = (char*)P("HTTP_COOKIE");
834	835	if( z ){
835	836	z = mprintf("%s",z);
836	837	add_param_list(z, ';');
837	838	}
838		-
	839	+
839	840	z = (char*)P("QUERY_STRING");
840	841	if( z ){
841	842	z = mprintf("%s",z);
842	843	add_param_list(z, '&');
843	844	}
		@@ -849,11 +850,11 @@
849	850
850	851	len = atoi(PD("CONTENT_LENGTH", "0"));
851	852	g.zContentType = zType = P("CONTENT_TYPE");
852	853	if( len>0 && zType ){
853	854	blob_zero(&g.cgiIn);
854		- if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
	855	+ if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
855	856	\|\| strncmp(zType,"multipart/form-data",19)==0 ){
856	857	z = fossil_malloc( len+1 );
857	858	len = fread(z, 1, len, g.httpIn);
858	859	z[len] = 0;
859	860	cgi_trace(z);
		@@ -879,11 +880,11 @@
879	880	/* FIXMEs:
880	881
881	882	- See if fossil really needs g.cgiIn to be set for this purpose
882	883	(i don't think it does). If it does then fill g.cgiIn and
883	884	refactor to parse the JSON from there.
884		-
	885	+
885	886	- After parsing POST JSON, copy the "first layer" of keys/values
886	887	to cgi_setenv(), honoring the upper-case distinction used
887	888	in add_param_list(). However...
888	889
889	890	- If we do that then we might get a disconnect in precedence of
		@@ -1196,20 +1197,20 @@
1196	1197	for(i=0; zToken[i] && zToken[i]!='?'; i++){}
1197	1198	if( zToken[i] ) zToken[i++] = 0;
1198	1199	cgi_setenv("PATH_INFO", zToken);
1199	1200	cgi_setenv("QUERY_STRING", &zToken[i]);
1200	1201	if( zIpAddr==0 &&
1201		- getpeername(fileno(g.httpIn), (struct sockaddr*)&remoteName,
	1202	+ getpeername(fileno(g.httpIn), (struct sockaddr*)&remoteName,
1202	1203	&size)>=0
1203	1204	){
1204	1205	zIpAddr = inet_ntoa(remoteName.sin_addr);
1205	1206	}
1206		- if( zIpAddr ){
	1207	+ if( zIpAddr ){
1207	1208	cgi_setenv("REMOTE_ADDR", zIpAddr);
1208	1209	g.zIpAddr = mprintf("%s", zIpAddr);
1209	1210	}
1210		-
	1211	+
1211	1212	/* Get all the optional fields that follow the first line.
1212	1213	*/
1213	1214	while( fgets(zLine,sizeof(zLine),g.httpIn) ){
1214	1215	char *zFieldName;
1215	1216	char *zVal;
		@@ -1249,11 +1250,11 @@
1249	1250	cgi_init();
1250	1251	cgi_trace(0);
1251	1252	}
1252	1253
1253	1254	#if INTERFACE
1254		-/*
	1255	+/*
1255	1256	** Bitmap values for the flags parameter to cgi_http_server().
1256	1257	*/
1257	1258	#define HTTP_SERVER_LOCALHOST 0x0001 /* Bind to 127.0.0.1 only */
1258	1259
1259	1260	#endif /* INTERFACE */
		@@ -1385,11 +1386,11 @@
1385	1386	/* Bury dead children */
1386	1387	while( waitpid(0, 0, WNOHANG)>0 ){
1387	1388	nchildren--;
1388	1389	}
1389	1390	}
1390		- /* NOT REACHED */
	1391	+ /* NOT REACHED */
1391	1392	fossil_exit(1);
1392	1393	#endif
1393	1394	/* NOT REACHED */
1394	1395	return 0;
1395	1396	}
		@@ -1473,11 +1474,11 @@
1473	1474	p->tm_mon %= 12;
1474	1475	}
1475	1476	isLeapYr = p->tm_year%4==0 && (p->tm_year%100!=0 \|\| (p->tm_year+300)%400==0);
1476	1477	p->tm_yday = priorDays[p->tm_mon] + p->tm_mday - 1;
1477	1478	if( isLeapYr && p->tm_mon>1 ) p->tm_yday++;
1478		- nDay = (p->tm_year-70)*365 + (p->tm_year-69)/4 -p->tm_year/100 +
	1479	+ nDay = (p->tm_year-70)*365 + (p->tm_year-69)/4 -p->tm_year/100 +
1479	1480	(p->tm_year+300)/400 + p->tm_yday;
1480	1481	t = ((nDay24 + p->tm_hour)60 + p->tm_min)*60 + p->tm_sec;
1481	1482	return t;
1482	1483	}
1483	1484
1484	1485

	--- src/cgi.c
	+++ src/cgi.c
	@@ -258,11 +258,11 @@
258	zTok = strtok_r(0, ",\"",&zPos)){}
259	fossil_free(zBuf);
260	if(zTok) return 1;
261	}
262	}
263
264	return 0;
265	}
266	#endif
267
268	/*
	@@ -465,11 +465,11 @@
465	** must be made of zValue.
466	*/
467	void cgi_setenv(const char zName, const char zValue){
468	cgi_set_parameter_nocopy(zName, mprintf("%s",zValue));
469	}
470
471
472	/*
473	** Add a list of query parameters or cookies to the parameter set.
474	**
475	** Each parameter is of the form NAME=VALUE. Both the NAME and the
	@@ -498,24 +498,25 @@
498	while( *z ){
499	char *zName;
500	char *zValue;
501	while( fossil_isspace(*z) ){ z++; }
502	zName = z;
503	while( z && z!='=' && *z!=terminator ){ z++; }
504	if( *z=='=' ){
505	*z = 0;
506	z++;
507	zValue = z;
508	while( z && z!=terminator ){ z++; }
509	if( *z ){
510	*z = 0;
511	z++;
512	}


513	dehttpize(zValue);
514	}else{
515	if( z ){ z++ = 0; }
516	zValue = "";
517	}
518	if( fossil_islower(zName[0]) ){
519	cgi_set_parameter_nocopy(zName, zValue);
520	}
521	#ifdef FOSSIL_ENABLE_JSON
	@@ -582,11 +583,11 @@
582	break;
583	}
584	}
585	*pz = &z[i];
586	get_line_from_string(pz, pLen);
587	return z;
588	}
589
590	/*
591	** Tokenize a line of text into as many as nArg tokens. Make
592	** azArg[] point to the start of each token.
	@@ -689,11 +690,11 @@
689	cgi_set_parameter_nocopy(mprintf("%s:mimetype",zName), z);
690	}
691	}
692	}
693	}
694	}
695	}
696
697
698	#ifdef FOSSIL_ENABLE_JSON
699	/*
	@@ -833,11 +834,11 @@
833	z = (char*)P("HTTP_COOKIE");
834	if( z ){
835	z = mprintf("%s",z);
836	add_param_list(z, ';');
837	}
838
839	z = (char*)P("QUERY_STRING");
840	if( z ){
841	z = mprintf("%s",z);
842	add_param_list(z, '&');
843	}
	@@ -849,11 +850,11 @@
849
850	len = atoi(PD("CONTENT_LENGTH", "0"));
851	g.zContentType = zType = P("CONTENT_TYPE");
852	if( len>0 && zType ){
853	blob_zero(&g.cgiIn);
854	if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
855	\|\| strncmp(zType,"multipart/form-data",19)==0 ){
856	z = fossil_malloc( len+1 );
857	len = fread(z, 1, len, g.httpIn);
858	z[len] = 0;
859	cgi_trace(z);
	@@ -879,11 +880,11 @@
879	/* FIXMEs:
880
881	- See if fossil really needs g.cgiIn to be set for this purpose
882	(i don't think it does). If it does then fill g.cgiIn and
883	refactor to parse the JSON from there.
884
885	- After parsing POST JSON, copy the "first layer" of keys/values
886	to cgi_setenv(), honoring the upper-case distinction used
887	in add_param_list(). However...
888
889	- If we do that then we might get a disconnect in precedence of
	@@ -1196,20 +1197,20 @@
1196	for(i=0; zToken[i] && zToken[i]!='?'; i++){}
1197	if( zToken[i] ) zToken[i++] = 0;
1198	cgi_setenv("PATH_INFO", zToken);
1199	cgi_setenv("QUERY_STRING", &zToken[i]);
1200	if( zIpAddr==0 &&
1201	getpeername(fileno(g.httpIn), (struct sockaddr*)&remoteName,
1202	&size)>=0
1203	){
1204	zIpAddr = inet_ntoa(remoteName.sin_addr);
1205	}
1206	if( zIpAddr ){
1207	cgi_setenv("REMOTE_ADDR", zIpAddr);
1208	g.zIpAddr = mprintf("%s", zIpAddr);
1209	}
1210
1211	/* Get all the optional fields that follow the first line.
1212	*/
1213	while( fgets(zLine,sizeof(zLine),g.httpIn) ){
1214	char *zFieldName;
1215	char *zVal;
	@@ -1249,11 +1250,11 @@
1249	cgi_init();
1250	cgi_trace(0);
1251	}
1252
1253	#if INTERFACE
1254	/*
1255	** Bitmap values for the flags parameter to cgi_http_server().
1256	*/
1257	#define HTTP_SERVER_LOCALHOST 0x0001 /* Bind to 127.0.0.1 only */
1258
1259	#endif /* INTERFACE */
	@@ -1385,11 +1386,11 @@
1385	/* Bury dead children */
1386	while( waitpid(0, 0, WNOHANG)>0 ){
1387	nchildren--;
1388	}
1389	}
1390	/* NOT REACHED */
1391	fossil_exit(1);
1392	#endif
1393	/* NOT REACHED */
1394	return 0;
1395	}
	@@ -1473,11 +1474,11 @@
1473	p->tm_mon %= 12;
1474	}
1475	isLeapYr = p->tm_year%4==0 && (p->tm_year%100!=0 \|\| (p->tm_year+300)%400==0);
1476	p->tm_yday = priorDays[p->tm_mon] + p->tm_mday - 1;
1477	if( isLeapYr && p->tm_mon>1 ) p->tm_yday++;
1478	nDay = (p->tm_year-70)*365 + (p->tm_year-69)/4 -p->tm_year/100 +
1479	(p->tm_year+300)/400 + p->tm_yday;
1480	t = ((nDay24 + p->tm_hour)60 + p->tm_min)*60 + p->tm_sec;
1481	return t;
1482	}
1483
1484

	--- src/cgi.c
	+++ src/cgi.c
	@@ -258,11 +258,11 @@
258	zTok = strtok_r(0, ",\"",&zPos)){}
259	fossil_free(zBuf);
260	if(zTok) return 1;
261	}
262	}
263
264	return 0;
265	}
266	#endif
267
268	/*
	@@ -465,11 +465,11 @@
465	** must be made of zValue.
466	*/
467	void cgi_setenv(const char zName, const char zValue){
468	cgi_set_parameter_nocopy(zName, mprintf("%s",zValue));
469	}
470
471
472	/*
473	** Add a list of query parameters or cookies to the parameter set.
474	**
475	** Each parameter is of the form NAME=VALUE. Both the NAME and the
	@@ -498,24 +498,25 @@
498	while( *z ){
499	char *zName;
500	char *zValue;
501	while( fossil_isspace(*z) ){ z++; }
502	zName = z;
503	zValue = 0;
504	while( *z ){
505	if( *z==terminator ){
506	*z++ = 0; break;
507	}
508	if( !zValue && (*z=='=') ){
509	*z = 0;
510	zValue = z+1;
511	}
512	z++;
513	}
514	if( zValue ){
515	dehttpize(zValue);
516	}else{
517	zValue = zName;

518	}
519	if( fossil_islower(zName[0]) ){
520	cgi_set_parameter_nocopy(zName, zValue);
521	}
522	#ifdef FOSSIL_ENABLE_JSON
	@@ -582,11 +583,11 @@
583	break;
584	}
585	}
586	*pz = &z[i];
587	get_line_from_string(pz, pLen);
588	return z;
589	}
590
591	/*
592	** Tokenize a line of text into as many as nArg tokens. Make
593	** azArg[] point to the start of each token.
	@@ -689,11 +690,11 @@
690	cgi_set_parameter_nocopy(mprintf("%s:mimetype",zName), z);
691	}
692	}
693	}
694	}
695	}
696	}
697
698
699	#ifdef FOSSIL_ENABLE_JSON
700	/*
	@@ -833,11 +834,11 @@
834	z = (char*)P("HTTP_COOKIE");
835	if( z ){
836	z = mprintf("%s",z);
837	add_param_list(z, ';');
838	}
839
840	z = (char*)P("QUERY_STRING");
841	if( z ){
842	z = mprintf("%s",z);
843	add_param_list(z, '&');
844	}
	@@ -849,11 +850,11 @@
850
851	len = atoi(PD("CONTENT_LENGTH", "0"));
852	g.zContentType = zType = P("CONTENT_TYPE");
853	if( len>0 && zType ){
854	blob_zero(&g.cgiIn);
855	if( fossil_strcmp(zType,"application/x-www-form-urlencoded")==0
856	\|\| strncmp(zType,"multipart/form-data",19)==0 ){
857	z = fossil_malloc( len+1 );
858	len = fread(z, 1, len, g.httpIn);
859	z[len] = 0;
860	cgi_trace(z);
	@@ -879,11 +880,11 @@
880	/* FIXMEs:
881
882	- See if fossil really needs g.cgiIn to be set for this purpose
883	(i don't think it does). If it does then fill g.cgiIn and
884	refactor to parse the JSON from there.
885
886	- After parsing POST JSON, copy the "first layer" of keys/values
887	to cgi_setenv(), honoring the upper-case distinction used
888	in add_param_list(). However...
889
890	- If we do that then we might get a disconnect in precedence of
	@@ -1196,20 +1197,20 @@
1197	for(i=0; zToken[i] && zToken[i]!='?'; i++){}
1198	if( zToken[i] ) zToken[i++] = 0;
1199	cgi_setenv("PATH_INFO", zToken);
1200	cgi_setenv("QUERY_STRING", &zToken[i]);
1201	if( zIpAddr==0 &&
1202	getpeername(fileno(g.httpIn), (struct sockaddr*)&remoteName,
1203	&size)>=0
1204	){
1205	zIpAddr = inet_ntoa(remoteName.sin_addr);
1206	}
1207	if( zIpAddr ){
1208	cgi_setenv("REMOTE_ADDR", zIpAddr);
1209	g.zIpAddr = mprintf("%s", zIpAddr);
1210	}
1211
1212	/* Get all the optional fields that follow the first line.
1213	*/
1214	while( fgets(zLine,sizeof(zLine),g.httpIn) ){
1215	char *zFieldName;
1216	char *zVal;
	@@ -1249,11 +1250,11 @@
1250	cgi_init();
1251	cgi_trace(0);
1252	}
1253
1254	#if INTERFACE
1255	/*
1256	** Bitmap values for the flags parameter to cgi_http_server().
1257	*/
1258	#define HTTP_SERVER_LOCALHOST 0x0001 /* Bind to 127.0.0.1 only */
1259
1260	#endif /* INTERFACE */
	@@ -1385,11 +1386,11 @@
1386	/* Bury dead children */
1387	while( waitpid(0, 0, WNOHANG)>0 ){
1388	nchildren--;
1389	}
1390	}
1391	/* NOT REACHED */
1392	fossil_exit(1);
1393	#endif
1394	/* NOT REACHED */
1395	return 0;
1396	}
	@@ -1473,11 +1474,11 @@
1474	p->tm_mon %= 12;
1475	}
1476	isLeapYr = p->tm_year%4==0 && (p->tm_year%100!=0 \|\| (p->tm_year+300)%400==0);
1477	p->tm_yday = priorDays[p->tm_mon] + p->tm_mday - 1;
1478	if( isLeapYr && p->tm_mon>1 ) p->tm_yday++;
1479	nDay = (p->tm_year-70)*365 + (p->tm_year-69)/4 -p->tm_year/100 +
1480	(p->tm_year+300)/400 + p->tm_yday;
1481	t = ((nDay24 + p->tm_hour)60 + p->tm_min)*60 + p->tm_sec;
1482	return t;
1483	}
1484
1485

M src/event.c

+8 -8

		--- src/event.c
		+++ src/event.c
		@@ -185,11 +185,11 @@
185	185	blob_init(&comment, pEvent->zComment, -1);
186	186	wiki_convert(&comment, 0, WIKI_INLINE);
187	187	blob_reset(&comment);
188	188	@ </div>
189	189	@ </blockquote><hr />
190		- }
	190	+ }
191	191
192	192	wiki_convert(&tail, 0, 0);
193	193	style_footer();
194	194	manifest_destroy(pEvent);
195	195	}
		@@ -227,11 +227,11 @@
227	227	fossil_redirect_home();
228	228	return;
229	229	}
230	230	}
231	231	zTag = mprintf("event-%s", zEventId);
232		- rid = db_int(0,
	232	+ rid = db_int(0,
233	233	"SELECT rid FROM tagxref"
234	234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	235	" ORDER BY mtime DESC", zTag
236	236	);
237	237	free(zTag);
		@@ -307,11 +307,11 @@
307	307	Stmt q;
308	308	char *zBlob;
309	309
310	310	/* Load the tags string into a blob */
311	311	blob_zero(&tags);
312		- blob_append(&tags, zTags, -1);
	312	+ blob_append(&tags, zTags, -1);
313	313
314	314	/* Collapse all sequences of whitespace and "," characters into
315	315	** a single space character */
316	316	zBlob = blob_str(&tags);
317	317	for(i=j=0; zBlob[i]; i++, j++){
		@@ -336,11 +336,11 @@
336	336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	337	while( db_step(&q)==SQLITE_ROW ){
338	338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	339	}
340	340	db_finalize(&q);
341		- }
	341	+ }
342	342	if( g.zLogin ){
343	343	blob_appendf(&event, "U %F\n", g.zLogin);
344	344	}
345	345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	346	md5sum_blob(&event, &cksum);
		@@ -406,27 +406,27 @@
406	406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	407	@ </td></tr>
408	408
409	409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	410	@ <td valign="top">
411		- @ <textarea name="c" class="eventedit" cols="80"
	411	+ @ <textarea name="c" class="eventedit" cols="80"
412	412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	413	@ </td></tr>
414	414
415	415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	416	@ <td valign="top">
417	417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	418	@ </td></tr>
419		-
	419	+
420	420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	421	@ <td valign="top">
422	422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	423	@ </td></tr>
424		-
	424	+
425	425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	426	@ <td valign="top">
427		- @ <textarea name="w" class="eventedit" cols="80"
	427	+ @ <textarea name="w" class="eventedit" cols="80"
428	428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	429	@ </td></tr>
430	430
431	431	@ <tr><td colspan="2">
432	432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433	433

	--- src/event.c
	+++ src/event.c
	@@ -185,11 +185,11 @@
185	blob_init(&comment, pEvent->zComment, -1);
186	wiki_convert(&comment, 0, WIKI_INLINE);
187	blob_reset(&comment);
188	@ </div>
189	@ </blockquote><hr />
190	}
191
192	wiki_convert(&tail, 0, 0);
193	style_footer();
194	manifest_destroy(pEvent);
195	}
	@@ -227,11 +227,11 @@
227	fossil_redirect_home();
228	return;
229	}
230	}
231	zTag = mprintf("event-%s", zEventId);
232	rid = db_int(0,
233	"SELECT rid FROM tagxref"
234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	" ORDER BY mtime DESC", zTag
236	);
237	free(zTag);
	@@ -307,11 +307,11 @@
307	Stmt q;
308	char *zBlob;
309
310	/* Load the tags string into a blob */
311	blob_zero(&tags);
312	blob_append(&tags, zTags, -1);
313
314	/* Collapse all sequences of whitespace and "," characters into
315	** a single space character */
316	zBlob = blob_str(&tags);
317	for(i=j=0; zBlob[i]; i++, j++){
	@@ -336,11 +336,11 @@
336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	while( db_step(&q)==SQLITE_ROW ){
338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	}
340	db_finalize(&q);
341	}
342	if( g.zLogin ){
343	blob_appendf(&event, "U %F\n", g.zLogin);
344	}
345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	md5sum_blob(&event, &cksum);
	@@ -406,27 +406,27 @@
406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	@ </td></tr>
408
409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	@ <td valign="top">
411	@ <textarea name="c" class="eventedit" cols="80"
412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	@ </td></tr>
414
415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	@ <td valign="top">
417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	@ </td></tr>
419
420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	@ <td valign="top">
422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	@ </td></tr>
424
425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	@ <td valign="top">
427	@ <textarea name="w" class="eventedit" cols="80"
428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	@ </td></tr>
430
431	@ <tr><td colspan="2">
432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433

	--- src/event.c
	+++ src/event.c
	@@ -185,11 +185,11 @@
185	blob_init(&comment, pEvent->zComment, -1);
186	wiki_convert(&comment, 0, WIKI_INLINE);
187	blob_reset(&comment);
188	@ </div>
189	@ </blockquote><hr />
190	}
191
192	wiki_convert(&tail, 0, 0);
193	style_footer();
194	manifest_destroy(pEvent);
195	}
	@@ -227,11 +227,11 @@
227	fossil_redirect_home();
228	return;
229	}
230	}
231	zTag = mprintf("event-%s", zEventId);
232	rid = db_int(0,
233	"SELECT rid FROM tagxref"
234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	" ORDER BY mtime DESC", zTag
236	);
237	free(zTag);
	@@ -307,11 +307,11 @@
307	Stmt q;
308	char *zBlob;
309
310	/* Load the tags string into a blob */
311	blob_zero(&tags);
312	blob_append(&tags, zTags, -1);
313
314	/* Collapse all sequences of whitespace and "," characters into
315	** a single space character */
316	zBlob = blob_str(&tags);
317	for(i=j=0; zBlob[i]; i++, j++){
	@@ -336,11 +336,11 @@
336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	while( db_step(&q)==SQLITE_ROW ){
338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	}
340	db_finalize(&q);
341	}
342	if( g.zLogin ){
343	blob_appendf(&event, "U %F\n", g.zLogin);
344	}
345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	md5sum_blob(&event, &cksum);
	@@ -406,27 +406,27 @@
406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	@ </td></tr>
408
409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	@ <td valign="top">
411	@ <textarea name="c" class="eventedit" cols="80"
412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	@ </td></tr>
414
415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	@ <td valign="top">
417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	@ </td></tr>
419
420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	@ <td valign="top">
422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	@ </td></tr>
424
425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	@ <td valign="top">
427	@ <textarea name="w" class="eventedit" cols="80"
428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	@ </td></tr>
430
431	@ <tr><td colspan="2">
432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433

M src/event.c

+8 -8

		--- src/event.c
		+++ src/event.c
		@@ -185,11 +185,11 @@
185	185	blob_init(&comment, pEvent->zComment, -1);
186	186	wiki_convert(&comment, 0, WIKI_INLINE);
187	187	blob_reset(&comment);
188	188	@ </div>
189	189	@ </blockquote><hr />
190		- }
	190	+ }
191	191
192	192	wiki_convert(&tail, 0, 0);
193	193	style_footer();
194	194	manifest_destroy(pEvent);
195	195	}
		@@ -227,11 +227,11 @@
227	227	fossil_redirect_home();
228	228	return;
229	229	}
230	230	}
231	231	zTag = mprintf("event-%s", zEventId);
232		- rid = db_int(0,
	232	+ rid = db_int(0,
233	233	"SELECT rid FROM tagxref"
234	234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	235	" ORDER BY mtime DESC", zTag
236	236	);
237	237	free(zTag);
		@@ -307,11 +307,11 @@
307	307	Stmt q;
308	308	char *zBlob;
309	309
310	310	/* Load the tags string into a blob */
311	311	blob_zero(&tags);
312		- blob_append(&tags, zTags, -1);
	312	+ blob_append(&tags, zTags, -1);
313	313
314	314	/* Collapse all sequences of whitespace and "," characters into
315	315	** a single space character */
316	316	zBlob = blob_str(&tags);
317	317	for(i=j=0; zBlob[i]; i++, j++){
		@@ -336,11 +336,11 @@
336	336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	337	while( db_step(&q)==SQLITE_ROW ){
338	338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	339	}
340	340	db_finalize(&q);
341		- }
	341	+ }
342	342	if( g.zLogin ){
343	343	blob_appendf(&event, "U %F\n", g.zLogin);
344	344	}
345	345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	346	md5sum_blob(&event, &cksum);
		@@ -406,27 +406,27 @@
406	406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	407	@ </td></tr>
408	408
409	409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	410	@ <td valign="top">
411		- @ <textarea name="c" class="eventedit" cols="80"
	411	+ @ <textarea name="c" class="eventedit" cols="80"
412	412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	413	@ </td></tr>
414	414
415	415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	416	@ <td valign="top">
417	417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	418	@ </td></tr>
419		-
	419	+
420	420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	421	@ <td valign="top">
422	422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	423	@ </td></tr>
424		-
	424	+
425	425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	426	@ <td valign="top">
427		- @ <textarea name="w" class="eventedit" cols="80"
	427	+ @ <textarea name="w" class="eventedit" cols="80"
428	428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	429	@ </td></tr>
430	430
431	431	@ <tr><td colspan="2">
432	432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433	433

	--- src/event.c
	+++ src/event.c
	@@ -185,11 +185,11 @@
185	blob_init(&comment, pEvent->zComment, -1);
186	wiki_convert(&comment, 0, WIKI_INLINE);
187	blob_reset(&comment);
188	@ </div>
189	@ </blockquote><hr />
190	}
191
192	wiki_convert(&tail, 0, 0);
193	style_footer();
194	manifest_destroy(pEvent);
195	}
	@@ -227,11 +227,11 @@
227	fossil_redirect_home();
228	return;
229	}
230	}
231	zTag = mprintf("event-%s", zEventId);
232	rid = db_int(0,
233	"SELECT rid FROM tagxref"
234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	" ORDER BY mtime DESC", zTag
236	);
237	free(zTag);
	@@ -307,11 +307,11 @@
307	Stmt q;
308	char *zBlob;
309
310	/* Load the tags string into a blob */
311	blob_zero(&tags);
312	blob_append(&tags, zTags, -1);
313
314	/* Collapse all sequences of whitespace and "," characters into
315	** a single space character */
316	zBlob = blob_str(&tags);
317	for(i=j=0; zBlob[i]; i++, j++){
	@@ -336,11 +336,11 @@
336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	while( db_step(&q)==SQLITE_ROW ){
338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	}
340	db_finalize(&q);
341	}
342	if( g.zLogin ){
343	blob_appendf(&event, "U %F\n", g.zLogin);
344	}
345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	md5sum_blob(&event, &cksum);
	@@ -406,27 +406,27 @@
406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	@ </td></tr>
408
409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	@ <td valign="top">
411	@ <textarea name="c" class="eventedit" cols="80"
412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	@ </td></tr>
414
415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	@ <td valign="top">
417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	@ </td></tr>
419
420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	@ <td valign="top">
422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	@ </td></tr>
424
425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	@ <td valign="top">
427	@ <textarea name="w" class="eventedit" cols="80"
428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	@ </td></tr>
430
431	@ <tr><td colspan="2">
432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433

	--- src/event.c
	+++ src/event.c
	@@ -185,11 +185,11 @@
185	blob_init(&comment, pEvent->zComment, -1);
186	wiki_convert(&comment, 0, WIKI_INLINE);
187	blob_reset(&comment);
188	@ </div>
189	@ </blockquote><hr />
190	}
191
192	wiki_convert(&tail, 0, 0);
193	style_footer();
194	manifest_destroy(pEvent);
195	}
	@@ -227,11 +227,11 @@
227	fossil_redirect_home();
228	return;
229	}
230	}
231	zTag = mprintf("event-%s", zEventId);
232	rid = db_int(0,
233	"SELECT rid FROM tagxref"
234	" WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q)"
235	" ORDER BY mtime DESC", zTag
236	);
237	free(zTag);
	@@ -307,11 +307,11 @@
307	Stmt q;
308	char *zBlob;
309
310	/* Load the tags string into a blob */
311	blob_zero(&tags);
312	blob_append(&tags, zTags, -1);
313
314	/* Collapse all sequences of whitespace and "," characters into
315	** a single space character */
316	zBlob = blob_str(&tags);
317	for(i=j=0; zBlob[i]; i++, j++){
	@@ -336,11 +336,11 @@
336	db_prepare(&q, "SELECT x FROM newtags ORDER BY x");
337	while( db_step(&q)==SQLITE_ROW ){
338	blob_appendf(&event, "T +sym-%F *\n", db_column_text(&q, 0));
339	}
340	db_finalize(&q);
341	}
342	if( g.zLogin ){
343	blob_appendf(&event, "U %F\n", g.zLogin);
344	}
345	blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody);
346	md5sum_blob(&event, &cksum);
	@@ -406,27 +406,27 @@
406	@ <input type="text" name="t" size="25" value="%h(zETime)" />
407	@ </td></tr>
408
409	@ <tr><td align="right" valign="top"><b>Timeline Comment:</b></td>
410	@ <td valign="top">
411	@ <textarea name="c" class="eventedit" cols="80"
412	@ rows="3" wrap="virtual">%h(zComment)</textarea>
413	@ </td></tr>
414
415	@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
416	@ <td valign="top">
417	render_color_chooser(0, zClr, 0, "clr", "cclr");
418	@ </td></tr>
419
420	@ <tr><td align="right" valign="top"><b>Tags:</b></td>
421	@ <td valign="top">
422	@ <input type="text" name="g" size="40" value="%h(zTags)" />
423	@ </td></tr>
424
425	@ <tr><td align="right" valign="top"><b>Page Content:</b></td>
426	@ <td valign="top">
427	@ <textarea name="w" class="eventedit" cols="80"
428	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
429	@ </td></tr>
430
431	@ <tr><td colspan="2">
432	@ <input type="submit" name="preview" value="Preview Your Changes" />
433

M src/info.c

+12 -7

		--- src/info.c
		+++ src/info.c
		@@ -390,11 +390,11 @@
390	390	@ <pre style="white-space:pre;">
391	391	append_diff(zOld, zNew, diffFlags, pRe);
392	392	@ </pre>
393	393	}else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394	394	@
395		- @ %z(href("%R/fdiff?v1=%S&v2=%S",zOld,zNew))[diff]</a>
	395	+ @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a>
396	396	}
397	397	@ </p>
398	398	}
399	399	}
400	400
		@@ -455,10 +455,11 @@
455	455	u64 diffFlags; /* Flag parameter for text_diff() */
456	456	const char zName; / Name of the checkin to be displayed */
457	457	const char zUuid; / UUID of zName */
458	458	const char zParent; / UUID of the parent checkin (if any) */
459	459	const char zRe; / regex parameter */
	460	+ const char *zSbs;
460	461	ReCompiled pRe = 0; / regex */
461	462
462	463	login_check_credentials();
463	464	if( !g.perm.Read ){ login_needed(); return; }
464	465	zName = P("name");
		@@ -484,11 +485,12 @@
484	485	" FROM blob, event"
485	486	" WHERE blob.rid=%d"
486	487	" AND event.objid=%d",
487	488	rid, rid
488	489	);
489		- sideBySide = !is_false(PD("sbs","1"));
	490	+ zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
	491	+ sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
490	492	if( db_step(&q)==SQLITE_ROW ){
491	493	const char *zUuid = db_column_text(&q, 0);
492	494	char *zTitle = mprintf("Check-in [%.10s]", zUuid);
493	495	char zEUser, zEComment;
494	496	const char *zUser;
		@@ -896,10 +898,11 @@
896	898	const char *zBranch;
897	899	const char *zFrom;
898	900	const char *zTo;
899	901	const char *zRe;
900	902	const char *zVerbose;
	903	+ const char *zSbs;
901	904	ReCompiled *pRe = 0;
902	905
903	906	login_check_credentials();
904	907	if( !g.perm.Read ){ login_needed(); return; }
905	908	login_anonymous_available();
		@@ -913,11 +916,12 @@
913	916	}
914	917	pTo = vdiff_parse_manifest("to", &ridTo);
915	918	if( pTo==0 ) return;
916	919	pFrom = vdiff_parse_manifest("from", &ridFrom);
917	920	if( pFrom==0 ) return;
918		- sideBySide = !is_false(PD("sbs","1"));
	921	+ zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
	922	+ sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
919	923	zVerbose = P("v");
920	924	if( !zVerbose ){
921	925	zVerbose = P("verbose");
922	926	}
923	927	if( !zVerbose ){
		@@ -932,16 +936,16 @@
932	936	"%R/vdiff?from=%T&to=%T&sbs=1",
933	937	zFrom, zTo);
934	938	}
935	939	if( sideBySide \|\| !verboseFlag ) {
936	940	style_submenu_element("Unified Diff", "udiff",
937		- "%R/vdiff?from=%T&to=%T%s&sbs=0&v=1",
	941	+ "%R/vdiff?from=%T&to=%T%s&sbs=0&v",
938	942	zFrom, zTo);
939	943	}
940	944	style_submenu_element("Invert", "invert",
941	945	"%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
942		- sideBySide, (verboseFlag && !sideBySide)?"&v=1":"");
	946	+ sideBySide, (verboseFlag && !sideBySide)?"&v":"");
943	947	style_header("Check-in Differences");
944	948	@ <h2>Difference From:</h2><blockquote>
945	949	checkin_description(ridFrom);
946	950	@ </blockquote><h2>To:</h2><blockquote>
947	951	checkin_description(ridTo);
		@@ -1246,21 +1250,22 @@
1246	1250	int isPatch;
1247	1251	int sideBySide;
1248	1252	Blob c1, c2, diff, *pOut;
1249	1253	char *zV1;
1250	1254	char *zV2;
1251		- const char *zRe;
	1255	+ const char zRe, zSbs;
1252	1256	ReCompiled *pRe = 0;
1253	1257	u64 diffFlags;
1254	1258	const char *zStyle = "sbsdiff";
1255	1259
1256	1260	login_check_credentials();
1257	1261	if( !g.perm.Read ){ login_needed(); return; }
1258	1262	v1 = name_to_rid_www("v1");
1259	1263	v2 = name_to_rid_www("v2");
1260	1264	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
1261		- sideBySide = !is_false(PD("sbs","1"));
	1265	+ zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
	1266	+ sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
1262	1267	zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1263	1268	zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1264	1269	isPatch = P("patch")!=0;
1265	1270	if( isPatch ){
1266	1271	pOut = cgi_output_blob();
1267	1272

	--- src/info.c
	+++ src/info.c
	@@ -390,11 +390,11 @@
390	@ <pre style="white-space:pre;">
391	append_diff(zOld, zNew, diffFlags, pRe);
392	@ </pre>
393	}else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394	@
395	@ %z(href("%R/fdiff?v1=%S&v2=%S",zOld,zNew))[diff]</a>
396	}
397	@ </p>
398	}
399	}
400
	@@ -455,10 +455,11 @@
455	u64 diffFlags; /* Flag parameter for text_diff() */
456	const char zName; / Name of the checkin to be displayed */
457	const char zUuid; / UUID of zName */
458	const char zParent; / UUID of the parent checkin (if any) */
459	const char zRe; / regex parameter */

460	ReCompiled pRe = 0; / regex */
461
462	login_check_credentials();
463	if( !g.perm.Read ){ login_needed(); return; }
464	zName = P("name");
	@@ -484,11 +485,12 @@
484	" FROM blob, event"
485	" WHERE blob.rid=%d"
486	" AND event.objid=%d",
487	rid, rid
488	);
489	sideBySide = !is_false(PD("sbs","1"));

490	if( db_step(&q)==SQLITE_ROW ){
491	const char *zUuid = db_column_text(&q, 0);
492	char *zTitle = mprintf("Check-in [%.10s]", zUuid);
493	char zEUser, zEComment;
494	const char *zUser;
	@@ -896,10 +898,11 @@
896	const char *zBranch;
897	const char *zFrom;
898	const char *zTo;
899	const char *zRe;
900	const char *zVerbose;

901	ReCompiled *pRe = 0;
902
903	login_check_credentials();
904	if( !g.perm.Read ){ login_needed(); return; }
905	login_anonymous_available();
	@@ -913,11 +916,12 @@
913	}
914	pTo = vdiff_parse_manifest("to", &ridTo);
915	if( pTo==0 ) return;
916	pFrom = vdiff_parse_manifest("from", &ridFrom);
917	if( pFrom==0 ) return;
918	sideBySide = !is_false(PD("sbs","1"));

919	zVerbose = P("v");
920	if( !zVerbose ){
921	zVerbose = P("verbose");
922	}
923	if( !zVerbose ){
	@@ -932,16 +936,16 @@
932	"%R/vdiff?from=%T&to=%T&sbs=1",
933	zFrom, zTo);
934	}
935	if( sideBySide \|\| !verboseFlag ) {
936	style_submenu_element("Unified Diff", "udiff",
937	"%R/vdiff?from=%T&to=%T%s&sbs=0&v=1",
938	zFrom, zTo);
939	}
940	style_submenu_element("Invert", "invert",
941	"%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
942	sideBySide, (verboseFlag && !sideBySide)?"&v=1":"");
943	style_header("Check-in Differences");
944	@ <h2>Difference From:</h2><blockquote>
945	checkin_description(ridFrom);
946	@ </blockquote><h2>To:</h2><blockquote>
947	checkin_description(ridTo);
	@@ -1246,21 +1250,22 @@
1246	int isPatch;
1247	int sideBySide;
1248	Blob c1, c2, diff, *pOut;
1249	char *zV1;
1250	char *zV2;
1251	const char *zRe;
1252	ReCompiled *pRe = 0;
1253	u64 diffFlags;
1254	const char *zStyle = "sbsdiff";
1255
1256	login_check_credentials();
1257	if( !g.perm.Read ){ login_needed(); return; }
1258	v1 = name_to_rid_www("v1");
1259	v2 = name_to_rid_www("v2");
1260	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
1261	sideBySide = !is_false(PD("sbs","1"));

1262	zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1263	zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1264	isPatch = P("patch")!=0;
1265	if( isPatch ){
1266	pOut = cgi_output_blob();
1267

	--- src/info.c
	+++ src/info.c
	@@ -390,11 +390,11 @@
390	@ <pre style="white-space:pre;">
391	append_diff(zOld, zNew, diffFlags, pRe);
392	@ </pre>
393	}else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
394	@
395	@ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a>
396	}
397	@ </p>
398	}
399	}
400
	@@ -455,10 +455,11 @@
455	u64 diffFlags; /* Flag parameter for text_diff() */
456	const char zName; / Name of the checkin to be displayed */
457	const char zUuid; / UUID of zName */
458	const char zParent; / UUID of the parent checkin (if any) */
459	const char zRe; / regex parameter */
460	const char *zSbs;
461	ReCompiled pRe = 0; / regex */
462
463	login_check_credentials();
464	if( !g.perm.Read ){ login_needed(); return; }
465	zName = P("name");
	@@ -484,11 +485,12 @@
485	" FROM blob, event"
486	" WHERE blob.rid=%d"
487	" AND event.objid=%d",
488	rid, rid
489	);
490	zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
491	sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
492	if( db_step(&q)==SQLITE_ROW ){
493	const char *zUuid = db_column_text(&q, 0);
494	char *zTitle = mprintf("Check-in [%.10s]", zUuid);
495	char zEUser, zEComment;
496	const char *zUser;
	@@ -896,10 +898,11 @@
898	const char *zBranch;
899	const char *zFrom;
900	const char *zTo;
901	const char *zRe;
902	const char *zVerbose;
903	const char *zSbs;
904	ReCompiled *pRe = 0;
905
906	login_check_credentials();
907	if( !g.perm.Read ){ login_needed(); return; }
908	login_anonymous_available();
	@@ -913,11 +916,12 @@
916	}
917	pTo = vdiff_parse_manifest("to", &ridTo);
918	if( pTo==0 ) return;
919	pFrom = vdiff_parse_manifest("from", &ridFrom);
920	if( pFrom==0 ) return;
921	zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
922	sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
923	zVerbose = P("v");
924	if( !zVerbose ){
925	zVerbose = P("verbose");
926	}
927	if( !zVerbose ){
	@@ -932,16 +936,16 @@
936	"%R/vdiff?from=%T&to=%T&sbs=1",
937	zFrom, zTo);
938	}
939	if( sideBySide \|\| !verboseFlag ) {
940	style_submenu_element("Unified Diff", "udiff",
941	"%R/vdiff?from=%T&to=%T%s&sbs=0&v",
942	zFrom, zTo);
943	}
944	style_submenu_element("Invert", "invert",
945	"%R/vdiff?from=%T&to=%T&sbs=%d%s", zTo, zFrom,
946	sideBySide, (verboseFlag && !sideBySide)?"&v":"");
947	style_header("Check-in Differences");
948	@ <h2>Difference From:</h2><blockquote>
949	checkin_description(ridFrom);
950	@ </blockquote><h2>To:</h2><blockquote>
951	checkin_description(ridTo);
	@@ -1246,21 +1250,22 @@
1250	int isPatch;
1251	int sideBySide;
1252	Blob c1, c2, diff, *pOut;
1253	char *zV1;
1254	char *zV2;
1255	const char zRe, zSbs;
1256	ReCompiled *pRe = 0;
1257	u64 diffFlags;
1258	const char *zStyle = "sbsdiff";
1259
1260	login_check_credentials();
1261	if( !g.perm.Read ){ login_needed(); return; }
1262	v1 = name_to_rid_www("v1");
1263	v2 = name_to_rid_www("v2");
1264	if( v1==0 \|\| v2==0 ) fossil_redirect_home();
1265	zSbs = P("sbs"); /* Note that "sbs=1" is the default value */
1266	sideBySide = (zSbs==0) \|\| ((*zSbs!=0) && !is_false(zSbs));
1267	zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
1268	zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
1269	isPatch = P("patch")!=0;
1270	if( isPatch ){
1271	pOut = cgi_output_blob();
1272

Fossil SCM

Keyboard Shortcuts