Fossil SCM

Integrate andygoth-crlf. This renames CRNL to CRLF throughout Fossil. crnl-glob is renamed to crlf-glob, but crnl-glob is retained as a compatibility alias.

andygoth 2016-11-07 01:10 trunk merge

Commit 87320cf482e9bceb4445624689e8b98ed72c9e86

Parent e9a43ae0ef5ac20…

8 files changed +20 -19 +1 +5 -3 +1 +1 -1 +2 -2 +5 -5 +1

~ src/checkin.c ~ src/configure.c ~ src/db.c ~ src/json_config.c ~ src/printf.c ~ src/report.c ~ www/settings.wiki ~ www/sync.wiki

M src/checkin.c

+20 -19

		--- src/checkin.c
		+++ src/checkin.c
		@@ -1701,16 +1701,16 @@
1701	1701	** Issue a warning and give the user an opportunity to abandon out
1702	1702	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1703	1703	** is seen in a text file.
1704	1704	**
1705	1705	** Return 1 if the user pressed 'c'. In that case, the file will have
1706		-** been converted to UTF-8 (if it was UTF-16) with NL line-endings,
	1706	+** been converted to UTF-8 (if it was UTF-16) with LF line-endings,
1707	1707	** and the original file will have been renamed to "<filename>-original".
1708	1708	*/
1709	1709	static int commit_warning(
1710	1710	Blob pContent, / The content of the file being committed. */
1711		- int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
	1711	+ int crlfOk, /* Non-zero if CR/LF warnings should be disabled. */
1712	1712	int binOk, /* Non-zero if binary warnings should be disabled. */
1713	1713	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1714	1714	int noPrompt, /* 0 to always prompt, 1 for 'N', 2 for 'Y'. */
1715	1715	const char zFilename, / The full name of the file being committed. */
1716	1716	Blob pReason / Reason for warning, if any (non-fatal only). */
		@@ -1761,39 +1761,39 @@
1761	1761	zWarning = "binary data";
1762	1762	zConvert = ""; /* We cannot convert binary files. */
1763	1763	}
1764	1764	zDisable = "\"binary-glob\" setting";
1765	1765	}else if( fUnicode && fHasAnyCr ){
1766		- if( crnlOk && encodingOk ){
1767		- return 0; /* We don't want CR/NL and Unicode warnings for this file. */
	1766	+ if( crlfOk && encodingOk ){
	1767	+ return 0; /* We don't want CR/LF and Unicode warnings for this file. */
1768	1768	}
1769	1769	if( fHasLoneCrOnly ){
1770	1770	zWarning = "CR line endings and Unicode";
1771	1771	}else if( fHasCrLfOnly ){
1772		- zWarning = "CR/NL line endings and Unicode";
	1772	+ zWarning = "CR/LF line endings and Unicode";
1773	1773	}else{
1774	1774	zWarning = "mixed line endings and Unicode";
1775	1775	}
1776		- zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
	1776	+ zDisable = "\"crlf-glob\" and \"encoding-glob\" settings";
1777	1777	}else if( fHasInvalidUtf8 ){
1778	1778	if( encodingOk ){
1779	1779	return 0; /* We don't want encoding warnings for this file. */
1780	1780	}
1781	1781	zWarning = "invalid UTF-8";
1782	1782	zDisable = "\"encoding-glob\" setting";
1783	1783	}else if( fHasAnyCr ){
1784		- if( crnlOk ){
1785		- return 0; /* We don't want CR/NL warnings for this file. */
	1784	+ if( crlfOk ){
	1785	+ return 0; /* We don't want CR/LF warnings for this file. */
1786	1786	}
1787	1787	if( fHasLoneCrOnly ){
1788	1788	zWarning = "CR line endings";
1789	1789	}else if( fHasCrLfOnly ){
1790		- zWarning = "CR/NL line endings";
	1790	+ zWarning = "CR/LF line endings";
1791	1791	}else{
1792	1792	zWarning = "mixed line endings";
1793	1793	}
1794		- zDisable = "\"crnl-glob\" setting";
	1794	+ zDisable = "\"crlf-glob\" setting";
1795	1795	}else{
1796	1796	if( encodingOk ){
1797	1797	return 0; /* We don't want encoding warnings for this file. */
1798	1798	}
1799	1799	zWarning = "Unicode";
		@@ -1880,35 +1880,36 @@
1880	1880	db_must_be_within_tree();
1881	1881	db_prepare(&q,
1882	1882	"SELECT %Q \|\| pathname, pathname, %s, %s, %s FROM vfile"
1883	1883	" WHERE NOT deleted",
1884	1884	g.zLocalRoot,
1885		- glob_expr("pathname", noSettings ? 0 : db_get("crnl-glob","")),
	1885	+ glob_expr("pathname", noSettings ? 0 : db_get("crlf-glob",
	1886	+ db_get("crnl-glob",""))),
1886	1887	glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")),
1887	1888	glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob",""))
1888	1889	);
1889	1890	while( db_step(&q)==SQLITE_ROW ){
1890	1891	const char *zFullname;
1891	1892	const char *zName;
1892	1893	Blob content;
1893	1894	Blob reason;
1894		- int crnlOk, binOk, encodingOk;
	1895	+ int crlfOk, binOk, encodingOk;
1895	1896	int fileRc;
1896	1897
1897	1898	zFullname = db_column_text(&q, 0);
1898	1899	zName = db_column_text(&q, 1);
1899		- crnlOk = db_column_int(&q, 2);
	1900	+ crlfOk = db_column_int(&q, 2);
1900	1901	binOk = db_column_int(&q, 3);
1901	1902	encodingOk = db_column_int(&q, 4);
1902	1903	blob_zero(&content);
1903	1904	if( file_wd_islink(zFullname) ){
1904	1905	blob_read_link(&content, zFullname);
1905	1906	}else{
1906	1907	blob_read_from_file(&content, zFullname);
1907	1908	}
1908	1909	blob_zero(&reason);
1909		- fileRc = commit_warning(&content, crnlOk, binOk, encodingOk, 2,
	1910	+ fileRc = commit_warning(&content, crlfOk, binOk, encodingOk, 2,
1910	1911	zFullname, &reason);
1911	1912	if( fileRc \|\| verboseFlag ){
1912	1913	fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason));
1913	1914	}
1914	1915	blob_reset(&reason);
		@@ -1964,11 +1965,11 @@
1964	1965	** be older than its ancestor unless the --allow-older option appears.
1965	1966	** If any of files in the check-in appear to contain unresolved merge
1966	1967	** conflicts, the check-in will not be allowed unless the
1967	1968	** --allow-conflict option is present. In addition, the entire
1968	1969	** check-in process may be aborted if a file contains content that
1969		-** appears to be binary, Unicode text, or text with CR/NL line endings
	1970	+** appears to be binary, Unicode text, or text with CR/LF line endings
1970	1971	** unless the interactive user chooses to proceed. If there is no
1971	1972	** interactive user or these warnings should be skipped for some other
1972	1973	** reason, the --no-warnings option may be used. A check-in is not
1973	1974	** allowed against a closed leaf.
1974	1975	**
		@@ -2338,24 +2339,24 @@
2338	2339	*/
2339	2340	db_prepare(&q,
2340	2341	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
2341	2342	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
2342	2343	g.zLocalRoot,
2343		- glob_expr("pathname", db_get("crnl-glob","")),
	2344	+ glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))),
2344	2345	glob_expr("pathname", db_get("binary-glob","")),
2345	2346	glob_expr("pathname", db_get("encoding-glob",""))
2346	2347	);
2347	2348	while( db_step(&q)==SQLITE_ROW ){
2348	2349	int id, rid;
2349	2350	const char *zFullname;
2350	2351	Blob content;
2351		- int crnlOk, binOk, encodingOk;
	2352	+ int crlfOk, binOk, encodingOk;
2352	2353
2353	2354	id = db_column_int(&q, 0);
2354	2355	zFullname = db_column_text(&q, 1);
2355	2356	rid = db_column_int(&q, 2);
2356		- crnlOk = db_column_int(&q, 3);
	2357	+ crlfOk = db_column_int(&q, 3);
2357	2358	binOk = db_column_int(&q, 4);
2358	2359	encodingOk = db_column_int(&q, 5);
2359	2360
2360	2361	blob_zero(&content);
2361	2362	if( file_wd_islink(zFullname) ){
		@@ -2364,11 +2365,11 @@
2364	2365	}else{
2365	2366	blob_read_from_file(&content, zFullname);
2366	2367	}
2367	2368	/* Do not emit any warnings when they are disabled. */
2368	2369	if( !noWarningFlag ){
2369		- abortCommit \|= commit_warning(&content, crnlOk, binOk,
	2370	+ abortCommit \|= commit_warning(&content, crlfOk, binOk,
2370	2371	encodingOk, noPrompt,
2371	2372	zFullname, 0);
2372	2373	}
2373	2374	if( contains_merge_marker(&content) ){
2374	2375	Blob fname; /* Relative pathname of the file */
2375	2376

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1701,16 +1701,16 @@
1701	** Issue a warning and give the user an opportunity to abandon out
1702	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1703	** is seen in a text file.
1704	**
1705	** Return 1 if the user pressed 'c'. In that case, the file will have
1706	** been converted to UTF-8 (if it was UTF-16) with NL line-endings,
1707	** and the original file will have been renamed to "<filename>-original".
1708	*/
1709	static int commit_warning(
1710	Blob pContent, / The content of the file being committed. */
1711	int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
1712	int binOk, /* Non-zero if binary warnings should be disabled. */
1713	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1714	int noPrompt, /* 0 to always prompt, 1 for 'N', 2 for 'Y'. */
1715	const char zFilename, / The full name of the file being committed. */
1716	Blob pReason / Reason for warning, if any (non-fatal only). */
	@@ -1761,39 +1761,39 @@
1761	zWarning = "binary data";
1762	zConvert = ""; /* We cannot convert binary files. */
1763	}
1764	zDisable = "\"binary-glob\" setting";
1765	}else if( fUnicode && fHasAnyCr ){
1766	if( crnlOk && encodingOk ){
1767	return 0; /* We don't want CR/NL and Unicode warnings for this file. */
1768	}
1769	if( fHasLoneCrOnly ){
1770	zWarning = "CR line endings and Unicode";
1771	}else if( fHasCrLfOnly ){
1772	zWarning = "CR/NL line endings and Unicode";
1773	}else{
1774	zWarning = "mixed line endings and Unicode";
1775	}
1776	zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
1777	}else if( fHasInvalidUtf8 ){
1778	if( encodingOk ){
1779	return 0; /* We don't want encoding warnings for this file. */
1780	}
1781	zWarning = "invalid UTF-8";
1782	zDisable = "\"encoding-glob\" setting";
1783	}else if( fHasAnyCr ){
1784	if( crnlOk ){
1785	return 0; /* We don't want CR/NL warnings for this file. */
1786	}
1787	if( fHasLoneCrOnly ){
1788	zWarning = "CR line endings";
1789	}else if( fHasCrLfOnly ){
1790	zWarning = "CR/NL line endings";
1791	}else{
1792	zWarning = "mixed line endings";
1793	}
1794	zDisable = "\"crnl-glob\" setting";
1795	}else{
1796	if( encodingOk ){
1797	return 0; /* We don't want encoding warnings for this file. */
1798	}
1799	zWarning = "Unicode";
	@@ -1880,35 +1880,36 @@
1880	db_must_be_within_tree();
1881	db_prepare(&q,
1882	"SELECT %Q \|\| pathname, pathname, %s, %s, %s FROM vfile"
1883	" WHERE NOT deleted",
1884	g.zLocalRoot,
1885	glob_expr("pathname", noSettings ? 0 : db_get("crnl-glob","")),

1886	glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")),
1887	glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob",""))
1888	);
1889	while( db_step(&q)==SQLITE_ROW ){
1890	const char *zFullname;
1891	const char *zName;
1892	Blob content;
1893	Blob reason;
1894	int crnlOk, binOk, encodingOk;
1895	int fileRc;
1896
1897	zFullname = db_column_text(&q, 0);
1898	zName = db_column_text(&q, 1);
1899	crnlOk = db_column_int(&q, 2);
1900	binOk = db_column_int(&q, 3);
1901	encodingOk = db_column_int(&q, 4);
1902	blob_zero(&content);
1903	if( file_wd_islink(zFullname) ){
1904	blob_read_link(&content, zFullname);
1905	}else{
1906	blob_read_from_file(&content, zFullname);
1907	}
1908	blob_zero(&reason);
1909	fileRc = commit_warning(&content, crnlOk, binOk, encodingOk, 2,
1910	zFullname, &reason);
1911	if( fileRc \|\| verboseFlag ){
1912	fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason));
1913	}
1914	blob_reset(&reason);
	@@ -1964,11 +1965,11 @@
1964	** be older than its ancestor unless the --allow-older option appears.
1965	** If any of files in the check-in appear to contain unresolved merge
1966	** conflicts, the check-in will not be allowed unless the
1967	** --allow-conflict option is present. In addition, the entire
1968	** check-in process may be aborted if a file contains content that
1969	** appears to be binary, Unicode text, or text with CR/NL line endings
1970	** unless the interactive user chooses to proceed. If there is no
1971	** interactive user or these warnings should be skipped for some other
1972	** reason, the --no-warnings option may be used. A check-in is not
1973	** allowed against a closed leaf.
1974	**
	@@ -2338,24 +2339,24 @@
2338	*/
2339	db_prepare(&q,
2340	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
2341	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
2342	g.zLocalRoot,
2343	glob_expr("pathname", db_get("crnl-glob","")),
2344	glob_expr("pathname", db_get("binary-glob","")),
2345	glob_expr("pathname", db_get("encoding-glob",""))
2346	);
2347	while( db_step(&q)==SQLITE_ROW ){
2348	int id, rid;
2349	const char *zFullname;
2350	Blob content;
2351	int crnlOk, binOk, encodingOk;
2352
2353	id = db_column_int(&q, 0);
2354	zFullname = db_column_text(&q, 1);
2355	rid = db_column_int(&q, 2);
2356	crnlOk = db_column_int(&q, 3);
2357	binOk = db_column_int(&q, 4);
2358	encodingOk = db_column_int(&q, 5);
2359
2360	blob_zero(&content);
2361	if( file_wd_islink(zFullname) ){
	@@ -2364,11 +2365,11 @@
2364	}else{
2365	blob_read_from_file(&content, zFullname);
2366	}
2367	/* Do not emit any warnings when they are disabled. */
2368	if( !noWarningFlag ){
2369	abortCommit \|= commit_warning(&content, crnlOk, binOk,
2370	encodingOk, noPrompt,
2371	zFullname, 0);
2372	}
2373	if( contains_merge_marker(&content) ){
2374	Blob fname; /* Relative pathname of the file */
2375

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1701,16 +1701,16 @@
1701	** Issue a warning and give the user an opportunity to abandon out
1702	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1703	** is seen in a text file.
1704	**
1705	** Return 1 if the user pressed 'c'. In that case, the file will have
1706	** been converted to UTF-8 (if it was UTF-16) with LF line-endings,
1707	** and the original file will have been renamed to "<filename>-original".
1708	*/
1709	static int commit_warning(
1710	Blob pContent, / The content of the file being committed. */
1711	int crlfOk, /* Non-zero if CR/LF warnings should be disabled. */
1712	int binOk, /* Non-zero if binary warnings should be disabled. */
1713	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1714	int noPrompt, /* 0 to always prompt, 1 for 'N', 2 for 'Y'. */
1715	const char zFilename, / The full name of the file being committed. */
1716	Blob pReason / Reason for warning, if any (non-fatal only). */
	@@ -1761,39 +1761,39 @@
1761	zWarning = "binary data";
1762	zConvert = ""; /* We cannot convert binary files. */
1763	}
1764	zDisable = "\"binary-glob\" setting";
1765	}else if( fUnicode && fHasAnyCr ){
1766	if( crlfOk && encodingOk ){
1767	return 0; /* We don't want CR/LF and Unicode warnings for this file. */
1768	}
1769	if( fHasLoneCrOnly ){
1770	zWarning = "CR line endings and Unicode";
1771	}else if( fHasCrLfOnly ){
1772	zWarning = "CR/LF line endings and Unicode";
1773	}else{
1774	zWarning = "mixed line endings and Unicode";
1775	}
1776	zDisable = "\"crlf-glob\" and \"encoding-glob\" settings";
1777	}else if( fHasInvalidUtf8 ){
1778	if( encodingOk ){
1779	return 0; /* We don't want encoding warnings for this file. */
1780	}
1781	zWarning = "invalid UTF-8";
1782	zDisable = "\"encoding-glob\" setting";
1783	}else if( fHasAnyCr ){
1784	if( crlfOk ){
1785	return 0; /* We don't want CR/LF warnings for this file. */
1786	}
1787	if( fHasLoneCrOnly ){
1788	zWarning = "CR line endings";
1789	}else if( fHasCrLfOnly ){
1790	zWarning = "CR/LF line endings";
1791	}else{
1792	zWarning = "mixed line endings";
1793	}
1794	zDisable = "\"crlf-glob\" setting";
1795	}else{
1796	if( encodingOk ){
1797	return 0; /* We don't want encoding warnings for this file. */
1798	}
1799	zWarning = "Unicode";
	@@ -1880,35 +1880,36 @@
1880	db_must_be_within_tree();
1881	db_prepare(&q,
1882	"SELECT %Q \|\| pathname, pathname, %s, %s, %s FROM vfile"
1883	" WHERE NOT deleted",
1884	g.zLocalRoot,
1885	glob_expr("pathname", noSettings ? 0 : db_get("crlf-glob",
1886	db_get("crnl-glob",""))),
1887	glob_expr("pathname", noSettings ? 0 : db_get("binary-glob","")),
1888	glob_expr("pathname", noSettings ? 0 : db_get("encoding-glob",""))
1889	);
1890	while( db_step(&q)==SQLITE_ROW ){
1891	const char *zFullname;
1892	const char *zName;
1893	Blob content;
1894	Blob reason;
1895	int crlfOk, binOk, encodingOk;
1896	int fileRc;
1897
1898	zFullname = db_column_text(&q, 0);
1899	zName = db_column_text(&q, 1);
1900	crlfOk = db_column_int(&q, 2);
1901	binOk = db_column_int(&q, 3);
1902	encodingOk = db_column_int(&q, 4);
1903	blob_zero(&content);
1904	if( file_wd_islink(zFullname) ){
1905	blob_read_link(&content, zFullname);
1906	}else{
1907	blob_read_from_file(&content, zFullname);
1908	}
1909	blob_zero(&reason);
1910	fileRc = commit_warning(&content, crlfOk, binOk, encodingOk, 2,
1911	zFullname, &reason);
1912	if( fileRc \|\| verboseFlag ){
1913	fossil_print("%d\t%s\t%s\n", fileRc, zName, blob_str(&reason));
1914	}
1915	blob_reset(&reason);
	@@ -1964,11 +1965,11 @@
1965	** be older than its ancestor unless the --allow-older option appears.
1966	** If any of files in the check-in appear to contain unresolved merge
1967	** conflicts, the check-in will not be allowed unless the
1968	** --allow-conflict option is present. In addition, the entire
1969	** check-in process may be aborted if a file contains content that
1970	** appears to be binary, Unicode text, or text with CR/LF line endings
1971	** unless the interactive user chooses to proceed. If there is no
1972	** interactive user or these warnings should be skipped for some other
1973	** reason, the --no-warnings option may be used. A check-in is not
1974	** allowed against a closed leaf.
1975	**
	@@ -2338,24 +2339,24 @@
2339	*/
2340	db_prepare(&q,
2341	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
2342	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
2343	g.zLocalRoot,
2344	glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))),
2345	glob_expr("pathname", db_get("binary-glob","")),
2346	glob_expr("pathname", db_get("encoding-glob",""))
2347	);
2348	while( db_step(&q)==SQLITE_ROW ){
2349	int id, rid;
2350	const char *zFullname;
2351	Blob content;
2352	int crlfOk, binOk, encodingOk;
2353
2354	id = db_column_int(&q, 0);
2355	zFullname = db_column_text(&q, 1);
2356	rid = db_column_int(&q, 2);
2357	crlfOk = db_column_int(&q, 3);
2358	binOk = db_column_int(&q, 4);
2359	encodingOk = db_column_int(&q, 5);
2360
2361	blob_zero(&content);
2362	if( file_wd_islink(zFullname) ){
	@@ -2364,11 +2365,11 @@
2365	}else{
2366	blob_read_from_file(&content, zFullname);
2367	}
2368	/* Do not emit any warnings when they are disabled. */
2369	if( !noWarningFlag ){
2370	abortCommit \|= commit_warning(&content, crlfOk, binOk,
2371	encodingOk, noPrompt,
2372	zFullname, 0);
2373	}
2374	if( contains_merge_marker(&content) ){
2375	Blob fname; /* Relative pathname of the file */
2376

M src/configure.c

		--- src/configure.c
		+++ src/configure.c
		@@ -121,10 +121,11 @@
121	121	{ "manifest", CONFIGSET_PROJ },
122	122	{ "binary-glob", CONFIGSET_PROJ },
123	123	{ "clean-glob", CONFIGSET_PROJ },
124	124	{ "ignore-glob", CONFIGSET_PROJ },
125	125	{ "keep-glob", CONFIGSET_PROJ },
	126	+ { "crlf-glob", CONFIGSET_PROJ },
126	127	{ "crnl-glob", CONFIGSET_PROJ },
127	128	{ "encoding-glob", CONFIGSET_PROJ },
128	129	{ "empty-dirs", CONFIGSET_PROJ },
129	130	{ "allow-symlinks", CONFIGSET_PROJ },
130	131	{ "dotfiles", CONFIGSET_PROJ },
131	132

	--- src/configure.c
	+++ src/configure.c
	@@ -121,10 +121,11 @@
121	{ "manifest", CONFIGSET_PROJ },
122	{ "binary-glob", CONFIGSET_PROJ },
123	{ "clean-glob", CONFIGSET_PROJ },
124	{ "ignore-glob", CONFIGSET_PROJ },
125	{ "keep-glob", CONFIGSET_PROJ },

126	{ "crnl-glob", CONFIGSET_PROJ },
127	{ "encoding-glob", CONFIGSET_PROJ },
128	{ "empty-dirs", CONFIGSET_PROJ },
129	{ "allow-symlinks", CONFIGSET_PROJ },
130	{ "dotfiles", CONFIGSET_PROJ },
131

	--- src/configure.c
	+++ src/configure.c
	@@ -121,10 +121,11 @@
121	{ "manifest", CONFIGSET_PROJ },
122	{ "binary-glob", CONFIGSET_PROJ },
123	{ "clean-glob", CONFIGSET_PROJ },
124	{ "ignore-glob", CONFIGSET_PROJ },
125	{ "keep-glob", CONFIGSET_PROJ },
126	{ "crlf-glob", CONFIGSET_PROJ },
127	{ "crnl-glob", CONFIGSET_PROJ },
128	{ "encoding-glob", CONFIGSET_PROJ },
129	{ "empty-dirs", CONFIGSET_PROJ },
130	{ "allow-symlinks", CONFIGSET_PROJ },
131	{ "dotfiles", CONFIGSET_PROJ },
132

M src/db.c

+5 -3

		--- src/db.c
		+++ src/db.c
		@@ -2733,10 +2733,11 @@
2733	2733	#else
2734	2734	{ "case-sensitive", 0, 0, 0, 0, "on" },
2735	2735	#endif
2736	2736	{ "clean-glob", 0, 40, 1, 0, "" },
2737	2737	{ "clearsign", 0, 0, 0, 0, "off" },
	2738	+ { "crlf-glob", 0, 40, 1, 0, "" },
2738	2739	{ "crnl-glob", 0, 40, 1, 0, "" },
2739	2740	{ "default-perms", 0, 16, 0, 0, "u" },
2740	2741	{ "diff-binary", 0, 0, 0, 0, "on" },
2741	2742	{ "diff-command", 0, 40, 0, 0, "" },
2742	2743	{ "dont-push", 0, 0, 0, 0, "off" },
		@@ -2890,13 +2891,14 @@
2890	2891	**
2891	2892	** clearsign When enabled, fossil will attempt to sign all commits
2892	2893	** with gpg. When disabled (the default), commits will
2893	2894	** be unsigned. Default: off
2894	2895	**
2895		-** crnl-glob A comma or newline-separated list of GLOB patterns for
2896		-** (versionable) text files in which it is ok to have CR, CR+NL or mixed
2897		-** line endings. Set to "*" to disable CR+NL checking.
	2896	+** crlf-glob A comma or newline-separated list of GLOB patterns for
	2897	+** (versionable) text files in which it is ok to have CR, CR+LF or mixed
	2898	+** line endings. Set to "*" to disable CR+LF checking.
	2899	+** The crnl-glob setting is a compatibility alias.
2898	2900	**
2899	2901	** default-perms Permissions given automatically to new users. For more
2900	2902	** information on permissions see Users page in Server
2901	2903	** Administration of the HTTP UI. Default: u.
2902	2904	**
2903	2905

	--- src/db.c
	+++ src/db.c
	@@ -2733,10 +2733,11 @@
2733	#else
2734	{ "case-sensitive", 0, 0, 0, 0, "on" },
2735	#endif
2736	{ "clean-glob", 0, 40, 1, 0, "" },
2737	{ "clearsign", 0, 0, 0, 0, "off" },

2738	{ "crnl-glob", 0, 40, 1, 0, "" },
2739	{ "default-perms", 0, 16, 0, 0, "u" },
2740	{ "diff-binary", 0, 0, 0, 0, "on" },
2741	{ "diff-command", 0, 40, 0, 0, "" },
2742	{ "dont-push", 0, 0, 0, 0, "off" },
	@@ -2890,13 +2891,14 @@
2890	**
2891	** clearsign When enabled, fossil will attempt to sign all commits
2892	** with gpg. When disabled (the default), commits will
2893	** be unsigned. Default: off
2894	**
2895	** crnl-glob A comma or newline-separated list of GLOB patterns for
2896	** (versionable) text files in which it is ok to have CR, CR+NL or mixed
2897	** line endings. Set to "*" to disable CR+NL checking.

2898	**
2899	** default-perms Permissions given automatically to new users. For more
2900	** information on permissions see Users page in Server
2901	** Administration of the HTTP UI. Default: u.
2902	**
2903

	--- src/db.c
	+++ src/db.c
	@@ -2733,10 +2733,11 @@
2733	#else
2734	{ "case-sensitive", 0, 0, 0, 0, "on" },
2735	#endif
2736	{ "clean-glob", 0, 40, 1, 0, "" },
2737	{ "clearsign", 0, 0, 0, 0, "off" },
2738	{ "crlf-glob", 0, 40, 1, 0, "" },
2739	{ "crnl-glob", 0, 40, 1, 0, "" },
2740	{ "default-perms", 0, 16, 0, 0, "u" },
2741	{ "diff-binary", 0, 0, 0, 0, "on" },
2742	{ "diff-command", 0, 40, 0, 0, "" },
2743	{ "dont-push", 0, 0, 0, 0, "off" },
	@@ -2890,13 +2891,14 @@
2891	**
2892	** clearsign When enabled, fossil will attempt to sign all commits
2893	** with gpg. When disabled (the default), commits will
2894	** be unsigned. Default: off
2895	**
2896	** crlf-glob A comma or newline-separated list of GLOB patterns for
2897	** (versionable) text files in which it is ok to have CR, CR+LF or mixed
2898	** line endings. Set to "*" to disable CR+LF checking.
2899	** The crnl-glob setting is a compatibility alias.
2900	**
2901	** default-perms Permissions given automatically to new users. For more
2902	** information on permissions see Users page in Server
2903	** Administration of the HTTP UI. Default: u.
2904	**
2905

M src/json_config.c

		--- src/json_config.c
		+++ src/json_config.c
		@@ -77,10 +77,11 @@
77	77	{ "manifest", CONFIGSET_PROJ },
78	78	{ "binary-glob", CONFIGSET_PROJ },
79	79	{ "clean-glob", CONFIGSET_PROJ },
80	80	{ "ignore-glob", CONFIGSET_PROJ },
81	81	{ "keep-glob", CONFIGSET_PROJ },
	82	+{ "crlf-glob", CONFIGSET_PROJ },
82	83	{ "crnl-glob", CONFIGSET_PROJ },
83	84	{ "encoding-glob", CONFIGSET_PROJ },
84	85	{ "empty-dirs", CONFIGSET_PROJ },
85	86	{ "allow-symlinks", CONFIGSET_PROJ },
86	87	{ "dotfiles", CONFIGSET_PROJ },
87	88

	--- src/json_config.c
	+++ src/json_config.c
	@@ -77,10 +77,11 @@
77	{ "manifest", CONFIGSET_PROJ },
78	{ "binary-glob", CONFIGSET_PROJ },
79	{ "clean-glob", CONFIGSET_PROJ },
80	{ "ignore-glob", CONFIGSET_PROJ },
81	{ "keep-glob", CONFIGSET_PROJ },

82	{ "crnl-glob", CONFIGSET_PROJ },
83	{ "encoding-glob", CONFIGSET_PROJ },
84	{ "empty-dirs", CONFIGSET_PROJ },
85	{ "allow-symlinks", CONFIGSET_PROJ },
86	{ "dotfiles", CONFIGSET_PROJ },
87

	--- src/json_config.c
	+++ src/json_config.c
	@@ -77,10 +77,11 @@
77	{ "manifest", CONFIGSET_PROJ },
78	{ "binary-glob", CONFIGSET_PROJ },
79	{ "clean-glob", CONFIGSET_PROJ },
80	{ "ignore-glob", CONFIGSET_PROJ },
81	{ "keep-glob", CONFIGSET_PROJ },
82	{ "crlf-glob", CONFIGSET_PROJ },
83	{ "crnl-glob", CONFIGSET_PROJ },
84	{ "encoding-glob", CONFIGSET_PROJ },
85	{ "empty-dirs", CONFIGSET_PROJ },
86	{ "allow-symlinks", CONFIGSET_PROJ },
87	{ "dotfiles", CONFIGSET_PROJ },
88

M src/printf.c

+1 -1

		--- src/printf.c
		+++ src/printf.c
		@@ -1139,11 +1139,11 @@
1139	1139	}
1140	1140	free(z);
1141	1141	}
1142	1142
1143	1143	/*
1144		-** Turn off any NL to CRNL translation on the stream given as an
	1144	+** Turn off any LF to CRLF translation on the stream given as an
1145	1145	** argument. This is a no-op on unix but is necessary on windows.
1146	1146	*/
1147	1147	void fossil_binary_mode(FILE *p){
1148	1148	#if defined(_WIN32)
1149	1149	_setmode(_fileno(p), _O_BINARY);
1150	1150

	--- src/printf.c
	+++ src/printf.c
	@@ -1139,11 +1139,11 @@
1139	}
1140	free(z);
1141	}
1142
1143	/*
1144	** Turn off any NL to CRNL translation on the stream given as an
1145	** argument. This is a no-op on unix but is necessary on windows.
1146	*/
1147	void fossil_binary_mode(FILE *p){
1148	#if defined(_WIN32)
1149	_setmode(_fileno(p), _O_BINARY);
1150

	--- src/printf.c
	+++ src/printf.c
	@@ -1139,11 +1139,11 @@
1139	}
1140	free(z);
1141	}
1142
1143	/*
1144	** Turn off any LF to CRLF translation on the stream given as an
1145	** argument. This is a no-op on unix but is necessary on windows.
1146	*/
1147	void fossil_binary_mode(FILE *p){
1148	#if defined(_WIN32)
1149	_setmode(_fileno(p), _O_BINARY);
1150

M src/report.c

+2 -2

		--- src/report.c
		+++ src/report.c
		@@ -129,12 +129,12 @@
129	129	return "";
130	130	}
131	131
132	132	/*
133	133	** Remove blank lines from the beginning of a string and
134		-** all whitespace from the end. Removes whitespace preceding a NL,
135		-** which also converts any CRNL sequence into a single NL.
	134	+** all whitespace from the end. Removes whitespace preceding a LF,
	135	+** which also converts any CRLF sequence into a single LF.
136	136	*/
137	137	char remove_blank_lines(const char zOrig){
138	138	int i, j, n;
139	139	char *z;
140	140	for(i=j=0; fossil_isspace(zOrig[i]); i++){ if( zOrig[i]=='\n' ) j = i+1; }
141	141

	--- src/report.c
	+++ src/report.c
	@@ -129,12 +129,12 @@
129	return "";
130	}
131
132	/*
133	** Remove blank lines from the beginning of a string and
134	** all whitespace from the end. Removes whitespace preceding a NL,
135	** which also converts any CRNL sequence into a single NL.
136	*/
137	char remove_blank_lines(const char zOrig){
138	int i, j, n;
139	char *z;
140	for(i=j=0; fossil_isspace(zOrig[i]); i++){ if( zOrig[i]=='\n' ) j = i+1; }
141

	--- src/report.c
	+++ src/report.c
	@@ -129,12 +129,12 @@
129	return "";
130	}
131
132	/*
133	** Remove blank lines from the beginning of a string and
134	** all whitespace from the end. Removes whitespace preceding a LF,
135	** which also converts any CRLF sequence into a single LF.
136	*/
137	char remove_blank_lines(const char zOrig){
138	int i, j, n;
139	char *z;
140	for(i=j=0; fossil_isspace(zOrig[i]); i++){ if( zOrig[i]=='\n' ) j = i+1; }
141

M www/settings.wiki

+5 -5

		--- www/settings.wiki
		+++ www/settings.wiki
		@@ -33,15 +33,15 @@
33	33	use Fossil, how you communicate with the server, or options for hosting
34	34	a repository on the web.
35	35
36	36	However, for historical reasons, some settings affect how you work with
37	37	versioned files. These are <tt>allow-symlinks</tt>,
38		-<tt>binary-glob</tt>, <tt>crnl-glob</tt>, <tt>empty-dirs</tt>,
39		-<tt>encoding-glob</tt>, <tt>ignore-glob</tt>, <tt>keep-glob</tt> and
40		-<tt>manifest</tt>. The most important is <tt>ignore-glob</tt> which
41		-specifies which files should be ignored when looking for unmanaged files
42		-with the <tt>extras</tt> command.
	38	+<tt>binary-glob</tt>, <tt>crlf-glob</tt>, <tt>crnl-glob</tt>,
	39	+<tt>empty-dirs</tt>, <tt>encoding-glob</tt>, <tt>ignore-glob</tt>,
	40	+<tt>keep-glob</tt> and <tt>manifest</tt>. The most important is
	41	+<tt>ignore-glob</tt> which specifies which files should be ignored when
	42	+looking for unmanaged files with the <tt>extras</tt> command.
43	43
44	44	Because these options can change over time, and the inconvenience of
45	45	replicating changes, these settings are "versionable". As well as being
46	46	able to be set using the <tt>settings</tt> command or the web interface,
47	47	you can create versioned files in the <tt>.fossil-settings</tt>
48	48

	--- www/settings.wiki
	+++ www/settings.wiki
	@@ -33,15 +33,15 @@
33	use Fossil, how you communicate with the server, or options for hosting
34	a repository on the web.
35
36	However, for historical reasons, some settings affect how you work with
37	versioned files. These are <tt>allow-symlinks</tt>,
38	<tt>binary-glob</tt>, <tt>crnl-glob</tt>, <tt>empty-dirs</tt>,
39	<tt>encoding-glob</tt>, <tt>ignore-glob</tt>, <tt>keep-glob</tt> and
40	<tt>manifest</tt>. The most important is <tt>ignore-glob</tt> which
41	specifies which files should be ignored when looking for unmanaged files
42	with the <tt>extras</tt> command.
43
44	Because these options can change over time, and the inconvenience of
45	replicating changes, these settings are "versionable". As well as being
46	able to be set using the <tt>settings</tt> command or the web interface,
47	you can create versioned files in the <tt>.fossil-settings</tt>
48

	--- www/settings.wiki
	+++ www/settings.wiki
	@@ -33,15 +33,15 @@
33	use Fossil, how you communicate with the server, or options for hosting
34	a repository on the web.
35
36	However, for historical reasons, some settings affect how you work with
37	versioned files. These are <tt>allow-symlinks</tt>,
38	<tt>binary-glob</tt>, <tt>crlf-glob</tt>, <tt>crnl-glob</tt>,
39	<tt>empty-dirs</tt>, <tt>encoding-glob</tt>, <tt>ignore-glob</tt>,
40	<tt>keep-glob</tt> and <tt>manifest</tt>. The most important is
41	<tt>ignore-glob</tt> which specifies which files should be ignored when
42	looking for unmanaged files with the <tt>extras</tt> command.
43
44	Because these options can change over time, and the inconvenience of
45	replicating changes, these settings are "versionable". As well as being
46	able to be set using the <tt>settings</tt> command or the web interface,
47	you can create versioned files in the <tt>.fossil-settings</tt>
48

M www/sync.wiki

		--- www/sync.wiki
		+++ www/sync.wiki
		@@ -529,10 +529,11 @@
529	529	<li> binary-glob
530	530	<li> clean-glob
531	531	<ul></td><td valign="top"><ul>
532	532	<li> ignore-glob
533	533	<li> keep-glob
	534	+<li> crlf-glob
534	535	<li> crnl-glob
535	536	<li> encoding-glob
536	537	<li> empty-dirs
537	538	<li> allow-symlinks
538	539	<li> dotfiles
539	540

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -529,10 +529,11 @@
529	<li> binary-glob
530	<li> clean-glob
531	<ul></td><td valign="top"><ul>
532	<li> ignore-glob
533	<li> keep-glob

534	<li> crnl-glob
535	<li> encoding-glob
536	<li> empty-dirs
537	<li> allow-symlinks
538	<li> dotfiles
539

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -529,10 +529,11 @@
529	<li> binary-glob
530	<li> clean-glob
531	<ul></td><td valign="top"><ul>
532	<li> ignore-glob
533	<li> keep-glob
534	<li> crlf-glob
535	<li> crnl-glob
536	<li> encoding-glob
537	<li> empty-dirs
538	<li> allow-symlinks
539	<li> dotfiles
540

Fossil SCM

Keyboard Shortcuts