Fossil SCM

Rename crnl-glob to crlf-glob, retaining support for crnl-glob as a compatibility alias. Change terminology from NL to LF throughout, excepting cases where NL means newline and not line feed. Also don't change linenoise.c which is third-party code.

andygoth 2016-05-23 15:34 trunk

Commit 2bc3cfebe61aeaa5968d3d6ed01c49fb501db420

Parent 893905c83e3dd51…

8 files changed +15 -15 +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

+15 -15

		--- src/checkin.c
		+++ src/checkin.c
		@@ -1462,16 +1462,16 @@
1462	1462	** Issue a warning and give the user an opportunity to abandon out
1463	1463	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1464	1464	** is seen in a text file.
1465	1465	**
1466	1466	** Return 1 if the user pressed 'c'. In that case, the file will have
1467		-** been converted to UTF-8 (if it was UTF-16) with NL line-endings,
	1467	+** been converted to UTF-8 (if it was UTF-16) with LF line-endings,
1468	1468	** and the original file will have been renamed to "<filename>-original".
1469	1469	*/
1470	1470	static int commit_warning(
1471	1471	Blob p, / The content of the file being committed. */
1472		- int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
	1472	+ int crlfOk, /* Non-zero if CR/LF warnings should be disabled. */
1473	1473	int binOk, /* Non-zero if binary warnings should be disabled. */
1474	1474	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1475	1475	const char zFilename / The full name of the file being committed. */
1476	1476	){
1477	1477	int bReverse; /* UTF-16 byte order is reversed? */
		@@ -1520,39 +1520,39 @@
1520	1520	zWarning = "binary data";
1521	1521	zConvert = ""; /* We cannot convert binary files. */
1522	1522	}
1523	1523	zDisable = "\"binary-glob\" setting";
1524	1524	}else if( fUnicode && fHasAnyCr ){
1525		- if( crnlOk && encodingOk ){
1526		- return 0; /* We don't want CR/NL and Unicode warnings for this file. */
	1525	+ if( crlfOk && encodingOk ){
	1526	+ return 0; /* We don't want CR/LF and Unicode warnings for this file. */
1527	1527	}
1528	1528	if( fHasLoneCrOnly ){
1529	1529	zWarning = "CR line endings and Unicode";
1530	1530	}else if( fHasCrLfOnly ){
1531		- zWarning = "CR/NL line endings and Unicode";
	1531	+ zWarning = "CR/LF line endings and Unicode";
1532	1532	}else{
1533	1533	zWarning = "mixed line endings and Unicode";
1534	1534	}
1535		- zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
	1535	+ zDisable = "\"crlf-glob\" and \"encoding-glob\" settings";
1536	1536	}else if( fHasInvalidUtf8 ){
1537	1537	if( encodingOk ){
1538	1538	return 0; /* We don't want encoding warnings for this file. */
1539	1539	}
1540	1540	zWarning = "invalid UTF-8";
1541	1541	zDisable = "\"encoding-glob\" setting";
1542	1542	}else if( fHasAnyCr ){
1543		- if( crnlOk ){
1544		- return 0; /* We don't want CR/NL warnings for this file. */
	1543	+ if( crlfOk ){
	1544	+ return 0; /* We don't want CR/LF warnings for this file. */
1545	1545	}
1546	1546	if( fHasLoneCrOnly ){
1547	1547	zWarning = "CR line endings";
1548	1548	}else if( fHasCrLfOnly ){
1549		- zWarning = "CR/NL line endings";
	1549	+ zWarning = "CR/LF line endings";
1550	1550	}else{
1551	1551	zWarning = "mixed line endings";
1552	1552	}
1553		- zDisable = "\"crnl-glob\" setting";
	1553	+ zDisable = "\"crlf-glob\" setting";
1554	1554	}else{
1555	1555	if( encodingOk ){
1556	1556	return 0; /* We don't want encoding warnings for this file. */
1557	1557	}
1558	1558	zWarning = "Unicode";
		@@ -1649,11 +1649,11 @@
1649	1649	** be older than its ancestor unless the --allow-older option appears.
1650	1650	** If any of files in the check-in appear to contain unresolved merge
1651	1651	** conflicts, the check-in will not be allowed unless the
1652	1652	** --allow-conflict option is present. In addition, the entire
1653	1653	** check-in process may be aborted if a file contains content that
1654		-** appears to be binary, Unicode text, or text with CR/NL line endings
	1654	+** appears to be binary, Unicode text, or text with CR/LF line endings
1655	1655	** unless the interactive user chooses to proceed. If there is no
1656	1656	** interactive user or these warnings should be skipped for some other
1657	1657	** reason, the --no-warnings option may be used. A check-in is not
1658	1658	** allowed against a closed leaf.
1659	1659	**
		@@ -1994,24 +1994,24 @@
1994	1994	*/
1995	1995	db_prepare(&q,
1996	1996	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
1997	1997	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1998	1998	g.zLocalRoot,
1999		- glob_expr("pathname", db_get("crnl-glob","")),
	1999	+ glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))),
2000	2000	glob_expr("pathname", db_get("binary-glob","")),
2001	2001	glob_expr("pathname", db_get("encoding-glob",""))
2002	2002	);
2003	2003	while( db_step(&q)==SQLITE_ROW ){
2004	2004	int id, rid;
2005	2005	const char *zFullname;
2006	2006	Blob content;
2007		- int crnlOk, binOk, encodingOk;
	2007	+ int crlfOk, binOk, encodingOk;
2008	2008
2009	2009	id = db_column_int(&q, 0);
2010	2010	zFullname = db_column_text(&q, 1);
2011	2011	rid = db_column_int(&q, 2);
2012		- crnlOk = db_column_int(&q, 3);
	2012	+ crlfOk = db_column_int(&q, 3);
2013	2013	binOk = db_column_int(&q, 4);
2014	2014	encodingOk = db_column_int(&q, 5);
2015	2015
2016	2016	blob_zero(&content);
2017	2017	if( file_wd_islink(zFullname) ){
		@@ -2020,11 +2020,11 @@
2020	2020	}else{
2021	2021	blob_read_from_file(&content, zFullname);
2022	2022	}
2023	2023	/* Do not emit any warnings when they are disabled. */
2024	2024	if( !noWarningFlag ){
2025		- abortCommit \|= commit_warning(&content, crnlOk, binOk,
	2025	+ abortCommit \|= commit_warning(&content, crlfOk, binOk,
2026	2026	encodingOk, zFullname);
2027	2027	}
2028	2028	if( contains_merge_marker(&content) ){
2029	2029	Blob fname; /* Relative pathname of the file */
2030	2030
2031	2031

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1462,16 +1462,16 @@
1462	** Issue a warning and give the user an opportunity to abandon out
1463	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1464	** is seen in a text file.
1465	**
1466	** Return 1 if the user pressed 'c'. In that case, the file will have
1467	** been converted to UTF-8 (if it was UTF-16) with NL line-endings,
1468	** and the original file will have been renamed to "<filename>-original".
1469	*/
1470	static int commit_warning(
1471	Blob p, / The content of the file being committed. */
1472	int crnlOk, /* Non-zero if CR/NL warnings should be disabled. */
1473	int binOk, /* Non-zero if binary warnings should be disabled. */
1474	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1475	const char zFilename / The full name of the file being committed. */
1476	){
1477	int bReverse; /* UTF-16 byte order is reversed? */
	@@ -1520,39 +1520,39 @@
1520	zWarning = "binary data";
1521	zConvert = ""; /* We cannot convert binary files. */
1522	}
1523	zDisable = "\"binary-glob\" setting";
1524	}else if( fUnicode && fHasAnyCr ){
1525	if( crnlOk && encodingOk ){
1526	return 0; /* We don't want CR/NL and Unicode warnings for this file. */
1527	}
1528	if( fHasLoneCrOnly ){
1529	zWarning = "CR line endings and Unicode";
1530	}else if( fHasCrLfOnly ){
1531	zWarning = "CR/NL line endings and Unicode";
1532	}else{
1533	zWarning = "mixed line endings and Unicode";
1534	}
1535	zDisable = "\"crnl-glob\" and \"encoding-glob\" settings";
1536	}else if( fHasInvalidUtf8 ){
1537	if( encodingOk ){
1538	return 0; /* We don't want encoding warnings for this file. */
1539	}
1540	zWarning = "invalid UTF-8";
1541	zDisable = "\"encoding-glob\" setting";
1542	}else if( fHasAnyCr ){
1543	if( crnlOk ){
1544	return 0; /* We don't want CR/NL warnings for this file. */
1545	}
1546	if( fHasLoneCrOnly ){
1547	zWarning = "CR line endings";
1548	}else if( fHasCrLfOnly ){
1549	zWarning = "CR/NL line endings";
1550	}else{
1551	zWarning = "mixed line endings";
1552	}
1553	zDisable = "\"crnl-glob\" setting";
1554	}else{
1555	if( encodingOk ){
1556	return 0; /* We don't want encoding warnings for this file. */
1557	}
1558	zWarning = "Unicode";
	@@ -1649,11 +1649,11 @@
1649	** be older than its ancestor unless the --allow-older option appears.
1650	** If any of files in the check-in appear to contain unresolved merge
1651	** conflicts, the check-in will not be allowed unless the
1652	** --allow-conflict option is present. In addition, the entire
1653	** check-in process may be aborted if a file contains content that
1654	** appears to be binary, Unicode text, or text with CR/NL line endings
1655	** unless the interactive user chooses to proceed. If there is no
1656	** interactive user or these warnings should be skipped for some other
1657	** reason, the --no-warnings option may be used. A check-in is not
1658	** allowed against a closed leaf.
1659	**
	@@ -1994,24 +1994,24 @@
1994	*/
1995	db_prepare(&q,
1996	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
1997	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1998	g.zLocalRoot,
1999	glob_expr("pathname", db_get("crnl-glob","")),
2000	glob_expr("pathname", db_get("binary-glob","")),
2001	glob_expr("pathname", db_get("encoding-glob",""))
2002	);
2003	while( db_step(&q)==SQLITE_ROW ){
2004	int id, rid;
2005	const char *zFullname;
2006	Blob content;
2007	int crnlOk, binOk, encodingOk;
2008
2009	id = db_column_int(&q, 0);
2010	zFullname = db_column_text(&q, 1);
2011	rid = db_column_int(&q, 2);
2012	crnlOk = db_column_int(&q, 3);
2013	binOk = db_column_int(&q, 4);
2014	encodingOk = db_column_int(&q, 5);
2015
2016	blob_zero(&content);
2017	if( file_wd_islink(zFullname) ){
	@@ -2020,11 +2020,11 @@
2020	}else{
2021	blob_read_from_file(&content, zFullname);
2022	}
2023	/* Do not emit any warnings when they are disabled. */
2024	if( !noWarningFlag ){
2025	abortCommit \|= commit_warning(&content, crnlOk, binOk,
2026	encodingOk, zFullname);
2027	}
2028	if( contains_merge_marker(&content) ){
2029	Blob fname; /* Relative pathname of the file */
2030
2031

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1462,16 +1462,16 @@
1462	** Issue a warning and give the user an opportunity to abandon out
1463	** if a Unicode (UTF-16) byte-order-mark (BOM) or a \r\n line ending
1464	** is seen in a text file.
1465	**
1466	** Return 1 if the user pressed 'c'. In that case, the file will have
1467	** been converted to UTF-8 (if it was UTF-16) with LF line-endings,
1468	** and the original file will have been renamed to "<filename>-original".
1469	*/
1470	static int commit_warning(
1471	Blob p, / The content of the file being committed. */
1472	int crlfOk, /* Non-zero if CR/LF warnings should be disabled. */
1473	int binOk, /* Non-zero if binary warnings should be disabled. */
1474	int encodingOk, /* Non-zero if encoding warnings should be disabled. */
1475	const char zFilename / The full name of the file being committed. */
1476	){
1477	int bReverse; /* UTF-16 byte order is reversed? */
	@@ -1520,39 +1520,39 @@
1520	zWarning = "binary data";
1521	zConvert = ""; /* We cannot convert binary files. */
1522	}
1523	zDisable = "\"binary-glob\" setting";
1524	}else if( fUnicode && fHasAnyCr ){
1525	if( crlfOk && encodingOk ){
1526	return 0; /* We don't want CR/LF and Unicode warnings for this file. */
1527	}
1528	if( fHasLoneCrOnly ){
1529	zWarning = "CR line endings and Unicode";
1530	}else if( fHasCrLfOnly ){
1531	zWarning = "CR/LF line endings and Unicode";
1532	}else{
1533	zWarning = "mixed line endings and Unicode";
1534	}
1535	zDisable = "\"crlf-glob\" and \"encoding-glob\" settings";
1536	}else if( fHasInvalidUtf8 ){
1537	if( encodingOk ){
1538	return 0; /* We don't want encoding warnings for this file. */
1539	}
1540	zWarning = "invalid UTF-8";
1541	zDisable = "\"encoding-glob\" setting";
1542	}else if( fHasAnyCr ){
1543	if( crlfOk ){
1544	return 0; /* We don't want CR/LF warnings for this file. */
1545	}
1546	if( fHasLoneCrOnly ){
1547	zWarning = "CR line endings";
1548	}else if( fHasCrLfOnly ){
1549	zWarning = "CR/LF line endings";
1550	}else{
1551	zWarning = "mixed line endings";
1552	}
1553	zDisable = "\"crlf-glob\" setting";
1554	}else{
1555	if( encodingOk ){
1556	return 0; /* We don't want encoding warnings for this file. */
1557	}
1558	zWarning = "Unicode";
	@@ -1649,11 +1649,11 @@
1649	** be older than its ancestor unless the --allow-older option appears.
1650	** If any of files in the check-in appear to contain unresolved merge
1651	** conflicts, the check-in will not be allowed unless the
1652	** --allow-conflict option is present. In addition, the entire
1653	** check-in process may be aborted if a file contains content that
1654	** appears to be binary, Unicode text, or text with CR/LF line endings
1655	** unless the interactive user chooses to proceed. If there is no
1656	** interactive user or these warnings should be skipped for some other
1657	** reason, the --no-warnings option may be used. A check-in is not
1658	** allowed against a closed leaf.
1659	**
	@@ -1994,24 +1994,24 @@
1994	*/
1995	db_prepare(&q,
1996	"SELECT id, %Q \|\| pathname, mrid, %s, %s, %s FROM vfile "
1997	"WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1998	g.zLocalRoot,
1999	glob_expr("pathname", db_get("crlf-glob",db_get("crnl-glob",""))),
2000	glob_expr("pathname", db_get("binary-glob","")),
2001	glob_expr("pathname", db_get("encoding-glob",""))
2002	);
2003	while( db_step(&q)==SQLITE_ROW ){
2004	int id, rid;
2005	const char *zFullname;
2006	Blob content;
2007	int crlfOk, binOk, encodingOk;
2008
2009	id = db_column_int(&q, 0);
2010	zFullname = db_column_text(&q, 1);
2011	rid = db_column_int(&q, 2);
2012	crlfOk = db_column_int(&q, 3);
2013	binOk = db_column_int(&q, 4);
2014	encodingOk = db_column_int(&q, 5);
2015
2016	blob_zero(&content);
2017	if( file_wd_islink(zFullname) ){
	@@ -2020,11 +2020,11 @@
2020	}else{
2021	blob_read_from_file(&content, zFullname);
2022	}
2023	/* Do not emit any warnings when they are disabled. */
2024	if( !noWarningFlag ){
2025	abortCommit \|= commit_warning(&content, crlfOk, binOk,
2026	encodingOk, zFullname);
2027	}
2028	if( contains_merge_marker(&content) ){
2029	Blob fname; /* Relative pathname of the file */
2030
2031

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
		@@ -2528,10 +2528,11 @@
2528	2528	#else
2529	2529	{ "case-sensitive", 0, 0, 0, 0, "on" },
2530	2530	#endif
2531	2531	{ "clean-glob", 0, 40, 1, 0, "" },
2532	2532	{ "clearsign", 0, 0, 0, 0, "off" },
	2533	+ { "crlf-glob", 0, 40, 1, 0, "" },
2533	2534	{ "crnl-glob", 0, 40, 1, 0, "" },
2534	2535	{ "default-perms", 0, 16, 0, 0, "u" },
2535	2536	{ "diff-binary", 0, 0, 0, 0, "on" },
2536	2537	{ "diff-command", 0, 40, 0, 0, "" },
2537	2538	{ "dont-push", 0, 0, 0, 0, "off" },
		@@ -2684,13 +2685,14 @@
2684	2685	**
2685	2686	** clearsign When enabled, fossil will attempt to sign all commits
2686	2687	** with gpg. When disabled (the default), commits will
2687	2688	** be unsigned. Default: off
2688	2689	**
2689		-** crnl-glob A comma or newline-separated list of GLOB patterns for
2690		-** (versionable) text files in which it is ok to have CR, CR+NL or mixed
2691		-** line endings. Set to "*" to disable CR+NL checking.
	2690	+** crlf-glob A comma or newline-separated list of GLOB patterns for
	2691	+** (versionable) text files in which it is ok to have CR, CR+LF or mixed
	2692	+** line endings. Set to "*" to disable CR+LF checking.
	2693	+** The crnl-glob setting is a compatibility alias.
2692	2694	**
2693	2695	** default-perms Permissions given automatically to new users. For more
2694	2696	** information on permissions see Users page in Server
2695	2697	** Administration of the HTTP UI. Default: u.
2696	2698	**
2697	2699

	--- src/db.c
	+++ src/db.c
	@@ -2528,10 +2528,11 @@
2528	#else
2529	{ "case-sensitive", 0, 0, 0, 0, "on" },
2530	#endif
2531	{ "clean-glob", 0, 40, 1, 0, "" },
2532	{ "clearsign", 0, 0, 0, 0, "off" },

2533	{ "crnl-glob", 0, 40, 1, 0, "" },
2534	{ "default-perms", 0, 16, 0, 0, "u" },
2535	{ "diff-binary", 0, 0, 0, 0, "on" },
2536	{ "diff-command", 0, 40, 0, 0, "" },
2537	{ "dont-push", 0, 0, 0, 0, "off" },
	@@ -2684,13 +2685,14 @@
2684	**
2685	** clearsign When enabled, fossil will attempt to sign all commits
2686	** with gpg. When disabled (the default), commits will
2687	** be unsigned. Default: off
2688	**
2689	** crnl-glob A comma or newline-separated list of GLOB patterns for
2690	** (versionable) text files in which it is ok to have CR, CR+NL or mixed
2691	** line endings. Set to "*" to disable CR+NL checking.

2692	**
2693	** default-perms Permissions given automatically to new users. For more
2694	** information on permissions see Users page in Server
2695	** Administration of the HTTP UI. Default: u.
2696	**
2697

	--- src/db.c
	+++ src/db.c
	@@ -2528,10 +2528,11 @@
2528	#else
2529	{ "case-sensitive", 0, 0, 0, 0, "on" },
2530	#endif
2531	{ "clean-glob", 0, 40, 1, 0, "" },
2532	{ "clearsign", 0, 0, 0, 0, "off" },
2533	{ "crlf-glob", 0, 40, 1, 0, "" },
2534	{ "crnl-glob", 0, 40, 1, 0, "" },
2535	{ "default-perms", 0, 16, 0, 0, "u" },
2536	{ "diff-binary", 0, 0, 0, 0, "on" },
2537	{ "diff-command", 0, 40, 0, 0, "" },
2538	{ "dont-push", 0, 0, 0, 0, "off" },
	@@ -2684,13 +2685,14 @@
2685	**
2686	** clearsign When enabled, fossil will attempt to sign all commits
2687	** with gpg. When disabled (the default), commits will
2688	** be unsigned. Default: off
2689	**
2690	** crlf-glob A comma or newline-separated list of GLOB patterns for
2691	** (versionable) text files in which it is ok to have CR, CR+LF or mixed
2692	** line endings. Set to "*" to disable CR+LF checking.
2693	** The crnl-glob setting is a compatibility alias.
2694	**
2695	** default-perms Permissions given automatically to new users. For more
2696	** information on permissions see Users page in Server
2697	** Administration of the HTTP UI. Default: u.
2698	**
2699

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
		@@ -1130,11 +1130,11 @@
1130	1130	}
1131	1131	free(z);
1132	1132	}
1133	1133
1134	1134	/*
1135		-** Turn off any NL to CRNL translation on the stream given as an
	1135	+** Turn off any LF to CRLF translation on the stream given as an
1136	1136	** argument. This is a no-op on unix but is necessary on windows.
1137	1137	*/
1138	1138	void fossil_binary_mode(FILE *p){
1139	1139	#if defined(_WIN32)
1140	1140	_setmode(_fileno(p), _O_BINARY);
1141	1141

	--- src/printf.c
	+++ src/printf.c
	@@ -1130,11 +1130,11 @@
1130	}
1131	free(z);
1132	}
1133
1134	/*
1135	** Turn off any NL to CRNL translation on the stream given as an
1136	** argument. This is a no-op on unix but is necessary on windows.
1137	*/
1138	void fossil_binary_mode(FILE *p){
1139	#if defined(_WIN32)
1140	_setmode(_fileno(p), _O_BINARY);
1141

	--- src/printf.c
	+++ src/printf.c
	@@ -1130,11 +1130,11 @@
1130	}
1131	free(z);
1132	}
1133
1134	/*
1135	** Turn off any LF to CRLF translation on the stream given as an
1136	** argument. This is a no-op on unix but is necessary on windows.
1137	*/
1138	void fossil_binary_mode(FILE *p){
1139	#if defined(_WIN32)
1140	_setmode(_fileno(p), _O_BINARY);
1141

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
		@@ -414,10 +414,11 @@
414	414	<li> binary-glob
415	415	<li> clean-glob
416	416	<ul></td><td valign="top"><ul>
417	417	<li> ignore-glob
418	418	<li> keep-glob
	419	+<li> crlf-glob
419	420	<li> crnl-glob
420	421	<li> encoding-glob
421	422	<li> empty-dirs
422	423	<li> allow-symlinks
423	424	<li> dotfiles
424	425

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -414,10 +414,11 @@
414	<li> binary-glob
415	<li> clean-glob
416	<ul></td><td valign="top"><ul>
417	<li> ignore-glob
418	<li> keep-glob

419	<li> crnl-glob
420	<li> encoding-glob
421	<li> empty-dirs
422	<li> allow-symlinks
423	<li> dotfiles
424

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -414,10 +414,11 @@
414	<li> binary-glob
415	<li> clean-glob
416	<ul></td><td valign="top"><ul>
417	<li> ignore-glob
418	<li> keep-glob
419	<li> crlf-glob
420	<li> crnl-glob
421	<li> encoding-glob
422	<li> empty-dirs
423	<li> allow-symlinks
424	<li> dotfiles
425

Fossil SCM

Keyboard Shortcuts