75c45fd8c36… — Fossil SCM

M src/chat.c

+1 -1

		--- src/chat.c
		+++ src/chat.c
		@@ -1202,11 +1202,11 @@
1202	1202	**
1203	1203	** --all Download all chat content. Normally only
1204	1204	** previously undownloaded content is retrieved.
1205	1205	** --debug Additional debugging output
1206	1206	** --out DATABASE Store CHAT table in separate database file
1207		-** DATABASE rather that adding to local clone
	1207	+** DATABASE rather than adding to local clone
1208	1208	** --unsafe Allow the use of unencrypted http://
1209	1209	**
1210	1210	** > fossil chat send [ARGUMENTS]
1211	1211	**
1212	1212	** This command sends a new message to the chatroom. The message
1213	1213

	--- src/chat.c
	+++ src/chat.c
	@@ -1202,11 +1202,11 @@
1202	**
1203	** --all Download all chat content. Normally only
1204	** previously undownloaded content is retrieved.
1205	** --debug Additional debugging output
1206	** --out DATABASE Store CHAT table in separate database file
1207	** DATABASE rather that adding to local clone
1208	** --unsafe Allow the use of unencrypted http://
1209	**
1210	** > fossil chat send [ARGUMENTS]
1211	**
1212	** This command sends a new message to the chatroom. The message
1213

	--- src/chat.c
	+++ src/chat.c
	@@ -1202,11 +1202,11 @@
1202	**
1203	** --all Download all chat content. Normally only
1204	** previously undownloaded content is retrieved.
1205	** --debug Additional debugging output
1206	** --out DATABASE Store CHAT table in separate database file
1207	** DATABASE rather than adding to local clone
1208	** --unsafe Allow the use of unencrypted http://
1209	**
1210	** > fossil chat send [ARGUMENTS]
1211	**
1212	** This command sends a new message to the chatroom. The message
1213

M src/checkin.c

+4 -4

		--- src/checkin.c
		+++ src/checkin.c
		@@ -567,11 +567,11 @@
567	567	}
568	568
569	569	/* Confirm current working directory is within check-out. */
570	570	db_must_be_within_tree();
571	571
572		- /* Get check-out version. l*/
	572	+ /* Get check-out version. */
