6d0d1f71673… — Fossil SCM

M src/configure.c

+1 -1

		--- src/configure.c
		+++ src/configure.c
		@@ -338,11 +338,11 @@
338	338	** OLD FORMAT:
339	339	**
340	340	** The old format is retained for backwards compatibility, but is deprecated.
341	341	** The cutover from old format to new was on 2011-04-25. After sufficient
342	342	** time has passed, support for the old format will be removed.
343		-** Update: Support for the old format was remoed on 2017-09-20.
	343	+** Update: Support for the old format was removed on 2017-09-20.
344	344	**
345	345	** zName is either the NAME of an element of the CONFIG table, or else
346	346	** one of the special names "@shun", "@reportfmt", "@user", or "@concealed".
347	347	** If zName is a CONFIG table name, then CONTENT replaces (overwrites) the
348	348	** element in the CONFIG table. For one of the @-labels, CONTENT is raw
349	349

	--- src/configure.c
	+++ src/configure.c
	@@ -338,11 +338,11 @@
338	** OLD FORMAT:
339	**
340	** The old format is retained for backwards compatibility, but is deprecated.
341	** The cutover from old format to new was on 2011-04-25. After sufficient
342	** time has passed, support for the old format will be removed.
343	** Update: Support for the old format was remoed on 2017-09-20.
344	**
345	** zName is either the NAME of an element of the CONFIG table, or else
346	** one of the special names "@shun", "@reportfmt", "@user", or "@concealed".
347	** If zName is a CONFIG table name, then CONTENT replaces (overwrites) the
348	** element in the CONFIG table. For one of the @-labels, CONTENT is raw
349

	--- src/configure.c
	+++ src/configure.c
	@@ -338,11 +338,11 @@
338	** OLD FORMAT:
339	**
340	** The old format is retained for backwards compatibility, but is deprecated.
341	** The cutover from old format to new was on 2011-04-25. After sufficient
342	** time has passed, support for the old format will be removed.
343	** Update: Support for the old format was removed on 2017-09-20.
344	**
345	** zName is either the NAME of an element of the CONFIG table, or else
346	** one of the special names "@shun", "@reportfmt", "@user", or "@concealed".
347	** If zName is a CONFIG table name, then CONTENT replaces (overwrites) the
348	** element in the CONFIG table. For one of the @-labels, CONTENT is raw
349

M src/file.c

+3 -3

		--- src/file.c
		+++ src/file.c
		@@ -59,13 +59,13 @@
59	59	**
60	60	** SymFILE is like RepoFILE except that it always uses the target filename of
61	61	** a symbolic link as the content, instead of the content of the object
62	62	** that the symlink points to. SymFILE acts as if allow-symlinks is always ON.
63	63	*/
64		-#define ExtFILE 0 /* Always follow symlinks */
65		-#define RepoFILE 1 /* Follow symlinks iff allow-symlinks is OFF */
66		-#define SymFILE 2 /* Never follow symlinks */
	64	+#define ExtFILE 0 /* Always follow symlinks */
	65	+#define RepoFILE 1 /* Follow symlinks if and only if allow-symlinks is OFF */
	66	+#define SymFILE 2 /* Never follow symlinks */
67	67
68	68	#include <dirent.h>
69	69	#if defined(_WIN32)
70	70	# define DIR _WDIR
71	71	# define dirent _wdirent
72	72

	--- src/file.c
	+++ src/file.c
	@@ -59,13 +59,13 @@
59	**
60	** SymFILE is like RepoFILE except that it always uses the target filename of
61	** a symbolic link as the content, instead of the content of the object
62	** that the symlink points to. SymFILE acts as if allow-symlinks is always ON.
63	*/
64	#define ExtFILE 0 /* Always follow symlinks */
65	#define RepoFILE 1 /* Follow symlinks iff allow-symlinks is OFF */
66	#define SymFILE 2 /* Never follow symlinks */
67
68	#include <dirent.h>
69	#if defined(_WIN32)
70	# define DIR _WDIR
71	# define dirent _wdirent
72

	--- src/file.c
	+++ src/file.c
	@@ -59,13 +59,13 @@
59	**
60	** SymFILE is like RepoFILE except that it always uses the target filename of
61	** a symbolic link as the content, instead of the content of the object
62	** that the symlink points to. SymFILE acts as if allow-symlinks is always ON.
63	*/
64	#define ExtFILE 0 /* Always follow symlinks */
65	#define RepoFILE 1 /* Follow symlinks if and only if allow-symlinks is OFF */
66	#define SymFILE 2 /* Never follow symlinks */
67
68	#include <dirent.h>
69	#if defined(_WIN32)
70	# define DIR _WDIR
71	# define dirent _wdirent
72

