3e7c7e22773… — Fossil SCM

M src/alerts.c

+1 -1

		--- src/alerts.c
		+++ src/alerts.c
		@@ -1134,11 +1134,11 @@
1134	1134	** designated host and port and all times.
1135	1135	*/
1136	1136
1137	1137
1138	1138	/*
1139		-** COMMAND: alerts* abbreviated-subcommands
	1139	+** COMMAND: alerts* abbrv-subcom
1140	1140	**
1141	1141	** Usage: %fossil alerts SUBCOMMAND ARGS...
1142	1142	**
1143	1143	** Subcommands:
1144	1144	**
1145	1145

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1134,11 +1134,11 @@
1134	** designated host and port and all times.
1135	*/
1136
1137
1138	/*
1139	** COMMAND: alerts* abbreviated-subcommands
1140	**
1141	** Usage: %fossil alerts SUBCOMMAND ARGS...
1142	**
1143	** Subcommands:
1144	**
1145

	--- src/alerts.c
	+++ src/alerts.c
	@@ -1134,11 +1134,11 @@
1134	** designated host and port and all times.
1135	*/
1136
1137
1138	/*
1139	** COMMAND: alerts* abbrv-subcom
1140	**
1141	** Usage: %fossil alerts SUBCOMMAND ARGS...
1142	**
1143	** Subcommands:
1144	**
1145

M src/allrepo.c

+1 -1

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -51,11 +51,11 @@
51	51	blob_appendf(pExtra, " %s", g.argv[i]);
52	52	}
53	53	}
54	54
55	55	/*
56		-** COMMAND: all abbreviated-subcommands
	56	+** COMMAND: all abbrv-subcom
57	57	**
58	58	** Usage: %fossil all SUBCOMMAND ...
59	59	**
60	60	** The ~/.fossil file records the location of all repositories for a
61	61	** user. This command performs certain operations on all repositories
62	62

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -51,11 +51,11 @@
51	blob_appendf(pExtra, " %s", g.argv[i]);
52	}
53	}
54
55	/*
56	** COMMAND: all abbreviated-subcommands
57	**
58	** Usage: %fossil all SUBCOMMAND ...
59	**
60	** The ~/.fossil file records the location of all repositories for a
61	** user. This command performs certain operations on all repositories
62

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -51,11 +51,11 @@
51	blob_appendf(pExtra, " %s", g.argv[i]);
52	}
53	}
54
55	/*
56	** COMMAND: all abbrv-subcom
57	**
58	** Usage: %fossil all SUBCOMMAND ...
59	**
60	** The ~/.fossil file records the location of all repositories for a
61	** user. This command performs certain operations on all repositories
62

M src/cache.c

+1 -1

		--- src/cache.c
		+++ src/cache.c
		@@ -255,11 +255,11 @@
255	255	void cache_initialize(void){
256	256	sqlite3_close(cacheOpen(1));
257	257	}
258	258
259	259	/*
260		-** COMMAND: cache* abbreviated-subcommands
	260	+** COMMAND: cache* abbrv-subcom
261	261	**
262	262	** Usage: %fossil cache SUBCOMMAND
263	263	**
264	264	** Manage the cache used for potentially expensive web pages such as
265	265	** /zip and /tarball. SUBCOMMAND can be:
266	266

	--- src/cache.c
	+++ src/cache.c
	@@ -255,11 +255,11 @@
255	void cache_initialize(void){
256	sqlite3_close(cacheOpen(1));
257	}
258
259	/*
260	** COMMAND: cache* abbreviated-subcommands
261	**
262	** Usage: %fossil cache SUBCOMMAND
263	**
264	** Manage the cache used for potentially expensive web pages such as
265	** /zip and /tarball. SUBCOMMAND can be:
266

	--- src/cache.c
	+++ src/cache.c
	@@ -255,11 +255,11 @@
255	void cache_initialize(void){
256	sqlite3_close(cacheOpen(1));
257	}
258
259	/*
260	** COMMAND: cache* abbrv-subcom
261	**
262	** Usage: %fossil cache SUBCOMMAND
263	**
264	** Manage the cache used for potentially expensive web pages such as
265	** /zip and /tarball. SUBCOMMAND can be:
266

M src/checkin.c

+1 -1

		--- src/checkin.c
		+++ src/checkin.c
		@@ -2283,11 +2283,11 @@
2283	2283	char pB = (char)b;
2284	2284	return fossil_strcmp(pA[0], pB[0]);
2285	2285	}
2286	2286
2287	2287	/*
2288		-** SETTING: verify-comments width=8 default=on show-only-if-changed
	2288	+** SETTING: verify-comments width=8 default=on if-chng
2289	2289	**
2290	2290	** This setting determines how much sanity checking, if any, the
2291	2291	** "fossil commit" and "fossil amend" commands do against check-in
2292	2292	** comments. Recognized values:
2293	2293	**
2294	2294

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2283,11 +2283,11 @@
2283	char pB = (char)b;
2284	return fossil_strcmp(pA[0], pB[0]);
2285	}
2286
2287	/*
2288	** SETTING: verify-comments width=8 default=on show-only-if-changed
2289	**
2290	** This setting determines how much sanity checking, if any, the
2291	** "fossil commit" and "fossil amend" commands do against check-in
2292	** comments. Recognized values:
2293	**
2294

	--- src/checkin.c
	+++ src/checkin.c
	@@ -2283,11 +2283,11 @@
2283	char pB = (char)b;
2284	return fossil_strcmp(pA[0], pB[0]);
2285	}
2286
2287	/*
2288	** SETTING: verify-comments width=8 default=on if-chng
2289	**
2290	** This setting determines how much sanity checking, if any, the
2291	** "fossil commit" and "fossil amend" commands do against check-in
2292	** comments. Recognized values:
2293	**
2294

M src/http_ssl.c

+2 -2

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -910,12 +910,12 @@
910	910	if( file_isdir(zPath, ExtFILE)>0 ) *pzStore = zPath;
911	911	}
912	912	#endif /* FOSSIL_ENABLE_SSL */
913	913
914	914	/*
915		-** COMMAND: tls-config* abbreviated-subcommands
916		-** COMMAND: ssl-config abbreviated-subcommands
	915	+** COMMAND: tls-config* abbrv-subcom
	916	+** COMMAND: ssl-config abbrv-subcom
917	917	**
918	918	** Usage: %fossil ssl-config [SUBCOMMAND] [OPTIONS...] [ARGS...]
919	919	**
920	920	** This command is used to view or modify the TLS (Transport Layer
921	921	** Security) configuration for Fossil. TLS (formerly SSL) is the
922	922

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -910,12 +910,12 @@
910	if( file_isdir(zPath, ExtFILE)>0 ) *pzStore = zPath;
911	}
912	#endif /* FOSSIL_ENABLE_SSL */
913
914	/*
915	** COMMAND: tls-config* abbreviated-subcommands
916	** COMMAND: ssl-config abbreviated-subcommands
917	**
918	** Usage: %fossil ssl-config [SUBCOMMAND] [OPTIONS...] [ARGS...]
919	**
920	** This command is used to view or modify the TLS (Transport Layer
921	** Security) configuration for Fossil. TLS (formerly SSL) is the
922

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -910,12 +910,12 @@
910	if( file_isdir(zPath, ExtFILE)>0 ) *pzStore = zPath;
911	}
912	#endif /* FOSSIL_ENABLE_SSL */
913
914	/*
915	** COMMAND: tls-config* abbrv-subcom
916	** COMMAND: ssl-config abbrv-subcom
917	**
918	** Usage: %fossil ssl-config [SUBCOMMAND] [OPTIONS...] [ARGS...]
919	**
920	** This command is used to view or modify the TLS (Transport Layer
921	** Security) configuration for Fossil. TLS (formerly SSL) is the
922

M src/printf.c

+3 -3

		--- src/printf.c
		+++ src/printf.c
		@@ -241,27 +241,27 @@
241	241	return n;
242	242	}
243	243	#endif
244	244
245	245	/*
246		-** SETTING: timeline-plaintext boolean default=off show-only-if-changed
	246	+** SETTING: timeline-plaintext boolean default=off if-chng
247	247	**
248	248	** If enabled, no wiki-formatting is done for timeline comment messages.
249	249	** Hyperlinks are activated, but they show up on screen using the
250	250	** complete input text, not just the display text. No other formatting
251	251	** is done.
252	252	*/
253	253	/*
254		-** SETTING: timeline-block-markup boolean default=off show-only-if-changed
	254	+** SETTING: timeline-block-markup boolean default=off if-chng
255	255	**
256	256	** If enabled, block markup (paragraph brakes, tables, lists, headings, etc)
257	257	** is enabled while rendering check-in comment message on the timeline.
258	258	** This is disabled by default, because the timeline works best if the
259	259	** check-in comments are short and do not take up too much vertical space.
260	260	*/
261	261	/*
262		-** SETTING: timeline-hard-newlines boolean default=off show-only-if-changed
	262	+** SETTING: timeline-hard-newlines boolean default=off if-chng
263	263	**
264	264	** If enabled, the timeline honors newline characters in check-in comments.
265	265	** In other words, newlines are coverted into <br> for HTML display.
266	266	** The default behavior, when this setting is off, is that newlines are
267	267	** treated like any other whitespace character.
268	268

	--- src/printf.c
	+++ src/printf.c
	@@ -241,27 +241,27 @@
241	return n;
242	}
243	#endif
244
245	/*
246	** SETTING: timeline-plaintext boolean default=off show-only-if-changed
247	**
248	** If enabled, no wiki-formatting is done for timeline comment messages.
249	** Hyperlinks are activated, but they show up on screen using the
250	** complete input text, not just the display text. No other formatting
251	** is done.
252	*/
253	/*
254	** SETTING: timeline-block-markup boolean default=off show-only-if-changed
255	**
256	** If enabled, block markup (paragraph brakes, tables, lists, headings, etc)
257	** is enabled while rendering check-in comment message on the timeline.
258	** This is disabled by default, because the timeline works best if the
259	** check-in comments are short and do not take up too much vertical space.
260	*/
261	/*
262	** SETTING: timeline-hard-newlines boolean default=off show-only-if-changed
263	**
264	** If enabled, the timeline honors newline characters in check-in comments.
265	** In other words, newlines are coverted into <br> for HTML display.
266	** The default behavior, when this setting is off, is that newlines are
267	** treated like any other whitespace character.
268

	--- src/printf.c
	+++ src/printf.c
	@@ -241,27 +241,27 @@
241	return n;
242	}
243	#endif
244
245	/*
246	** SETTING: timeline-plaintext boolean default=off if-chng
247	**
248	** If enabled, no wiki-formatting is done for timeline comment messages.
249	** Hyperlinks are activated, but they show up on screen using the
250	** complete input text, not just the display text. No other formatting
251	** is done.
252	*/
253	/*
254	** SETTING: timeline-block-markup boolean default=off if-chng
255	**
256	** If enabled, block markup (paragraph brakes, tables, lists, headings, etc)
257	** is enabled while rendering check-in comment message on the timeline.
258	** This is disabled by default, because the timeline works best if the
259	** check-in comments are short and do not take up too much vertical space.
260	*/
261	/*
262	** SETTING: timeline-hard-newlines boolean default=off if-chng
263	**
264	** If enabled, the timeline honors newline characters in check-in comments.
265	** In other words, newlines are coverted into <br> for HTML display.
266	** The default behavior, when this setting is off, is that newlines are
267	** treated like any other whitespace character.
268

M src/search.c

+1 -1

		--- src/search.c
		+++ src/search.c
		@@ -2291,11 +2291,11 @@
2291	2291	}
2292	2292	fossil_print(" done\n");
2293	2293	}
2294	2294
2295	2295	/*
2296		-** COMMAND: fts-config* abbreviated-subcommands
	2296	+** COMMAND: fts-config* abbrv-subcom
2297	2297	**
2298	2298	** Usage: fossil fts-config ?SUBCOMMAND? ?ARGUMENT?
2299	2299	**
2300	2300	** The "fossil fts-config" command configures the full-text search capabilities
2301	2301	** of the repository. Subcommands:
2302	2302

	--- src/search.c
	+++ src/search.c
	@@ -2291,11 +2291,11 @@
2291	}
2292	fossil_print(" done\n");
2293	}
2294
2295	/*
2296	** COMMAND: fts-config* abbreviated-subcommands
2297	**
2298	** Usage: fossil fts-config ?SUBCOMMAND? ?ARGUMENT?
2299	**
2300	** The "fossil fts-config" command configures the full-text search capabilities
2301	** of the repository. Subcommands:
2302

	--- src/search.c
	+++ src/search.c
	@@ -2291,11 +2291,11 @@
2291	}
2292	fossil_print(" done\n");
2293	}
2294
2295	/*
2296	** COMMAND: fts-config* abbrv-subcom
2297	**
2298	** Usage: fossil fts-config ?SUBCOMMAND? ?ARGUMENT?
2299	**
2300	** The "fossil fts-config" command configures the full-text search capabilities
2301	** of the repository. Subcommands:
2302

M src/timeline.c

+2 -2

		--- src/timeline.c
		+++ src/timeline.c
		@@ -222,20 +222,20 @@
222	222	}
223	223	zPrevDate[0] = 0;
224	224	mxWikiLen = db_get_int("timeline-max-comment", 0);
225	225	dateFormat = db_get_int("timeline-date-format", 0);
226	226	/*
227		- ** SETTING: timeline-truncate-at-blank boolean default=off show-only-if-changed
	227	+ ** SETTING: timeline-truncate-at-blank boolean default=off if-chng
228	228	**
229	229	** If enabled, check-in comments displayed on the timeline are truncated
230	230	** at the first blank line of the comment text. The comment text after
231	231	** the first blank line is only seen in the /info or similar pages that
232	232	** show details about the check-in.
233	233	*/
234	234	bCommentGitStyle = db_get_int("timeline-truncate-at-blank", 0);
235	235	/*
236		- ** SETTING: timeline-tslink-info boolean default=off show-only-if-changed
	236	+ ** SETTING: timeline-tslink-info boolean default=off if-chng
237	237	**
238	238	** The hyperlink on the timestamp associated with each timeline entry,
239	239	** on the far left-hand side of the screen, normally targets another
240	240	** /timeline page that shows the entry in context. However, if this
241	241	** option is turned on, that hyperlink targets the /info page showing
242	242

	--- src/timeline.c
	+++ src/timeline.c
	@@ -222,20 +222,20 @@
222	}
223	zPrevDate[0] = 0;
224	mxWikiLen = db_get_int("timeline-max-comment", 0);
225	dateFormat = db_get_int("timeline-date-format", 0);
226	/*
227	** SETTING: timeline-truncate-at-blank boolean default=off show-only-if-changed
228	**
229	** If enabled, check-in comments displayed on the timeline are truncated
230	** at the first blank line of the comment text. The comment text after
231	** the first blank line is only seen in the /info or similar pages that
232	** show details about the check-in.
233	*/
234	bCommentGitStyle = db_get_int("timeline-truncate-at-blank", 0);
235	/*
236	** SETTING: timeline-tslink-info boolean default=off show-only-if-changed
237	**
238	** The hyperlink on the timestamp associated with each timeline entry,
239	** on the far left-hand side of the screen, normally targets another
240	** /timeline page that shows the entry in context. However, if this
241	** option is turned on, that hyperlink targets the /info page showing
242

	--- src/timeline.c
	+++ src/timeline.c
	@@ -222,20 +222,20 @@
222	}
223	zPrevDate[0] = 0;
224	mxWikiLen = db_get_int("timeline-max-comment", 0);
225	dateFormat = db_get_int("timeline-date-format", 0);
226	/*
227	** SETTING: timeline-truncate-at-blank boolean default=off if-chng
228	**
229	** If enabled, check-in comments displayed on the timeline are truncated
230	** at the first blank line of the comment text. The comment text after
231	** the first blank line is only seen in the /info or similar pages that
232	** show details about the check-in.
233	*/
234	bCommentGitStyle = db_get_int("timeline-truncate-at-blank", 0);
235	/*
236	** SETTING: timeline-tslink-info boolean default=off if-chng
237	**
238	** The hyperlink on the timestamp associated with each timeline entry,
239	** on the far left-hand side of the screen, normally targets another
240	** /timeline page that shows the entry in context. However, if this
241	** option is turned on, that hyperlink targets the /info page showing
242

M src/unversioned.c

+2 -2

		--- src/unversioned.c
		+++ src/unversioned.c
		@@ -218,12 +218,12 @@
218	218	}
219	219	return 0;
220	220	}
221	221
222	222	/*
223		-** COMMAND: uv# abbreviated-subcommands
224		-** COMMAND: unversioned abbreviated-subcommands
	223	+** COMMAND: uv# abbrv-subcom
	224	+** COMMAND: unversioned abbrv-subcom
225	225	**
226	226	** Usage: %fossil unversioned SUBCOMMAND ARGS...
227	227	** or: %fossil uv SUBCOMMAND ARGS..
228	228	**
229	229	** Unversioned files (UV-files) are artifacts that are synced and are available
230	230

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -218,12 +218,12 @@
218	}
219	return 0;
220	}
221
222	/*
223	** COMMAND: uv# abbreviated-subcommands
224	** COMMAND: unversioned abbreviated-subcommands
225	**
226	** Usage: %fossil unversioned SUBCOMMAND ARGS...
227	** or: %fossil uv SUBCOMMAND ARGS..
228	**
229	** Unversioned files (UV-files) are artifacts that are synced and are available
230

	--- src/unversioned.c
	+++ src/unversioned.c
	@@ -218,12 +218,12 @@
218	}
219	return 0;
220	}
221
222	/*
223	** COMMAND: uv# abbrv-subcom
224	** COMMAND: unversioned abbrv-subcom
225	**
226	** Usage: %fossil unversioned SUBCOMMAND ARGS...
227	** or: %fossil uv SUBCOMMAND ARGS..
228	**
229	** Unversioned files (UV-files) are artifacts that are synced and are available
230

M tools/mkindex.c

+4 -2

		--- tools/mkindex.c
		+++ tools/mkindex.c
		@@ -282,13 +282,15 @@
282	282	aEntry[nUsed].zVar = string_dup(&zLine[i+9], j-9);
283	283	}else if( j==6 && strncmp(&zLine[i], "hidden", 6)==0 ){
284	284	aEntry[nUsed].eType \|= CMDFLAG_HIDDEN;
285	285	}else if( j==14 && strncmp(&zLine[i], "loadavg-exempt", 14)==0 ){
286	286	aEntry[nUsed].eType \|= CMDFLAG_LDAVG_EXEMPT;
287		- }else if( j==23 && strncmp(&zLine[i], "abbreviated-subcommands", 23)==0 ){
	287	+ }else if( (j==23 && strncmp(&zLine[i], "abbreviated-subcommands", 23)==0)
	288	+ \|\| (j==12 && strncmp(&zLine[i], "abbrv-subcom", 12)==0) ){
288	289	aEntry[nUsed].eType \|= CMDFLAG_ABBREVSUBCMD;
289		- }else if( j==20 && strncmp(&zLine[i], "show-only-if-changed", 20)==0 ){
	290	+ }else if( (j==20 && strncmp(&zLine[i], "show-only-if-changed", 20)==0)
	291	+ \|\| (j==7 && strncmp(&zLine[i], "if-chng", 7)==0) ){
290	292	aEntry[nUsed].eType \|= CMDFLAG_IFCHNG;
291	293	}else{
292	294	fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
293	295	zFile, nLine, j, &zLine[i]);
294	296	nErr++;
295	297

	--- tools/mkindex.c
	+++ tools/mkindex.c
	@@ -282,13 +282,15 @@
282	aEntry[nUsed].zVar = string_dup(&zLine[i+9], j-9);
283	}else if( j==6 && strncmp(&zLine[i], "hidden", 6)==0 ){
284	aEntry[nUsed].eType \|= CMDFLAG_HIDDEN;
285	}else if( j==14 && strncmp(&zLine[i], "loadavg-exempt", 14)==0 ){
286	aEntry[nUsed].eType \|= CMDFLAG_LDAVG_EXEMPT;
287	}else if( j==23 && strncmp(&zLine[i], "abbreviated-subcommands", 23)==0 ){

288	aEntry[nUsed].eType \|= CMDFLAG_ABBREVSUBCMD;
289	}else if( j==20 && strncmp(&zLine[i], "show-only-if-changed", 20)==0 ){

290	aEntry[nUsed].eType \|= CMDFLAG_IFCHNG;
291	}else{
292	fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
293	zFile, nLine, j, &zLine[i]);
294	nErr++;
295

	--- tools/mkindex.c
	+++ tools/mkindex.c
	@@ -282,13 +282,15 @@
282	aEntry[nUsed].zVar = string_dup(&zLine[i+9], j-9);
283	}else if( j==6 && strncmp(&zLine[i], "hidden", 6)==0 ){
284	aEntry[nUsed].eType \|= CMDFLAG_HIDDEN;
285	}else if( j==14 && strncmp(&zLine[i], "loadavg-exempt", 14)==0 ){
286	aEntry[nUsed].eType \|= CMDFLAG_LDAVG_EXEMPT;
287	}else if( (j==23 && strncmp(&zLine[i], "abbreviated-subcommands", 23)==0)
288	\|\| (j==12 && strncmp(&zLine[i], "abbrv-subcom", 12)==0) ){
289	aEntry[nUsed].eType \|= CMDFLAG_ABBREVSUBCMD;
290	}else if( (j==20 && strncmp(&zLine[i], "show-only-if-changed", 20)==0)
291	\|\| (j==7 && strncmp(&zLine[i], "if-chng", 7)==0) ){
292	aEntry[nUsed].eType \|= CMDFLAG_IFCHNG;
293	}else{
294	fprintf(stderr, "%s:%d: unknown option: '%.*s'\n",
295	zFile, nLine, j, &zLine[i]);
296	nErr++;
297

Fossil SCM

Keyboard Shortcuts