573	573	vid = db_lget_int("checkout", 0);
574	574
575	575	/* Relative path flag determination is done by a shared function. */
576	576	if( determine_cwd_relative_option() ){
577	577	flags \|= C_RELPATH;
		@@ -2318,11 +2318,11 @@
2318	2318	**
2319	2319	** A check-in is not permitted to fork unless the --allow-fork option
2320	2320	** appears. An empty check-in (i.e. with nothing changed) is not
2321	2321	** allowed unless the --allow-empty option appears. A check-in may not
2322	2322	** be older than its ancestor unless the --allow-older option appears.
2323		-** If any of files in the check-in appear to contain unresolved merge
	2323	+** If any files in the check-in appear to contain unresolved merge
2324	2324	** conflicts, the check-in will not be allowed unless the
2325	2325	** --allow-conflict option is present. In addition, the entire
2326	2326	** check-in process may be aborted if a file contains content that
2327	2327	** appears to be binary, Unicode text, or text with CR/LF line endings
2328	2328	** unless the interactive user chooses to proceed. If there is no
		@@ -2358,11 +2358,11 @@
2358	2358	** than relying on file mtimes
2359	2359	** --ignore-clock-skew If a clock skew is detected, ignore it and
2360	2360	** behave as if the user had entered 'yes' to
2361	2361	** the question of whether to proceed despite
2362	2362	** the skew.
2363		-** --ignore-oversize Do not warning the user about oversized files
	2363	+** --ignore-oversize Do not warn the user about oversized files
2364	2364	** --integrate Close all merged-in branches
2365	2365	** -m\|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2366	2366	** -M\|--message-file FILE Read the commit comment from given file
2367	2367	** --mimetype MIMETYPE Mimetype of check-in comment
2368	2368	** -n\|--dry-run If given, display instead of run actions
		@@ -2560,11 +2560,11 @@
2560	2560	**
2561	2561	** If the remote repository sent an avoid-delta-manifests pragma on
2562	2562	** the autosync above, then also try to avoid deltas, unless the
2563	2563	** --delta option is specified. The remote repo will send the
2564	2564	** avoid-delta-manifests pragma if it has its "forbid-delta-manifests"
2565		- ** setting is enabled.
	2565	+ ** setting enabled.
2566	2566	*/
2567	2567	if( !db_get_boolean("seen-delta-manifest",0)
2568	2568	\|\| db_get_boolean("forbid-delta-manifests",0)
2569	2569	\|\| g.bAvoidDeltaManifests
2570	2570	){
2571	2571

	--- src/checkin.c
	+++ src/checkin.c
	@@ -567,11 +567,11 @@
567	}
568
569	/* Confirm current working directory is within check-out. */
570	db_must_be_within_tree();
571
572	/* Get check-out version. l*/
573	vid = db_lget_int("checkout", 0);
574
575	/* Relative path flag determination is done by a shared function. */
576	if( determine_cwd_relative_option() ){
577	flags \|= C_RELPATH;
	@@ -2318,11 +2318,11 @@
2318	**
2319	** A check-in is not permitted to fork unless the --allow-fork option
2320	** appears. An empty check-in (i.e. with nothing changed) is not
2321	** allowed unless the --allow-empty option appears. A check-in may not
2322	** be older than its ancestor unless the --allow-older option appears.
2323	** If any of files in the check-in appear to contain unresolved merge
2324	** conflicts, the check-in will not be allowed unless the
2325	** --allow-conflict option is present. In addition, the entire
2326	** check-in process may be aborted if a file contains content that
2327	** appears to be binary, Unicode text, or text with CR/LF line endings
2328	** unless the interactive user chooses to proceed. If there is no
	@@ -2358,11 +2358,11 @@
2358	** than relying on file mtimes
2359	** --ignore-clock-skew If a clock skew is detected, ignore it and
2360	** behave as if the user had entered 'yes' to
2361	** the question of whether to proceed despite
2362	** the skew.
2363	** --ignore-oversize Do not warning the user about oversized files
2364	** --integrate Close all merged-in branches
2365	** -m\|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2366	** -M\|--message-file FILE Read the commit comment from given file
2367	** --mimetype MIMETYPE Mimetype of check-in comment
2368	** -n\|--dry-run If given, display instead of run actions
	@@ -2560,11 +2560,11 @@
2560	**
2561	** If the remote repository sent an avoid-delta-manifests pragma on
2562	** the autosync above, then also try to avoid deltas, unless the
2563	** --delta option is specified. The remote repo will send the
2564	** avoid-delta-manifests pragma if it has its "forbid-delta-manifests"
2565	** setting is enabled.
2566	*/
2567	if( !db_get_boolean("seen-delta-manifest",0)
2568	\|\| db_get_boolean("forbid-delta-manifests",0)
2569	\|\| g.bAvoidDeltaManifests
2570	){
2571

	--- src/checkin.c
	+++ src/checkin.c
	@@ -567,11 +567,11 @@
567	}
568
569	/* Confirm current working directory is within check-out. */
570	db_must_be_within_tree();
571
572	/* Get check-out version. */
573	vid = db_lget_int("checkout", 0);
574
575	/* Relative path flag determination is done by a shared function. */
576	if( determine_cwd_relative_option() ){
577	flags \|= C_RELPATH;
	@@ -2318,11 +2318,11 @@
2318	**
2319	** A check-in is not permitted to fork unless the --allow-fork option
2320	** appears. An empty check-in (i.e. with nothing changed) is not
2321	** allowed unless the --allow-empty option appears. A check-in may not
2322	** be older than its ancestor unless the --allow-older option appears.
2323	** If any files in the check-in appear to contain unresolved merge
2324	** conflicts, the check-in will not be allowed unless the
2325	** --allow-conflict option is present. In addition, the entire
2326	** check-in process may be aborted if a file contains content that
2327	** appears to be binary, Unicode text, or text with CR/LF line endings
2328	** unless the interactive user chooses to proceed. If there is no
	@@ -2358,11 +2358,11 @@
2358	** than relying on file mtimes
2359	** --ignore-clock-skew If a clock skew is detected, ignore it and
2360	** behave as if the user had entered 'yes' to
2361	** the question of whether to proceed despite
2362	** the skew.
2363	** --ignore-oversize Do not warn the user about oversized files
2364	** --integrate Close all merged-in branches
2365	** -m\|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2366	** -M\|--message-file FILE Read the commit comment from given file
2367	** --mimetype MIMETYPE Mimetype of check-in comment
2368	** -n\|--dry-run If given, display instead of run actions
	@@ -2560,11 +2560,11 @@
2560	**
2561	** If the remote repository sent an avoid-delta-manifests pragma on
2562	** the autosync above, then also try to avoid deltas, unless the
2563	** --delta option is specified. The remote repo will send the
2564	** avoid-delta-manifests pragma if it has its "forbid-delta-manifests"
2565	** setting enabled.
2566	*/
2567	if( !db_get_boolean("seen-delta-manifest",0)
2568	\|\| db_get_boolean("forbid-delta-manifests",0)
2569	\|\| g.bAvoidDeltaManifests
2570	){
2571

M src/db.c

+3 -3

		--- src/db.c
		+++ src/db.c
		@@ -4080,11 +4080,11 @@
4080	4080	** specified then that version is checked out. Otherwise the most recent
4081	4081	** check-in on the main branch (usually "trunk") is used.
4082	4082	**
4083	4083	** REPOSITORY can be the filename for a repository that already exists on the
4084	4084	** local machine or it can be a URI for a remote repository. If REPOSITORY
4085		-** is a URI in one of the formats recognized by the [[clone]] command, then
	4085	+** is a URI in one of the formats recognized by the [[clone]] command, the
4086	4086	** remote repo is first cloned, then the clone is opened. The clone will be
4087	4087	** stored in the current directory, or in DIR if the "--repodir DIR" option
4088	4088	** is used. The name of the clone will be taken from the last term of the URI.
4089	4089	** For "http:" and "https:" URIs, you can append an extra term to the end of
4090	4090	** the URI to get any repository name you like. For example:
		@@ -5362,11 +5362,11 @@
5362	5362	}
5363	5363
5364	5364	/*
5365	5365	** Compute a "fingerprint" on the repository. A fingerprint is used
5366	5366	** to verify that that the repository has not been replaced by a clone
5367		-** of the same repository. More precisely, a fingerprint are used to
	5367	+** of the same repository. More precisely, a fingerprint is used to
5368	5368	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5369	5369	**
5370	5370	** The check-out database ("localdb") stores RID values. When associating
5371	5371	** a check-out database against a repository database, it is useful to verify
5372	5372	** the fingerprint so that we know tha the RID values in the check-out
		@@ -5427,11 +5427,11 @@
5427	5427	** COMMAND: test-fingerprint
5428	5428	**
5429	5429	** Usage: %fossil test-fingerprint ?RCVID?
5430	5430	**
5431	5431	** Display the repository fingerprint using the supplied RCVID or
5432		-** using the latest RCVID if not is given on the command line.
	5432	+** using the latest RCVID if none is given on the command line.
5433	5433	** Show both the legacy and the newer version of the fingerprint,
5434	5434	** and the currently stored fingerprint if there is one.
5435	5435	*/
5436	5436	void test_fingerprint(void){
5437	5437	int rcvid = 0;
5438	5438

	--- src/db.c
	+++ src/db.c
	@@ -4080,11 +4080,11 @@
4080	** specified then that version is checked out. Otherwise the most recent
4081	** check-in on the main branch (usually "trunk") is used.
4082	**
4083	** REPOSITORY can be the filename for a repository that already exists on the
4084	** local machine or it can be a URI for a remote repository. If REPOSITORY
4085	** is a URI in one of the formats recognized by the [[clone]] command, then
4086	** remote repo is first cloned, then the clone is opened. The clone will be
4087	** stored in the current directory, or in DIR if the "--repodir DIR" option
4088	** is used. The name of the clone will be taken from the last term of the URI.
4089	** For "http:" and "https:" URIs, you can append an extra term to the end of
4090	** the URI to get any repository name you like. For example:
	@@ -5362,11 +5362,11 @@
5362	}
5363
5364	/*
5365	** Compute a "fingerprint" on the repository. A fingerprint is used
5366	** to verify that that the repository has not been replaced by a clone
5367	** of the same repository. More precisely, a fingerprint are used to
5368	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5369	**
5370	** The check-out database ("localdb") stores RID values. When associating
5371	** a check-out database against a repository database, it is useful to verify
5372	** the fingerprint so that we know tha the RID values in the check-out
	@@ -5427,11 +5427,11 @@
5427	** COMMAND: test-fingerprint
5428	**
5429	** Usage: %fossil test-fingerprint ?RCVID?
5430	**
5431	** Display the repository fingerprint using the supplied RCVID or
5432	** using the latest RCVID if not is given on the command line.
5433	** Show both the legacy and the newer version of the fingerprint,
5434	** and the currently stored fingerprint if there is one.
5435	*/
5436	void test_fingerprint(void){
5437	int rcvid = 0;
5438

	--- src/db.c
	+++ src/db.c
	@@ -4080,11 +4080,11 @@
4080	** specified then that version is checked out. Otherwise the most recent
4081	** check-in on the main branch (usually "trunk") is used.
4082	**
4083	** REPOSITORY can be the filename for a repository that already exists on the
4084	** local machine or it can be a URI for a remote repository. If REPOSITORY
4085	** is a URI in one of the formats recognized by the [[clone]] command, the
4086	** remote repo is first cloned, then the clone is opened. The clone will be
4087	** stored in the current directory, or in DIR if the "--repodir DIR" option
4088	** is used. The name of the clone will be taken from the last term of the URI.
4089	** For "http:" and "https:" URIs, you can append an extra term to the end of
4090	** the URI to get any repository name you like. For example:
	@@ -5362,11 +5362,11 @@
5362	}
5363
5364	/*
5365	** Compute a "fingerprint" on the repository. A fingerprint is used
5366	** to verify that that the repository has not been replaced by a clone
5367	** of the same repository. More precisely, a fingerprint is used to
5368	** verify that the mapping between SHA3 hashes and RID values is unchanged.
5369	**
5370	** The check-out database ("localdb") stores RID values. When associating
5371	** a check-out database against a repository database, it is useful to verify
5372	** the fingerprint so that we know tha the RID values in the check-out
	@@ -5427,11 +5427,11 @@
5427	** COMMAND: test-fingerprint
5428	**
5429	** Usage: %fossil test-fingerprint ?RCVID?
5430	**
5431	** Display the repository fingerprint using the supplied RCVID or
5432	** using the latest RCVID if none is given on the command line.
5433	** Show both the legacy and the newer version of the fingerprint,
5434	** and the currently stored fingerprint if there is one.
5435	*/
5436	void test_fingerprint(void){
5437	int rcvid = 0;
5438

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -1266,11 +1266,11 @@
1266	1266	** -n\|--linenum Show line numbers
1267	1267	** -N\|--new-file Alias for --verbose
1268	1268	** --numstat Show only the number of added and deleted lines
1269	1269	** -y\|--side-by-side Side-by-side diff
1270	1270	** --strip-trailing-cr Strip trailing CR
1271		-** --tcl Tcl-formated output used internally by --tk
	1271	+** --tcl Tcl-formatted output used internally by --tk
1272	1272	** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
1273	1273	** --tk Launch a Tcl/Tk GUI for display
1274	1274	** --to VERSION Select VERSION as target for the diff
1275	1275	** --undo Diff against the "undo" buffer
1276	1276	** --unified Unified diff
1277	1277

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1266,11 +1266,11 @@
1266	** -n\|--linenum Show line numbers
1267	** -N\|--new-file Alias for --verbose
1268	** --numstat Show only the number of added and deleted lines
1269	** -y\|--side-by-side Side-by-side diff
1270	** --strip-trailing-cr Strip trailing CR
1271	** --tcl Tcl-formated output used internally by --tk
1272	** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
1273	** --tk Launch a Tcl/Tk GUI for display
1274	** --to VERSION Select VERSION as target for the diff
1275	** --undo Diff against the "undo" buffer
1276	** --unified Unified diff
1277

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1266,11 +1266,11 @@
1266	** -n\|--linenum Show line numbers
1267	** -N\|--new-file Alias for --verbose
1268	** --numstat Show only the number of added and deleted lines
1269	** -y\|--side-by-side Side-by-side diff
1270	** --strip-trailing-cr Strip trailing CR
1271	** --tcl Tcl-formatted output used internally by --tk
1272	** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh")
1273	** --tk Launch a Tcl/Tk GUI for display
1274	** --to VERSION Select VERSION as target for the diff
1275	** --undo Diff against the "undo" buffer
1276	** --unified Unified diff
1277

M src/fossil.page.chat.js

+1 -1

		--- src/fossil.page.chat.js
		+++ src/fossil.page.chat.js
		@@ -2132,11 +2132,11 @@
2132	2132	s.value ? 'add' : 'remove'
2133	2133	]('compact');
2134	2134	Chat.e.inputFields[Chat.e.inputFields.$currentIndex].focus();
2135	2135	});
2136	2136	Chat.settings.addListener('edit-ctrl-send',function(s){
2137		- const label = (s.value ? "Ctrl-" : "")+"Enter submits message";
	2137	+ const label = (s.value ? "Ctrl-" : "")+"Enter submits message.";
2138	2138	Chat.e.inputFields.forEach((e)=>{
2139	2139	const v = e.dataset.placeholder0 + " " +label;
2140	2140	if(e.isContentEditable) e.dataset.placeholder = v;
2141	2141	else D.attr(e,'placeholder',v);
2142	2142	});
2143	2143

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -2132,11 +2132,11 @@
2132	s.value ? 'add' : 'remove'
2133	]('compact');
2134	Chat.e.inputFields[Chat.e.inputFields.$currentIndex].focus();
2135	});
2136	Chat.settings.addListener('edit-ctrl-send',function(s){
2137	const label = (s.value ? "Ctrl-" : "")+"Enter submits message";
2138	Chat.e.inputFields.forEach((e)=>{
2139	const v = e.dataset.placeholder0 + " " +label;
2140	if(e.isContentEditable) e.dataset.placeholder = v;
2141	else D.attr(e,'placeholder',v);
2142	});
2143

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -2132,11 +2132,11 @@
2132	s.value ? 'add' : 'remove'
2133	]('compact');
2134	Chat.e.inputFields[Chat.e.inputFields.$currentIndex].focus();
2135	});
2136	Chat.settings.addListener('edit-ctrl-send',function(s){
2137	const label = (s.value ? "Ctrl-" : "")+"Enter submits message.";
2138	Chat.e.inputFields.forEach((e)=>{
2139	const v = e.dataset.placeholder0 + " " +label;
2140	if(e.isContentEditable) e.dataset.placeholder = v;
2141	else D.attr(e,'placeholder',v);
2142	});
2143

M src/merge.c

+3

		--- src/merge.c
		+++ src/merge.c
		@@ -295,10 +295,13 @@
295	295	** Files which are renamed in the merged-in branch will be renamed in
296	296	** the current check-out.
297	297	**
298	298	** If the VERSION argument is omitted, then Fossil attempts to find
299	299	** a recent fork on the current branch to merge.
	300	+**
	301	+** Note that this command does not commit the merge, as that is a
	302	+** separate step.
300	303	**
301	304	** If there are multiple VERSION arguments, then each VERSION is merged
302	305	** (or cherrypicked) in the order that they appear on the command-line.
303	306	**
304	307	** Options:
305	308

	--- src/merge.c
	+++ src/merge.c
	@@ -295,10 +295,13 @@
295	** Files which are renamed in the merged-in branch will be renamed in
296	** the current check-out.
297	**
298	** If the VERSION argument is omitted, then Fossil attempts to find
299	** a recent fork on the current branch to merge.



300	**
301	** If there are multiple VERSION arguments, then each VERSION is merged
302	** (or cherrypicked) in the order that they appear on the command-line.
303	**
304	** Options:
305

	--- src/merge.c
	+++ src/merge.c
	@@ -295,10 +295,13 @@
295	** Files which are renamed in the merged-in branch will be renamed in
296	** the current check-out.
297	**
298	** If the VERSION argument is omitted, then Fossil attempts to find
299	** a recent fork on the current branch to merge.
300	**
301	** Note that this command does not commit the merge, as that is a
302	** separate step.
303	**
304	** If there are multiple VERSION arguments, then each VERSION is merged
305	** (or cherrypicked) in the order that they appear on the command-line.
306	**
307	** Options:
308

Fossil SCM

Keyboard Shortcuts