M src/skins.c

-5

		--- src/skins.c
		+++ src/skins.c
		@@ -678,14 +678,10 @@
678	678	zTitle = mprintf("%s for Draft%d", aSkinAttr[ii].zTitle, iSkin);
679	679
680	680	zBasis = PD("basis","default");
681	681	zDflt = mprintf("skins/%s/%s.txt", zBasis, aSkinAttr[ii].zFile);
682	682	db_begin_transaction();
683		- if( P("revert")!=0 ){
684		- db_multi_exec("DELETE FROM config WHERE name=%Q", aSkinAttr[ii].zFile);
685		- cgi_replace_parameter(aSkinAttr[ii].zFile, builtin_text(zDflt));
686		- }
687	683	style_header("%s", zTitle);
688	684	for(j=0; j<count(aSkinAttr); j++){
689	685	if( j==ii ) continue;
690	686	style_submenu_element(aSkinAttr[j].zSubmenu,
691	687	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
		@@ -715,11 +711,10 @@
715	711	DIFF_STRIP_EOLCR;
716	712	Blob from, to, out;
717	713	blob_init(&to, zContent, -1);
718	714	blob_init(&from, builtin_text(zDflt), -1);
719	715	blob_zero(&out);
720		- @ <input type="submit" name="revert" value="Revert" /><p>
721	716	if( diffFlags & DIFF_SIDEBYSIDE ){
722	717	text_diff(&from, &to, &out, 0, diffFlags \| DIFF_HTML \| DIFF_NOTTOOBIG);
723	718	@ %s(blob_str(&out))
724	719	}else{
725	720	text_diff(&from, &to, &out, 0,
726	721

	--- src/skins.c
	+++ src/skins.c
	@@ -678,14 +678,10 @@
678	zTitle = mprintf("%s for Draft%d", aSkinAttr[ii].zTitle, iSkin);
679
680	zBasis = PD("basis","default");
681	zDflt = mprintf("skins/%s/%s.txt", zBasis, aSkinAttr[ii].zFile);
682	db_begin_transaction();
683	if( P("revert")!=0 ){
684	db_multi_exec("DELETE FROM config WHERE name=%Q", aSkinAttr[ii].zFile);
685	cgi_replace_parameter(aSkinAttr[ii].zFile, builtin_text(zDflt));
686	}
687	style_header("%s", zTitle);
688	for(j=0; j<count(aSkinAttr); j++){
689	if( j==ii ) continue;
690	style_submenu_element(aSkinAttr[j].zSubmenu,
691	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
	@@ -715,11 +711,10 @@
715	DIFF_STRIP_EOLCR;
716	Blob from, to, out;
717	blob_init(&to, zContent, -1);
718	blob_init(&from, builtin_text(zDflt), -1);
719	blob_zero(&out);
720	@ <input type="submit" name="revert" value="Revert" /><p>
721	if( diffFlags & DIFF_SIDEBYSIDE ){
722	text_diff(&from, &to, &out, 0, diffFlags \| DIFF_HTML \| DIFF_NOTTOOBIG);
723	@ %s(blob_str(&out))
724	}else{
725	text_diff(&from, &to, &out, 0,
726

	--- src/skins.c
	+++ src/skins.c
	@@ -678,14 +678,10 @@
678	zTitle = mprintf("%s for Draft%d", aSkinAttr[ii].zTitle, iSkin);
679
680	zBasis = PD("basis","default");
681	zDflt = mprintf("skins/%s/%s.txt", zBasis, aSkinAttr[ii].zFile);
682	db_begin_transaction();




683	style_header("%s", zTitle);
684	for(j=0; j<count(aSkinAttr); j++){
685	if( j==ii ) continue;
686	style_submenu_element(aSkinAttr[j].zSubmenu,
687	"%R/setup_skinedit?w=%d&basis=%h&sk=%d",j,zBasis,iSkin);
	@@ -715,11 +711,10 @@
711	DIFF_STRIP_EOLCR;
712	Blob from, to, out;
713	blob_init(&to, zContent, -1);
714	blob_init(&from, builtin_text(zDflt), -1);
715	blob_zero(&out);

716	if( diffFlags & DIFF_SIDEBYSIDE ){
717	text_diff(&from, &to, &out, 0, diffFlags \| DIFF_HTML \| DIFF_NOTTOOBIG);
718	@ %s(blob_str(&out))
719	}else{
720	text_diff(&from, &to, &out, 0,
721

Fossil SCM