bc36fdcf3ac… — Fossil SCM

M src/add.c

+23 -23

		--- src/add.c
		+++ src/add.c
		@@ -23,19 +23,19 @@
23	23	#include <assert.h>
24	24	#include <dirent.h>
25	25	#include "cygsup.h"
26	26
27	27	/*
28		-** This routine returns the names of files in a working checkout that
	28	+** This routine returns the names of files in a working check-out that
29	29	** are created by Fossil itself, and hence should not be added, deleted,
30	30	** or merge, and should be omitted from "clean" and "extras" lists.
31	31	**
32	32	** Return the N-th name. The first name has N==0. When all names have
33	33	** been used, return 0.
34	34	*/
35	35	const char *fossil_reserved_name(int N, int omitRepo){
36		- /* Possible names of the local per-checkout database file and
	36	+ /* Possible names of the local per-check-out database file and
37	37	** its associated journals
38	38	*/
39	39	static const char *const azName[] = {
40	40	"_FOSSIL_",
41	41	"_FOSSIL_-journal",
		@@ -44,11 +44,11 @@
44	44	".fslckout",
45	45	".fslckout-journal",
46	46	".fslckout-wal",
47	47	".fslckout-shm",
48	48
49		- /* The use of ".fos" as the name of the checkout database is
	49	+ /* The use of ".fos" as the name of the check-out database is
50	50	** deprecated. Use ".fslckout" instead. At some point, the following
51	51	** entries should be removed. 2012-02-04 */
52	52	".fos",
53	53	".fos-journal",
54	54	".fos-wal",
		@@ -67,11 +67,11 @@
67	67	{ "manifest.tags", MFESTFLG_TAGS }
68	68	};
69	69	static const char *azManifests[3];
70	70
71	71	/*
72		- ** Names of repository files, if they exist in the checkout.
	72	+ ** Names of repository files, if they exist in the check-out.
73	73	*/
74	74	static const char *azRepo[4] = { 0, 0, 0, 0 };
75	75
76	76	/* Cached setting "manifest" */
77	77	static int cachedManifest = -1;
		@@ -245,11 +245,11 @@
245	245	blob_reset(&repoName);
246	246	return nAdd;
247	247	}
248	248
249	249	/*
250		-** Resets the ADDED/DELETED state of a checkout, such that all
	250	+** Resets the ADDED/DELETED state of a check-out, such that all
251	251	** newly-added (but not yet committed) files are no longer added and
252	252	** newly-removed (but not yet committed) files are no longer
253	253	** removed. If bIsAdd is true, it operates on the "add" state, else it
254	254	** operates on the "rm" state.
255	255	**
		@@ -261,12 +261,12 @@
261	261	**
262	262	** This is intended to be called only in the context of the
263	263	** add/rm/addremove commands, after a call to verify_all_options().
264	264	**
265	265	** Un-added files are not modified but any un-rm'd files which are
266		-** missing from the checkout are restored from the repo. un-rm'd files
267		-** which exist in the checkout are left as-is, rather than restoring
	266	+** missing from the check-out are restored from the repo. un-rm'd files
	267	+** which exist in the check-out are left as-is, rather than restoring
268	268	** them using vfile_to_disk(), to avoid overwriting any local changes
269	269	** made to those files.
270	270	*/
271	271	static void addremove_reset(int bIsAdd, int bDryRun, int bVerbose){
272	272	int nReset = 0; /* # of entries which get reset */
		@@ -341,11 +341,11 @@
341	341	** COMMAND: add
342	342	**
343	343	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
344	344	**
345	345	** Make arrangements to add one or more files or directories to the
346		-** current checkout at the next [[commit]].
	346	+** current check-out at the next [[commit]].
347	347	**
348	348	** When adding files or directories recursively, filenames that begin
349	349	** with "." are excluded by default. To include such files, add
350	350	** the "--dotfiles" option to the command-line.
351	351	**
		@@ -370,11 +370,11 @@
370	370	** -f\|--force Add files without prompting
371	371	** --ignore CSG Ignore unmanaged files matching patterns from
372	372	** the Comma Separated Glob (CSG) pattern list
373	373	** --clean CSG Also ignore files matching patterns from
374	374	** the Comma Separated Glob (CSG) list
375		-** --reset Reset the ADDED state of a checkout, such
	375	+** --reset Reset the ADDED state of a check-out, such
376	376	** that all newly-added (but not yet committed)
377	377	** files are no longer added. No flags other
378	378	** than --verbose and --dry-run may be used
379	379	** with --reset.
380	380	** --allow-reserved Permit filenames which are reserved on
		@@ -387,11 +387,11 @@
387	387	**
388	388	** See also: [[addremove]], [[rm]]
389	389	*/
390	390	void add_cmd(void){
391	391	int i; /* Loop counter */
392		- int vid; /* Currently checked out version */
	392	+ int vid; /* Currently checked-out version */
393	393	int nRoot; /* Full path characters in g.zLocalRoot */
394	394	const char zCleanFlag; / The --clean option or clean-glob setting */
395	395	const char zIgnoreFlag; / The --ignore option or ignore-glob setting */
396	396	Glob pIgnore, pClean; /* Ignore everything matching the glob patterns */
397	397	unsigned scanFlags = 0; /* Flags passed to vfile_scan() */
		@@ -437,11 +437,11 @@
437	437	char *zName;
438	438	int isDir;
439	439	Blob fullName = empty_blob;
440	440
441	441	/* file_tree_name() throws a fatal error if g.argv[i] is outside of the
442		- ** checkout. */
	442	+ ** check-out. */
443	443	file_tree_name(g.argv[i], &fullName, 0, 1);
444	444	blob_reset(&fullName);
445	445	file_canonical_name(g.argv[i], &fullName, 0);
446	446	zName = blob_str(&fullName);
447	447	isDir = file_isdir(zName, RepoFILE);
		@@ -530,11 +530,11 @@
530	530	db_multi_exec("INSERT INTO fremove VALUES('%q');", blob_str(&fullOldName));
531	531	blob_reset(&fullOldName);
532	532	}
533	533
534	534	/*
535		-** This function deletes files from the checkout, using the file names
	535	+** This function deletes files from the check-out, using the file names
536	536	** contained in the temporary table "fremove". The temporary table is
537	537	** created on demand by the add_file_to_remove() function.
538	538	**
539	539	** If dryRunFlag is non-zero, no files will be removed; however, their
540	540	** names will still be output.
		@@ -581,16 +581,16 @@
581	581	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
582	582	** setting is non-zero, files WILL BE removed from disk as well.
583	583	** This does NOT apply to the 'forget' command.
584	584	**
585	585	** Options:
586		-** --soft Skip removing files from the checkout.
	586	+** --soft Skip removing files from the check-out.
587	587	** This supersedes the --hard option.
588	588	** --hard Remove files from the check-out
589	589	** --case-sensitive BOOL Override the case-sensitive setting
590	590	** -n\|--dry-run If given, display instead of run actions.
591		-** --reset Reset the DELETED state of a checkout, such
	591	+** --reset Reset the DELETED state of a check-out, such
592	592	** that all newly-rm'd (but not yet committed)
593	593	** files are no longer removed. No flags other
594	594	** than --verbose or --dry-run may be used with
595	595	** --reset.
596	596	** -v\|--verbose Outputs information about each --reset file.
		@@ -743,17 +743,17 @@
743	743	** COMMAND: addremove
744	744	**
745	745	** Usage: %fossil addremove ?OPTIONS?
746	746	**
747	747	** Do all necessary "[[add]]" and "[[rm]]" commands to synchronize the
748		-** repository with the content of the working checkout:
	748	+** repository with the content of the working check-out:
749	749	**
750		-** * All files in the checkout but not in the repository (that is,
	750	+** * All files in the check-out but not in the repository (that is,
751	751	** all files displayed using the "extras" command) are added as
752	752	** if by the "[[add]]" command.
753	753	**
754		-** * All files in the repository but missing from the checkout (that is,
	754	+** * All files in the repository but missing from the check-out (that is,
755	755	** all files that show as MISSING with the "status" command) are
756	756	** removed as if by the "[[rm]]" command.
757	757	**
758	758	** The command does not "[[commit]]". You must run the "[[commit]]" separately
759	759	** as a separate step.
		@@ -777,11 +777,11 @@
777	777	** --ignore CSG Ignore unmanaged files matching patterns from
778	778	** the Comma Separated Glob (CSG) list
779	779	** --clean CSG Also ignore files matching patterns from
780	780	** the Comma Separated Glob (CSG) list
781	781	** -n\|--dry-run If given, display instead of run actions
782		-** --reset Reset the ADDED/DELETED state of a checkout,
	782	+** --reset Reset the ADDED/DELETED state of a check-out,
783	783	** such that all newly-added (but not yet committed)
784	784	** files are no longer added and all newly-removed
785	785	** (but not yet committed) files are no longer
786	786	** removed. No flags other than --verbose and
787	787	** --dry-run may be used with --reset.
		@@ -826,11 +826,11 @@
826	826	/* Fail if unprocessed arguments are present, in case user expect the
827	827	** addremove command to accept a list of file or directory.
828	828	*/
829	829	if( g.argc>2 ){
830	830	fossil_fatal(
831		- "%s: Can only work on the entire checkout, no arguments supported.",
	831	+ "%s: Can only work on the entire check-out, no arguments supported.",
832	832	g.argv[1]);
833	833	}
834	834	db_must_be_within_tree();
835	835	if( zCleanFlag==0 ){
836	836	zCleanFlag = db_get("clean-glob", 0);
		@@ -955,11 +955,11 @@
955	955	blob_reset(&fullNewName);
956	956	blob_reset(&fullOldName);
957	957	}
958	958
959	959	/*
960		-** This function moves files within the checkout, using the file names
	960	+** This function moves files within the check-out, using the file names
961	961	** contained in the temporary table "fmove". The temporary table is
962	962	** created on demand by the add_file_to_move() function.
963	963	**
964	964	** If dryRunFlag is non-zero, no files will be moved; however, their
965	965	** names will still be output.
		@@ -1021,13 +1021,13 @@
1021	1021	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
1022	1022	** setting is non-zero, files WILL BE renamed or moved on disk
1023	1023	** as well. This does NOT apply to the 'rename' command.
1024	1024	**
1025	1025	** Options:
1026		-** --soft Skip moving files within the checkout.
	1026	+** --soft Skip moving files within the check-out.
1027	1027	** This supersedes the --hard option.
1028		-** --hard Move files within the checkout
	1028	+** --hard Move files within the check-out
1029	1029	** --case-sensitive BOOL Override the case-sensitive setting
1030	1030	** -n\|--dry-run If given, display instead of run actions
1031	1031	**
1032	1032	** See also: [[changes]], [[status]]
1033	1033	*/
		@@ -1052,11 +1052,11 @@
1052	1052	/* We should be done with options.. */
1053	1053	verify_all_options();
1054	1054
1055	1055	vid = db_lget_int("checkout", 0);
1056	1056	if( vid==0 ){
1057		- fossil_fatal("no checkout in which to rename files");
	1057	+ fossil_fatal("no check-out in which to rename files");
1058	1058	}
1059	1059	if( g.argc<4 ){
1060	1060	usage("OLDNAME NEWNAME");
1061	1061	}
1062	1062	zDest = g.argv[g.argc-1];
1063	1063

	--- src/add.c
	+++ src/add.c
	@@ -23,19 +23,19 @@
23	#include <assert.h>
24	#include <dirent.h>
25	#include "cygsup.h"
26
27	/*
28	** This routine returns the names of files in a working checkout that
29	** are created by Fossil itself, and hence should not be added, deleted,
30	** or merge, and should be omitted from "clean" and "extras" lists.
31	**
32	** Return the N-th name. The first name has N==0. When all names have
33	** been used, return 0.
34	*/
35	const char *fossil_reserved_name(int N, int omitRepo){
36	/* Possible names of the local per-checkout database file and
37	** its associated journals
38	*/
39	static const char *const azName[] = {
40	"_FOSSIL_",
41	"_FOSSIL_-journal",
	@@ -44,11 +44,11 @@
44	".fslckout",
45	".fslckout-journal",
46	".fslckout-wal",
47	".fslckout-shm",
48
49	/* The use of ".fos" as the name of the checkout database is
50	** deprecated. Use ".fslckout" instead. At some point, the following
51	** entries should be removed. 2012-02-04 */
52	".fos",
53	".fos-journal",
54	".fos-wal",
	@@ -67,11 +67,11 @@
67	{ "manifest.tags", MFESTFLG_TAGS }
68	};
69	static const char *azManifests[3];
70
71	/*
72	** Names of repository files, if they exist in the checkout.
73	*/
74	static const char *azRepo[4] = { 0, 0, 0, 0 };
75
76	/* Cached setting "manifest" */
77	static int cachedManifest = -1;
	@@ -245,11 +245,11 @@
245	blob_reset(&repoName);
246	return nAdd;
247	}
248
249	/*
250	** Resets the ADDED/DELETED state of a checkout, such that all
251	** newly-added (but not yet committed) files are no longer added and
252	** newly-removed (but not yet committed) files are no longer
253	** removed. If bIsAdd is true, it operates on the "add" state, else it
254	** operates on the "rm" state.
255	**
	@@ -261,12 +261,12 @@
261	**
262	** This is intended to be called only in the context of the
263	** add/rm/addremove commands, after a call to verify_all_options().
264	**
265	** Un-added files are not modified but any un-rm'd files which are
266	** missing from the checkout are restored from the repo. un-rm'd files
267	** which exist in the checkout are left as-is, rather than restoring
268	** them using vfile_to_disk(), to avoid overwriting any local changes
269	** made to those files.
270	*/
271	static void addremove_reset(int bIsAdd, int bDryRun, int bVerbose){
272	int nReset = 0; /* # of entries which get reset */
	@@ -341,11 +341,11 @@
341	** COMMAND: add
342	**
343	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
344	**
345	** Make arrangements to add one or more files or directories to the
346	** current checkout at the next [[commit]].
347	**
348	** When adding files or directories recursively, filenames that begin
349	** with "." are excluded by default. To include such files, add
350	** the "--dotfiles" option to the command-line.
351	**
	@@ -370,11 +370,11 @@
370	** -f\|--force Add files without prompting
371	** --ignore CSG Ignore unmanaged files matching patterns from
372	** the Comma Separated Glob (CSG) pattern list
373	** --clean CSG Also ignore files matching patterns from
374	** the Comma Separated Glob (CSG) list
375	** --reset Reset the ADDED state of a checkout, such
376	** that all newly-added (but not yet committed)
377	** files are no longer added. No flags other
378	** than --verbose and --dry-run may be used
379	** with --reset.
380	** --allow-reserved Permit filenames which are reserved on
	@@ -387,11 +387,11 @@
387	**
388	** See also: [[addremove]], [[rm]]
389	*/
390	void add_cmd(void){
391	int i; /* Loop counter */
392	int vid; /* Currently checked out version */
393	int nRoot; /* Full path characters in g.zLocalRoot */
394	const char zCleanFlag; / The --clean option or clean-glob setting */
395	const char zIgnoreFlag; / The --ignore option or ignore-glob setting */
396	Glob pIgnore, pClean; /* Ignore everything matching the glob patterns */
397	unsigned scanFlags = 0; /* Flags passed to vfile_scan() */
	@@ -437,11 +437,11 @@
437	char *zName;
438	int isDir;
439	Blob fullName = empty_blob;
440
441	/* file_tree_name() throws a fatal error if g.argv[i] is outside of the
442	** checkout. */
443	file_tree_name(g.argv[i], &fullName, 0, 1);
444	blob_reset(&fullName);
445	file_canonical_name(g.argv[i], &fullName, 0);
446	zName = blob_str(&fullName);
447	isDir = file_isdir(zName, RepoFILE);
	@@ -530,11 +530,11 @@
530	db_multi_exec("INSERT INTO fremove VALUES('%q');", blob_str(&fullOldName));
531	blob_reset(&fullOldName);
532	}
533
534	/*
535	** This function deletes files from the checkout, using the file names
536	** contained in the temporary table "fremove". The temporary table is
537	** created on demand by the add_file_to_remove() function.
538	**
539	** If dryRunFlag is non-zero, no files will be removed; however, their
540	** names will still be output.
	@@ -581,16 +581,16 @@
581	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
582	** setting is non-zero, files WILL BE removed from disk as well.
583	** This does NOT apply to the 'forget' command.
584	**
585	** Options:
586	** --soft Skip removing files from the checkout.
587	** This supersedes the --hard option.
588	** --hard Remove files from the check-out
589	** --case-sensitive BOOL Override the case-sensitive setting
590	** -n\|--dry-run If given, display instead of run actions.
591	** --reset Reset the DELETED state of a checkout, such
592	** that all newly-rm'd (but not yet committed)
593	** files are no longer removed. No flags other
594	** than --verbose or --dry-run may be used with
595	** --reset.
596	** -v\|--verbose Outputs information about each --reset file.
	@@ -743,17 +743,17 @@
743	** COMMAND: addremove
744	**
745	** Usage: %fossil addremove ?OPTIONS?
746	**
747	** Do all necessary "[[add]]" and "[[rm]]" commands to synchronize the
748	** repository with the content of the working checkout:
749	**
750	** * All files in the checkout but not in the repository (that is,
751	** all files displayed using the "extras" command) are added as
752	** if by the "[[add]]" command.
753	**
754	** * All files in the repository but missing from the checkout (that is,
755	** all files that show as MISSING with the "status" command) are
756	** removed as if by the "[[rm]]" command.
757	**
758	** The command does not "[[commit]]". You must run the "[[commit]]" separately
759	** as a separate step.
	@@ -777,11 +777,11 @@
777	** --ignore CSG Ignore unmanaged files matching patterns from
778	** the Comma Separated Glob (CSG) list
779	** --clean CSG Also ignore files matching patterns from
780	** the Comma Separated Glob (CSG) list
781	** -n\|--dry-run If given, display instead of run actions
782	** --reset Reset the ADDED/DELETED state of a checkout,
783	** such that all newly-added (but not yet committed)
784	** files are no longer added and all newly-removed
785	** (but not yet committed) files are no longer
786	** removed. No flags other than --verbose and
787	** --dry-run may be used with --reset.
	@@ -826,11 +826,11 @@
826	/* Fail if unprocessed arguments are present, in case user expect the
827	** addremove command to accept a list of file or directory.
828	*/
829	if( g.argc>2 ){
830	fossil_fatal(
831	"%s: Can only work on the entire checkout, no arguments supported.",
832	g.argv[1]);
833	}
834	db_must_be_within_tree();
835	if( zCleanFlag==0 ){
836	zCleanFlag = db_get("clean-glob", 0);
	@@ -955,11 +955,11 @@
955	blob_reset(&fullNewName);
956	blob_reset(&fullOldName);
957	}
958
959	/*
960	** This function moves files within the checkout, using the file names
961	** contained in the temporary table "fmove". The temporary table is
962	** created on demand by the add_file_to_move() function.
963	**
964	** If dryRunFlag is non-zero, no files will be moved; however, their
965	** names will still be output.
	@@ -1021,13 +1021,13 @@
1021	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
1022	** setting is non-zero, files WILL BE renamed or moved on disk
1023	** as well. This does NOT apply to the 'rename' command.
1024	**
1025	** Options:
1026	** --soft Skip moving files within the checkout.
1027	** This supersedes the --hard option.
1028	** --hard Move files within the checkout
1029	** --case-sensitive BOOL Override the case-sensitive setting
1030	** -n\|--dry-run If given, display instead of run actions
1031	**
1032	** See also: [[changes]], [[status]]
1033	*/
	@@ -1052,11 +1052,11 @@
1052	/* We should be done with options.. */
1053	verify_all_options();
1054
1055	vid = db_lget_int("checkout", 0);
1056	if( vid==0 ){
1057	fossil_fatal("no checkout in which to rename files");
1058	}
1059	if( g.argc<4 ){
1060	usage("OLDNAME NEWNAME");
1061	}
1062	zDest = g.argv[g.argc-1];
1063

	--- src/add.c
	+++ src/add.c
	@@ -23,19 +23,19 @@
23	#include <assert.h>
24	#include <dirent.h>
25	#include "cygsup.h"
26
27	/*
28	** This routine returns the names of files in a working check-out that
29	** are created by Fossil itself, and hence should not be added, deleted,
30	** or merge, and should be omitted from "clean" and "extras" lists.
31	**
32	** Return the N-th name. The first name has N==0. When all names have
33	** been used, return 0.
34	*/
35	const char *fossil_reserved_name(int N, int omitRepo){
36	/* Possible names of the local per-check-out database file and
37	** its associated journals
38	*/
39	static const char *const azName[] = {
40	"_FOSSIL_",
41	"_FOSSIL_-journal",
	@@ -44,11 +44,11 @@
44	".fslckout",
45	".fslckout-journal",
46	".fslckout-wal",
47	".fslckout-shm",
48
49	/* The use of ".fos" as the name of the check-out database is
50	** deprecated. Use ".fslckout" instead. At some point, the following
51	** entries should be removed. 2012-02-04 */
52	".fos",
53	".fos-journal",
54	".fos-wal",
	@@ -67,11 +67,11 @@
67	{ "manifest.tags", MFESTFLG_TAGS }
68	};
69	static const char *azManifests[3];
70
71	/*
72	** Names of repository files, if they exist in the check-out.
73	*/
74	static const char *azRepo[4] = { 0, 0, 0, 0 };
75
76	/* Cached setting "manifest" */
77	static int cachedManifest = -1;
	@@ -245,11 +245,11 @@
245	blob_reset(&repoName);
246	return nAdd;
247	}
248
249	/*
250	** Resets the ADDED/DELETED state of a check-out, such that all
251	** newly-added (but not yet committed) files are no longer added and
252	** newly-removed (but not yet committed) files are no longer
253	** removed. If bIsAdd is true, it operates on the "add" state, else it
254	** operates on the "rm" state.
255	**
	@@ -261,12 +261,12 @@
261	**
262	** This is intended to be called only in the context of the
263	** add/rm/addremove commands, after a call to verify_all_options().
264	**
265	** Un-added files are not modified but any un-rm'd files which are
266	** missing from the check-out are restored from the repo. un-rm'd files
267	** which exist in the check-out are left as-is, rather than restoring
268	** them using vfile_to_disk(), to avoid overwriting any local changes
269	** made to those files.
270	*/
271	static void addremove_reset(int bIsAdd, int bDryRun, int bVerbose){
272	int nReset = 0; /* # of entries which get reset */
	@@ -341,11 +341,11 @@
341	** COMMAND: add
342	**
343	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
344	**
345	** Make arrangements to add one or more files or directories to the
346	** current check-out at the next [[commit]].
347	**
348	** When adding files or directories recursively, filenames that begin
349	** with "." are excluded by default. To include such files, add
350	** the "--dotfiles" option to the command-line.
351	**
	@@ -370,11 +370,11 @@
370	** -f\|--force Add files without prompting
371	** --ignore CSG Ignore unmanaged files matching patterns from
372	** the Comma Separated Glob (CSG) pattern list
373	** --clean CSG Also ignore files matching patterns from
374	** the Comma Separated Glob (CSG) list
375	** --reset Reset the ADDED state of a check-out, such
376	** that all newly-added (but not yet committed)
377	** files are no longer added. No flags other
378	** than --verbose and --dry-run may be used
379	** with --reset.
380	** --allow-reserved Permit filenames which are reserved on
	@@ -387,11 +387,11 @@
387	**
388	** See also: [[addremove]], [[rm]]
389	*/
390	void add_cmd(void){
391	int i; /* Loop counter */
392	int vid; /* Currently checked-out version */
393	int nRoot; /* Full path characters in g.zLocalRoot */
394	const char zCleanFlag; / The --clean option or clean-glob setting */
395	const char zIgnoreFlag; / The --ignore option or ignore-glob setting */
396	Glob pIgnore, pClean; /* Ignore everything matching the glob patterns */
397	unsigned scanFlags = 0; /* Flags passed to vfile_scan() */
	@@ -437,11 +437,11 @@
437	char *zName;
438	int isDir;
439	Blob fullName = empty_blob;
440
441	/* file_tree_name() throws a fatal error if g.argv[i] is outside of the
442	** check-out. */
443	file_tree_name(g.argv[i], &fullName, 0, 1);
444	blob_reset(&fullName);
445	file_canonical_name(g.argv[i], &fullName, 0);
446	zName = blob_str(&fullName);
447	isDir = file_isdir(zName, RepoFILE);
	@@ -530,11 +530,11 @@
530	db_multi_exec("INSERT INTO fremove VALUES('%q');", blob_str(&fullOldName));
531	blob_reset(&fullOldName);
532	}
533
534	/*
535	** This function deletes files from the check-out, using the file names
536	** contained in the temporary table "fremove". The temporary table is
537	** created on demand by the add_file_to_remove() function.
538	**
539	** If dryRunFlag is non-zero, no files will be removed; however, their
540	** names will still be output.
	@@ -581,16 +581,16 @@
581	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
582	** setting is non-zero, files WILL BE removed from disk as well.
583	** This does NOT apply to the 'forget' command.
584	**
585	** Options:
586	** --soft Skip removing files from the check-out.
587	** This supersedes the --hard option.
588	** --hard Remove files from the check-out
589	** --case-sensitive BOOL Override the case-sensitive setting
590	** -n\|--dry-run If given, display instead of run actions.
591	** --reset Reset the DELETED state of a check-out, such
592	** that all newly-rm'd (but not yet committed)
593	** files are no longer removed. No flags other
594	** than --verbose or --dry-run may be used with
595	** --reset.
596	** -v\|--verbose Outputs information about each --reset file.
	@@ -743,17 +743,17 @@
743	** COMMAND: addremove
744	**
745	** Usage: %fossil addremove ?OPTIONS?
746	**
747	** Do all necessary "[[add]]" and "[[rm]]" commands to synchronize the
748	** repository with the content of the working check-out:
749	**
750	** * All files in the check-out but not in the repository (that is,
751	** all files displayed using the "extras" command) are added as
752	** if by the "[[add]]" command.
753	**
754	** * All files in the repository but missing from the check-out (that is,
755	** all files that show as MISSING with the "status" command) are
756	** removed as if by the "[[rm]]" command.
757	**
758	** The command does not "[[commit]]". You must run the "[[commit]]" separately
759	** as a separate step.
	@@ -777,11 +777,11 @@
777	** --ignore CSG Ignore unmanaged files matching patterns from
778	** the Comma Separated Glob (CSG) list
779	** --clean CSG Also ignore files matching patterns from
780	** the Comma Separated Glob (CSG) list
781	** -n\|--dry-run If given, display instead of run actions
782	** --reset Reset the ADDED/DELETED state of a check-out,
783	** such that all newly-added (but not yet committed)
784	** files are no longer added and all newly-removed
785	** (but not yet committed) files are no longer
786	** removed. No flags other than --verbose and
787	** --dry-run may be used with --reset.
	@@ -826,11 +826,11 @@
826	/* Fail if unprocessed arguments are present, in case user expect the
827	** addremove command to accept a list of file or directory.
828	*/
829	if( g.argc>2 ){
830	fossil_fatal(
831	"%s: Can only work on the entire check-out, no arguments supported.",
832	g.argv[1]);
833	}
834	db_must_be_within_tree();
835	if( zCleanFlag==0 ){
836	zCleanFlag = db_get("clean-glob", 0);
	@@ -955,11 +955,11 @@
955	blob_reset(&fullNewName);
956	blob_reset(&fullOldName);
957	}
958
959	/*
960	** This function moves files within the check-out, using the file names
961	** contained in the temporary table "fmove". The temporary table is
962	** created on demand by the add_file_to_move() function.
963	**
964	** If dryRunFlag is non-zero, no files will be moved; however, their
965	** names will still be output.
	@@ -1021,13 +1021,13 @@
1021	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
1022	** setting is non-zero, files WILL BE renamed or moved on disk
1023	** as well. This does NOT apply to the 'rename' command.
1024	**
1025	** Options:
1026	** --soft Skip moving files within the check-out.
1027	** This supersedes the --hard option.
1028	** --hard Move files within the check-out
1029	** --case-sensitive BOOL Override the case-sensitive setting
1030	** -n\|--dry-run If given, display instead of run actions
1031	**
1032	** See also: [[changes]], [[status]]
1033	*/
	@@ -1052,11 +1052,11 @@
1052	/* We should be done with options.. */
1053	verify_all_options();
1054
1055	vid = db_lget_int("checkout", 0);
1056	if( vid==0 ){
1057	fossil_fatal("no check-out in which to rename files");
1058	}
1059	if( g.argc<4 ){
1060	usage("OLDNAME NEWNAME");
1061	}
1062	zDest = g.argv[g.argc-1];
1063

M src/ajax.c

+2 -2

		--- src/ajax.c
		+++ src/ajax.c
		@@ -235,11 +235,11 @@
235	235	}
236	236	return 1;
237	237	}
238	238
239	239	/*
240		-** Helper for collecting filename/checkin request parameters.
	240	+** Helper for collecting filename/check-in request parameters.
241	241	**
242	242	** If zFn is not NULL, it is assigned the value of the first one of
243	243	** the "filename" or "fn" CGI parameters which is set.
244	244	**
245	245	** If zCi is not NULL, it is assigned the value of the first one of
		@@ -323,11 +323,11 @@
323	323	ln ? AJAX_PREVIEW_LINE_NUMBERS : 0,
324	324	&renderMode, iframeHeight);
325	325	/*
326	326	** Now tell the caller if we did indeed use AJAX_RENDER_WIKI, so that
327	327	** they can re-set the <base href> to an appropriate value (which
328		- ** requires knowing the content's current checkin version, which we
	328	+ ** requires knowing the content's current check-in version, which we
329	329	** don't have here).
330	330	*/
331	331	switch(renderMode){
332	332	/* The strings used here MUST correspond to those used in the JS-side
333	333	** fossil.page.previewModes map.
334	334

	--- src/ajax.c
	+++ src/ajax.c
	@@ -235,11 +235,11 @@
235	}
236	return 1;
237	}
238
239	/*
240	** Helper for collecting filename/checkin request parameters.
241	**
242	** If zFn is not NULL, it is assigned the value of the first one of
243	** the "filename" or "fn" CGI parameters which is set.
244	**
245	** If zCi is not NULL, it is assigned the value of the first one of
	@@ -323,11 +323,11 @@
323	ln ? AJAX_PREVIEW_LINE_NUMBERS : 0,
324	&renderMode, iframeHeight);
325	/*
326	** Now tell the caller if we did indeed use AJAX_RENDER_WIKI, so that
327	** they can re-set the <base href> to an appropriate value (which
328	** requires knowing the content's current checkin version, which we
329	** don't have here).
330	*/
331	switch(renderMode){
332	/* The strings used here MUST correspond to those used in the JS-side
333	** fossil.page.previewModes map.
334

	--- src/ajax.c
	+++ src/ajax.c
	@@ -235,11 +235,11 @@
235	}
236	return 1;
237	}
238
239	/*
240	** Helper for collecting filename/check-in request parameters.
241	**
242	** If zFn is not NULL, it is assigned the value of the first one of
243	** the "filename" or "fn" CGI parameters which is set.
244	**
245	** If zCi is not NULL, it is assigned the value of the first one of
	@@ -323,11 +323,11 @@
323	ln ? AJAX_PREVIEW_LINE_NUMBERS : 0,
324	&renderMode, iframeHeight);
325	/*
326	** Now tell the caller if we did indeed use AJAX_RENDER_WIKI, so that
327	** they can re-set the <base href> to an appropriate value (which
328	** requires knowing the content's current check-in version, which we
329	** don't have here).
330	*/
331	switch(renderMode){
332	/* The strings used here MUST correspond to those used in the JS-side
333	** fossil.page.previewModes map.
334

M src/allrepo.c

+7 -7

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -69,27 +69,27 @@
69	69	**
70	70	** cache Manages the cache used for potentially expensive web
71	71	** pages. Any additional arguments are passed on verbatim
72	72	** to the cache command.
73	73	**
74		-** changes Shows all local checkouts that have uncommitted changes.
	74	+** changes Shows all local check-outs that have uncommitted changes.
75	75	** This operation has no additional options.
76	76	**
77		-** clean Delete all "extra" files in all local checkouts. Extreme
	77	+** clean Delete all "extra" files in all local check-outs. Extreme
78	78	** caution should be exercised with this command because its
79	79	** effects cannot be undone. Use of the --dry-run option to
80		-** carefully review the local checkouts to be operated upon
	80	+** carefully review the local check-outs to be operated upon
81	81	** and the --whatif option to carefully review the files to
82	82	** be deleted beforehand is highly recommended. The command
83	83	** line options supported by the clean command itself, if any
84	84	** are present, are passed along verbatim.
85	85	**
86	86	** config Only the "config pull AREA" command works.
87	87	**
88	88	** dbstat Run the "dbstat" command on all repositories.
89	89	**
90		-** extras Shows "extra" files from all local checkouts. The command
	90	+** extras Shows "extra" files from all local check-outs. The command
91	91	** line options supported by the extra command itself, if any
92	92	** are present, are passed along verbatim.
93	93	**
94	94	** fts-config Run the "fts-config" command on all repositories.
95	95	**
		@@ -137,14 +137,14 @@
137	137	** hint if you rename repositories.
138	138	**
139	139	** ignore Arguments are repositories that should be ignored by
140	140	** subsequent clean, extras, list, pull, push, rebuild, and
141	141	** sync operations. The -c\|--ckout option causes the listed
142		-** local checkouts to be ignored instead.
	142	+** local check-outs to be ignored instead.
143	143	**
144	144	** list \| ls Display the location of all repositories. The -c\|--ckout
145		-** option causes all local checkouts to be listed instead.
	145	+** option causes all local check-outs to be listed instead.
146	146	**
147	147	** Repositories are automatically added to the set of known repositories
148	148	** when one of the following commands are run against the repository:
149	149	** clone, info, pull, push, or sync. Even previously ignored repositories
150	150	** are added back to the list of repositories by these commands.
		@@ -425,11 +425,11 @@
425	425	}
426	426	if( zCmd[0]=='l' ){
427	427	fossil_print("%s\n", zFilename);
428	428	continue;
429	429	}else if( showFile ){
430		- fossil_print("%s: %s\n", useCheckouts ? "checkout" : "repository",
	430	+ fossil_print("%s: %s\n", useCheckouts ? "check-out" : "repository",
431	431	zFilename);
432	432	}
433	433	zSyscmd = mprintf("%$ %s %$%s",
434	434	g.nameOfExe, zCmd, zFilename, blob_str(&extra));
435	435	if( showLabel ){
436	436

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -69,27 +69,27 @@
69	**
70	** cache Manages the cache used for potentially expensive web
71	** pages. Any additional arguments are passed on verbatim
72	** to the cache command.
73	**
74	** changes Shows all local checkouts that have uncommitted changes.
75	** This operation has no additional options.
76	**
77	** clean Delete all "extra" files in all local checkouts. Extreme
78	** caution should be exercised with this command because its
79	** effects cannot be undone. Use of the --dry-run option to
80	** carefully review the local checkouts to be operated upon
81	** and the --whatif option to carefully review the files to
82	** be deleted beforehand is highly recommended. The command
83	** line options supported by the clean command itself, if any
84	** are present, are passed along verbatim.
85	**
86	** config Only the "config pull AREA" command works.
87	**
88	** dbstat Run the "dbstat" command on all repositories.
89	**
90	** extras Shows "extra" files from all local checkouts. The command
91	** line options supported by the extra command itself, if any
92	** are present, are passed along verbatim.
93	**
94	** fts-config Run the "fts-config" command on all repositories.
95	**
	@@ -137,14 +137,14 @@
137	** hint if you rename repositories.
138	**
139	** ignore Arguments are repositories that should be ignored by
140	** subsequent clean, extras, list, pull, push, rebuild, and
141	** sync operations. The -c\|--ckout option causes the listed
142	** local checkouts to be ignored instead.
143	**
144	** list \| ls Display the location of all repositories. The -c\|--ckout
145	** option causes all local checkouts to be listed instead.
146	**
147	** Repositories are automatically added to the set of known repositories
148	** when one of the following commands are run against the repository:
149	** clone, info, pull, push, or sync. Even previously ignored repositories
150	** are added back to the list of repositories by these commands.
	@@ -425,11 +425,11 @@
425	}
426	if( zCmd[0]=='l' ){
427	fossil_print("%s\n", zFilename);
428	continue;
429	}else if( showFile ){
430	fossil_print("%s: %s\n", useCheckouts ? "checkout" : "repository",
431	zFilename);
432	}
433	zSyscmd = mprintf("%$ %s %$%s",
434	g.nameOfExe, zCmd, zFilename, blob_str(&extra));
435	if( showLabel ){
436

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -69,27 +69,27 @@
69	**
70	** cache Manages the cache used for potentially expensive web
71	** pages. Any additional arguments are passed on verbatim
72	** to the cache command.
73	**
74	** changes Shows all local check-outs that have uncommitted changes.
75	** This operation has no additional options.
76	**
77	** clean Delete all "extra" files in all local check-outs. Extreme
78	** caution should be exercised with this command because its
79	** effects cannot be undone. Use of the --dry-run option to
80	** carefully review the local check-outs to be operated upon
81	** and the --whatif option to carefully review the files to
82	** be deleted beforehand is highly recommended. The command
83	** line options supported by the clean command itself, if any
84	** are present, are passed along verbatim.
85	**
86	** config Only the "config pull AREA" command works.
87	**
88	** dbstat Run the "dbstat" command on all repositories.
89	**
90	** extras Shows "extra" files from all local check-outs. The command
91	** line options supported by the extra command itself, if any
92	** are present, are passed along verbatim.
93	**
94	** fts-config Run the "fts-config" command on all repositories.
95	**
	@@ -137,14 +137,14 @@
137	** hint if you rename repositories.
138	**
139	** ignore Arguments are repositories that should be ignored by
140	** subsequent clean, extras, list, pull, push, rebuild, and
141	** sync operations. The -c\|--ckout option causes the listed
142	** local check-outs to be ignored instead.
143	**
144	** list \| ls Display the location of all repositories. The -c\|--ckout
145	** option causes all local check-outs to be listed instead.
146	**
147	** Repositories are automatically added to the set of known repositories
148	** when one of the following commands are run against the repository:
149	** clone, info, pull, push, or sync. Even previously ignored repositories
150	** are added back to the list of repositories by these commands.
	@@ -425,11 +425,11 @@
425	}
426	if( zCmd[0]=='l' ){
427	fossil_print("%s\n", zFilename);
428	continue;
429	}else if( showFile ){
430	fossil_print("%s: %s\n", useCheckouts ? "check-out" : "repository",
431	zFilename);
432	}
433	zSyscmd = mprintf("%$ %s %$%s",
434	g.nameOfExe, zCmd, zFilename, blob_str(&extra));
435	if( showLabel ){
436

M src/backoffice.c

+1 -1

		--- src/backoffice.c
		+++ src/backoffice.c
		@@ -666,11 +666,11 @@
666	666	** COMMAND: backoffice*
667	667	**
668	668	** Usage: %fossil backoffice [OPTIONS...] [REPOSITORIES...]
669	669	**
670	670	** Run backoffice processing on the repositories listed. If no
671		-** repository is specified, run it on the repository of the local checkout.
	671	+** repository is specified, run it on the repository of the local check-out.
672	672	**
673	673	** This might be done by a cron job or similar to make sure backoffice
674	674	** processing happens periodically. Or, the --poll option can be used
675	675	** to run this command as a daemon that will periodically invoke backoffice
676	676	** on a collection of repositories.
677	677

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -666,11 +666,11 @@
666	** COMMAND: backoffice*
667	**
668	** Usage: %fossil backoffice [OPTIONS...] [REPOSITORIES...]
669	**
670	** Run backoffice processing on the repositories listed. If no
671	** repository is specified, run it on the repository of the local checkout.
672	**
673	** This might be done by a cron job or similar to make sure backoffice
674	** processing happens periodically. Or, the --poll option can be used
675	** to run this command as a daemon that will periodically invoke backoffice
676	** on a collection of repositories.
677

	--- src/backoffice.c
	+++ src/backoffice.c
	@@ -666,11 +666,11 @@
666	** COMMAND: backoffice*
667	**
668	** Usage: %fossil backoffice [OPTIONS...] [REPOSITORIES...]
669	**
670	** Run backoffice processing on the repositories listed. If no
671	** repository is specified, run it on the repository of the local check-out.
672	**
673	** This might be done by a cron job or similar to make sure backoffice
674	** processing happens periodically. Or, the --poll option can be used
675	** to run this command as a daemon that will periodically invoke backoffice
676	** on a collection of repositories.
677

M src/bisect.c

+5 -5

		--- src/bisect.c
		+++ src/bisect.c
		@@ -202,11 +202,11 @@
202	202
203	203	/*
204	204	** Create a TEMP table named "bilog" that contains the complete history
205	205	** of the current bisect.
206	206	**
207		-** If iCurrent>0 then it is the RID of the current checkout and is included
	207	+** If iCurrent>0 then it is the RID of the current check-out and is included
208	208	** in the history table.
209	209	**
210	210	** If zDesc is not NULL, then it is the bid= query parameter to /timeline
211	211	** that describes a bisect. Use the information in zDesc rather than in
212	212	** the bisect-log variable.
		@@ -469,21 +469,21 @@
469	469	** COMMAND: bisect
470	470	**
471	471	** Usage: %fossil bisect SUBCOMMAND ...
472	472	**
473	473	** Run various subcommands useful for searching back through the change
474		-** history for a particular checkin that causes or fixes a problem.
	474	+** history for a particular check-in that causes or fixes a problem.
475	475	**
476	476	** > fossil bisect bad ?VERSION?
477	477	**
478	478	** Identify version VERSION as non-working. If VERSION is omitted,
479		-** the current checkout is marked as non-working.
	479	+** the current check-out is marked as non-working.
480	480	**
481	481	** > fossil bisect good ?VERSION?
482	482	**
483	483	** Identify version VERSION as working. If VERSION is omitted,
484		-** the current checkout is marked as working.
	484	+** the current check-out is marked as working.
485	485	**
486	486	** > fossil bisect log
487	487	** > fossil bisect chart
488	488	**
489	489	** Show a log of "good", "bad", and "skip" versions. "bisect log"
		@@ -515,11 +515,11 @@
515	515	** after each step, rather than using the exit
516	516	** code from COMMAND
517	517	**
518	518	** > fossil bisect skip ?VERSION?
519	519	**
520		-** Cause VERSION (or the current checkout if VERSION is omitted) to
	520	+** Cause VERSION (or the current check-out if VERSION is omitted) to
521	521	** be ignored for the purpose of the current bisect. This might
522	522	** be done, for example, because VERSION does not compile correctly
523	523	** or is otherwise unsuitable to participate in this bisect.
524	524	**
525	525	** > fossil bisect vlist\|ls\|status ?-a\|--all?
526	526

	--- src/bisect.c
	+++ src/bisect.c
	@@ -202,11 +202,11 @@
202
203	/*
204	** Create a TEMP table named "bilog" that contains the complete history
205	** of the current bisect.
206	**
207	** If iCurrent>0 then it is the RID of the current checkout and is included
208	** in the history table.
209	**
210	** If zDesc is not NULL, then it is the bid= query parameter to /timeline
211	** that describes a bisect. Use the information in zDesc rather than in
212	** the bisect-log variable.
	@@ -469,21 +469,21 @@
469	** COMMAND: bisect
470	**
471	** Usage: %fossil bisect SUBCOMMAND ...
472	**
473	** Run various subcommands useful for searching back through the change
474	** history for a particular checkin that causes or fixes a problem.
475	**
476	** > fossil bisect bad ?VERSION?
477	**
478	** Identify version VERSION as non-working. If VERSION is omitted,
479	** the current checkout is marked as non-working.
480	**
481	** > fossil bisect good ?VERSION?
482	**
483	** Identify version VERSION as working. If VERSION is omitted,
484	** the current checkout is marked as working.
485	**
486	** > fossil bisect log
487	** > fossil bisect chart
488	**
489	** Show a log of "good", "bad", and "skip" versions. "bisect log"
	@@ -515,11 +515,11 @@
515	** after each step, rather than using the exit
516	** code from COMMAND
517	**
518	** > fossil bisect skip ?VERSION?
519	**
520	** Cause VERSION (or the current checkout if VERSION is omitted) to
521	** be ignored for the purpose of the current bisect. This might
522	** be done, for example, because VERSION does not compile correctly
523	** or is otherwise unsuitable to participate in this bisect.
524	**
525	** > fossil bisect vlist\|ls\|status ?-a\|--all?
526

	--- src/bisect.c
	+++ src/bisect.c
	@@ -202,11 +202,11 @@
202
203	/*
204	** Create a TEMP table named "bilog" that contains the complete history
205	** of the current bisect.
206	**
207	** If iCurrent>0 then it is the RID of the current check-out and is included
208	** in the history table.
209	**
210	** If zDesc is not NULL, then it is the bid= query parameter to /timeline
211	** that describes a bisect. Use the information in zDesc rather than in
212	** the bisect-log variable.
	@@ -469,21 +469,21 @@
469	** COMMAND: bisect
470	**
471	** Usage: %fossil bisect SUBCOMMAND ...
472	**
473	** Run various subcommands useful for searching back through the change
474	** history for a particular check-in that causes or fixes a problem.
475	**
476	** > fossil bisect bad ?VERSION?
477	**
478	** Identify version VERSION as non-working. If VERSION is omitted,
479	** the current check-out is marked as non-working.
480	**
481	** > fossil bisect good ?VERSION?
482	**
483	** Identify version VERSION as working. If VERSION is omitted,
484	** the current check-out is marked as working.
485	**
486	** > fossil bisect log
487	** > fossil bisect chart
488	**
489	** Show a log of "good", "bad", and "skip" versions. "bisect log"
	@@ -515,11 +515,11 @@
515	** after each step, rather than using the exit
516	** code from COMMAND
517	**
518	** > fossil bisect skip ?VERSION?
519	**
520	** Cause VERSION (or the current check-out if VERSION is omitted) to
521	** be ignored for the purpose of the current bisect. This might
522	** be done, for example, because VERSION does not compile correctly
523	** or is otherwise unsuitable to participate in this bisect.
524	**
525	** > fossil bisect vlist\|ls\|status ?-a\|--all?
526

M src/branch.c

+12 -12

		--- src/branch.c
		+++ src/branch.c
		@@ -224,15 +224,15 @@
224	224
225	225	/*
226	226	** Create a TEMP table named "tmp_brlist" with 7 columns:
227	227	**
228	228	** name Name of the branch
229		-** mtime Time of last checkin on this branch
	229	+** mtime Time of last check-in on this branch
230	230	** isclosed True if the branch is closed
231	231	** mergeto Another branch this branch was merged into
232	232	** nckin Number of checkins on this branch
233		-** ckin Hash of the last checkin on this branch
	233	+** ckin Hash of the last check-in on this branch
234	234	** isprivate True if the branch is private
235	235	** bgclr Background color for this branch
236	236	*/
237	237	static const char createBrlistQuery[] =
238	238	@ CREATE TEMP TABLE IF NOT EXISTS tmp_brlist AS
		@@ -474,11 +474,11 @@
474	474	return 0;
475	475	}
476	476
477	477	/*
478	478	** Internal helper for branch_cmd_close() and friends. zName is a
479		-** symbolic checkin name. Returns the blob.rid of the checkin or fails
	479	+** symbolic check-in name. Returns the blob.rid of the check-in or fails
480	480	** fatally if the name does not resolve unambiguously. If zUuid is
481	481	** not NULL, *zUuid is set to the resolved blob.uuid and must be freed
482	482	** by the caller via fossil_free().
483	483	*/
484	484	static int branch_resolve_name(char const zName, char *zUuid){
		@@ -491,11 +491,11 @@
491	491	return rid;
492	492	}
493	493
494	494	/*
495	495	** Implementation of (branch hide/unhide) subcommands. nStartAtArg is
496		-** the g.argv index to start reading branch/checkin names. fHide is
	496	+** the g.argv index to start reading branch/check-in names. fHide is
497	497	** true for hiding, false for unhiding. Fails fatally on error.
498	498	*/
499	499	static void branch_cmd_hide(int nStartAtArg, int fHide){
500	500	int argPos = nStartAtArg; /* g.argv pos with first branch/ci name */
501	501	char * zUuid = 0; /* Resolved branch UUID. */
		@@ -512,29 +512,29 @@
512	512	const int isHidden = rid_has_tag(rid, TAG_HIDDEN);
513	513	/* Potential TODO: check for existing 'hidden' flag and skip this
514	514	** entry if it already has (if fHide) or does not have (if !fHide)
515	515	** that tag. FWIW, /ci_edit does not do so. */
516	516	if(fHide && isHidden){
517		- fossil_warning("Skipping hidden checkin %s: %s.", zName, zUuid);
	517	+ fossil_warning("Skipping hidden check-in %s: %s.", zName, zUuid);
518	518	continue;
519	519	}else if(!fHide && !isHidden){
520		- fossil_warning("Skipping non-hidden checkin %s: %s.", zName, zUuid);
	520	+ fossil_warning("Skipping non-hidden check-in %s: %s.", zName, zUuid);
521	521	continue;
522	522	}
523	523	branch_cmd_tag_add(rid, fHide ? "*hidden" : "-hidden");
524	524	if(fVerbose!=0){
525		- fossil_print("%s checkin [%s] %s\n",
	525	+ fossil_print("%s check-in [%s] %s\n",
526	526	fHide ? "Hiding" : "Unhiding",
527	527	zName, zUuid);
528	528	}
529	529	}
530	530	branch_cmd_tag_finalize(fDryRun, fVerbose, zDateOvrd, zUserOvrd);
531	531	}
532	532
533	533	/*
534	534	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
535		-** the g.argv index to start reading branch/checkin names. The given
	535	+** the g.argv index to start reading branch/check-in names. The given
536	536	** checkins are closed if fClose is true, else their "closed" tag (if
537	537	** any) is cancelled. Fails fatally on error.
538	538	*/
539	539	static void branch_cmd_close(int nStartAtArg, int fClose){
540	540	int argPos = nStartAtArg; /* g.argv pos with first branch name */
		@@ -585,12 +585,12 @@
585	585	**
586	586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	587	**
588	588	** Adds or cancels the "closed" tag to one or more branches.
589	589	** It accepts arbitrary unambiguous symbolic names but
590		-** will only resolve checkin names and skips any which resolve
591		-** to non-leaf checkins. Options:
	590	+** will only resolve check-in names and skips any which resolve
	591	+** to non-leaf check-ins. Options:
592	592	** -n\|--dry-run do not commit changes and dump artifact
593	593	** to stdout
594	594	** -v\|--verbose output more information
595	595	** --date-override DATE DATE to use instead of 'now'
596	596	** --user-override USER USER to use instead of the current default
		@@ -600,11 +600,11 @@
600	600	** Print the name of the branch for the current check-out
601	601	**
602	602	** > fossil branch hide\|unhide ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
603	603	**
604	604	** Adds or cancels the "hidden" tag for the specified branches or
605		-** or checkin IDs. Accepts the same options as the close
	605	+** or check-in IDs. Accepts the same options as the close
606	606	** subcommand.
607	607	**
608	608	** > fossil branch info BRANCH-NAME
609	609	**
610	610	** Print information about a branch
		@@ -657,11 +657,11 @@
657	657	db_find_and_open_repository(0, 0);
658	658	if( g.argc>=3 ) zCmd = g.argv[2];
659	659	n = strlen(zCmd);
660	660	if( strncmp(zCmd,"current",n)==0 ){
661	661	if( !g.localOpen ){
662		- fossil_fatal("not within an open checkout");
	662	+ fossil_fatal("not within an open check-out");
663	663	}else{
664	664	int vid = db_lget_int("checkout", 0);
665	665	char *zCurrent = db_text(0, "SELECT value FROM tagxref"
666	666	" WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
667	667	fossil_print("%s\n", zCurrent);
668	668

	--- src/branch.c
	+++ src/branch.c
	@@ -224,15 +224,15 @@
224
225	/*
226	** Create a TEMP table named "tmp_brlist" with 7 columns:
227	**
228	** name Name of the branch
229	** mtime Time of last checkin on this branch
230	** isclosed True if the branch is closed
231	** mergeto Another branch this branch was merged into
232	** nckin Number of checkins on this branch
233	** ckin Hash of the last checkin on this branch
234	** isprivate True if the branch is private
235	** bgclr Background color for this branch
236	*/
237	static const char createBrlistQuery[] =
238	@ CREATE TEMP TABLE IF NOT EXISTS tmp_brlist AS
	@@ -474,11 +474,11 @@
474	return 0;
475	}
476
477	/*
478	** Internal helper for branch_cmd_close() and friends. zName is a
479	** symbolic checkin name. Returns the blob.rid of the checkin or fails
480	** fatally if the name does not resolve unambiguously. If zUuid is
481	** not NULL, *zUuid is set to the resolved blob.uuid and must be freed
482	** by the caller via fossil_free().
483	*/
484	static int branch_resolve_name(char const zName, char *zUuid){
	@@ -491,11 +491,11 @@
491	return rid;
492	}
493
494	/*
495	** Implementation of (branch hide/unhide) subcommands. nStartAtArg is
496	** the g.argv index to start reading branch/checkin names. fHide is
497	** true for hiding, false for unhiding. Fails fatally on error.
498	*/
499	static void branch_cmd_hide(int nStartAtArg, int fHide){
500	int argPos = nStartAtArg; /* g.argv pos with first branch/ci name */
501	char * zUuid = 0; /* Resolved branch UUID. */
	@@ -512,29 +512,29 @@
512	const int isHidden = rid_has_tag(rid, TAG_HIDDEN);
513	/* Potential TODO: check for existing 'hidden' flag and skip this
514	** entry if it already has (if fHide) or does not have (if !fHide)
515	** that tag. FWIW, /ci_edit does not do so. */
516	if(fHide && isHidden){
517	fossil_warning("Skipping hidden checkin %s: %s.", zName, zUuid);
518	continue;
519	}else if(!fHide && !isHidden){
520	fossil_warning("Skipping non-hidden checkin %s: %s.", zName, zUuid);
521	continue;
522	}
523	branch_cmd_tag_add(rid, fHide ? "*hidden" : "-hidden");
524	if(fVerbose!=0){
525	fossil_print("%s checkin [%s] %s\n",
526	fHide ? "Hiding" : "Unhiding",
527	zName, zUuid);
528	}
529	}
530	branch_cmd_tag_finalize(fDryRun, fVerbose, zDateOvrd, zUserOvrd);
531	}
532
533	/*
534	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
535	** the g.argv index to start reading branch/checkin names. The given
536	** checkins are closed if fClose is true, else their "closed" tag (if
537	** any) is cancelled. Fails fatally on error.
538	*/
539	static void branch_cmd_close(int nStartAtArg, int fClose){
540	int argPos = nStartAtArg; /* g.argv pos with first branch name */
	@@ -585,12 +585,12 @@
585	**
586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	**
588	** Adds or cancels the "closed" tag to one or more branches.
589	** It accepts arbitrary unambiguous symbolic names but
590	** will only resolve checkin names and skips any which resolve
591	** to non-leaf checkins. Options:
592	** -n\|--dry-run do not commit changes and dump artifact
593	** to stdout
594	** -v\|--verbose output more information
595	** --date-override DATE DATE to use instead of 'now'
596	** --user-override USER USER to use instead of the current default
	@@ -600,11 +600,11 @@
600	** Print the name of the branch for the current check-out
601	**
602	** > fossil branch hide\|unhide ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
603	**
604	** Adds or cancels the "hidden" tag for the specified branches or
605	** or checkin IDs. Accepts the same options as the close
606	** subcommand.
607	**
608	** > fossil branch info BRANCH-NAME
609	**
610	** Print information about a branch
	@@ -657,11 +657,11 @@
657	db_find_and_open_repository(0, 0);
658	if( g.argc>=3 ) zCmd = g.argv[2];
659	n = strlen(zCmd);
660	if( strncmp(zCmd,"current",n)==0 ){
661	if( !g.localOpen ){
662	fossil_fatal("not within an open checkout");
663	}else{
664	int vid = db_lget_int("checkout", 0);
665	char *zCurrent = db_text(0, "SELECT value FROM tagxref"
666	" WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
667	fossil_print("%s\n", zCurrent);
668

	--- src/branch.c
	+++ src/branch.c
	@@ -224,15 +224,15 @@
224
225	/*
226	** Create a TEMP table named "tmp_brlist" with 7 columns:
227	**
228	** name Name of the branch
229	** mtime Time of last check-in on this branch
230	** isclosed True if the branch is closed
231	** mergeto Another branch this branch was merged into
232	** nckin Number of checkins on this branch
233	** ckin Hash of the last check-in on this branch
234	** isprivate True if the branch is private
235	** bgclr Background color for this branch
236	*/
237	static const char createBrlistQuery[] =
238	@ CREATE TEMP TABLE IF NOT EXISTS tmp_brlist AS
	@@ -474,11 +474,11 @@
474	return 0;
475	}
476
477	/*
478	** Internal helper for branch_cmd_close() and friends. zName is a
479	** symbolic check-in name. Returns the blob.rid of the check-in or fails
480	** fatally if the name does not resolve unambiguously. If zUuid is
481	** not NULL, *zUuid is set to the resolved blob.uuid and must be freed
482	** by the caller via fossil_free().
483	*/
484	static int branch_resolve_name(char const zName, char *zUuid){
	@@ -491,11 +491,11 @@
491	return rid;
492	}
493
494	/*
495	** Implementation of (branch hide/unhide) subcommands. nStartAtArg is
496	** the g.argv index to start reading branch/check-in names. fHide is
497	** true for hiding, false for unhiding. Fails fatally on error.
498	*/
499	static void branch_cmd_hide(int nStartAtArg, int fHide){
500	int argPos = nStartAtArg; /* g.argv pos with first branch/ci name */
501	char * zUuid = 0; /* Resolved branch UUID. */
	@@ -512,29 +512,29 @@
512	const int isHidden = rid_has_tag(rid, TAG_HIDDEN);
513	/* Potential TODO: check for existing 'hidden' flag and skip this
514	** entry if it already has (if fHide) or does not have (if !fHide)
515	** that tag. FWIW, /ci_edit does not do so. */
516	if(fHide && isHidden){
517	fossil_warning("Skipping hidden check-in %s: %s.", zName, zUuid);
518	continue;
519	}else if(!fHide && !isHidden){
520	fossil_warning("Skipping non-hidden check-in %s: %s.", zName, zUuid);
521	continue;
522	}
523	branch_cmd_tag_add(rid, fHide ? "*hidden" : "-hidden");
524	if(fVerbose!=0){
525	fossil_print("%s check-in [%s] %s\n",
526	fHide ? "Hiding" : "Unhiding",
527	zName, zUuid);
528	}
529	}
530	branch_cmd_tag_finalize(fDryRun, fVerbose, zDateOvrd, zUserOvrd);
531	}
532
533	/*
534	** Implementation of (branch close\|reopen) subcommands. nStartAtArg is
535	** the g.argv index to start reading branch/check-in names. The given
536	** checkins are closed if fClose is true, else their "closed" tag (if
537	** any) is cancelled. Fails fatally on error.
538	*/
539	static void branch_cmd_close(int nStartAtArg, int fClose){
540	int argPos = nStartAtArg; /* g.argv pos with first branch name */
	@@ -585,12 +585,12 @@
585	**
586	** > fossil branch close\|reopen ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
587	**
588	** Adds or cancels the "closed" tag to one or more branches.
589	** It accepts arbitrary unambiguous symbolic names but
590	** will only resolve check-in names and skips any which resolve
591	** to non-leaf check-ins. Options:
592	** -n\|--dry-run do not commit changes and dump artifact
593	** to stdout
594	** -v\|--verbose output more information
595	** --date-override DATE DATE to use instead of 'now'
596	** --user-override USER USER to use instead of the current default
	@@ -600,11 +600,11 @@
600	** Print the name of the branch for the current check-out
601	**
602	** > fossil branch hide\|unhide ?OPTIONS? BRANCH-NAME ?...BRANCH-NAMES?
603	**
604	** Adds or cancels the "hidden" tag for the specified branches or
605	** or check-in IDs. Accepts the same options as the close
606	** subcommand.
607	**
608	** > fossil branch info BRANCH-NAME
609	**
610	** Print information about a branch
	@@ -657,11 +657,11 @@
657	db_find_and_open_repository(0, 0);
658	if( g.argc>=3 ) zCmd = g.argv[2];
659	n = strlen(zCmd);
660	if( strncmp(zCmd,"current",n)==0 ){
661	if( !g.localOpen ){
662	fossil_fatal("not within an open check-out");
663	}else{
664	int vid = db_lget_int("checkout", 0);
665	char *zCurrent = db_text(0, "SELECT value FROM tagxref"
666	" WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH);
667	fossil_print("%s\n", zCurrent);
668

M src/checkin.c

+20 -20

		--- src/checkin.c
		+++ src/checkin.c
		@@ -61,11 +61,11 @@
61	61	/*
62	62	** Create a TEMP table named SFILE and add all unmanaged files named on
63	63	** the command-line to that table. If directories are named, then add
64	64	** all unmanaged files contained underneath those directories. If there
65	65	** are no files or directories named on the command-line, then add all
66		-** unmanaged files anywhere in the checkout.
	66	+** unmanaged files anywhere in the check-out.
67	67	**
68	68	** This routine never follows symlinks. It always treats symlinks as
69	69	** object unto themselves.
70	70	*/
71	71	static void locate_unmanaged_files(
		@@ -198,11 +198,11 @@
198	198	/* Append an ORDER BY clause then compile the query. */
199	199	blob_append_sql(&sql, " ORDER BY pathname");
200	200	db_prepare(&q, "%s", blob_sql_text(&sql));
201	201	blob_reset(&sql);
202	202
203		- /* Bind the checkout version ID to the query if needed. */
	203	+ /* Bind the check-out version ID to the query if needed. */
204	204	if( (flags & C_ALL) && (flags & C_MTIME) ){
205	205	db_bind_int(&q, ":vid", db_lget_int("checkout", 0));
206	206	}
207	207
208	208	/* Execute the query and assemble the report. */
		@@ -367,11 +367,11 @@
367	367	** COMMAND: changes
368	368	** COMMAND: status
369	369	**
370	370	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
371	371	**
372		-** Report the change status of files in the current checkout. If one or
	372	+** Report the change status of files in the current check-out. If one or
373	373	** more PATHS are specified, only changes among the named files and
374	374	** directories are reported. Directories are searched recursively.
375	375	**
376	376	** The status command is similar to the changes command, except it lacks
377	377	** several of the options supported by changes and it has its own header
		@@ -385,11 +385,11 @@
385	385	**
386	386	** By default, all changed files are selected for display. This behavior
387	387	** can be overridden by using one or more filter options (listed below),
388	388	** in which case only files with the specified change type(s) are shown.
389	389	** As a special case, the --no-merge option does not inhibit this default.
390		-** This default shows exactly the set of changes that would be checked
	390	+** This default shows exactly the set of changes that would be checked-
391	391	** in by the commit command.
392	392	**
393	393	** If no filter options are used, or if the --merge option is used, the
394	394	** artifact hash of each merge contributor check-in version is displayed at
395	395	** the end of the report. The --no-merge option is useful to display the
		@@ -409,11 +409,11 @@
409	409	** to be merged or conflicted and therefore will be shown by --edited, not
410	410	** --updated, with types EDITED or CONFLICT. The --changed option can be
411	411	** used to display the union of --edited and --updated.
412	412	**
413	413	** --differ is so named because it lists all the differences between the
414		-** checked-out version and the checkout directory. In addition to the
	414	+** checked-out version and the check-out directory. In addition to the
415	415	** default changes (excluding --merge), it lists extra files which (if
416	416	** ignore-glob is set correctly) may be worth adding. Prior to doing a
417	417	** commit, it is good practice to check --differ to see not only which
418	418	** changes would be committed but also if any files should be added.
419	419	**
		@@ -517,14 +517,14 @@
517	517	&& find_option(noFlagDefs[i].option, 0, 0) ){
518	518	flags &= ~noFlagDefs[i].mask;
519	519	}
520	520	}
521	521
522		- /* Confirm current working directory is within checkout. */
	522	+ /* Confirm current working directory is within check-out. */
523	523	db_must_be_within_tree();
524	524
525		- /* Get checkout version. l*/
	525	+ /* Get check-out version. l*/
526	526	vid = db_lget_int("checkout", 0);
527	527
528	528	/* Relative path flag determination is done by a shared function. */
529	529	if( determine_cwd_relative_option() ){
530	530	flags \|= C_RELPATH;
		@@ -662,11 +662,11 @@
662	662	/*
663	663	** COMMAND: ls
664	664	**
665	665	** Usage: %fossil ls ?OPTIONS? ?PATHS ...?
666	666	**
667		-** List all files in the current checkout. If PATHS is included, only the
	667	+** List all files in the current check-out. If PATHS is included, only the
668	668	** named files (or their children if directories) are shown.
669	669	**
670	670	** The ls command is essentially two related commands in one, depending on
671	671	** whether or not the -r option is given. -r selects a specific check-in
672	672	** version to list, in which case -R can be used to select the repository.
		@@ -827,11 +827,11 @@
827	827	** COMMAND: extras
828	828	**
829	829	** Usage: %fossil extras ?OPTIONS? ?PATH1 ...?
830	830	**
831	831	** Print a list of all files in the source tree that are not part of the
832		-** current checkout. See also the "clean" command. If paths are specified,
	832	+** current check-out. See also the "clean" command. If paths are specified,
833	833	** only files in the given directories will be listed.
834	834	**
835	835	** Files and subdirectories whose names begin with "." are normally
836	836	** ignored but can be included by adding the --dotfiles option.
837	837	**
		@@ -896,11 +896,11 @@
896	896	** COMMAND: clean
897	897	**
898	898	** Usage: %fossil clean ?OPTIONS? ?PATH ...?
899	899	**
900	900	** Delete all "extra" files in the source tree. "Extra" files are files
901		-** that are not officially part of the checkout. If one or more PATH
	901	+** that are not officially part of the check-out. If one or more PATH
902	902	** arguments appear, then only the files named, or files contained with
903	903	** directories named, will be removed.
904	904	**
905	905	** If the --prompt option is used, prompts are issued to confirm the
906	906	** permanent removal of each file. Otherwise, files are backed up to the
		@@ -925,11 +925,11 @@
925	925	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
926	926	** --verily option when you really want to clean up everything. Extreme
927	927	** care should be exercised when using the --verily option.
928	928	**
929	929	** Options:
930		-** --allckouts Check for empty directories within any checkouts
	930	+** --allckouts Check for empty directories within any check-outs
931	931	** that may be nested within the current one. This
932	932	** option should be used with great care because the
933	933	** empty-dirs setting (and other applicable settings)
934	934	** belonging to the other repositories, if any, will
935	935	** not be checked.
		@@ -1515,13 +1515,13 @@
1515	1515	}
1516	1516	return result;
1517	1517	}
1518	1518
1519	1519	/*
1520		-** Returns true if the checkin identified by the first parameter is
	1520	+** Returns true if the check-in identified by the first parameter is
1521	1521	** older than the given (valid) date/time string, else returns false.
1522		-** Also returns true if rid does not refer to a checkin, but it is not
	1522	+** Also returns true if rid does not refer to a check-in, but it is not
1523	1523	** intended to be used for that case.
1524	1524	*/
1525	1525	int checkin_is_younger(
1526	1526	int rid, /* The record ID of the ancestor */
1527	1527	const char zDate / Date & time of the current check-in */
		@@ -1641,11 +1641,11 @@
1641	1641	zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND "
1642	1642	"EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)",
1643	1643	vid, vid);
1644	1644	if( !zParentUuid ){
1645	1645	fossil_fatal("Could not find a valid check-in for RID %d. "
1646		- "Possible checkout/repo mismatch.", vid);
	1646	+ "Possible check-out/repo mismatch.", vid);
1647	1647	}
1648	1648	}
1649	1649	if( pBaseline ){
1650	1650	blob_appendf(pOut, "B %s\n", zBaselineUuid);
1651	1651	manifest_file_rewind(pBaseline);
		@@ -2022,11 +2022,11 @@
2022	2022	/*
2023	2023	** COMMAND: test-commit-warning
2024	2024	**
2025	2025	** Usage: %fossil test-commit-warning ?OPTIONS?
2026	2026	**
2027		-** Check each file in the checkout, including unmodified ones, using all
	2027	+** Check each file in the check-out, including unmodified ones, using all
2028	2028	** the pre-commit checks.
2029	2029	**
2030	2030	** Options:
2031	2031	** --no-settings Do not consider any glob settings.
2032	2032	** -v\|--verbose Show per-file results for all pre-commit checks.
		@@ -2097,11 +2097,11 @@
2097	2097	**
2098	2098	** Usage: %fossil commit ?OPTIONS? ?FILE...?
2099	2099	** or: %fossil ci ?OPTIONS? ?FILE...?
2100	2100	**
2101	2101	** Create a new version containing all of the changes in the current
2102		-** checkout. You will be prompted to enter a check-in comment unless
	2102	+** check-out. You will be prompted to enter a check-in comment unless
2103	2103	** the comment has been specified on the command-line using "-m" or a
2104	2104	** file containing the comment using -M. The editor defined in the
2105	2105	** "editor" fossil option (see %fossil help set) will be used, or from
2106	2106	** the "VISUAL" or "EDITOR" environment variables (in that order) if
2107	2107	** no editor is set.
		@@ -2404,11 +2404,11 @@
2404	2404	}
2405	2405	}
2406	2406
2407	2407	/* There are two ways this command may be executed. If there are
2408	2408	** no arguments following the word "commit", then all modified files
2409		- ** in the checked out directory are committed. If one or more arguments
	2409	+ ** in the checked-out directory are committed. If one or more arguments
2410	2410	** follows "commit", then only those files are committed.
2411	2411	**
2412	2412	** After the following function call has returned, the Global.aCommitFile[]
2413	2413	** array is allocated to contain the "id" field from the vfile table
2414	2414	** for each file to be committed. Or, if aCommitFile is NULL, all files
		@@ -2825,11 +2825,11 @@
2825	2825	** of the manifest file).
2826	2826	*/
2827	2827	vfile_aggregate_checksum_repository(nvid, &cksum2);
2828	2828	if( blob_compare(&cksum1, &cksum2) ){
2829	2829	vfile_compare_repository_to_disk(nvid);
2830		- fossil_fatal("working checkout does not match what would have ended "
	2830	+ fossil_fatal("working check-out does not match what would have ended "
2831	2831	"up in the repository: %b versus %b",
2832	2832	&cksum1, &cksum2);
2833	2833	}
2834	2834
2835	2835	/* Verify that the manifest checksum matches the expected checksum */
		@@ -2838,18 +2838,18 @@
2838	2838	fossil_fatal("manifest checksum self-test failed: "
2839	2839	"%b versus %b", &cksum1, &cksum1b);
2840	2840	}
2841	2841	if( blob_compare(&cksum1, &cksum2) ){
2842	2842	fossil_fatal(
2843		- "working checkout does not match manifest after commit: "
	2843	+ "working check-out does not match manifest after commit: "
2844	2844	"%b versus %b", &cksum1, &cksum2);
2845	2845	}
2846	2846
2847	2847	/* Verify that the commit did not modify any disk images. */
2848	2848	vfile_aggregate_checksum_disk(nvid, &cksum2);
2849	2849	if( blob_compare(&cksum1, &cksum2) ){
2850		- fossil_fatal("working checkout before and after commit does not match");
	2850	+ fossil_fatal("working check-out before and after commit does not match");
2851	2851	}
2852	2852	}
2853	2853
2854	2854	/* Clear the undo/redo stack */
2855	2855	undo_reset();
2856	2856

	--- src/checkin.c
	+++ src/checkin.c
	@@ -61,11 +61,11 @@
61	/*
62	** Create a TEMP table named SFILE and add all unmanaged files named on
63	** the command-line to that table. If directories are named, then add
64	** all unmanaged files contained underneath those directories. If there
65	** are no files or directories named on the command-line, then add all
66	** unmanaged files anywhere in the checkout.
67	**
68	** This routine never follows symlinks. It always treats symlinks as
69	** object unto themselves.
70	*/
71	static void locate_unmanaged_files(
	@@ -198,11 +198,11 @@
198	/* Append an ORDER BY clause then compile the query. */
199	blob_append_sql(&sql, " ORDER BY pathname");
200	db_prepare(&q, "%s", blob_sql_text(&sql));
201	blob_reset(&sql);
202
203	/* Bind the checkout version ID to the query if needed. */
204	if( (flags & C_ALL) && (flags & C_MTIME) ){
205	db_bind_int(&q, ":vid", db_lget_int("checkout", 0));
206	}
207
208	/* Execute the query and assemble the report. */
	@@ -367,11 +367,11 @@
367	** COMMAND: changes
368	** COMMAND: status
369	**
370	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
371	**
372	** Report the change status of files in the current checkout. If one or
373	** more PATHS are specified, only changes among the named files and
374	** directories are reported. Directories are searched recursively.
375	**
376	** The status command is similar to the changes command, except it lacks
377	** several of the options supported by changes and it has its own header
	@@ -385,11 +385,11 @@
385	**
386	** By default, all changed files are selected for display. This behavior
387	** can be overridden by using one or more filter options (listed below),
388	** in which case only files with the specified change type(s) are shown.
389	** As a special case, the --no-merge option does not inhibit this default.
390	** This default shows exactly the set of changes that would be checked
391	** in by the commit command.
392	**
393	** If no filter options are used, or if the --merge option is used, the
394	** artifact hash of each merge contributor check-in version is displayed at
395	** the end of the report. The --no-merge option is useful to display the
	@@ -409,11 +409,11 @@
409	** to be merged or conflicted and therefore will be shown by --edited, not
410	** --updated, with types EDITED or CONFLICT. The --changed option can be
411	** used to display the union of --edited and --updated.
412	**
413	** --differ is so named because it lists all the differences between the
414	** checked-out version and the checkout directory. In addition to the
415	** default changes (excluding --merge), it lists extra files which (if
416	** ignore-glob is set correctly) may be worth adding. Prior to doing a
417	** commit, it is good practice to check --differ to see not only which
418	** changes would be committed but also if any files should be added.
419	**
	@@ -517,14 +517,14 @@
517	&& find_option(noFlagDefs[i].option, 0, 0) ){
518	flags &= ~noFlagDefs[i].mask;
519	}
520	}
521
522	/* Confirm current working directory is within checkout. */
523	db_must_be_within_tree();
524
525	/* Get checkout version. l*/
526	vid = db_lget_int("checkout", 0);
527
528	/* Relative path flag determination is done by a shared function. */
529	if( determine_cwd_relative_option() ){
530	flags \|= C_RELPATH;
	@@ -662,11 +662,11 @@
662	/*
663	** COMMAND: ls
664	**
665	** Usage: %fossil ls ?OPTIONS? ?PATHS ...?
666	**
667	** List all files in the current checkout. If PATHS is included, only the
668	** named files (or their children if directories) are shown.
669	**
670	** The ls command is essentially two related commands in one, depending on
671	** whether or not the -r option is given. -r selects a specific check-in
672	** version to list, in which case -R can be used to select the repository.
	@@ -827,11 +827,11 @@
827	** COMMAND: extras
828	**
829	** Usage: %fossil extras ?OPTIONS? ?PATH1 ...?
830	**
831	** Print a list of all files in the source tree that are not part of the
832	** current checkout. See also the "clean" command. If paths are specified,
833	** only files in the given directories will be listed.
834	**
835	** Files and subdirectories whose names begin with "." are normally
836	** ignored but can be included by adding the --dotfiles option.
837	**
	@@ -896,11 +896,11 @@
896	** COMMAND: clean
897	**
898	** Usage: %fossil clean ?OPTIONS? ?PATH ...?
899	**
900	** Delete all "extra" files in the source tree. "Extra" files are files
901	** that are not officially part of the checkout. If one or more PATH
902	** arguments appear, then only the files named, or files contained with
903	** directories named, will be removed.
904	**
905	** If the --prompt option is used, prompts are issued to confirm the
906	** permanent removal of each file. Otherwise, files are backed up to the
	@@ -925,11 +925,11 @@
925	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
926	** --verily option when you really want to clean up everything. Extreme
927	** care should be exercised when using the --verily option.
928	**
929	** Options:
930	** --allckouts Check for empty directories within any checkouts
931	** that may be nested within the current one. This
932	** option should be used with great care because the
933	** empty-dirs setting (and other applicable settings)
934	** belonging to the other repositories, if any, will
935	** not be checked.
	@@ -1515,13 +1515,13 @@
1515	}
1516	return result;
1517	}
1518
1519	/*
1520	** Returns true if the checkin identified by the first parameter is
1521	** older than the given (valid) date/time string, else returns false.
1522	** Also returns true if rid does not refer to a checkin, but it is not
1523	** intended to be used for that case.
1524	*/
1525	int checkin_is_younger(
1526	int rid, /* The record ID of the ancestor */
1527	const char zDate / Date & time of the current check-in */
	@@ -1641,11 +1641,11 @@
1641	zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND "
1642	"EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)",
1643	vid, vid);
1644	if( !zParentUuid ){
1645	fossil_fatal("Could not find a valid check-in for RID %d. "
1646	"Possible checkout/repo mismatch.", vid);
1647	}
1648	}
1649	if( pBaseline ){
1650	blob_appendf(pOut, "B %s\n", zBaselineUuid);
1651	manifest_file_rewind(pBaseline);
	@@ -2022,11 +2022,11 @@
2022	/*
2023	** COMMAND: test-commit-warning
2024	**
2025	** Usage: %fossil test-commit-warning ?OPTIONS?
2026	**
2027	** Check each file in the checkout, including unmodified ones, using all
2028	** the pre-commit checks.
2029	**
2030	** Options:
2031	** --no-settings Do not consider any glob settings.
2032	** -v\|--verbose Show per-file results for all pre-commit checks.
	@@ -2097,11 +2097,11 @@
2097	**
2098	** Usage: %fossil commit ?OPTIONS? ?FILE...?
2099	** or: %fossil ci ?OPTIONS? ?FILE...?
2100	**
2101	** Create a new version containing all of the changes in the current
2102	** checkout. You will be prompted to enter a check-in comment unless
2103	** the comment has been specified on the command-line using "-m" or a
2104	** file containing the comment using -M. The editor defined in the
2105	** "editor" fossil option (see %fossil help set) will be used, or from
2106	** the "VISUAL" or "EDITOR" environment variables (in that order) if
2107	** no editor is set.
	@@ -2404,11 +2404,11 @@
2404	}
2405	}
2406
2407	/* There are two ways this command may be executed. If there are
2408	** no arguments following the word "commit", then all modified files
2409	** in the checked out directory are committed. If one or more arguments
2410	** follows "commit", then only those files are committed.
2411	**
2412	** After the following function call has returned, the Global.aCommitFile[]
2413	** array is allocated to contain the "id" field from the vfile table
2414	** for each file to be committed. Or, if aCommitFile is NULL, all files
	@@ -2825,11 +2825,11 @@
2825	** of the manifest file).
2826	*/
2827	vfile_aggregate_checksum_repository(nvid, &cksum2);
2828	if( blob_compare(&cksum1, &cksum2) ){
2829	vfile_compare_repository_to_disk(nvid);
2830	fossil_fatal("working checkout does not match what would have ended "
2831	"up in the repository: %b versus %b",
2832	&cksum1, &cksum2);
2833	}
2834
2835	/* Verify that the manifest checksum matches the expected checksum */
	@@ -2838,18 +2838,18 @@
2838	fossil_fatal("manifest checksum self-test failed: "
2839	"%b versus %b", &cksum1, &cksum1b);
2840	}
2841	if( blob_compare(&cksum1, &cksum2) ){
2842	fossil_fatal(
2843	"working checkout does not match manifest after commit: "
2844	"%b versus %b", &cksum1, &cksum2);
2845	}
2846
2847	/* Verify that the commit did not modify any disk images. */
2848	vfile_aggregate_checksum_disk(nvid, &cksum2);
2849	if( blob_compare(&cksum1, &cksum2) ){
2850	fossil_fatal("working checkout before and after commit does not match");
2851	}
2852	}
2853
2854	/* Clear the undo/redo stack */
2855	undo_reset();
2856

	--- src/checkin.c
	+++ src/checkin.c
	@@ -61,11 +61,11 @@
61	/*
62	** Create a TEMP table named SFILE and add all unmanaged files named on
63	** the command-line to that table. If directories are named, then add
64	** all unmanaged files contained underneath those directories. If there
65	** are no files or directories named on the command-line, then add all
66	** unmanaged files anywhere in the check-out.
67	**
68	** This routine never follows symlinks. It always treats symlinks as
69	** object unto themselves.
70	*/
71	static void locate_unmanaged_files(
	@@ -198,11 +198,11 @@
198	/* Append an ORDER BY clause then compile the query. */
199	blob_append_sql(&sql, " ORDER BY pathname");
200	db_prepare(&q, "%s", blob_sql_text(&sql));
201	blob_reset(&sql);
202
203	/* Bind the check-out version ID to the query if needed. */
204	if( (flags & C_ALL) && (flags & C_MTIME) ){
205	db_bind_int(&q, ":vid", db_lget_int("checkout", 0));
206	}
207
208	/* Execute the query and assemble the report. */
	@@ -367,11 +367,11 @@
367	** COMMAND: changes
368	** COMMAND: status
369	**
370	** Usage: %fossil changes\|status ?OPTIONS? ?PATHS ...?
371	**
372	** Report the change status of files in the current check-out. If one or
373	** more PATHS are specified, only changes among the named files and
374	** directories are reported. Directories are searched recursively.
375	**
376	** The status command is similar to the changes command, except it lacks
377	** several of the options supported by changes and it has its own header
	@@ -385,11 +385,11 @@
385	**
386	** By default, all changed files are selected for display. This behavior
387	** can be overridden by using one or more filter options (listed below),
388	** in which case only files with the specified change type(s) are shown.
389	** As a special case, the --no-merge option does not inhibit this default.
390	** This default shows exactly the set of changes that would be checked-
391	** in by the commit command.
392	**
393	** If no filter options are used, or if the --merge option is used, the
394	** artifact hash of each merge contributor check-in version is displayed at
395	** the end of the report. The --no-merge option is useful to display the
	@@ -409,11 +409,11 @@
409	** to be merged or conflicted and therefore will be shown by --edited, not
410	** --updated, with types EDITED or CONFLICT. The --changed option can be
411	** used to display the union of --edited and --updated.
412	**
413	** --differ is so named because it lists all the differences between the
414	** checked-out version and the check-out directory. In addition to the
415	** default changes (excluding --merge), it lists extra files which (if
416	** ignore-glob is set correctly) may be worth adding. Prior to doing a
417	** commit, it is good practice to check --differ to see not only which
418	** changes would be committed but also if any files should be added.
419	**
	@@ -517,14 +517,14 @@
517	&& find_option(noFlagDefs[i].option, 0, 0) ){
518	flags &= ~noFlagDefs[i].mask;
519	}
520	}
521
522	/* Confirm current working directory is within check-out. */
523	db_must_be_within_tree();
524
525	/* Get check-out version. l*/
526	vid = db_lget_int("checkout", 0);
527
528	/* Relative path flag determination is done by a shared function. */
529	if( determine_cwd_relative_option() ){
530	flags \|= C_RELPATH;
	@@ -662,11 +662,11 @@
662	/*
663	** COMMAND: ls
664	**
665	** Usage: %fossil ls ?OPTIONS? ?PATHS ...?
666	**
667	** List all files in the current check-out. If PATHS is included, only the
668	** named files (or their children if directories) are shown.
669	**
670	** The ls command is essentially two related commands in one, depending on
671	** whether or not the -r option is given. -r selects a specific check-in
672	** version to list, in which case -R can be used to select the repository.
	@@ -827,11 +827,11 @@
827	** COMMAND: extras
828	**
829	** Usage: %fossil extras ?OPTIONS? ?PATH1 ...?
830	**
831	** Print a list of all files in the source tree that are not part of the
832	** current check-out. See also the "clean" command. If paths are specified,
833	** only files in the given directories will be listed.
834	**
835	** Files and subdirectories whose names begin with "." are normally
836	** ignored but can be included by adding the --dotfiles option.
837	**
	@@ -896,11 +896,11 @@
896	** COMMAND: clean
897	**
898	** Usage: %fossil clean ?OPTIONS? ?PATH ...?
899	**
900	** Delete all "extra" files in the source tree. "Extra" files are files
901	** that are not officially part of the check-out. If one or more PATH
902	** arguments appear, then only the files named, or files contained with
903	** directories named, will be removed.
904	**
905	** If the --prompt option is used, prompts are issued to confirm the
906	** permanent removal of each file. Otherwise, files are backed up to the
	@@ -925,11 +925,11 @@
925	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
926	** --verily option when you really want to clean up everything. Extreme
927	** care should be exercised when using the --verily option.
928	**
929	** Options:
930	** --allckouts Check for empty directories within any check-outs
931	** that may be nested within the current one. This
932	** option should be used with great care because the
933	** empty-dirs setting (and other applicable settings)
934	** belonging to the other repositories, if any, will
935	** not be checked.
	@@ -1515,13 +1515,13 @@
1515	}
1516	return result;
1517	}
1518
1519	/*
1520	** Returns true if the check-in identified by the first parameter is
1521	** older than the given (valid) date/time string, else returns false.
1522	** Also returns true if rid does not refer to a check-in, but it is not
1523	** intended to be used for that case.
1524	*/
1525	int checkin_is_younger(
1526	int rid, /* The record ID of the ancestor */
1527	const char zDate / Date & time of the current check-in */
	@@ -1641,11 +1641,11 @@
1641	zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND "
1642	"EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)",
1643	vid, vid);
1644	if( !zParentUuid ){
1645	fossil_fatal("Could not find a valid check-in for RID %d. "
1646	"Possible check-out/repo mismatch.", vid);
1647	}
1648	}
1649	if( pBaseline ){
1650	blob_appendf(pOut, "B %s\n", zBaselineUuid);
1651	manifest_file_rewind(pBaseline);
	@@ -2022,11 +2022,11 @@
2022	/*
2023	** COMMAND: test-commit-warning
2024	**
2025	** Usage: %fossil test-commit-warning ?OPTIONS?
2026	**
2027	** Check each file in the check-out, including unmodified ones, using all
2028	** the pre-commit checks.
2029	**
2030	** Options:
2031	** --no-settings Do not consider any glob settings.
2032	** -v\|--verbose Show per-file results for all pre-commit checks.
	@@ -2097,11 +2097,11 @@
2097	**
2098	** Usage: %fossil commit ?OPTIONS? ?FILE...?
2099	** or: %fossil ci ?OPTIONS? ?FILE...?
2100	**
2101	** Create a new version containing all of the changes in the current
2102	** check-out. You will be prompted to enter a check-in comment unless
2103	** the comment has been specified on the command-line using "-m" or a
2104	** file containing the comment using -M. The editor defined in the
2105	** "editor" fossil option (see %fossil help set) will be used, or from
2106	** the "VISUAL" or "EDITOR" environment variables (in that order) if
2107	** no editor is set.
	@@ -2404,11 +2404,11 @@
2404	}
2405	}
2406
2407	/* There are two ways this command may be executed. If there are
2408	** no arguments following the word "commit", then all modified files
2409	** in the checked-out directory are committed. If one or more arguments
2410	** follows "commit", then only those files are committed.
2411	**
2412	** After the following function call has returned, the Global.aCommitFile[]
2413	** array is allocated to contain the "id" field from the vfile table
2414	** for each file to be committed. Or, if aCommitFile is NULL, all files
	@@ -2825,11 +2825,11 @@
2825	** of the manifest file).
2826	*/
2827	vfile_aggregate_checksum_repository(nvid, &cksum2);
2828	if( blob_compare(&cksum1, &cksum2) ){
2829	vfile_compare_repository_to_disk(nvid);
2830	fossil_fatal("working check-out does not match what would have ended "
2831	"up in the repository: %b versus %b",
2832	&cksum1, &cksum2);
2833	}
2834
2835	/* Verify that the manifest checksum matches the expected checksum */
	@@ -2838,18 +2838,18 @@
2838	fossil_fatal("manifest checksum self-test failed: "
2839	"%b versus %b", &cksum1, &cksum1b);
2840	}
2841	if( blob_compare(&cksum1, &cksum2) ){
2842	fossil_fatal(
2843	"working check-out does not match manifest after commit: "
2844	"%b versus %b", &cksum1, &cksum2);
2845	}
2846
2847	/* Verify that the commit did not modify any disk images. */
2848	vfile_aggregate_checksum_disk(nvid, &cksum2);
2849	if( blob_compare(&cksum1, &cksum2) ){
2850	fossil_fatal("working check-out before and after commit does not match");
2851	}
2852	}
2853
2854	/* Clear the undo/redo stack */
2855	undo_reset();
2856

M src/checkout.c

+17 -17

		--- src/checkout.c
		+++ src/checkout.c
		@@ -21,15 +21,15 @@
21	21	#include "config.h"
22	22	#include "checkout.h"
23	23	#include <assert.h>
24	24
25	25	/*
26		-** Check to see if there is an existing checkout that has been
	26	+** Check to see if there is an existing check-out that has been
27	27	** modified. Return values:
28	28	**
29		-** 0: There is an existing checkout but it is unmodified
30		-** 1: There is a modified checkout - there are unsaved changes
	29	+** 0: There is an existing check-out but it is unmodified
	30	+** 1: There is a modified check-out - there are unsaved changes
31	31	*/
32	32	int unsaved_changes(unsigned int cksigFlags){
33	33	int vid;
34	34	db_must_be_within_tree();
35	35	vid = db_lget_int("checkout",0);
		@@ -108,11 +108,11 @@
108	108	}
109	109	if( !is_a_version(vid) ){
110	110	fossil_fatal("object [%S] is not a check-in", blob_str(&uuid));
111	111	}
112	112	if( load_vfile_from_rid(vid) && !forceMissingFlag ){
113		- fossil_fatal("missing content, unable to checkout");
	113	+ fossil_fatal("missing content, unable to check out");
114	114	};
115	115	return vid;
116	116	}
117	117
118	118	/*
		@@ -269,33 +269,33 @@
269	269	** way around, it is recommended that you become familiar with the
270	270	** "fossil update" command first.
271	271	**
272	272	** This command changes the current check-out to the version specified
273	273	** as an argument. The command aborts if there are edited files in the
274		-** current checkout unless the --force option is used. The --keep option
	274	+** current check-out unless the --force option is used. The --keep option
275	275	** leaves files on disk unchanged, except the manifest and manifest.uuid
276	276	** files.
277	277	**
278		-** The --latest flag can be used in place of VERSION to checkout the
	278	+** The --latest flag can be used in place of VERSION to check-out the
279	279	** latest version in the repository.
280	280	**
281	281	** Options:
282		-** --force Ignore edited files in the current checkout
	282	+** --force Ignore edited files in the current check-out
283	283	** --keep Only update the manifest file(s)
284		-** --force-missing Force checkout even if content is missing
	284	+** --force-missing Force check-out even if content is missing
285	285	** --setmtime Set timestamps of all files to match their SCM-side
286		-** times (the timestamp of the last checkin which modified
	286	+** times (the timestamp of the last check-in which modified
287	287	** them)
288	288	**
289	289	** See also: [[update]]
290	290	*/
291	291	void checkout_cmd(void){
292		- int forceFlag; /* Force checkout even if edits exist */
293		- int forceMissingFlag; /* Force checkout even if missing content */
	292	+ int forceFlag; /* Force check-out even if edits exist */
	293	+ int forceMissingFlag; /* Force check-out even if missing content */
294	294	int keepFlag; /* Do not change any files on disk */
295		- int latestFlag; /* Checkout the latest version */
296		- char zVers; / Version to checkout */
	295	+ int latestFlag; /* Check out the latest version */
	296	+ char zVers; / Version to check out */
297	297	int promptFlag; /* True to prompt before overwriting */
298	298	int vid, prior;
299	299	int setmtimeFlag; /* --setmtime. Set mtimes on files */
300	300	Blob cksum1, cksum1b, cksum2;
301	301
		@@ -313,11 +313,11 @@
313	313
314	314	if( (latestFlag!=0 && g.argc!=2) \|\| (latestFlag==0 && g.argc!=3) ){
315	315	usage("VERSION\|--latest ?--force? ?--keep?");
316	316	}
317	317	if( !forceFlag && unsaved_changes(0) ){
318		- fossil_fatal("there are unsaved changes in the current checkout");
	318	+ fossil_fatal("there are unsaved changes in the current check-out");
319	319	}
320	320	if( forceFlag ){
321	321	db_multi_exec("DELETE FROM vfile");
322	322	prior = 0;
323	323	}else{
		@@ -397,11 +397,11 @@
397	397	** The opposite of "[[open]]". Close the current database connection.
398	398	** Require a -f or --force flag if there are unsaved changes in the
399	399	** current check-out or if there is non-empty stash.
400	400	**
401	401	** Options:
402		-** -f\|--force necessary to close a check out with uncommitted changes
	402	+** -f\|--force necessary to close a check-out with uncommitted changes
403	403	**
404	404	** See also: [[open]]
405	405	*/
406	406	void close_cmd(void){
407	407	int forceFlag = find_option("force","f",0)!=0;
		@@ -409,20 +409,20 @@
409	409
410	410	/* We should be done with options.. */
411	411	verify_all_options();
412	412
413	413	if( !forceFlag && unsaved_changes(0) ){
414		- fossil_fatal("there are unsaved changes in the current checkout");
	414	+ fossil_fatal("there are unsaved changes in the current check-out");
415	415	}
416	416	if( !forceFlag
417	417	&& db_table_exists("localdb","stash")
418	418	&& db_exists("SELECT 1 FROM localdb.stash")
419	419	){
420		- fossil_fatal("closing the checkout will delete your stash");
	420	+ fossil_fatal("closing the check-out will delete your stash");
421	421	}
422	422	if( db_is_writeable("repository") ){
423	423	db_unset_mprintf(1, "ckout:%q", g.zLocalRoot);
424	424	}
425	425	unlink_local_database(1);
426	426	db_close(1);
427	427	unlink_local_database(0);
428	428	}
429	429

	--- src/checkout.c
	+++ src/checkout.c
	@@ -21,15 +21,15 @@
21	#include "config.h"
22	#include "checkout.h"
23	#include <assert.h>
24
25	/*
26	** Check to see if there is an existing checkout that has been
27	** modified. Return values:
28	**
29	** 0: There is an existing checkout but it is unmodified
30	** 1: There is a modified checkout - there are unsaved changes
31	*/
32	int unsaved_changes(unsigned int cksigFlags){
33	int vid;
34	db_must_be_within_tree();
35	vid = db_lget_int("checkout",0);
	@@ -108,11 +108,11 @@
108	}
109	if( !is_a_version(vid) ){
110	fossil_fatal("object [%S] is not a check-in", blob_str(&uuid));
111	}
112	if( load_vfile_from_rid(vid) && !forceMissingFlag ){
113	fossil_fatal("missing content, unable to checkout");
114	};
115	return vid;
116	}
117
118	/*
	@@ -269,33 +269,33 @@
269	** way around, it is recommended that you become familiar with the
270	** "fossil update" command first.
271	**
272	** This command changes the current check-out to the version specified
273	** as an argument. The command aborts if there are edited files in the
274	** current checkout unless the --force option is used. The --keep option
275	** leaves files on disk unchanged, except the manifest and manifest.uuid
276	** files.
277	**
278	** The --latest flag can be used in place of VERSION to checkout the
279	** latest version in the repository.
280	**
281	** Options:
282	** --force Ignore edited files in the current checkout
283	** --keep Only update the manifest file(s)
284	** --force-missing Force checkout even if content is missing
285	** --setmtime Set timestamps of all files to match their SCM-side
286	** times (the timestamp of the last checkin which modified
287	** them)
288	**
289	** See also: [[update]]
290	*/
291	void checkout_cmd(void){
292	int forceFlag; /* Force checkout even if edits exist */
293	int forceMissingFlag; /* Force checkout even if missing content */
294	int keepFlag; /* Do not change any files on disk */
295	int latestFlag; /* Checkout the latest version */
296	char zVers; / Version to checkout */
297	int promptFlag; /* True to prompt before overwriting */
298	int vid, prior;
299	int setmtimeFlag; /* --setmtime. Set mtimes on files */
300	Blob cksum1, cksum1b, cksum2;
301
	@@ -313,11 +313,11 @@
313
314	if( (latestFlag!=0 && g.argc!=2) \|\| (latestFlag==0 && g.argc!=3) ){
315	usage("VERSION\|--latest ?--force? ?--keep?");
316	}
317	if( !forceFlag && unsaved_changes(0) ){
318	fossil_fatal("there are unsaved changes in the current checkout");
319	}
320	if( forceFlag ){
321	db_multi_exec("DELETE FROM vfile");
322	prior = 0;
323	}else{
	@@ -397,11 +397,11 @@
397	** The opposite of "[[open]]". Close the current database connection.
398	** Require a -f or --force flag if there are unsaved changes in the
399	** current check-out or if there is non-empty stash.
400	**
401	** Options:
402	** -f\|--force necessary to close a check out with uncommitted changes
403	**
404	** See also: [[open]]
405	*/
406	void close_cmd(void){
407	int forceFlag = find_option("force","f",0)!=0;
	@@ -409,20 +409,20 @@
409
410	/* We should be done with options.. */
411	verify_all_options();
412
413	if( !forceFlag && unsaved_changes(0) ){
414	fossil_fatal("there are unsaved changes in the current checkout");
415	}
416	if( !forceFlag
417	&& db_table_exists("localdb","stash")
418	&& db_exists("SELECT 1 FROM localdb.stash")
419	){
420	fossil_fatal("closing the checkout will delete your stash");
421	}
422	if( db_is_writeable("repository") ){
423	db_unset_mprintf(1, "ckout:%q", g.zLocalRoot);
424	}
425	unlink_local_database(1);
426	db_close(1);
427	unlink_local_database(0);
428	}
429

	--- src/checkout.c
	+++ src/checkout.c
	@@ -21,15 +21,15 @@
21	#include "config.h"
22	#include "checkout.h"
23	#include <assert.h>
24
25	/*
26	** Check to see if there is an existing check-out that has been
27	** modified. Return values:
28	**
29	** 0: There is an existing check-out but it is unmodified
30	** 1: There is a modified check-out - there are unsaved changes
31	*/
32	int unsaved_changes(unsigned int cksigFlags){
33	int vid;
34	db_must_be_within_tree();
35	vid = db_lget_int("checkout",0);
	@@ -108,11 +108,11 @@
108	}
109	if( !is_a_version(vid) ){
110	fossil_fatal("object [%S] is not a check-in", blob_str(&uuid));
111	}
112	if( load_vfile_from_rid(vid) && !forceMissingFlag ){
113	fossil_fatal("missing content, unable to check out");
114	};
115	return vid;
116	}
117
118	/*
	@@ -269,33 +269,33 @@
269	** way around, it is recommended that you become familiar with the
270	** "fossil update" command first.
271	**
272	** This command changes the current check-out to the version specified
273	** as an argument. The command aborts if there are edited files in the
274	** current check-out unless the --force option is used. The --keep option
275	** leaves files on disk unchanged, except the manifest and manifest.uuid
276	** files.
277	**
278	** The --latest flag can be used in place of VERSION to check-out the
279	** latest version in the repository.
280	**
281	** Options:
282	** --force Ignore edited files in the current check-out
283	** --keep Only update the manifest file(s)
284	** --force-missing Force check-out even if content is missing
285	** --setmtime Set timestamps of all files to match their SCM-side
286	** times (the timestamp of the last check-in which modified
287	** them)
288	**
289	** See also: [[update]]
290	*/
291	void checkout_cmd(void){
292	int forceFlag; /* Force check-out even if edits exist */
293	int forceMissingFlag; /* Force check-out even if missing content */
294	int keepFlag; /* Do not change any files on disk */
295	int latestFlag; /* Check out the latest version */
296	char zVers; / Version to check out */
297	int promptFlag; /* True to prompt before overwriting */
298	int vid, prior;
299	int setmtimeFlag; /* --setmtime. Set mtimes on files */
300	Blob cksum1, cksum1b, cksum2;
301
	@@ -313,11 +313,11 @@
313
314	if( (latestFlag!=0 && g.argc!=2) \|\| (latestFlag==0 && g.argc!=3) ){
315	usage("VERSION\|--latest ?--force? ?--keep?");
316	}
317	if( !forceFlag && unsaved_changes(0) ){
318	fossil_fatal("there are unsaved changes in the current check-out");
319	}
320	if( forceFlag ){
321	db_multi_exec("DELETE FROM vfile");
322	prior = 0;
323	}else{
	@@ -397,11 +397,11 @@
397	** The opposite of "[[open]]". Close the current database connection.
398	** Require a -f or --force flag if there are unsaved changes in the
399	** current check-out or if there is non-empty stash.
400	**
401	** Options:
402	** -f\|--force necessary to close a check-out with uncommitted changes
403	**
404	** See also: [[open]]
405	*/
406	void close_cmd(void){
407	int forceFlag = find_option("force","f",0)!=0;
	@@ -409,20 +409,20 @@
409
410	/* We should be done with options.. */
411	verify_all_options();
412
413	if( !forceFlag && unsaved_changes(0) ){
414	fossil_fatal("there are unsaved changes in the current check-out");
415	}
416	if( !forceFlag
417	&& db_table_exists("localdb","stash")
418	&& db_exists("SELECT 1 FROM localdb.stash")
419	){
420	fossil_fatal("closing the check-out will delete your stash");
421	}
422	if( db_is_writeable("repository") ){
423	db_unset_mprintf(1, "ckout:%q", g.zLocalRoot);
424	}
425	unlink_local_database(1);
426	db_close(1);
427	unlink_local_database(0);
428	}
429

M src/clone.c

+4 -4

		--- src/clone.c
		+++ src/clone.c
		@@ -108,11 +108,11 @@
108	108	** Use %HH escapes for special characters in the userid and
109	109	** password. For example "%40" in place of "@", "%2f" in place
110	110	** of "/", and "%3a" in place of ":".
111	111	**
112	112	** Note that in Fossil (in contrast to some other DVCSes) a repository
113		-** is distinct from a checkout. Cloning a repository is not the same thing
	113	+** is distinct from a check-out. Cloning a repository is not the same thing
114	114	** as opening a repository. This command always clones the repository. This
115	115	** command might also open the repository, but only if the --no-open option
116	116	** is omitted and either the --workdir option is included or the FILENAME
117	117	** argument is omitted. Use the separate [[open]] command to open a
118	118	** repository that was previously cloned and already exists on the
		@@ -124,11 +124,11 @@
124	124	**
125	125	** Options:
126	126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	128	** --nested Allow opening a repository inside an opened
129		-** checkout
	129	+** check-out
130	130	** --nocompress Omit extra delta compression
131	131	** --no-open Clone only. Do not open a check-out.
132	132	** --once Don't remember the URI.
133	133	** --private Also clone private branches
134	134	** --save-http-password Remember the HTTP password without asking
		@@ -135,11 +135,11 @@
135	135	** --ssh-command\|-c SSH Use SSH as the "ssh" command
136	136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	137	** --transport-command CMD Use CMD to move messages to the server and back
138	138	** -u\|--unversioned Also sync unversioned content
139	139	** -v\|--verbose Show more statistics in output
140		-** --workdir DIR Also open a checkout in DIR
	140	+** --workdir DIR Also open a check-out in DIR
141	141	**
142	142	** See also: [[init]], [[open]]
143	143	*/
144	144	void clone_cmd(void){
145	145	char *zPassword;
		@@ -200,11 +200,11 @@
200	200	fossil_free(zBase);
201	201	}
202	202	if( -1 != file_size(zRepo, ExtFILE) ){
203	203	fossil_fatal("file already exists: %s", zRepo);
204	204	}
205		- /* Fail before clone if open will fail because inside an open checkout */
	205	+ /* Fail before clone if open will fail because inside an open check-out */
206	206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207	207	if( db_open_local_v2(0, allowNested) ){
208	208	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
209	209	}
210	210	}
211	211

	--- src/clone.c
	+++ src/clone.c
	@@ -108,11 +108,11 @@
108	** Use %HH escapes for special characters in the userid and
109	** password. For example "%40" in place of "@", "%2f" in place
110	** of "/", and "%3a" in place of ":".
111	**
112	** Note that in Fossil (in contrast to some other DVCSes) a repository
113	** is distinct from a checkout. Cloning a repository is not the same thing
114	** as opening a repository. This command always clones the repository. This
115	** command might also open the repository, but only if the --no-open option
116	** is omitted and either the --workdir option is included or the FILENAME
117	** argument is omitted. Use the separate [[open]] command to open a
118	** repository that was previously cloned and already exists on the
	@@ -124,11 +124,11 @@
124	**
125	** Options:
126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	** --nested Allow opening a repository inside an opened
129	** checkout
130	** --nocompress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
	@@ -135,11 +135,11 @@
135	** --ssh-command\|-c SSH Use SSH as the "ssh" command
136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	** --transport-command CMD Use CMD to move messages to the server and back
138	** -u\|--unversioned Also sync unversioned content
139	** -v\|--verbose Show more statistics in output
140	** --workdir DIR Also open a checkout in DIR
141	**
142	** See also: [[init]], [[open]]
143	*/
144	void clone_cmd(void){
145	char *zPassword;
	@@ -200,11 +200,11 @@
200	fossil_free(zBase);
201	}
202	if( -1 != file_size(zRepo, ExtFILE) ){
203	fossil_fatal("file already exists: %s", zRepo);
204	}
205	/* Fail before clone if open will fail because inside an open checkout */
206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207	if( db_open_local_v2(0, allowNested) ){
208	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
209	}
210	}
211

	--- src/clone.c
	+++ src/clone.c
	@@ -108,11 +108,11 @@
108	** Use %HH escapes for special characters in the userid and
109	** password. For example "%40" in place of "@", "%2f" in place
110	** of "/", and "%3a" in place of ":".
111	**
112	** Note that in Fossil (in contrast to some other DVCSes) a repository
113	** is distinct from a check-out. Cloning a repository is not the same thing
114	** as opening a repository. This command always clones the repository. This
115	** command might also open the repository, but only if the --no-open option
116	** is omitted and either the --workdir option is included or the FILENAME
117	** argument is omitted. Use the separate [[open]] command to open a
118	** repository that was previously cloned and already exists on the
	@@ -124,11 +124,11 @@
124	**
125	** Options:
126	** -A\|--admin-user USERNAME Make USERNAME the administrator
127	** -B\|--httpauth USER:PASS Add HTTP Basic Authorization to requests
128	** --nested Allow opening a repository inside an opened
129	** check-out
130	** --nocompress Omit extra delta compression
131	** --no-open Clone only. Do not open a check-out.
132	** --once Don't remember the URI.
133	** --private Also clone private branches
134	** --save-http-password Remember the HTTP password without asking
	@@ -135,11 +135,11 @@
135	** --ssh-command\|-c SSH Use SSH as the "ssh" command
136	** --ssl-identity FILENAME Use the SSL identity if requested by the server
137	** --transport-command CMD Use CMD to move messages to the server and back
138	** -u\|--unversioned Also sync unversioned content
139	** -v\|--verbose Show more statistics in output
140	** --workdir DIR Also open a check-out in DIR
141	**
142	** See also: [[init]], [[open]]
143	*/
144	void clone_cmd(void){
145	char *zPassword;
	@@ -200,11 +200,11 @@
200	fossil_free(zBase);
201	}
202	if( -1 != file_size(zRepo, ExtFILE) ){
203	fossil_fatal("file already exists: %s", zRepo);
204	}
205	/* Fail before clone if open will fail because inside an open check-out */
206	if( zWorkDir!=0 && zWorkDir[0]!=0 && !noOpen ){
207	if( db_open_local_v2(0, allowNested) ){
208	fossil_fatal("there is already an open tree at %s", g.zLocalRoot);
209	}
210	}
211

M src/db.c

+35 -35

		--- src/db.c
		+++ src/db.c
		@@ -23,11 +23,11 @@
23	23	** (1) The "configdb" database in ~/.fossil or ~/.config/fossil.db
24	24	** or in %LOCALAPPDATA%/_fossil
25	25	**
26	26	** (2) The "repository" database
27	27	**
28		-** (3) A local checkout database named "_FOSSIL_" or ".fslckout"
	28	+** (3) A local check-out database named "_FOSSIL_" or ".fslckout"
29	29	** and located at the root of the local copy of the source tree.
30	30	**
31	31	*/
32	32	#include "config.h"
33	33	#if defined(_WIN32)
		@@ -2052,21 +2052,21 @@
2052	2052	if( file_access(zDbName, F_OK) ) return 0;
2053	2053	lsize = file_size(zDbName, ExtFILE);
2054	2054	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2055	2055	db_open_or_attach(zDbName, "localdb");
2056	2056
2057		- /* Check to see if the checkout database has the lastest schema changes.
	2057	+ /* Check to see if the check-out database has the lastest schema changes.
2058	2058	** The most recent schema change (2019-01-19) is the addition of the
2059	2059	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2060	2060	** column, assume everything else is up-to-date.
2061	2061	*/
2062	2062	if( db_table_has_column("localdb","vmerge","mhash") ){
2063		- return 1; /* This is a checkout database with the latest schema */
	2063	+ return 1; /* This is a check-out database with the latest schema */
2064	2064	}
2065	2065
2066	2066	/* If there is no vfile table, then assume we have picked up something
2067		- ** that is not even close to being a valid checkout database */
	2067	+ ** that is not even close to being a valid check-out database */
2068	2068	if( !db_table_exists("localdb","vfile") ){
2069	2069	return 0; /* Not a DB */
2070	2070	}
2071	2071
2072	2072	/* If the "isexe" column is missing from the vfile table, then
		@@ -2092,11 +2092,11 @@
2092	2092	if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){
2093	2093	db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0");
2094	2094	}
2095	2095	}
2096	2096
2097		- /* The design of the checkout database changed on 2019-01-19, adding the mhash
	2097	+ /* The design of the check-out database changed on 2019-01-19, adding the mhash
2098	2098	** column to vfile and vmerge and changing the UNIQUE index on vmerge into
2099	2099	** a PRIMARY KEY that includes the new mhash column. However, we must have
2100	2100	** the repository database at hand in order to do the migration, so that
2101	2101	** step is deferred. */
2102	2102	return 1;
		@@ -2114,11 +2114,11 @@
2114	2114	** try again. Once the file is found, the g.zLocalRoot variable is set
2115	2115	** to the root of the repository tree and this routine returns 1. If
2116	2116	** no database is found, then this routine return 0.
2117	2117	**
2118	2118	** In db_open_local_v2(), if the bRootOnly flag is true, then only
2119		-** look in the CWD for the checkout database. Do not scan upwards in
	2119	+** look in the CWD for the check-out database. Do not scan upwards in
2120	2120	** the file hierarchy.
2121	2121	**
2122	2122	** This routine always opens the user database regardless of whether or
2123	2123	** not the repository database is found. If the _FOSSIL_ or .fslckout file
2124	2124	** is found, it is attached to the open database connection too.
		@@ -2136,11 +2136,11 @@
2136	2136	sqlite3_snprintf(sizeof(zPwd)-n, &zPwd[n], "/%s", aDbName[i]);
2137	2137	if( isValidLocalDb(zPwd) ){
2138	2138	if( db_open_config(0, 1)==0 ){
2139	2139	return 0; /* Configuration could not be opened */
2140	2140	}
2141		- /* Found a valid checkout database file */
	2141	+ /* Found a valid check-out database file */
2142	2142	g.zLocalDbName = mprintf("%s", zPwd);
2143	2143	zPwd[n] = 0;
2144	2144	while( n>0 && zPwd[n-1]=='/' ){
2145	2145	n--;
2146	2146	zPwd[n] = 0;
		@@ -2156,11 +2156,11 @@
2156	2156	while( n>1 && zPwd[n]!='/' ){ n--; }
2157	2157	while( n>1 && zPwd[n-1]=='/' ){ n--; }
2158	2158	zPwd[n] = 0;
2159	2159	}
2160	2160
2161		- /* A checkout database file could not be found */
	2161	+ /* A check-out database file could not be found */
2162	2162	return 0;
2163	2163	}
2164	2164	int db_open_local(const char *zDbName){
2165	2165	return db_open_local_v2(zDbName, 0);
2166	2166	}
		@@ -2294,17 +2294,17 @@
2294	2294	/* Make a change to the CHECK constraint on the BLOB table for
2295	2295	** version 2.0 and later.
2296	2296	*/
2297	2297	rebuild_schema_update_2_0(); /* Do the Fossil-2.0 schema updates */
2298	2298
2299		- /* Additional checks that occur when opening the checkout database */
	2299	+ /* Additional checks that occur when opening the check-out database */
2300	2300	if( g.localOpen ){
2301	2301
2302	2302	/* If the repository database that was just opened has been
2303	2303	** eplaced by a clone of the same project, with different RID
2304	2304	** values, then renumber the RID values stored in various tables
2305		- ** of the checkout database, so that the repository and checkout
	2305	+ ** of the check-out database, so that the repository and check-out
2306	2306	** databases align.
2307	2307	*/
2308	2308	if( !db_fingerprint_ok() ){
2309	2309	if( find_option("no-rid-adjust",0,0)!=0 ){
2310	2310	/* The --no-rid-adjust command-line option bypasses the RID value
		@@ -2333,11 +2333,11 @@
2333	2333	"Bisect history and undo have been lost.\n"
2334	2334	);
2335	2335	}
2336	2336	}
2337	2337
2338		- /* Make sure the checkout database schema migration of 2019-01-20
	2338	+ /* Make sure the check-out database schema migration of 2019-01-20
2339	2339	** has occurred.
2340	2340	**
2341	2341	** The 2019-01-19 migration is the addition of the vmerge.mhash and
2342	2342	** vfile.mhash columns and making the vmerge.mhash column part of the
2343	2343	** PRIMARY KEY for vmerge.
		@@ -2388,11 +2388,11 @@
2388	2388	#endif
2389	2389
2390	2390	/*
2391	2391	** Try to find the repository and open it. Use the -R or --repository
2392	2392	** option to locate the repository. If no such option is available, then
2393		-** use the repository of the open checkout if there is one.
	2393	+** use the repository of the open check-out if there is one.
2394	2394	**
2395	2395	** Error out if the repository cannot be opened.
2396	2396	*/
2397	2397	void db_find_and_open_repository(int bFlags, int nArgUsed){
2398	2398	const char *zRep = find_repository_option();
		@@ -2471,11 +2471,11 @@
2471	2471	** COMMAND: test-move-repository
2472	2472	**
2473	2473	** Usage: %fossil test-move-repository PATHNAME
2474	2474	**
2475	2475	** Change the location of the repository database on a local check-out.
2476		-** Use this command to avoid having to close and reopen a checkout
	2476	+** Use this command to avoid having to close and reopen a check-out
2477	2477	** when relocating the repository database.
2478	2478	*/
2479	2479	void move_repo_cmd(void){
2480	2480	Blob repo;
2481	2481	char *zRepo;
		@@ -2486,11 +2486,11 @@
2486	2486	zRepo = blob_str(&repo);
2487	2487	if( file_access(zRepo, F_OK) ){
2488	2488	fossil_fatal("no such file: %s", zRepo);
2489	2489	}
2490	2490	if( db_open_local(zRepo)==0 ){
2491		- fossil_fatal("not in a local checkout");
	2491	+ fossil_fatal("not in a local check-out");
2492	2492	return;
2493	2493	}
2494	2494	db_open_or_attach(zRepo, "test_repo");
2495	2495	db_lset("repository", blob_str(&repo));
2496	2496	db_record_repository_filename(blob_str(&repo));
		@@ -2505,11 +2505,11 @@
2505	2505	if( find_repository_option() ){
2506	2506	fossil_fatal("the \"%s\" command only works from within an open check-out",
2507	2507	g.argv[1]);
2508	2508	}
2509	2509	if( db_open_local(0)==0 ){
2510		- fossil_fatal("current directory is not within an open checkout");
	2510	+ fossil_fatal("current directory is not within an open check-out");
2511	2511	}
2512	2512	db_open_repository(0);
2513	2513	db_verify_schema();
2514	2514	}
2515	2515
		@@ -3192,11 +3192,11 @@
3192	3192	zVersionedSetting = fossil_strdup(cacheEntry->zValue);
3193	3193	break;
3194	3194	}
3195	3195	cacheEntry = cacheEntry->next;
3196	3196	}
3197		- /* Attempt to read value from file in checkout if there wasn't a cache hit. */
	3197	+ /* Attempt to read value from file in check-out if there wasn't a cache hit.*/
3198	3198	if( cacheEntry==0 ){
3199	3199	Blob versionedPathname;
3200	3200	Blob setting;
3201	3201	blob_zero(&versionedPathname);
3202	3202	blob_zero(&setting);
		@@ -3299,11 +3299,11 @@
3299	3299	}
3300	3300	db_reset(&q2);
3301	3301	}
3302	3302	if( pSetting!=0 && pSetting->versionable ){
3303	3303	/* This is a versionable setting, try and get the info from a
3304		- ** checked out file */
	3304	+ ** checked-out file */
3305	3305	char * zZ = z;
3306	3306	z = db_get_versioned(zName, z);
3307	3307	if(zZ != z){
3308	3308	fossil_free(zZ);
3309	3309	}
		@@ -3591,16 +3591,16 @@
3591	3591	**
3592	3592	** repo:%s
3593	3593	**
3594	3594	** The value field is set to 1.
3595	3595	**
3596		-** If running from a local checkout, also record the root of the checkout
	3596	+** If running from a local check-out, also record the root of the check-out
3597	3597	** as follows:
3598	3598	**
3599	3599	** ckout:%s
3600	3600	**
3601		-** Where %s is the checkout root. The value is the repository file.
	3601	+** Where %s is the check-out root. The value is the repository file.
3602	3602	*/
3603	3603	void db_record_repository_filename(const char *zName){
3604	3604	char *zRepoSetting;
3605	3605	char *zCkoutSetting;
3606	3606	Blob full;
		@@ -3661,11 +3661,11 @@
3661	3661	/*
3662	3662	** COMMAND: open
3663	3663	**
3664	3664	** Usage: %fossil open REPOSITORY ?VERSION? ?OPTIONS?
3665	3665	**
3666		-** Open a new connection to the repository name REPOSITORY. A checkout
	3666	+** Open a new connection to the repository name REPOSITORY. A check-out
3667	3667	** for the repository is created with its root at the current working
3668	3668	** directory, or in DIR if the "--workdir DIR" is used. If VERSION is
3669	3669	** specified then that version is checked out. Otherwise the most recent
3670	3670	** check-in on the main branch (usually "trunk") is used.
3671	3671	**
		@@ -3683,24 +3683,24 @@
3683	3683	** The base URI for cloning is "https://fossil-scm.org/home". The extra
3684	3684	** "new-name" term means that the cloned repository will be called
3685	3685	** "new-name.fossil".
3686	3686	**
3687	3687	** Options:
3688		-** --empty Initialize checkout as being empty, but still connected
3689		-** with the local repository. If you commit this checkout,
	3688	+** --empty Initialize check-out as being empty, but still connected
	3689	+** with the local repository. If you commit this check-out,
3690	3690	** it will become a new "initial" commit in the repository.
3691	3691	** -f\|--force Continue with the open even if the working directory is
3692	3692	** not empty
3693	3693	** --force-missing Force opening a repository with missing content
3694	3694	** -k\|--keep Only modify the manifest file(s)
3695		-** --nested Allow opening a repository inside an opened checkout
	3695	+** --nested Allow opening a repository inside an opened check-out
3696	3696	** --nosync Do not auto-sync the repository prior to opening even
3697	3697	** if the autosync setting is on.
3698	3698	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3699	3699	** the clone in DIR rather than in "."
3700	3700	** --setmtime Set timestamps of all files to match their SCM-side
3701		-** times (the timestamp of the last checkin which modified
	3701	+** times (the timestamp of the last check-in which modified
3702	3702	** them).
3703	3703	** --sync Auto-sync prior to opening even if the autosync setting
3704	3704	** is off
3705	3705	** --verbose If passed a URI then this flag is passed on to the clone
3706	3706	** operation, otherwise it has no effect
		@@ -4333,11 +4333,11 @@
4333	4333	** The value is the primary branch for the project.
4334	4334	*/
4335	4335	/*
4336	4336	** SETTING: manifest width=5 versionable
4337	4337	** If enabled, automatically create files "manifest" and "manifest.uuid"
4338		-** in every checkout.
	4338	+** in every check-out.
4339	4339	**
4340	4340	** Optionally use combinations of characters 'r' for "manifest",
4341	4341	** 'u' for "manifest.uuid" and 't' for "manifest.tags". The SQLite
4342	4342	** and Fossil repositories both require manifests.
4343	4343	*/
		@@ -4369,13 +4369,13 @@
4369	4369	** projects.
4370	4370	*/
4371	4371	/*
4372	4372	** SETTING: mv-rm-files boolean default=off
4373	4373	** If enabled, the "mv" and "rename" commands will also move
4374		-** the associated files within the checkout -AND- the "rm"
	4374	+** the associated files within the check-out -AND- the "rm"
4375	4375	** and "delete" commands will also remove the associated
4376		-** files from within the checkout.
	4376	+** files from within the check-out.
4377	4377	*/
4378	4378	/*
4379	4379	** SETTING: pgp-command width=40 sensitive
4380	4380	** Command used to clear-sign manifests at check-in.
4381	4381	** Default value is "gpg --clearsign -o"
		@@ -4406,11 +4406,11 @@
4406	4406	** When showing changes and extras, report paths relative
4407	4407	** to the current working directory.
4408	4408	*/
4409	4409	/*
4410	4410	** SETTING: repo-cksum boolean default=on
4411		-** Compute checksums over all files in each checkout as a double-check
	4411	+** Compute checksums over all files in each check-out as a double-check
4412	4412	** of correctness. Disable this on large repositories for a performance
4413	4413	** improvement.
4414	4414	*/
4415	4415	/*
4416	4416	** SETTING: repolist-skin width=2 default=0
		@@ -4881,11 +4881,11 @@
4881	4881	/*
4882	4882	** COMMAND: test-database-names
4883	4883	**
4884	4884	** Print the names of the various database files:
4885	4885	** (1) The main repository database
4886		-** (2) The local checkout database
	4886	+** (2) The local check-out database
4887	4887	** (3) The global configuration database
4888	4888	*/
4889	4889	void test_database_name_cmd(void){
4890	4890	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
4891	4891	fossil_print("Repository database: %s\n", g.zRepositoryName);
		@@ -4897,13 +4897,13 @@
4897	4897	** Compute a "fingerprint" on the repository. A fingerprint is used
4898	4898	** to verify that that the repository has not been replaced by a clone
4899	4899	** of the same repository. More precisely, a fingerprint are used to
4900	4900	** verify that the mapping between SHA3 hashes and RID values is unchanged.
4901	4901	**
4902		-** The checkout database ("localdb") stores RID values. When associating
4903		-** a checkout database against a repository database, it is useful to verify
4904		-** the fingerprint so that we know tha the RID values in the checkout
	4902	+** The check-out database ("localdb") stores RID values. When associating
	4903	+** a check-out database against a repository database, it is useful to verify
	4904	+** the fingerprint so that we know tha the RID values in the check-out
4905	4905	** database still correspond to the correct entries in the BLOB table of
4906	4906	** the repository.
4907	4907	**
4908	4908	** The fingerprint is based on the RCVFROM table. When constructing a
4909	4909	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
		@@ -5006,21 +5006,21 @@
5006	5006	** of the VVAR table matches the fingerprint on the currently
5007	5007	** connected repository. Return true if the fingerprint is ok, and
5008	5008	** return false if the fingerprint does not match.
5009	5009	*/
5010	5010	int db_fingerprint_ok(void){
5011		- char zCkout; / The fingerprint recorded in the checkout database */
	5011	+ char zCkout; / The fingerprint recorded in the check-out database */
5012	5012	char zRepo; / The fingerprint of the repository */
5013	5013	int rc; /* Result */
5014	5014
5015	5015	if( !db_lget_int("checkout", 0) ){
5016		- /* We have an empty checkout, fingerprint is still NULL. */
	5016	+ /* We have an empty check-out, fingerprint is still NULL. */
5017	5017	return 2;
5018	5018	}
5019	5019	zCkout = db_text(0,"SELECT value FROM localdb.vvar WHERE name='fingerprint'");
5020	5020	if( zCkout==0 ){
5021		- /* This is an older checkout that does not record a fingerprint.
	5021	+ /* This is an older check-out that does not record a fingerprint.
5022	5022	** We have to assume everything is ok */
5023	5023	return 2;
5024	5024	}
5025	5025	zRepo = db_fingerprint(atoi(zCkout), 1);
5026	5026	rc = fossil_strcmp(zCkout,zRepo)==0;
5027	5027

	--- src/db.c
	+++ src/db.c
	@@ -23,11 +23,11 @@
23	** (1) The "configdb" database in ~/.fossil or ~/.config/fossil.db
24	** or in %LOCALAPPDATA%/_fossil
25	**
26	** (2) The "repository" database
27	**
28	** (3) A local checkout database named "_FOSSIL_" or ".fslckout"
29	** and located at the root of the local copy of the source tree.
30	**
31	*/
32	#include "config.h"
33	#if defined(_WIN32)
	@@ -2052,21 +2052,21 @@
2052	if( file_access(zDbName, F_OK) ) return 0;
2053	lsize = file_size(zDbName, ExtFILE);
2054	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2055	db_open_or_attach(zDbName, "localdb");
2056
2057	/* Check to see if the checkout database has the lastest schema changes.
2058	** The most recent schema change (2019-01-19) is the addition of the
2059	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2060	** column, assume everything else is up-to-date.
2061	*/
2062	if( db_table_has_column("localdb","vmerge","mhash") ){
2063	return 1; /* This is a checkout database with the latest schema */
2064	}
2065
2066	/* If there is no vfile table, then assume we have picked up something
2067	** that is not even close to being a valid checkout database */
2068	if( !db_table_exists("localdb","vfile") ){
2069	return 0; /* Not a DB */
2070	}
2071
2072	/* If the "isexe" column is missing from the vfile table, then
	@@ -2092,11 +2092,11 @@
2092	if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){
2093	db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0");
2094	}
2095	}
2096
2097	/* The design of the checkout database changed on 2019-01-19, adding the mhash
2098	** column to vfile and vmerge and changing the UNIQUE index on vmerge into
2099	** a PRIMARY KEY that includes the new mhash column. However, we must have
2100	** the repository database at hand in order to do the migration, so that
2101	** step is deferred. */
2102	return 1;
	@@ -2114,11 +2114,11 @@
2114	** try again. Once the file is found, the g.zLocalRoot variable is set
2115	** to the root of the repository tree and this routine returns 1. If
2116	** no database is found, then this routine return 0.
2117	**
2118	** In db_open_local_v2(), if the bRootOnly flag is true, then only
2119	** look in the CWD for the checkout database. Do not scan upwards in
2120	** the file hierarchy.
2121	**
2122	** This routine always opens the user database regardless of whether or
2123	** not the repository database is found. If the _FOSSIL_ or .fslckout file
2124	** is found, it is attached to the open database connection too.
	@@ -2136,11 +2136,11 @@
2136	sqlite3_snprintf(sizeof(zPwd)-n, &zPwd[n], "/%s", aDbName[i]);
2137	if( isValidLocalDb(zPwd) ){
2138	if( db_open_config(0, 1)==0 ){
2139	return 0; /* Configuration could not be opened */
2140	}
2141	/* Found a valid checkout database file */
2142	g.zLocalDbName = mprintf("%s", zPwd);
2143	zPwd[n] = 0;
2144	while( n>0 && zPwd[n-1]=='/' ){
2145	n--;
2146	zPwd[n] = 0;
	@@ -2156,11 +2156,11 @@
2156	while( n>1 && zPwd[n]!='/' ){ n--; }
2157	while( n>1 && zPwd[n-1]=='/' ){ n--; }
2158	zPwd[n] = 0;
2159	}
2160
2161	/* A checkout database file could not be found */
2162	return 0;
2163	}
2164	int db_open_local(const char *zDbName){
2165	return db_open_local_v2(zDbName, 0);
2166	}
	@@ -2294,17 +2294,17 @@
2294	/* Make a change to the CHECK constraint on the BLOB table for
2295	** version 2.0 and later.
2296	*/
2297	rebuild_schema_update_2_0(); /* Do the Fossil-2.0 schema updates */
2298
2299	/* Additional checks that occur when opening the checkout database */
2300	if( g.localOpen ){
2301
2302	/* If the repository database that was just opened has been
2303	** eplaced by a clone of the same project, with different RID
2304	** values, then renumber the RID values stored in various tables
2305	** of the checkout database, so that the repository and checkout
2306	** databases align.
2307	*/
2308	if( !db_fingerprint_ok() ){
2309	if( find_option("no-rid-adjust",0,0)!=0 ){
2310	/* The --no-rid-adjust command-line option bypasses the RID value
	@@ -2333,11 +2333,11 @@
2333	"Bisect history and undo have been lost.\n"
2334	);
2335	}
2336	}
2337
2338	/* Make sure the checkout database schema migration of 2019-01-20
2339	** has occurred.
2340	**
2341	** The 2019-01-19 migration is the addition of the vmerge.mhash and
2342	** vfile.mhash columns and making the vmerge.mhash column part of the
2343	** PRIMARY KEY for vmerge.
	@@ -2388,11 +2388,11 @@
2388	#endif
2389
2390	/*
2391	** Try to find the repository and open it. Use the -R or --repository
2392	** option to locate the repository. If no such option is available, then
2393	** use the repository of the open checkout if there is one.
2394	**
2395	** Error out if the repository cannot be opened.
2396	*/
2397	void db_find_and_open_repository(int bFlags, int nArgUsed){
2398	const char *zRep = find_repository_option();
	@@ -2471,11 +2471,11 @@
2471	** COMMAND: test-move-repository
2472	**
2473	** Usage: %fossil test-move-repository PATHNAME
2474	**
2475	** Change the location of the repository database on a local check-out.
2476	** Use this command to avoid having to close and reopen a checkout
2477	** when relocating the repository database.
2478	*/
2479	void move_repo_cmd(void){
2480	Blob repo;
2481	char *zRepo;
	@@ -2486,11 +2486,11 @@
2486	zRepo = blob_str(&repo);
2487	if( file_access(zRepo, F_OK) ){
2488	fossil_fatal("no such file: %s", zRepo);
2489	}
2490	if( db_open_local(zRepo)==0 ){
2491	fossil_fatal("not in a local checkout");
2492	return;
2493	}
2494	db_open_or_attach(zRepo, "test_repo");
2495	db_lset("repository", blob_str(&repo));
2496	db_record_repository_filename(blob_str(&repo));
	@@ -2505,11 +2505,11 @@
2505	if( find_repository_option() ){
2506	fossil_fatal("the \"%s\" command only works from within an open check-out",
2507	g.argv[1]);
2508	}
2509	if( db_open_local(0)==0 ){
2510	fossil_fatal("current directory is not within an open checkout");
2511	}
2512	db_open_repository(0);
2513	db_verify_schema();
2514	}
2515
	@@ -3192,11 +3192,11 @@
3192	zVersionedSetting = fossil_strdup(cacheEntry->zValue);
3193	break;
3194	}
3195	cacheEntry = cacheEntry->next;
3196	}
3197	/* Attempt to read value from file in checkout if there wasn't a cache hit. */
3198	if( cacheEntry==0 ){
3199	Blob versionedPathname;
3200	Blob setting;
3201	blob_zero(&versionedPathname);
3202	blob_zero(&setting);
	@@ -3299,11 +3299,11 @@
3299	}
3300	db_reset(&q2);
3301	}
3302	if( pSetting!=0 && pSetting->versionable ){
3303	/* This is a versionable setting, try and get the info from a
3304	** checked out file */
3305	char * zZ = z;
3306	z = db_get_versioned(zName, z);
3307	if(zZ != z){
3308	fossil_free(zZ);
3309	}
	@@ -3591,16 +3591,16 @@
3591	**
3592	** repo:%s
3593	**
3594	** The value field is set to 1.
3595	**
3596	** If running from a local checkout, also record the root of the checkout
3597	** as follows:
3598	**
3599	** ckout:%s
3600	**
3601	** Where %s is the checkout root. The value is the repository file.
3602	*/
3603	void db_record_repository_filename(const char *zName){
3604	char *zRepoSetting;
3605	char *zCkoutSetting;
3606	Blob full;
	@@ -3661,11 +3661,11 @@
3661	/*
3662	** COMMAND: open
3663	**
3664	** Usage: %fossil open REPOSITORY ?VERSION? ?OPTIONS?
3665	**
3666	** Open a new connection to the repository name REPOSITORY. A checkout
3667	** for the repository is created with its root at the current working
3668	** directory, or in DIR if the "--workdir DIR" is used. If VERSION is
3669	** specified then that version is checked out. Otherwise the most recent
3670	** check-in on the main branch (usually "trunk") is used.
3671	**
	@@ -3683,24 +3683,24 @@
3683	** The base URI for cloning is "https://fossil-scm.org/home". The extra
3684	** "new-name" term means that the cloned repository will be called
3685	** "new-name.fossil".
3686	**
3687	** Options:
3688	** --empty Initialize checkout as being empty, but still connected
3689	** with the local repository. If you commit this checkout,
3690	** it will become a new "initial" commit in the repository.
3691	** -f\|--force Continue with the open even if the working directory is
3692	** not empty
3693	** --force-missing Force opening a repository with missing content
3694	** -k\|--keep Only modify the manifest file(s)
3695	** --nested Allow opening a repository inside an opened checkout
3696	** --nosync Do not auto-sync the repository prior to opening even
3697	** if the autosync setting is on.
3698	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3699	** the clone in DIR rather than in "."
3700	** --setmtime Set timestamps of all files to match their SCM-side
3701	** times (the timestamp of the last checkin which modified
3702	** them).
3703	** --sync Auto-sync prior to opening even if the autosync setting
3704	** is off
3705	** --verbose If passed a URI then this flag is passed on to the clone
3706	** operation, otherwise it has no effect
	@@ -4333,11 +4333,11 @@
4333	** The value is the primary branch for the project.
4334	*/
4335	/*
4336	** SETTING: manifest width=5 versionable
4337	** If enabled, automatically create files "manifest" and "manifest.uuid"
4338	** in every checkout.
4339	**
4340	** Optionally use combinations of characters 'r' for "manifest",
4341	** 'u' for "manifest.uuid" and 't' for "manifest.tags". The SQLite
4342	** and Fossil repositories both require manifests.
4343	*/
	@@ -4369,13 +4369,13 @@
4369	** projects.
4370	*/
4371	/*
4372	** SETTING: mv-rm-files boolean default=off
4373	** If enabled, the "mv" and "rename" commands will also move
4374	** the associated files within the checkout -AND- the "rm"
4375	** and "delete" commands will also remove the associated
4376	** files from within the checkout.
4377	*/
4378	/*
4379	** SETTING: pgp-command width=40 sensitive
4380	** Command used to clear-sign manifests at check-in.
4381	** Default value is "gpg --clearsign -o"
	@@ -4406,11 +4406,11 @@
4406	** When showing changes and extras, report paths relative
4407	** to the current working directory.
4408	*/
4409	/*
4410	** SETTING: repo-cksum boolean default=on
4411	** Compute checksums over all files in each checkout as a double-check
4412	** of correctness. Disable this on large repositories for a performance
4413	** improvement.
4414	*/
4415	/*
4416	** SETTING: repolist-skin width=2 default=0
	@@ -4881,11 +4881,11 @@
4881	/*
4882	** COMMAND: test-database-names
4883	**
4884	** Print the names of the various database files:
4885	** (1) The main repository database
4886	** (2) The local checkout database
4887	** (3) The global configuration database
4888	*/
4889	void test_database_name_cmd(void){
4890	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
4891	fossil_print("Repository database: %s\n", g.zRepositoryName);
	@@ -4897,13 +4897,13 @@
4897	** Compute a "fingerprint" on the repository. A fingerprint is used
4898	** to verify that that the repository has not been replaced by a clone
4899	** of the same repository. More precisely, a fingerprint are used to
4900	** verify that the mapping between SHA3 hashes and RID values is unchanged.
4901	**
4902	** The checkout database ("localdb") stores RID values. When associating
4903	** a checkout database against a repository database, it is useful to verify
4904	** the fingerprint so that we know tha the RID values in the checkout
4905	** database still correspond to the correct entries in the BLOB table of
4906	** the repository.
4907	**
4908	** The fingerprint is based on the RCVFROM table. When constructing a
4909	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
	@@ -5006,21 +5006,21 @@
5006	** of the VVAR table matches the fingerprint on the currently
5007	** connected repository. Return true if the fingerprint is ok, and
5008	** return false if the fingerprint does not match.
5009	*/
5010	int db_fingerprint_ok(void){
5011	char zCkout; / The fingerprint recorded in the checkout database */
5012	char zRepo; / The fingerprint of the repository */
5013	int rc; /* Result */
5014
5015	if( !db_lget_int("checkout", 0) ){
5016	/* We have an empty checkout, fingerprint is still NULL. */
5017	return 2;
5018	}
5019	zCkout = db_text(0,"SELECT value FROM localdb.vvar WHERE name='fingerprint'");
5020	if( zCkout==0 ){
5021	/* This is an older checkout that does not record a fingerprint.
5022	** We have to assume everything is ok */
5023	return 2;
5024	}
5025	zRepo = db_fingerprint(atoi(zCkout), 1);
5026	rc = fossil_strcmp(zCkout,zRepo)==0;
5027

	--- src/db.c
	+++ src/db.c
	@@ -23,11 +23,11 @@
23	** (1) The "configdb" database in ~/.fossil or ~/.config/fossil.db
24	** or in %LOCALAPPDATA%/_fossil
25	**
26	** (2) The "repository" database
27	**
28	** (3) A local check-out database named "_FOSSIL_" or ".fslckout"
29	** and located at the root of the local copy of the source tree.
30	**
31	*/
32	#include "config.h"
33	#if defined(_WIN32)
	@@ -2052,21 +2052,21 @@
2052	if( file_access(zDbName, F_OK) ) return 0;
2053	lsize = file_size(zDbName, ExtFILE);
2054	if( lsize%1024!=0 \|\| lsize<4096 ) return 0;
2055	db_open_or_attach(zDbName, "localdb");
2056
2057	/* Check to see if the check-out database has the lastest schema changes.
2058	** The most recent schema change (2019-01-19) is the addition of the
2059	** vmerge.mhash and vfile.mhash fields. If the schema has the vmerge.mhash
2060	** column, assume everything else is up-to-date.
2061	*/
2062	if( db_table_has_column("localdb","vmerge","mhash") ){
2063	return 1; /* This is a check-out database with the latest schema */
2064	}
2065
2066	/* If there is no vfile table, then assume we have picked up something
2067	** that is not even close to being a valid check-out database */
2068	if( !db_table_exists("localdb","vfile") ){
2069	return 0; /* Not a DB */
2070	}
2071
2072	/* If the "isexe" column is missing from the vfile table, then
	@@ -2092,11 +2092,11 @@
2092	if( db_local_table_exists_but_lacks_column("undo_vfile", "islink") ){
2093	db_multi_exec("ALTER TABLE undo_vfile ADD COLUMN islink BOOL DEFAULT 0");
2094	}
2095	}
2096
2097	/* The design of the check-out database changed on 2019-01-19, adding the mhash
2098	** column to vfile and vmerge and changing the UNIQUE index on vmerge into
2099	** a PRIMARY KEY that includes the new mhash column. However, we must have
2100	** the repository database at hand in order to do the migration, so that
2101	** step is deferred. */
2102	return 1;
	@@ -2114,11 +2114,11 @@
2114	** try again. Once the file is found, the g.zLocalRoot variable is set
2115	** to the root of the repository tree and this routine returns 1. If
2116	** no database is found, then this routine return 0.
2117	**
2118	** In db_open_local_v2(), if the bRootOnly flag is true, then only
2119	** look in the CWD for the check-out database. Do not scan upwards in
2120	** the file hierarchy.
2121	**
2122	** This routine always opens the user database regardless of whether or
2123	** not the repository database is found. If the _FOSSIL_ or .fslckout file
2124	** is found, it is attached to the open database connection too.
	@@ -2136,11 +2136,11 @@
2136	sqlite3_snprintf(sizeof(zPwd)-n, &zPwd[n], "/%s", aDbName[i]);
2137	if( isValidLocalDb(zPwd) ){
2138	if( db_open_config(0, 1)==0 ){
2139	return 0; /* Configuration could not be opened */
2140	}
2141	/* Found a valid check-out database file */
2142	g.zLocalDbName = mprintf("%s", zPwd);
2143	zPwd[n] = 0;
2144	while( n>0 && zPwd[n-1]=='/' ){
2145	n--;
2146	zPwd[n] = 0;
	@@ -2156,11 +2156,11 @@
2156	while( n>1 && zPwd[n]!='/' ){ n--; }
2157	while( n>1 && zPwd[n-1]=='/' ){ n--; }
2158	zPwd[n] = 0;
2159	}
2160
2161	/* A check-out database file could not be found */
2162	return 0;
2163	}
2164	int db_open_local(const char *zDbName){
2165	return db_open_local_v2(zDbName, 0);
2166	}
	@@ -2294,17 +2294,17 @@
2294	/* Make a change to the CHECK constraint on the BLOB table for
2295	** version 2.0 and later.
2296	*/
2297	rebuild_schema_update_2_0(); /* Do the Fossil-2.0 schema updates */
2298
2299	/* Additional checks that occur when opening the check-out database */
2300	if( g.localOpen ){
2301
2302	/* If the repository database that was just opened has been
2303	** eplaced by a clone of the same project, with different RID
2304	** values, then renumber the RID values stored in various tables
2305	** of the check-out database, so that the repository and check-out
2306	** databases align.
2307	*/
2308	if( !db_fingerprint_ok() ){
2309	if( find_option("no-rid-adjust",0,0)!=0 ){
2310	/* The --no-rid-adjust command-line option bypasses the RID value
	@@ -2333,11 +2333,11 @@
2333	"Bisect history and undo have been lost.\n"
2334	);
2335	}
2336	}
2337
2338	/* Make sure the check-out database schema migration of 2019-01-20
2339	** has occurred.
2340	**
2341	** The 2019-01-19 migration is the addition of the vmerge.mhash and
2342	** vfile.mhash columns and making the vmerge.mhash column part of the
2343	** PRIMARY KEY for vmerge.
	@@ -2388,11 +2388,11 @@
2388	#endif
2389
2390	/*
2391	** Try to find the repository and open it. Use the -R or --repository
2392	** option to locate the repository. If no such option is available, then
2393	** use the repository of the open check-out if there is one.
2394	**
2395	** Error out if the repository cannot be opened.
2396	*/
2397	void db_find_and_open_repository(int bFlags, int nArgUsed){
2398	const char *zRep = find_repository_option();
	@@ -2471,11 +2471,11 @@
2471	** COMMAND: test-move-repository
2472	**
2473	** Usage: %fossil test-move-repository PATHNAME
2474	**
2475	** Change the location of the repository database on a local check-out.
2476	** Use this command to avoid having to close and reopen a check-out
2477	** when relocating the repository database.
2478	*/
2479	void move_repo_cmd(void){
2480	Blob repo;
2481	char *zRepo;
	@@ -2486,11 +2486,11 @@
2486	zRepo = blob_str(&repo);
2487	if( file_access(zRepo, F_OK) ){
2488	fossil_fatal("no such file: %s", zRepo);
2489	}
2490	if( db_open_local(zRepo)==0 ){
2491	fossil_fatal("not in a local check-out");
2492	return;
2493	}
2494	db_open_or_attach(zRepo, "test_repo");
2495	db_lset("repository", blob_str(&repo));
2496	db_record_repository_filename(blob_str(&repo));
	@@ -2505,11 +2505,11 @@
2505	if( find_repository_option() ){
2506	fossil_fatal("the \"%s\" command only works from within an open check-out",
2507	g.argv[1]);
2508	}
2509	if( db_open_local(0)==0 ){
2510	fossil_fatal("current directory is not within an open check-out");
2511	}
2512	db_open_repository(0);
2513	db_verify_schema();
2514	}
2515
	@@ -3192,11 +3192,11 @@
3192	zVersionedSetting = fossil_strdup(cacheEntry->zValue);
3193	break;
3194	}
3195	cacheEntry = cacheEntry->next;
3196	}
3197	/* Attempt to read value from file in check-out if there wasn't a cache hit.*/
3198	if( cacheEntry==0 ){
3199	Blob versionedPathname;
3200	Blob setting;
3201	blob_zero(&versionedPathname);
3202	blob_zero(&setting);
	@@ -3299,11 +3299,11 @@
3299	}
3300	db_reset(&q2);
3301	}
3302	if( pSetting!=0 && pSetting->versionable ){
3303	/* This is a versionable setting, try and get the info from a
3304	** checked-out file */
3305	char * zZ = z;
3306	z = db_get_versioned(zName, z);
3307	if(zZ != z){
3308	fossil_free(zZ);
3309	}
	@@ -3591,16 +3591,16 @@
3591	**
3592	** repo:%s
3593	**
3594	** The value field is set to 1.
3595	**
3596	** If running from a local check-out, also record the root of the check-out
3597	** as follows:
3598	**
3599	** ckout:%s
3600	**
3601	** Where %s is the check-out root. The value is the repository file.
3602	*/
3603	void db_record_repository_filename(const char *zName){
3604	char *zRepoSetting;
3605	char *zCkoutSetting;
3606	Blob full;
	@@ -3661,11 +3661,11 @@
3661	/*
3662	** COMMAND: open
3663	**
3664	** Usage: %fossil open REPOSITORY ?VERSION? ?OPTIONS?
3665	**
3666	** Open a new connection to the repository name REPOSITORY. A check-out
3667	** for the repository is created with its root at the current working
3668	** directory, or in DIR if the "--workdir DIR" is used. If VERSION is
3669	** specified then that version is checked out. Otherwise the most recent
3670	** check-in on the main branch (usually "trunk") is used.
3671	**
	@@ -3683,24 +3683,24 @@
3683	** The base URI for cloning is "https://fossil-scm.org/home". The extra
3684	** "new-name" term means that the cloned repository will be called
3685	** "new-name.fossil".
3686	**
3687	** Options:
3688	** --empty Initialize check-out as being empty, but still connected
3689	** with the local repository. If you commit this check-out,
3690	** it will become a new "initial" commit in the repository.
3691	** -f\|--force Continue with the open even if the working directory is
3692	** not empty
3693	** --force-missing Force opening a repository with missing content
3694	** -k\|--keep Only modify the manifest file(s)
3695	** --nested Allow opening a repository inside an opened check-out
3696	** --nosync Do not auto-sync the repository prior to opening even
3697	** if the autosync setting is on.
3698	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3699	** the clone in DIR rather than in "."
3700	** --setmtime Set timestamps of all files to match their SCM-side
3701	** times (the timestamp of the last check-in which modified
3702	** them).
3703	** --sync Auto-sync prior to opening even if the autosync setting
3704	** is off
3705	** --verbose If passed a URI then this flag is passed on to the clone
3706	** operation, otherwise it has no effect
	@@ -4333,11 +4333,11 @@
4333	** The value is the primary branch for the project.
4334	*/
4335	/*
4336	** SETTING: manifest width=5 versionable
4337	** If enabled, automatically create files "manifest" and "manifest.uuid"
4338	** in every check-out.
4339	**
4340	** Optionally use combinations of characters 'r' for "manifest",
4341	** 'u' for "manifest.uuid" and 't' for "manifest.tags". The SQLite
4342	** and Fossil repositories both require manifests.
4343	*/
	@@ -4369,13 +4369,13 @@
4369	** projects.
4370	*/
4371	/*
4372	** SETTING: mv-rm-files boolean default=off
4373	** If enabled, the "mv" and "rename" commands will also move
4374	** the associated files within the check-out -AND- the "rm"
4375	** and "delete" commands will also remove the associated
4376	** files from within the check-out.
4377	*/
4378	/*
4379	** SETTING: pgp-command width=40 sensitive
4380	** Command used to clear-sign manifests at check-in.
4381	** Default value is "gpg --clearsign -o"
	@@ -4406,11 +4406,11 @@
4406	** When showing changes and extras, report paths relative
4407	** to the current working directory.
4408	*/
4409	/*
4410	** SETTING: repo-cksum boolean default=on
4411	** Compute checksums over all files in each check-out as a double-check
4412	** of correctness. Disable this on large repositories for a performance
4413	** improvement.
4414	*/
4415	/*
4416	** SETTING: repolist-skin width=2 default=0
	@@ -4881,11 +4881,11 @@
4881	/*
4882	** COMMAND: test-database-names
4883	**
4884	** Print the names of the various database files:
4885	** (1) The main repository database
4886	** (2) The local check-out database
4887	** (3) The global configuration database
4888	*/
4889	void test_database_name_cmd(void){
4890	db_find_and_open_repository(OPEN_ANY_SCHEMA, 0);
4891	fossil_print("Repository database: %s\n", g.zRepositoryName);
	@@ -4897,13 +4897,13 @@
4897	** Compute a "fingerprint" on the repository. A fingerprint is used
4898	** to verify that that the repository has not been replaced by a clone
4899	** of the same repository. More precisely, a fingerprint are used to
4900	** verify that the mapping between SHA3 hashes and RID values is unchanged.
4901	**
4902	** The check-out database ("localdb") stores RID values. When associating
4903	** a check-out database against a repository database, it is useful to verify
4904	** the fingerprint so that we know tha the RID values in the check-out
4905	** database still correspond to the correct entries in the BLOB table of
4906	** the repository.
4907	**
4908	** The fingerprint is based on the RCVFROM table. When constructing a
4909	** new fingerprint, use the most recent RCVFROM entry. (Set rcvid==0 to
	@@ -5006,21 +5006,21 @@
5006	** of the VVAR table matches the fingerprint on the currently
5007	** connected repository. Return true if the fingerprint is ok, and
5008	** return false if the fingerprint does not match.
5009	*/
5010	int db_fingerprint_ok(void){
5011	char zCkout; / The fingerprint recorded in the check-out database */
5012	char zRepo; / The fingerprint of the repository */
5013	int rc; /* Result */
5014
5015	if( !db_lget_int("checkout", 0) ){
5016	/* We have an empty check-out, fingerprint is still NULL. */
5017	return 2;
5018	}
5019	zCkout = db_text(0,"SELECT value FROM localdb.vvar WHERE name='fingerprint'");
5020	if( zCkout==0 ){
5021	/* This is an older check-out that does not record a fingerprint.
5022	** We have to assume everything is ok */
5023	return 2;
5024	}
5025	zRepo = db_fingerprint(atoi(zCkout), 1);
5026	rc = fossil_strcmp(zCkout,zRepo)==0;
5027

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -3548,11 +3548,11 @@
3548	3548	** limit=LIMIT Limit the amount of analysis. LIMIT can be one of:
3549	3549	** none No limit
3550	3550	** Xs As much as can be computed in X seconds
3551	3551	** N N versions
3552	3552	** log=BOOLEAN Show a log of versions analyzed
3553		-** origin=ID The origin checkin. If unspecified, the root
	3553	+** origin=ID The origin check-in. If unspecified, the root
3554	3554	** check-in over the entire repository is used.
3555	3555	** Specify "origin=trunk" or similar for a reverse
3556	3556	** annotation
3557	3557	** w=BOOLEAN Ignore whitespace
3558	3558	*/
3559	3559

	--- src/diff.c
	+++ src/diff.c
	@@ -3548,11 +3548,11 @@
3548	** limit=LIMIT Limit the amount of analysis. LIMIT can be one of:
3549	** none No limit
3550	** Xs As much as can be computed in X seconds
3551	** N N versions
3552	** log=BOOLEAN Show a log of versions analyzed
3553	** origin=ID The origin checkin. If unspecified, the root
3554	** check-in over the entire repository is used.
3555	** Specify "origin=trunk" or similar for a reverse
3556	** annotation
3557	** w=BOOLEAN Ignore whitespace
3558	*/
3559

	--- src/diff.c
	+++ src/diff.c
	@@ -3548,11 +3548,11 @@
3548	** limit=LIMIT Limit the amount of analysis. LIMIT can be one of:
3549	** none No limit
3550	** Xs As much as can be computed in X seconds
3551	** N N versions
3552	** log=BOOLEAN Show a log of versions analyzed
3553	** origin=ID The origin check-in. If unspecified, the root
3554	** check-in over the entire repository is used.
3555	** Specify "origin=trunk" or similar for a reverse
3556	** annotation
3557	** w=BOOLEAN Ignore whitespace
3558	*/
3559

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -1027,11 +1027,11 @@
1027	1027	** COMMAND: gdiff
1028	1028	**
1029	1029	** Usage: %fossil diff\|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
1030	1030	**
1031	1031	** Show the difference between the current version of each of the FILEs
1032		-** specified (as they exist on disk) and that same file as it was checked
	1032	+** specified (as they exist on disk) and that same file as it was checked-
1033	1033	** out. Or if the FILE arguments are omitted, show all unsaved changes
1034	1034	** currently in the working check-out.
1035	1035	**
1036	1036	** The default output format is a "unified patch" (the same as the
1037	1037	** output of "diff -u" on most unix systems). Many alternative formats
1038	1038

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1027,11 +1027,11 @@
1027	** COMMAND: gdiff
1028	**
1029	** Usage: %fossil diff\|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
1030	**
1031	** Show the difference between the current version of each of the FILEs
1032	** specified (as they exist on disk) and that same file as it was checked
1033	** out. Or if the FILE arguments are omitted, show all unsaved changes
1034	** currently in the working check-out.
1035	**
1036	** The default output format is a "unified patch" (the same as the
1037	** output of "diff -u" on most unix systems). Many alternative formats
1038

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -1027,11 +1027,11 @@
1027	** COMMAND: gdiff
1028	**
1029	** Usage: %fossil diff\|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...?
1030	**
1031	** Show the difference between the current version of each of the FILEs
1032	** specified (as they exist on disk) and that same file as it was checked-
1033	** out. Or if the FILE arguments are omitted, show all unsaved changes
1034	** currently in the working check-out.
1035	**
1036	** The default output format is a "unified patch" (the same as the
1037	** output of "diff -u" on most unix systems). Many alternative formats
1038

M src/doc.c

+1 -1

		--- src/doc.c
		+++ src/doc.c
		@@ -1012,11 +1012,11 @@
1012	1012	zDfltTitle = zName;
1013	1013	}
1014	1014	}else if( fossil_strcmp(zCheckin,"ckout")==0
1015	1015	\|\| fossil_strcmp(zCheckin,g.zCkoutAlias)==0
1016	1016	){
1017		- /* Read from the local checkout */
	1017	+ /* Read from the local check-out */
1018	1018	char *zFullpath;
1019	1019	db_must_be_within_tree();
1020	1020	zFullpath = mprintf("%s/%s", g.zLocalRoot, zName);
1021	1021	if( file_isfile(zFullpath, RepoFILE)
1022	1022	&& blob_read_from_file(&filebody, zFullpath, RepoFILE)>0 ){
1023	1023

	--- src/doc.c
	+++ src/doc.c
	@@ -1012,11 +1012,11 @@
1012	zDfltTitle = zName;
1013	}
1014	}else if( fossil_strcmp(zCheckin,"ckout")==0
1015	\|\| fossil_strcmp(zCheckin,g.zCkoutAlias)==0
1016	){
1017	/* Read from the local checkout */
1018	char *zFullpath;
1019	db_must_be_within_tree();
1020	zFullpath = mprintf("%s/%s", g.zLocalRoot, zName);
1021	if( file_isfile(zFullpath, RepoFILE)
1022	&& blob_read_from_file(&filebody, zFullpath, RepoFILE)>0 ){
1023

	--- src/doc.c
	+++ src/doc.c
	@@ -1012,11 +1012,11 @@
1012	zDfltTitle = zName;
1013	}
1014	}else if( fossil_strcmp(zCheckin,"ckout")==0
1015	\|\| fossil_strcmp(zCheckin,g.zCkoutAlias)==0
1016	){
1017	/* Read from the local check-out */
1018	char *zFullpath;
1019	db_must_be_within_tree();
1020	zFullpath = mprintf("%s/%s", g.zLocalRoot, zName);
1021	if( file_isfile(zFullpath, RepoFILE)
1022	&& blob_read_from_file(&filebody, zFullpath, RepoFILE)>0 ){
1023

M src/export.c

+2 -2

		--- src/export.c
		+++ src/export.c
		@@ -458,11 +458,11 @@
458	458	** written in the git-fast-export file format assuming the --git option is
459	459	** provided. The git-fast-export format is currently the only VCS
460	460	** interchange format supported, though other formats may be added in
461	461	** the future.
462	462	**
463		-** Run this command within a checkout. Or use the -R or --repository
	463	+** Run this command within a check-out. Or use the -R or --repository
464	464	** option to specify a Fossil repository to be exported.
465	465	**
466	466	** Only check-ins are exported using --git. Git does not support tickets
467	467	** or wiki or tech notes or attachments, so none of those are exported.
468	468	**
		@@ -1824,11 +1824,11 @@
1824	1824	** Write content from the Fossil repository into the Git repository
1825	1825	** in directory MIRROR. The Git repository is created if it does not
1826	1826	** already exist. If the Git repository does already exist, then
1827	1827	** new content added to fossil since the previous export is appended.
1828	1828	**
1829		-** Repeat this command whenever new checkins are added to the Fossil
	1829	+** Repeat this command whenever new check-ins are added to the Fossil
1830	1830	** repository in order to reflect those changes into the mirror. If
1831	1831	** the MIRROR option is omitted, the repository from the previous
1832	1832	** invocation is used.
1833	1833	**
1834	1834	** The MIRROR directory will contain a subdirectory named
1835	1835

	--- src/export.c
	+++ src/export.c
	@@ -458,11 +458,11 @@
458	** written in the git-fast-export file format assuming the --git option is
459	** provided. The git-fast-export format is currently the only VCS
460	** interchange format supported, though other formats may be added in
461	** the future.
462	**
463	** Run this command within a checkout. Or use the -R or --repository
464	** option to specify a Fossil repository to be exported.
465	**
466	** Only check-ins are exported using --git. Git does not support tickets
467	** or wiki or tech notes or attachments, so none of those are exported.
468	**
	@@ -1824,11 +1824,11 @@
1824	** Write content from the Fossil repository into the Git repository
1825	** in directory MIRROR. The Git repository is created if it does not
1826	** already exist. If the Git repository does already exist, then
1827	** new content added to fossil since the previous export is appended.
1828	**
1829	** Repeat this command whenever new checkins are added to the Fossil
1830	** repository in order to reflect those changes into the mirror. If
1831	** the MIRROR option is omitted, the repository from the previous
1832	** invocation is used.
1833	**
1834	** The MIRROR directory will contain a subdirectory named
1835

	--- src/export.c
	+++ src/export.c
	@@ -458,11 +458,11 @@
458	** written in the git-fast-export file format assuming the --git option is
459	** provided. The git-fast-export format is currently the only VCS
460	** interchange format supported, though other formats may be added in
461	** the future.
462	**
463	** Run this command within a check-out. Or use the -R or --repository
464	** option to specify a Fossil repository to be exported.
465	**
466	** Only check-ins are exported using --git. Git does not support tickets
467	** or wiki or tech notes or attachments, so none of those are exported.
468	**
	@@ -1824,11 +1824,11 @@
1824	** Write content from the Fossil repository into the Git repository
1825	** in directory MIRROR. The Git repository is created if it does not
1826	** already exist. If the Git repository does already exist, then
1827	** new content added to fossil since the previous export is appended.
1828	**
1829	** Repeat this command whenever new check-ins are added to the Fossil
1830	** repository in order to reflect those changes into the mirror. If
1831	** the MIRROR option is omitted, the repository from the previous
1832	** invocation is used.
1833	**
1834	** The MIRROR directory will contain a subdirectory named
1835

M src/file.c

+15 -15

		--- src/file.c
		+++ src/file.c
		@@ -378,11 +378,11 @@
378	378
379	379	/*
380	380	** The file named zFile is suppose to be an in-tree file. Check to
381	381	** ensure that it will be safe to write to this file by verifying that
382	382	** there are no symlinks or other non-directory objects in between the
383		-** root of the checkout and zFile.
	383	+** root of the check-out and zFile.
384	384	**
385	385	** If a problem is found, print a warning message (using fossil_warning())
386	386	** and return non-zero. If everything is ok, return zero.
387	387	*/
388	388	int file_unsafe_in_tree_path(const char *zFile){
		@@ -1479,11 +1479,11 @@
1479	1479	** Options:
1480	1480	**
1481	1481	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1482	1482	** --open-config Open the configuration database first.
1483	1483	** --reset Reset cached stat() info for each file.
1484		-** --root ROOT Use ROOT as the root of the checkout
	1484	+** --root ROOT Use ROOT as the root of the check-out
1485	1485	** --slash Trailing slashes, if any, are retained.
1486	1486	*/
1487	1487	void cmd_test_file_environment(void){
1488	1488	int i;
1489	1489	int slashFlag = find_option("slash",0,0)!=0;
		@@ -1699,22 +1699,22 @@
1699	1699
1700	1700	blob_zero(pOut);
1701	1701	if( !g.localOpen ){
1702	1702	if( absolute && !file_is_absolute_path(zOrigName) ){
1703	1703	if( errFatal ){
1704		- fossil_fatal("relative to absolute needs open checkout tree: %s",
	1704	+ fossil_fatal("relative to absolute needs open check-out tree: %s",
1705	1705	zOrigName);
1706	1706	}
1707	1707	return 0;
1708	1708	}else{
1709	1709	/*
1710	1710	** The original path may be relative or absolute; however, without
1711		- ** an open checkout tree, the only things we can do at this point
	1711	+ ** an open check-out tree, the only things we can do at this point
1712	1712	** is return it verbatim or generate a fatal error. The caller is
1713	1713	** probably expecting a tree-relative path name will be returned;
1714	1714	** however, most places where this function is called already check
1715		- ** if the local checkout tree is open, either directly or indirectly,
	1715	+ ** if the local check-out tree is open, either directly or indirectly,
1716	1716	** which would make this situation impossible. Alternatively, they
1717	1717	** could check the returned path using the file_is_absolute_path()
1718	1718	** function.
1719	1719	*/
1720	1720	blob_appendf(pOut, "%s", zOrigName);
		@@ -1749,11 +1749,11 @@
1749	1749
1750	1750	if( nFull<=nLocalRoot \|\| xCmp(zLocalRoot, zFull, nLocalRoot) ){
1751	1751	blob_reset(&localRoot);
1752	1752	blob_reset(&full);
1753	1753	if( errFatal ){
1754		- fossil_fatal("file outside of checkout tree: %s", zOrigName);
	1754	+ fossil_fatal("file outside of check-out tree: %s", zOrigName);
1755	1755	}
1756	1756	return 0;
1757	1757	}
1758	1758	if( absolute ){
1759	1759	if( !file_is_absolute_path(zOrigName) ){
		@@ -2402,11 +2402,11 @@
2402	2402	return 1;
2403	2403	}
2404	2404
2405	2405	/*
2406	2406	** Internal helper for touch_cmd(). If the given file name is found in
2407		-** the given checkout version, which MUST be the checkout version
	2407	+** the given check-out version, which MUST be the check-out version
2408	2408	** currently populating the vfile table, the vfile.mrid value for the
2409	2409	** file is returned, else 0 is returned. zName must be resolvable
2410	2410	** as-is from the vfile table - this function neither expands nor
2411	2411	** normalizes it, though it does compare using the repo's
2412	2412	** filename_collation() preference.
		@@ -2431,11 +2431,11 @@
2431	2431	/*
2432	2432	** COMMAND: touch*
2433	2433	**
2434	2434	** Usage: %fossil touch ?OPTIONS? ?FILENAME...?
2435	2435	**
2436		-** For each file in the current checkout matching one of the provided
	2436	+** For each file in the current check-out matching one of the provided
2437	2437	** list of glob patterns and/or file names, the file's mtime is
2438	2438	** updated to a value specified by one of the flags --checkout,
2439	2439	** --checkin, or --now.
2440	2440	**
2441	2441	** If neither glob patterns nor filenames are provided, it operates on
		@@ -2465,11 +2465,11 @@
2465	2465	** default is --now.
2466	2466	**
2467	2467	** Only one of -g or -G may be used. If neither is provided and no
2468	2468	** additional filenames are provided, the effect is as if a glob of
2469	2469	** '*' were provided, i.e. all files belonging to the
2470		-** currently-checked-out version. Note that all glob patterns provided
	2470	+** currently checked-out version. Note that all glob patterns provided
2471	2471	** via these flags are always evaluated as if they are relative to the
2472	2472	** top of the source tree, not the current working (sub)directory.
2473	2473	** Filenames provided without these flags, on the other hand, are
2474	2474	** treated as relative to the current directory.
2475	2475	**
		@@ -2483,11 +2483,11 @@
2483	2483	const char * zGlobList; /* -g List of glob patterns */
2484	2484	const char * zGlobFile; /* -G File of glob patterns */
2485	2485	Glob * pGlob = 0; /* List of glob patterns */
2486	2486	int verboseFlag;
2487	2487	int dryRunFlag;
2488		- int vid; /* Checkout version */
	2488	+ int vid; /* Check-out version */
2489	2489	int changeCount = 0; /* Number of files touched */
2490	2490	int quietFlag = 0; /* -q\|--quiet */
2491	2491	int timeFlag; /* -1==--checkin, 1==--checkout, 0==--now */
2492	2492	i64 nowTime = 0; /* Timestamp of --now or --checkout */
2493	2493	Stmt q;
		@@ -2513,16 +2513,16 @@
2513	2513	fossil_fatal("Options --checkin, --checkout, and --now may "
2514	2514	"not be used together.");
2515	2515	}else if(co){
2516	2516	timeFlag = 1;
2517	2517	if(verboseFlag){
2518		- fossil_print("Timestamp = current checkout version.\n");
	2518	+ fossil_print("Timestamp = current check-out version.\n");
2519	2519	}
2520	2520	}else if(ci){
2521	2521	timeFlag = -1;
2522	2522	if(verboseFlag){
2523		- fossil_print("Timestamp = checkin in which each file was "
	2523	+ fossil_print("Timestamp = check-in in which each file was "
2524	2524	"most recently modified.\n");
2525	2525	}
2526	2526	}else{
2527	2527	timeFlag = 0;
2528	2528	if(verboseFlag){
		@@ -2534,11 +2534,11 @@
2534	2534	verify_all_options();
2535	2535
2536	2536	db_must_be_within_tree();
2537	2537	vid = db_lget_int("checkout", 0);
2538	2538	if(vid==0){
2539		- fossil_fatal("Cannot determine checkout version.");
	2539	+ fossil_fatal("Cannot determine check-out version.");
2540	2540	}
2541	2541
2542	2542	if(zGlobList){
2543	2543	pGlob = *zGlobList ? glob_create(zGlobList) : 0;
2544	2544	}else if(zGlobFile){
		@@ -2555,19 +2555,19 @@
2555	2555	}
2556	2556
2557	2557	db_begin_transaction();
2558	2558	if(timeFlag==0){/--now/
2559	2559	nowTime = time(0);
2560		- }else if(timeFlag>0){/*--checkout: get the checkout
	2560	+ }else if(timeFlag>0){/*--checkout: get the check-out
2561	2561	manifest's timestamp*/
2562	2562	assert(vid>0);
2563	2563	nowTime = db_int64(-1,
2564	2564	"SELECT CAST(strftime('%%s',"
2565	2565	"(SELECT mtime FROM event WHERE objid=%d)"
2566	2566	") AS INTEGER)", vid);
2567	2567	if(nowTime<0){
2568		- fossil_fatal("Could not determine checkout version's time!");
	2568	+ fossil_fatal("Could not determine check-out version's time!");
2569	2569	}
2570	2570	}else{ /* --checkin */
2571	2571	assert(0 == nowTime);
2572	2572	}
2573	2573	if((pGlob && pGlob->nPattern>0) \|\| g.argc<3){
2574	2574

	--- src/file.c
	+++ src/file.c
	@@ -378,11 +378,11 @@
378
379	/*
380	** The file named zFile is suppose to be an in-tree file. Check to
381	** ensure that it will be safe to write to this file by verifying that
382	** there are no symlinks or other non-directory objects in between the
383	** root of the checkout and zFile.
384	**
385	** If a problem is found, print a warning message (using fossil_warning())
386	** and return non-zero. If everything is ok, return zero.
387	*/
388	int file_unsafe_in_tree_path(const char *zFile){
	@@ -1479,11 +1479,11 @@
1479	** Options:
1480	**
1481	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1482	** --open-config Open the configuration database first.
1483	** --reset Reset cached stat() info for each file.
1484	** --root ROOT Use ROOT as the root of the checkout
1485	** --slash Trailing slashes, if any, are retained.
1486	*/
1487	void cmd_test_file_environment(void){
1488	int i;
1489	int slashFlag = find_option("slash",0,0)!=0;
	@@ -1699,22 +1699,22 @@
1699
1700	blob_zero(pOut);
1701	if( !g.localOpen ){
1702	if( absolute && !file_is_absolute_path(zOrigName) ){
1703	if( errFatal ){
1704	fossil_fatal("relative to absolute needs open checkout tree: %s",
1705	zOrigName);
1706	}
1707	return 0;
1708	}else{
1709	/*
1710	** The original path may be relative or absolute; however, without
1711	** an open checkout tree, the only things we can do at this point
1712	** is return it verbatim or generate a fatal error. The caller is
1713	** probably expecting a tree-relative path name will be returned;
1714	** however, most places where this function is called already check
1715	** if the local checkout tree is open, either directly or indirectly,
1716	** which would make this situation impossible. Alternatively, they
1717	** could check the returned path using the file_is_absolute_path()
1718	** function.
1719	*/
1720	blob_appendf(pOut, "%s", zOrigName);
	@@ -1749,11 +1749,11 @@
1749
1750	if( nFull<=nLocalRoot \|\| xCmp(zLocalRoot, zFull, nLocalRoot) ){
1751	blob_reset(&localRoot);
1752	blob_reset(&full);
1753	if( errFatal ){
1754	fossil_fatal("file outside of checkout tree: %s", zOrigName);
1755	}
1756	return 0;
1757	}
1758	if( absolute ){
1759	if( !file_is_absolute_path(zOrigName) ){
	@@ -2402,11 +2402,11 @@
2402	return 1;
2403	}
2404
2405	/*
2406	** Internal helper for touch_cmd(). If the given file name is found in
2407	** the given checkout version, which MUST be the checkout version
2408	** currently populating the vfile table, the vfile.mrid value for the
2409	** file is returned, else 0 is returned. zName must be resolvable
2410	** as-is from the vfile table - this function neither expands nor
2411	** normalizes it, though it does compare using the repo's
2412	** filename_collation() preference.
	@@ -2431,11 +2431,11 @@
2431	/*
2432	** COMMAND: touch*
2433	**
2434	** Usage: %fossil touch ?OPTIONS? ?FILENAME...?
2435	**
2436	** For each file in the current checkout matching one of the provided
2437	** list of glob patterns and/or file names, the file's mtime is
2438	** updated to a value specified by one of the flags --checkout,
2439	** --checkin, or --now.
2440	**
2441	** If neither glob patterns nor filenames are provided, it operates on
	@@ -2465,11 +2465,11 @@
2465	** default is --now.
2466	**
2467	** Only one of -g or -G may be used. If neither is provided and no
2468	** additional filenames are provided, the effect is as if a glob of
2469	** '*' were provided, i.e. all files belonging to the
2470	** currently-checked-out version. Note that all glob patterns provided
2471	** via these flags are always evaluated as if they are relative to the
2472	** top of the source tree, not the current working (sub)directory.
2473	** Filenames provided without these flags, on the other hand, are
2474	** treated as relative to the current directory.
2475	**
	@@ -2483,11 +2483,11 @@
2483	const char * zGlobList; /* -g List of glob patterns */
2484	const char * zGlobFile; /* -G File of glob patterns */
2485	Glob * pGlob = 0; /* List of glob patterns */
2486	int verboseFlag;
2487	int dryRunFlag;
2488	int vid; /* Checkout version */
2489	int changeCount = 0; /* Number of files touched */
2490	int quietFlag = 0; /* -q\|--quiet */
2491	int timeFlag; /* -1==--checkin, 1==--checkout, 0==--now */
2492	i64 nowTime = 0; /* Timestamp of --now or --checkout */
2493	Stmt q;
	@@ -2513,16 +2513,16 @@
2513	fossil_fatal("Options --checkin, --checkout, and --now may "
2514	"not be used together.");
2515	}else if(co){
2516	timeFlag = 1;
2517	if(verboseFlag){
2518	fossil_print("Timestamp = current checkout version.\n");
2519	}
2520	}else if(ci){
2521	timeFlag = -1;
2522	if(verboseFlag){
2523	fossil_print("Timestamp = checkin in which each file was "
2524	"most recently modified.\n");
2525	}
2526	}else{
2527	timeFlag = 0;
2528	if(verboseFlag){
	@@ -2534,11 +2534,11 @@
2534	verify_all_options();
2535
2536	db_must_be_within_tree();
2537	vid = db_lget_int("checkout", 0);
2538	if(vid==0){
2539	fossil_fatal("Cannot determine checkout version.");
2540	}
2541
2542	if(zGlobList){
2543	pGlob = *zGlobList ? glob_create(zGlobList) : 0;
2544	}else if(zGlobFile){
	@@ -2555,19 +2555,19 @@
2555	}
2556
2557	db_begin_transaction();
2558	if(timeFlag==0){/--now/
2559	nowTime = time(0);
2560	}else if(timeFlag>0){/*--checkout: get the checkout
2561	manifest's timestamp*/
2562	assert(vid>0);
2563	nowTime = db_int64(-1,
2564	"SELECT CAST(strftime('%%s',"
2565	"(SELECT mtime FROM event WHERE objid=%d)"
2566	") AS INTEGER)", vid);
2567	if(nowTime<0){
2568	fossil_fatal("Could not determine checkout version's time!");
2569	}
2570	}else{ /* --checkin */
2571	assert(0 == nowTime);
2572	}
2573	if((pGlob && pGlob->nPattern>0) \|\| g.argc<3){
2574

	--- src/file.c
	+++ src/file.c
	@@ -378,11 +378,11 @@
378
379	/*
380	** The file named zFile is suppose to be an in-tree file. Check to
381	** ensure that it will be safe to write to this file by verifying that
382	** there are no symlinks or other non-directory objects in between the
383	** root of the check-out and zFile.
384	**
385	** If a problem is found, print a warning message (using fossil_warning())
386	** and return non-zero. If everything is ok, return zero.
387	*/
388	int file_unsafe_in_tree_path(const char *zFile){
	@@ -1479,11 +1479,11 @@
1479	** Options:
1480	**
1481	** --allow-symlinks BOOLEAN Temporarily turn allow-symlinks on/off
1482	** --open-config Open the configuration database first.
1483	** --reset Reset cached stat() info for each file.
1484	** --root ROOT Use ROOT as the root of the check-out
1485	** --slash Trailing slashes, if any, are retained.
1486	*/
1487	void cmd_test_file_environment(void){
1488	int i;
1489	int slashFlag = find_option("slash",0,0)!=0;
	@@ -1699,22 +1699,22 @@
1699
1700	blob_zero(pOut);
1701	if( !g.localOpen ){
1702	if( absolute && !file_is_absolute_path(zOrigName) ){
1703	if( errFatal ){
1704	fossil_fatal("relative to absolute needs open check-out tree: %s",
1705	zOrigName);
1706	}
1707	return 0;
1708	}else{
1709	/*
1710	** The original path may be relative or absolute; however, without
1711	** an open check-out tree, the only things we can do at this point
1712	** is return it verbatim or generate a fatal error. The caller is
1713	** probably expecting a tree-relative path name will be returned;
1714	** however, most places where this function is called already check
1715	** if the local check-out tree is open, either directly or indirectly,
1716	** which would make this situation impossible. Alternatively, they
1717	** could check the returned path using the file_is_absolute_path()
1718	** function.
1719	*/
1720	blob_appendf(pOut, "%s", zOrigName);
	@@ -1749,11 +1749,11 @@
1749
1750	if( nFull<=nLocalRoot \|\| xCmp(zLocalRoot, zFull, nLocalRoot) ){
1751	blob_reset(&localRoot);
1752	blob_reset(&full);
1753	if( errFatal ){
1754	fossil_fatal("file outside of check-out tree: %s", zOrigName);
1755	}
1756	return 0;
1757	}
1758	if( absolute ){
1759	if( !file_is_absolute_path(zOrigName) ){
	@@ -2402,11 +2402,11 @@
2402	return 1;
2403	}
2404
2405	/*
2406	** Internal helper for touch_cmd(). If the given file name is found in
2407	** the given check-out version, which MUST be the check-out version
2408	** currently populating the vfile table, the vfile.mrid value for the
2409	** file is returned, else 0 is returned. zName must be resolvable
2410	** as-is from the vfile table - this function neither expands nor
2411	** normalizes it, though it does compare using the repo's
2412	** filename_collation() preference.
	@@ -2431,11 +2431,11 @@
2431	/*
2432	** COMMAND: touch*
2433	**
2434	** Usage: %fossil touch ?OPTIONS? ?FILENAME...?
2435	**
2436	** For each file in the current check-out matching one of the provided
2437	** list of glob patterns and/or file names, the file's mtime is
2438	** updated to a value specified by one of the flags --checkout,
2439	** --checkin, or --now.
2440	**
2441	** If neither glob patterns nor filenames are provided, it operates on
	@@ -2465,11 +2465,11 @@
2465	** default is --now.
2466	**
2467	** Only one of -g or -G may be used. If neither is provided and no
2468	** additional filenames are provided, the effect is as if a glob of
2469	** '*' were provided, i.e. all files belonging to the
2470	** currently checked-out version. Note that all glob patterns provided
2471	** via these flags are always evaluated as if they are relative to the
2472	** top of the source tree, not the current working (sub)directory.
2473	** Filenames provided without these flags, on the other hand, are
2474	** treated as relative to the current directory.
2475	**
	@@ -2483,11 +2483,11 @@
2483	const char * zGlobList; /* -g List of glob patterns */
2484	const char * zGlobFile; /* -G File of glob patterns */
2485	Glob * pGlob = 0; /* List of glob patterns */
2486	int verboseFlag;
2487	int dryRunFlag;
2488	int vid; /* Check-out version */
2489	int changeCount = 0; /* Number of files touched */
2490	int quietFlag = 0; /* -q\|--quiet */
2491	int timeFlag; /* -1==--checkin, 1==--checkout, 0==--now */
2492	i64 nowTime = 0; /* Timestamp of --now or --checkout */
2493	Stmt q;
	@@ -2513,16 +2513,16 @@
2513	fossil_fatal("Options --checkin, --checkout, and --now may "
2514	"not be used together.");
2515	}else if(co){
2516	timeFlag = 1;
2517	if(verboseFlag){
2518	fossil_print("Timestamp = current check-out version.\n");
2519	}
2520	}else if(ci){
2521	timeFlag = -1;
2522	if(verboseFlag){
2523	fossil_print("Timestamp = check-in in which each file was "
2524	"most recently modified.\n");
2525	}
2526	}else{
2527	timeFlag = 0;
2528	if(verboseFlag){
	@@ -2534,11 +2534,11 @@
2534	verify_all_options();
2535
2536	db_must_be_within_tree();
2537	vid = db_lget_int("checkout", 0);
2538	if(vid==0){
2539	fossil_fatal("Cannot determine check-out version.");
2540	}
2541
2542	if(zGlobList){
2543	pGlob = *zGlobList ? glob_create(zGlobList) : 0;
2544	}else if(zGlobFile){
	@@ -2555,19 +2555,19 @@
2555	}
2556
2557	db_begin_transaction();
2558	if(timeFlag==0){/--now/
2559	nowTime = time(0);
2560	}else if(timeFlag>0){/*--checkout: get the check-out
2561	manifest's timestamp*/
2562	assert(vid>0);
2563	nowTime = db_int64(-1,
2564	"SELECT CAST(strftime('%%s',"
2565	"(SELECT mtime FROM event WHERE objid=%d)"
2566	") AS INTEGER)", vid);
2567	if(nowTime<0){
2568	fossil_fatal("Could not determine check-out version's time!");
2569	}
2570	}else{ /* --checkin */
2571	assert(0 == nowTime);
2572	}
2573	if((pGlob && pGlob->nPattern>0) \|\| g.argc<3){
2574

M src/fileedit.c

+43 -43

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -22,11 +22,11 @@
22	22	#include <assert.h>
23	23	#include <stdarg.h>
24	24
25	25	/*
26	26	** State for the "mini-checkin" infrastructure, which enables the
27		-** ability to commit changes to a single file without a checkout
	27	+** ability to commit changes to a single file without a check-out
28	28	** db, e.g. for use via an HTTP request.
29	29	**
30	30	** Use CheckinMiniInfo_init() to cleanly initialize one to a known
31	31	** valid/empty default state.
32	32	**
		@@ -35,11 +35,11 @@
35	35	** freed by CheckinMiniInfo_cleanup(). Similarly, each instance owns
36	36	** any memory for its own Blob members, but NOT for its pointers to
37	37	** blobs.
38	38	*/
39	39	struct CheckinMiniInfo {
40		- Manifest * pParent; /* parent checkin. Memory is owned by this
	40	+ Manifest * pParent; /* parent check-in. Memory is owned by this
41	41	object. */
42	42	char zParentUuid; / Full UUID of pParent */
43	43	char zFilename; / Name of single file to commit. Must be
44	44	relative to the top of the repo. */
45	45	Blob fileContent; /* Content of file referred to by zFilename. */
		@@ -101,11 +101,11 @@
101	101	** check.
102	102	*/
103	103	CIMINI_ALLOW_OLDER = 1<<4,
104	104
105	105	/*
106		-** Indicates that the content of the newly-checked-in file is
	106	+** Indicates that the content of the newly checked-in file is
107	107	** converted, if needed, to use the same EOL style as the previous
108	108	** version of that file. Only the in-memory/in-repo copies are
109	109	** affected, not the original file (if any).
110	110	*/
111	111	CIMINI_CONVERT_EOL_INHERIT = 1<<5,
		@@ -386,14 +386,14 @@
386	386	return 1;
387	387	#undef mf_err
388	388	}
389	389
390	390	/*
391		-** A so-called "single-file/mini/web checkin" is a slimmed-down form
392		-** of the checkin command which accepts only a single file and is
	391	+** A so-called "single-file/mini/web check-in" is a slimmed-down form
	392	+** of the check-in command which accepts only a single file and is
393	393	** intended to accept edits to a file via the web interface or from
394		-** the CLI from outside of a checkout.
	394	+** the CLI from outside of a check-out.
395	395	**
396	396	** Being fully non-interactive is a requirement for this function,
397	397	** thus it cannot perform autosync or similar activities (which
398	398	** includes checking for repo locks).
399	399	**
		@@ -440,11 +440,11 @@
440	440	** diagnostic message there.
441	441	**
442	442	** Returns true on success. If pRid is not NULL, the RID of the
443	443	** resulting manifest is written to *pRid.
444	444	**
445		-** The checkin process is largely influenced by pCI->flags, and that
	445	+** The check-in process is largely influenced by pCI->flags, and that
446	446	** must be populated before calling this. See the fossil_cimini_flags
447	447	** enum for the docs for each flag.
448	448	*/
449	449	static int checkin_mini(CheckinMiniInfo * pCI, int pRid, Blob pErr){
450	450	Blob mf = empty_blob; /* output manifest */
		@@ -494,11 +494,11 @@
494	494	ci_err((pErr,"Invalid filename for use in a repository: %s",
495	495	pCI->zFilename));
496	496	}
497	497	if(!(CIMINI_ALLOW_OLDER & pCI->flags)
498	498	&& !checkin_is_younger(pCI->pParent->rid, pCI->zDate)){
499		- ci_err((pErr,"Checkin time (%s) may not be older "
	499	+ ci_err((pErr,"Check-in time (%s) may not be older "
500	500	"than its parent (%z).",
501	501	pCI->zDate,
502	502	db_text(0, "SELECT strftime('%%Y-%%m-%%dT%%H:%%M:%%f',%lf)",
503	503	pCI->pParent->rDate)
504	504	));
		@@ -527,12 +527,12 @@
527	527	ci_err((pErr,"More than 1 EOL conversion policy was specified."));
528	528	}
529	529	}
530	530	/* Potential TODOs include:
531	531	**
532		- ** - Commit allows an empty checkin only with a flag, but we
533		- ** currently disallow an empty checkin entirely. Conform with
	532	+ ** - Commit allows an empty check-in only with a flag, but we
	533	+ ** currently disallow an empty check-in entirely. Conform with
534	534	** commit?
535	535	**
536	536	** Non-TODOs:
537	537	**
538	538	** - Check for a commit lock would require auto-sync, which this
		@@ -704,27 +704,27 @@
704	704	** -R\|--repository REPO The repository file to commit to.
705	705	** --as FILENAME The repository-side name of the input
706	706	** file, relative to the top of the
707	707	** repository. Default is the same as the
708	708	** input file name.
709		-** -m\|--comment COMMENT Required checkin comment.
710		-** -M\|--comment-file FILE Reads checkin comment from the given file.
	709	+** -m\|--comment COMMENT Required check-in comment.
	710	+** -M\|--comment-file FILE Reads check-in comment from the given file.
711	711	** -r\|--revision VERSION Commit from this version. Default is
712		-** the checkout version (if available) or
713		-** trunk (if used without a checkout).
	712	+** the check-out version (if available) or
	713	+** trunk (if used without a check-out).
714	714	** --allow-fork Allows the commit to be made against a
715	715	** non-leaf parent. Note that no autosync
716	716	** is performed beforehand.
717		-** --allow-merge-conflict Allows checkin of a file even if it
	717	+** --allow-merge-conflict Allows check-in of a file even if it
718	718	** appears to contain a fossil merge conflict
719	719	** marker.
720	720	** --user-override USER USER to use instead of the current
721	721	** default.
722	722	** --date-override DATETIME DATE to use instead of 'now'.
723	723	** --allow-older Allow a commit to be older than its
724	724	** ancestor.
725		-** --convert-eol-inherit Convert EOL style of the checkin to match
	725	+** --convert-eol-inherit Convert EOL style of the check-in to match
726	726	** the previous version's content.
727	727	** --convert-eol-unix Convert the EOL style to Unix.
728	728	** --convert-eol-windows Convert the EOL style to Windows.
729	729	** (only one of the --convert-eol-X options may be used and they only
730	730	** modified the saved blob, not the input file.)
		@@ -747,11 +747,11 @@
747	747	**
748	748	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
749	749	**
750	750	*/
751	751	void test_ci_mini_cmd(void){
752		- CheckinMiniInfo cimi; /* checkin state */
	752	+ CheckinMiniInfo cimi; /* check-in state */
753	753	int newRid = 0; /* RID of new version */
754	754	const char * zFilename; /* argv[2] */
755	755	const char * zComment; /* -m comment */
756	756	const char * zCommentFile; /* -M FILE */
757	757	const char * zAsFilename; /* --as filename */
		@@ -819,11 +819,11 @@
819	819	blob_read_from_file(&cimi.comment, zCommentFile, ExtFILE);
820	820	}else if(zComment && *zComment){
821	821	blob_append(&cimi.comment, zComment, -1);
822	822	}
823	823	if(!blob_size(&cimi.comment)){
824		- fossil_fatal("Non-empty checkin comment is required.");
	824	+ fossil_fatal("Non-empty check-in comment is required.");
825	825	}
826	826	}
827	827	db_begin_transaction();
828	828	zFilename = g.argv[2];
829	829	cimi.zFilename = mprintf("%/", zAsFilename ? zAsFilename : zFilename);
		@@ -831,11 +831,11 @@
831	831	cimi.zUser = mprintf("%s", zUser ? zUser : login_name());
832	832	if(zDate){
833	833	cimi.zDate = mprintf("%s", zDate);
834	834	}
835	835	if(zRevision==0 \|\| zRevision[0]==0){
836		- if(g.localOpen/checkout/){
	836	+ if(g.localOpen/check-out/){
837	837	zRevision = db_lget("checkout-hash", 0)/leak/;
838	838	}else{
839	839	zRevision = "trunk";
840	840	}
841	841	}
		@@ -873,11 +873,11 @@
873	873	db_end_transaction(0/*checkin_mini() will have triggered it to roll
874	874	** back in dry-run mode, but we need access to
875	875	** the transaction-written db state in this
876	876	** routine.*/);
877	877	if(!(cimi.flags & CIMINI_DRY_RUN) && newRid!=0 && g.localOpen!=0){
878		- fossil_warning("The checkout state is now out of sync "
	878	+ fossil_warning("The check-out state is now out of sync "
879	879	"with regards to this commit. It needs to be "
880	880	"'update'd or 'close'd and re-'open'ed.");
881	881	}
882	882	CheckinMiniInfo_cleanup(&cimi);
883	883	}
		@@ -969,11 +969,11 @@
969	969	** - *frid = the RID of zFilename's blob content. May not be NULL
970	970	** unless zFilename is also NULL. If BOTH of zFilename and frid are
971	971	** NULL then no confirmation is done on the filename argument - only
972	972	** zRev is checked.
973	973	**
974		-** Returns 0 if the given file is not in the given checkin or if
	974	+** Returns 0 if the given file is not in the given check-in or if
975	975	** fileedit_ajax_check_filename() fails, else returns true. If it
976	976	** returns false, it queues up an error response and the caller must
977	977	** return immediately.
978	978	*/
979	979	static int fileedit_ajax_setup_filerev(const char * zRev,
		@@ -988,24 +988,24 @@
988	988	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
989	989	return 0;
990	990	}
991	991	vid = symbolic_name_to_rid(zRev, "ci");
992	992	if(0==vid){
993		- ajax_route_error(404,"Cannot resolve name as a checkin: %s",
	993	+ ajax_route_error(404,"Cannot resolve name as a check-in: %s",
994	994	zRev);
995	995	return 0;
996	996	}else if(vid<0){
997		- ajax_route_error(400,"Checkin name is ambiguous: %s",
	997	+ ajax_route_error(400,"Check-in name is ambiguous: %s",
998	998	zRev);
999	999	return 0;
1000	1000	}else if(pVid!=0){
1001	1001	*pVid = vid;
1002	1002	}
1003	1003	if(checkFile){
1004	1004	zFileUuid = fileedit_file_uuid(zFilename, vid, 0);
1005	1005	if(zFileUuid==0){
1006		- ajax_route_error(404, "Checkin does not contain file.");
	1006	+ ajax_route_error(404, "Check-in does not contain file.");
1007	1007	return 0;
1008	1008	}
1009	1009	}
1010	1010	if(zRevUuid!=0){
1011	1011	*zRevUuid = rid_to_uuid(vid);
		@@ -1036,11 +1036,11 @@
1036	1036	** Extra response headers:
1037	1037	**
1038	1038	** x-fileedit-file-perm: empty or "x" or "l", representing PERM_REG,
1039	1039	** PERM_EXE, or PERM_LINK, respectively.
1040	1040	**
1041		-** x-fileedit-checkin-branch: branch name for the passed-in checkin.
	1041	+** x-fileedit-checkin-branch: branch name for the passed-in check-in.
1042	1042	*/
1043	1043	static void fileedit_ajax_content(void){
1044	1044	const char * zFilename = 0;
1045	1045	const char * zRev = 0;
1046	1046	int vid, frid;
		@@ -1087,11 +1087,11 @@
1087	1087	**
1088	1088	** Required query parameters:
1089	1089	**
1090	1090	** filename=FILENAME
1091	1091	** content=text
1092		-** checkin=checkin version
	1092	+** checkin=check-in version
1093	1093	**
1094	1094	** Optional parameters:
1095	1095	**
1096	1096	** sbs=integer (1=side-by-side or 0=unified, default=0)
1097	1097	**
		@@ -1155,11 +1155,11 @@
1155	1155	fossil_free(zRevUuid);
1156	1156	blob_reset(&content);
1157	1157	}
1158	1158
1159	1159	/*
1160		-** Sets up and validates most, but not all, of p's checkin-related
	1160	+** Sets up and validates most, but not all, of p's check-in-related
1161	1161	** state from the CGI environment. Returns 0 on success or a suggested
1162	1162	** HTTP result code on error, in which case a message will have been
1163	1163	** written to pErr.
1164	1164	**
1165	1165	** It always fails if it cannot completely resolve the 'file' and 'r'
		@@ -1177,11 +1177,11 @@
1177	1177	*/
1178	1178	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1179	1179	int * bIsMissingArg){
1180	1180	char * zFileUuid = 0; /* UUID of file content */
1181	1181	const char * zFlag; /* generic flag */
1182		- int rc = 0, vid = 0, frid = 0; /* result code, checkin/file rids */
	1182	+ int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
1183	1183
1184	1184	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1185	1185	zFlag = PD("filename",P("fn"));
1186	1186	if(zFlag==0 \|\| !*zFlag){
1187	1187	rc = 400;
		@@ -1209,21 +1209,21 @@
1209	1209	fail((pErr,"Missing required 'checkin' parameter."));
1210	1210	}
1211	1211	vid = symbolic_name_to_rid(zFlag, "ci");
1212	1212	if(0==vid){
1213	1213	rc = 404;
1214		- fail((pErr,"Could not resolve checkin version."));
	1214	+ fail((pErr,"Could not resolve check-in version."));
1215	1215	}else if(vid<0){
1216	1216	rc = 400;
1217		- fail((pErr,"Checkin name is ambiguous."));
	1217	+ fail((pErr,"Check-in name is ambiguous."));
1218	1218	}
1219	1219	p->zParentUuid = rid_to_uuid(vid)/fully expand it/;
1220	1220
1221	1221	zFileUuid = fileedit_file_uuid(p->zFilename, vid, &p->filePerm);
1222	1222	if(!zFileUuid){
1223	1223	rc = 404;
1224		- fail((pErr,"Checkin [%S] does not contain file: "
	1224	+ fail((pErr,"Check-in [%S] does not contain file: "
1225	1225	"[%h]", p->zParentUuid, p->zFilename));
1226	1226	}else if(PERM_LNK==p->filePerm){
1227	1227	rc = 400;
1228	1228	fail((pErr,"Editing symlinks is not permitted."));
1229	1229	}
		@@ -1342,11 +1342,11 @@
1342	1342	db_finalize(&q);
1343	1343	}
1344	1344
1345	1345	/*
1346	1346	** For the given fully resolved UUID, renders a JSON object containing
1347		-** the fileeedit-editable files in that checkin:
	1347	+** the fileeedit-editable files in that check-in:
1348	1348	**
1349	1349	** {
1350	1350	** checkin: UUID,
1351	1351	** editableFiles: [ filename1, ... filenameN ]
1352	1352	** }
		@@ -1392,11 +1392,11 @@
1392	1392	** ]
1393	1393	**
1394	1394	** The entries are ordered newest first.
1395	1395	**
1396	1396	** 'checkin=CHECKIN_NAME': fetch the current list of is-editable files
1397		-** for the current user and given checkin name:
	1397	+** for the current user and given check-in name:
1398	1398	**
1399	1399	** {
1400	1400	** checkin: UUID,
1401	1401	** editableFiles: [ filename1, ... filenameN ] // sorted by name
1402	1402	** }
		@@ -1430,11 +1430,11 @@
1430	1430	** AJAX route /fileedit?ajax=commit
1431	1431	**
1432	1432	** Required query parameters:
1433	1433	**
1434	1434	** filename=FILENAME
1435		-** checkin=Parent checkin UUID
	1435	+** checkin=Parent check-in UUID
1436	1436	** content=text
1437	1437	** comment=non-empty text
1438	1438	**
1439	1439	** Optional query parameters:
1440	1440	**
		@@ -1454,11 +1454,11 @@
1454	1454	**
1455	1455	** {
1456	1456	** checkin: newUUID,
1457	1457	** filename: theFilename,
1458	1458	** mimetype: string,
1459		-** branch: name of the checkin's branch,
	1459	+** branch: name of the check-in's branch,
1460	1460	** isExe: bool,
1461	1461	** dryRun: bool,
1462	1462	** manifest: text of manifest,
1463	1463	** }
1464	1464	**
		@@ -1466,11 +1466,11 @@
1466	1466	** ajax_route_error().
1467	1467	*/
1468	1468	static void fileedit_ajax_commit(void){
1469	1469	Blob err = empty_blob; /* Error messages */
1470	1470	Blob manifest = empty_blob; /* raw new manifest */
1471		- CheckinMiniInfo cimi; /* checkin state */
	1471	+ CheckinMiniInfo cimi; /* check-in state */
1472	1472	int rc; /* generic result code */
1473	1473	int newVid = 0; /* new version's RID */
1474	1474	char * zNewUuid = 0; /* newVid's UUID */
1475	1475	char const * zMimetype;
1476	1476	char * zBranch = 0;
		@@ -1484,11 +1484,11 @@
1484	1484	if(0!=rc){
1485	1485	ajax_route_error(rc,"%b",&err);
1486	1486	goto end_cleanup;
1487	1487	}
1488	1488	if(blob_size(&cimi.comment)==0){
1489		- ajax_route_error(400,"Empty checkin comment is not permitted.");
	1489	+ ajax_route_error(400,"Empty check-in comment is not permitted.");
1490	1490	goto end_cleanup;
1491	1491	}
1492	1492	if(0!=atoi(PD("include_manifest","0"))){
1493	1493	cimi.pMfOut = &manifest;
1494	1494	}
		@@ -1540,27 +1540,27 @@
1540	1540	** set on any repositories where this page should be activated.
1541	1541	**
1542	1542	** Optional query parameters:
1543	1543	**
1544	1544	** filename=FILENAME Repo-relative path to the file.
1545		-** checkin=VERSION Checkin version, using any unambiguous
	1545	+** checkin=VERSION Check-in version, using any unambiguous
1546	1546	** symbolic version name.
1547	1547	**
1548		-** If passed a filename but no checkin then it will attempt to
1549		-** load that file from the most recent leaf checkin.
	1548	+** If passed a filename but no check-in then it will attempt to
	1549	+** load that file from the most recent leaf check-in.
1550	1550	**
1551	1551	** Once the page is loaded, files may be selected from any open leaf
1552	1552	** version. The only way to edit files from non-leaf checkins is to
1553		-** pass both the filename and checkin as URL parameters to the page.
	1553	+** pass both the filename and check-in as URL parameters to the page.
1554	1554	** Users with the proper permissions will be presented with "Edit"
1555	1555	** links in various file-specific contexts for files which match the
1556	1556	** fileedit-glob, regardless of whether they refer to leaf versions or
1557	1557	** not.
1558	1558	*/
1559	1559	void fileedit_page(void){
1560	1560	const char * zFileMime = 0; /* File mime type guess */
1561		- CheckinMiniInfo cimi; /* Checkin state */
	1561	+ CheckinMiniInfo cimi; /* Check-in state */
1562	1562	int previewRenderMode = AJAX_RENDER_GUESS; /* preview mode */
1563	1563	Blob err = empty_blob; /* Error report */
1564	1564	const char zAjax = P("name"); / Name of AJAX route for
1565	1565	sub-dispatching. */
1566	1566
		@@ -2021,11 +2021,11 @@
2021	2021	CX(";\n");
2022	2022	if(blob_size(&err)>0){
2023	2023	CX("fossil.error(%!j);\n", blob_str(&err));
2024	2024	}
2025	2025	/* Populate the page with the current leaves and, if available,
2026		- the selected checkin's file list, to save 1 or 2 XHR requests
	2026	+ the selected check-in's file list, to save 1 or 2 XHR requests
2027	2027	at startup. That makes this page uncacheable, but compressed
2028	2028	delivery of this page is currently less than 6k. */
2029	2029	CX("fossil.page.initialLeaves = ");
2030	2030	fileedit_render_leaves_list(cimi.zParentUuid ? 0 : &zFirstLeafUuid);
2031	2031	CX(";\n");
2032	2032

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -22,11 +22,11 @@
22	#include <assert.h>
23	#include <stdarg.h>
24
25	/*
26	** State for the "mini-checkin" infrastructure, which enables the
27	** ability to commit changes to a single file without a checkout
28	** db, e.g. for use via an HTTP request.
29	**
30	** Use CheckinMiniInfo_init() to cleanly initialize one to a known
31	** valid/empty default state.
32	**
	@@ -35,11 +35,11 @@
35	** freed by CheckinMiniInfo_cleanup(). Similarly, each instance owns
36	** any memory for its own Blob members, but NOT for its pointers to
37	** blobs.
38	*/
39	struct CheckinMiniInfo {
40	Manifest * pParent; /* parent checkin. Memory is owned by this
41	object. */
42	char zParentUuid; / Full UUID of pParent */
43	char zFilename; / Name of single file to commit. Must be
44	relative to the top of the repo. */
45	Blob fileContent; /* Content of file referred to by zFilename. */
	@@ -101,11 +101,11 @@
101	** check.
102	*/
103	CIMINI_ALLOW_OLDER = 1<<4,
104
105	/*
106	** Indicates that the content of the newly-checked-in file is
107	** converted, if needed, to use the same EOL style as the previous
108	** version of that file. Only the in-memory/in-repo copies are
109	** affected, not the original file (if any).
110	*/
111	CIMINI_CONVERT_EOL_INHERIT = 1<<5,
	@@ -386,14 +386,14 @@
386	return 1;
387	#undef mf_err
388	}
389
390	/*
391	** A so-called "single-file/mini/web checkin" is a slimmed-down form
392	** of the checkin command which accepts only a single file and is
393	** intended to accept edits to a file via the web interface or from
394	** the CLI from outside of a checkout.
395	**
396	** Being fully non-interactive is a requirement for this function,
397	** thus it cannot perform autosync or similar activities (which
398	** includes checking for repo locks).
399	**
	@@ -440,11 +440,11 @@
440	** diagnostic message there.
441	**
442	** Returns true on success. If pRid is not NULL, the RID of the
443	** resulting manifest is written to *pRid.
444	**
445	** The checkin process is largely influenced by pCI->flags, and that
446	** must be populated before calling this. See the fossil_cimini_flags
447	** enum for the docs for each flag.
448	*/
449	static int checkin_mini(CheckinMiniInfo * pCI, int pRid, Blob pErr){
450	Blob mf = empty_blob; /* output manifest */
	@@ -494,11 +494,11 @@
494	ci_err((pErr,"Invalid filename for use in a repository: %s",
495	pCI->zFilename));
496	}
497	if(!(CIMINI_ALLOW_OLDER & pCI->flags)
498	&& !checkin_is_younger(pCI->pParent->rid, pCI->zDate)){
499	ci_err((pErr,"Checkin time (%s) may not be older "
500	"than its parent (%z).",
501	pCI->zDate,
502	db_text(0, "SELECT strftime('%%Y-%%m-%%dT%%H:%%M:%%f',%lf)",
503	pCI->pParent->rDate)
504	));
	@@ -527,12 +527,12 @@
527	ci_err((pErr,"More than 1 EOL conversion policy was specified."));
528	}
529	}
530	/* Potential TODOs include:
531	**
532	** - Commit allows an empty checkin only with a flag, but we
533	** currently disallow an empty checkin entirely. Conform with
534	** commit?
535	**
536	** Non-TODOs:
537	**
538	** - Check for a commit lock would require auto-sync, which this
	@@ -704,27 +704,27 @@
704	** -R\|--repository REPO The repository file to commit to.
705	** --as FILENAME The repository-side name of the input
706	** file, relative to the top of the
707	** repository. Default is the same as the
708	** input file name.
709	** -m\|--comment COMMENT Required checkin comment.
710	** -M\|--comment-file FILE Reads checkin comment from the given file.
711	** -r\|--revision VERSION Commit from this version. Default is
712	** the checkout version (if available) or
713	** trunk (if used without a checkout).
714	** --allow-fork Allows the commit to be made against a
715	** non-leaf parent. Note that no autosync
716	** is performed beforehand.
717	** --allow-merge-conflict Allows checkin of a file even if it
718	** appears to contain a fossil merge conflict
719	** marker.
720	** --user-override USER USER to use instead of the current
721	** default.
722	** --date-override DATETIME DATE to use instead of 'now'.
723	** --allow-older Allow a commit to be older than its
724	** ancestor.
725	** --convert-eol-inherit Convert EOL style of the checkin to match
726	** the previous version's content.
727	** --convert-eol-unix Convert the EOL style to Unix.
728	** --convert-eol-windows Convert the EOL style to Windows.
729	** (only one of the --convert-eol-X options may be used and they only
730	** modified the saved blob, not the input file.)
	@@ -747,11 +747,11 @@
747	**
748	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
749	**
750	*/
751	void test_ci_mini_cmd(void){
752	CheckinMiniInfo cimi; /* checkin state */
753	int newRid = 0; /* RID of new version */
754	const char * zFilename; /* argv[2] */
755	const char * zComment; /* -m comment */
756	const char * zCommentFile; /* -M FILE */
757	const char * zAsFilename; /* --as filename */
	@@ -819,11 +819,11 @@
819	blob_read_from_file(&cimi.comment, zCommentFile, ExtFILE);
820	}else if(zComment && *zComment){
821	blob_append(&cimi.comment, zComment, -1);
822	}
823	if(!blob_size(&cimi.comment)){
824	fossil_fatal("Non-empty checkin comment is required.");
825	}
826	}
827	db_begin_transaction();
828	zFilename = g.argv[2];
829	cimi.zFilename = mprintf("%/", zAsFilename ? zAsFilename : zFilename);
	@@ -831,11 +831,11 @@
831	cimi.zUser = mprintf("%s", zUser ? zUser : login_name());
832	if(zDate){
833	cimi.zDate = mprintf("%s", zDate);
834	}
835	if(zRevision==0 \|\| zRevision[0]==0){
836	if(g.localOpen/checkout/){
837	zRevision = db_lget("checkout-hash", 0)/leak/;
838	}else{
839	zRevision = "trunk";
840	}
841	}
	@@ -873,11 +873,11 @@
873	db_end_transaction(0/*checkin_mini() will have triggered it to roll
874	** back in dry-run mode, but we need access to
875	** the transaction-written db state in this
876	** routine.*/);
877	if(!(cimi.flags & CIMINI_DRY_RUN) && newRid!=0 && g.localOpen!=0){
878	fossil_warning("The checkout state is now out of sync "
879	"with regards to this commit. It needs to be "
880	"'update'd or 'close'd and re-'open'ed.");
881	}
882	CheckinMiniInfo_cleanup(&cimi);
883	}
	@@ -969,11 +969,11 @@
969	** - *frid = the RID of zFilename's blob content. May not be NULL
970	** unless zFilename is also NULL. If BOTH of zFilename and frid are
971	** NULL then no confirmation is done on the filename argument - only
972	** zRev is checked.
973	**
974	** Returns 0 if the given file is not in the given checkin or if
975	** fileedit_ajax_check_filename() fails, else returns true. If it
976	** returns false, it queues up an error response and the caller must
977	** return immediately.
978	*/
979	static int fileedit_ajax_setup_filerev(const char * zRev,
	@@ -988,24 +988,24 @@
988	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
989	return 0;
990	}
991	vid = symbolic_name_to_rid(zRev, "ci");
992	if(0==vid){
993	ajax_route_error(404,"Cannot resolve name as a checkin: %s",
994	zRev);
995	return 0;
996	}else if(vid<0){
997	ajax_route_error(400,"Checkin name is ambiguous: %s",
998	zRev);
999	return 0;
1000	}else if(pVid!=0){
1001	*pVid = vid;
1002	}
1003	if(checkFile){
1004	zFileUuid = fileedit_file_uuid(zFilename, vid, 0);
1005	if(zFileUuid==0){
1006	ajax_route_error(404, "Checkin does not contain file.");
1007	return 0;
1008	}
1009	}
1010	if(zRevUuid!=0){
1011	*zRevUuid = rid_to_uuid(vid);
	@@ -1036,11 +1036,11 @@
1036	** Extra response headers:
1037	**
1038	** x-fileedit-file-perm: empty or "x" or "l", representing PERM_REG,
1039	** PERM_EXE, or PERM_LINK, respectively.
1040	**
1041	** x-fileedit-checkin-branch: branch name for the passed-in checkin.
1042	*/
1043	static void fileedit_ajax_content(void){
1044	const char * zFilename = 0;
1045	const char * zRev = 0;
1046	int vid, frid;
	@@ -1087,11 +1087,11 @@
1087	**
1088	** Required query parameters:
1089	**
1090	** filename=FILENAME
1091	** content=text
1092	** checkin=checkin version
1093	**
1094	** Optional parameters:
1095	**
1096	** sbs=integer (1=side-by-side or 0=unified, default=0)
1097	**
	@@ -1155,11 +1155,11 @@
1155	fossil_free(zRevUuid);
1156	blob_reset(&content);
1157	}
1158
1159	/*
1160	** Sets up and validates most, but not all, of p's checkin-related
1161	** state from the CGI environment. Returns 0 on success or a suggested
1162	** HTTP result code on error, in which case a message will have been
1163	** written to pErr.
1164	**
1165	** It always fails if it cannot completely resolve the 'file' and 'r'
	@@ -1177,11 +1177,11 @@
1177	*/
1178	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1179	int * bIsMissingArg){
1180	char * zFileUuid = 0; /* UUID of file content */
1181	const char * zFlag; /* generic flag */
1182	int rc = 0, vid = 0, frid = 0; /* result code, checkin/file rids */
1183
1184	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1185	zFlag = PD("filename",P("fn"));
1186	if(zFlag==0 \|\| !*zFlag){
1187	rc = 400;
	@@ -1209,21 +1209,21 @@
1209	fail((pErr,"Missing required 'checkin' parameter."));
1210	}
1211	vid = symbolic_name_to_rid(zFlag, "ci");
1212	if(0==vid){
1213	rc = 404;
1214	fail((pErr,"Could not resolve checkin version."));
1215	}else if(vid<0){
1216	rc = 400;
1217	fail((pErr,"Checkin name is ambiguous."));
1218	}
1219	p->zParentUuid = rid_to_uuid(vid)/fully expand it/;
1220
1221	zFileUuid = fileedit_file_uuid(p->zFilename, vid, &p->filePerm);
1222	if(!zFileUuid){
1223	rc = 404;
1224	fail((pErr,"Checkin [%S] does not contain file: "
1225	"[%h]", p->zParentUuid, p->zFilename));
1226	}else if(PERM_LNK==p->filePerm){
1227	rc = 400;
1228	fail((pErr,"Editing symlinks is not permitted."));
1229	}
	@@ -1342,11 +1342,11 @@
1342	db_finalize(&q);
1343	}
1344
1345	/*
1346	** For the given fully resolved UUID, renders a JSON object containing
1347	** the fileeedit-editable files in that checkin:
1348	**
1349	** {
1350	** checkin: UUID,
1351	** editableFiles: [ filename1, ... filenameN ]
1352	** }
	@@ -1392,11 +1392,11 @@
1392	** ]
1393	**
1394	** The entries are ordered newest first.
1395	**
1396	** 'checkin=CHECKIN_NAME': fetch the current list of is-editable files
1397	** for the current user and given checkin name:
1398	**
1399	** {
1400	** checkin: UUID,
1401	** editableFiles: [ filename1, ... filenameN ] // sorted by name
1402	** }
	@@ -1430,11 +1430,11 @@
1430	** AJAX route /fileedit?ajax=commit
1431	**
1432	** Required query parameters:
1433	**
1434	** filename=FILENAME
1435	** checkin=Parent checkin UUID
1436	** content=text
1437	** comment=non-empty text
1438	**
1439	** Optional query parameters:
1440	**
	@@ -1454,11 +1454,11 @@
1454	**
1455	** {
1456	** checkin: newUUID,
1457	** filename: theFilename,
1458	** mimetype: string,
1459	** branch: name of the checkin's branch,
1460	** isExe: bool,
1461	** dryRun: bool,
1462	** manifest: text of manifest,
1463	** }
1464	**
	@@ -1466,11 +1466,11 @@
1466	** ajax_route_error().
1467	*/
1468	static void fileedit_ajax_commit(void){
1469	Blob err = empty_blob; /* Error messages */
1470	Blob manifest = empty_blob; /* raw new manifest */
1471	CheckinMiniInfo cimi; /* checkin state */
1472	int rc; /* generic result code */
1473	int newVid = 0; /* new version's RID */
1474	char * zNewUuid = 0; /* newVid's UUID */
1475	char const * zMimetype;
1476	char * zBranch = 0;
	@@ -1484,11 +1484,11 @@
1484	if(0!=rc){
1485	ajax_route_error(rc,"%b",&err);
1486	goto end_cleanup;
1487	}
1488	if(blob_size(&cimi.comment)==0){
1489	ajax_route_error(400,"Empty checkin comment is not permitted.");
1490	goto end_cleanup;
1491	}
1492	if(0!=atoi(PD("include_manifest","0"))){
1493	cimi.pMfOut = &manifest;
1494	}
	@@ -1540,27 +1540,27 @@
1540	** set on any repositories where this page should be activated.
1541	**
1542	** Optional query parameters:
1543	**
1544	** filename=FILENAME Repo-relative path to the file.
1545	** checkin=VERSION Checkin version, using any unambiguous
1546	** symbolic version name.
1547	**
1548	** If passed a filename but no checkin then it will attempt to
1549	** load that file from the most recent leaf checkin.
1550	**
1551	** Once the page is loaded, files may be selected from any open leaf
1552	** version. The only way to edit files from non-leaf checkins is to
1553	** pass both the filename and checkin as URL parameters to the page.
1554	** Users with the proper permissions will be presented with "Edit"
1555	** links in various file-specific contexts for files which match the
1556	** fileedit-glob, regardless of whether they refer to leaf versions or
1557	** not.
1558	*/
1559	void fileedit_page(void){
1560	const char * zFileMime = 0; /* File mime type guess */
1561	CheckinMiniInfo cimi; /* Checkin state */
1562	int previewRenderMode = AJAX_RENDER_GUESS; /* preview mode */
1563	Blob err = empty_blob; /* Error report */
1564	const char zAjax = P("name"); / Name of AJAX route for
1565	sub-dispatching. */
1566
	@@ -2021,11 +2021,11 @@
2021	CX(";\n");
2022	if(blob_size(&err)>0){
2023	CX("fossil.error(%!j);\n", blob_str(&err));
2024	}
2025	/* Populate the page with the current leaves and, if available,
2026	the selected checkin's file list, to save 1 or 2 XHR requests
2027	at startup. That makes this page uncacheable, but compressed
2028	delivery of this page is currently less than 6k. */
2029	CX("fossil.page.initialLeaves = ");
2030	fileedit_render_leaves_list(cimi.zParentUuid ? 0 : &zFirstLeafUuid);
2031	CX(";\n");
2032

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -22,11 +22,11 @@
22	#include <assert.h>
23	#include <stdarg.h>
24
25	/*
26	** State for the "mini-checkin" infrastructure, which enables the
27	** ability to commit changes to a single file without a check-out
28	** db, e.g. for use via an HTTP request.
29	**
30	** Use CheckinMiniInfo_init() to cleanly initialize one to a known
31	** valid/empty default state.
32	**
	@@ -35,11 +35,11 @@
35	** freed by CheckinMiniInfo_cleanup(). Similarly, each instance owns
36	** any memory for its own Blob members, but NOT for its pointers to
37	** blobs.
38	*/
39	struct CheckinMiniInfo {
40	Manifest * pParent; /* parent check-in. Memory is owned by this
41	object. */
42	char zParentUuid; / Full UUID of pParent */
43	char zFilename; / Name of single file to commit. Must be
44	relative to the top of the repo. */
45	Blob fileContent; /* Content of file referred to by zFilename. */
	@@ -101,11 +101,11 @@
101	** check.
102	*/
103	CIMINI_ALLOW_OLDER = 1<<4,
104
105	/*
106	** Indicates that the content of the newly checked-in file is
107	** converted, if needed, to use the same EOL style as the previous
108	** version of that file. Only the in-memory/in-repo copies are
109	** affected, not the original file (if any).
110	*/
111	CIMINI_CONVERT_EOL_INHERIT = 1<<5,
	@@ -386,14 +386,14 @@
386	return 1;
387	#undef mf_err
388	}
389
390	/*
391	** A so-called "single-file/mini/web check-in" is a slimmed-down form
392	** of the check-in command which accepts only a single file and is
393	** intended to accept edits to a file via the web interface or from
394	** the CLI from outside of a check-out.
395	**
396	** Being fully non-interactive is a requirement for this function,
397	** thus it cannot perform autosync or similar activities (which
398	** includes checking for repo locks).
399	**
	@@ -440,11 +440,11 @@
440	** diagnostic message there.
441	**
442	** Returns true on success. If pRid is not NULL, the RID of the
443	** resulting manifest is written to *pRid.
444	**
445	** The check-in process is largely influenced by pCI->flags, and that
446	** must be populated before calling this. See the fossil_cimini_flags
447	** enum for the docs for each flag.
448	*/
449	static int checkin_mini(CheckinMiniInfo * pCI, int pRid, Blob pErr){
450	Blob mf = empty_blob; /* output manifest */
	@@ -494,11 +494,11 @@
494	ci_err((pErr,"Invalid filename for use in a repository: %s",
495	pCI->zFilename));
496	}
497	if(!(CIMINI_ALLOW_OLDER & pCI->flags)
498	&& !checkin_is_younger(pCI->pParent->rid, pCI->zDate)){
499	ci_err((pErr,"Check-in time (%s) may not be older "
500	"than its parent (%z).",
501	pCI->zDate,
502	db_text(0, "SELECT strftime('%%Y-%%m-%%dT%%H:%%M:%%f',%lf)",
503	pCI->pParent->rDate)
504	));
	@@ -527,12 +527,12 @@
527	ci_err((pErr,"More than 1 EOL conversion policy was specified."));
528	}
529	}
530	/* Potential TODOs include:
531	**
532	** - Commit allows an empty check-in only with a flag, but we
533	** currently disallow an empty check-in entirely. Conform with
534	** commit?
535	**
536	** Non-TODOs:
537	**
538	** - Check for a commit lock would require auto-sync, which this
	@@ -704,27 +704,27 @@
704	** -R\|--repository REPO The repository file to commit to.
705	** --as FILENAME The repository-side name of the input
706	** file, relative to the top of the
707	** repository. Default is the same as the
708	** input file name.
709	** -m\|--comment COMMENT Required check-in comment.
710	** -M\|--comment-file FILE Reads check-in comment from the given file.
711	** -r\|--revision VERSION Commit from this version. Default is
712	** the check-out version (if available) or
713	** trunk (if used without a check-out).
714	** --allow-fork Allows the commit to be made against a
715	** non-leaf parent. Note that no autosync
716	** is performed beforehand.
717	** --allow-merge-conflict Allows check-in of a file even if it
718	** appears to contain a fossil merge conflict
719	** marker.
720	** --user-override USER USER to use instead of the current
721	** default.
722	** --date-override DATETIME DATE to use instead of 'now'.
723	** --allow-older Allow a commit to be older than its
724	** ancestor.
725	** --convert-eol-inherit Convert EOL style of the check-in to match
726	** the previous version's content.
727	** --convert-eol-unix Convert the EOL style to Unix.
728	** --convert-eol-windows Convert the EOL style to Windows.
729	** (only one of the --convert-eol-X options may be used and they only
730	** modified the saved blob, not the input file.)
	@@ -747,11 +747,11 @@
747	**
748	** %fossil test-ci-mini -R REPO -m ... -r foo --as src/myfile.c myfile.c
749	**
750	*/
751	void test_ci_mini_cmd(void){
752	CheckinMiniInfo cimi; /* check-in state */
753	int newRid = 0; /* RID of new version */
754	const char * zFilename; /* argv[2] */
755	const char * zComment; /* -m comment */
756	const char * zCommentFile; /* -M FILE */
757	const char * zAsFilename; /* --as filename */
	@@ -819,11 +819,11 @@
819	blob_read_from_file(&cimi.comment, zCommentFile, ExtFILE);
820	}else if(zComment && *zComment){
821	blob_append(&cimi.comment, zComment, -1);
822	}
823	if(!blob_size(&cimi.comment)){
824	fossil_fatal("Non-empty check-in comment is required.");
825	}
826	}
827	db_begin_transaction();
828	zFilename = g.argv[2];
829	cimi.zFilename = mprintf("%/", zAsFilename ? zAsFilename : zFilename);
	@@ -831,11 +831,11 @@
831	cimi.zUser = mprintf("%s", zUser ? zUser : login_name());
832	if(zDate){
833	cimi.zDate = mprintf("%s", zDate);
834	}
835	if(zRevision==0 \|\| zRevision[0]==0){
836	if(g.localOpen/check-out/){
837	zRevision = db_lget("checkout-hash", 0)/leak/;
838	}else{
839	zRevision = "trunk";
840	}
841	}
	@@ -873,11 +873,11 @@
873	db_end_transaction(0/*checkin_mini() will have triggered it to roll
874	** back in dry-run mode, but we need access to
875	** the transaction-written db state in this
876	** routine.*/);
877	if(!(cimi.flags & CIMINI_DRY_RUN) && newRid!=0 && g.localOpen!=0){
878	fossil_warning("The check-out state is now out of sync "
879	"with regards to this commit. It needs to be "
880	"'update'd or 'close'd and re-'open'ed.");
881	}
882	CheckinMiniInfo_cleanup(&cimi);
883	}
	@@ -969,11 +969,11 @@
969	** - *frid = the RID of zFilename's blob content. May not be NULL
970	** unless zFilename is also NULL. If BOTH of zFilename and frid are
971	** NULL then no confirmation is done on the filename argument - only
972	** zRev is checked.
973	**
974	** Returns 0 if the given file is not in the given check-in or if
975	** fileedit_ajax_check_filename() fails, else returns true. If it
976	** returns false, it queues up an error response and the caller must
977	** return immediately.
978	*/
979	static int fileedit_ajax_setup_filerev(const char * zRev,
	@@ -988,24 +988,24 @@
988	if(checkFile && !fileedit_ajax_check_filename(zFilename)){
989	return 0;
990	}
991	vid = symbolic_name_to_rid(zRev, "ci");
992	if(0==vid){
993	ajax_route_error(404,"Cannot resolve name as a check-in: %s",
994	zRev);
995	return 0;
996	}else if(vid<0){
997	ajax_route_error(400,"Check-in name is ambiguous: %s",
998	zRev);
999	return 0;
1000	}else if(pVid!=0){
1001	*pVid = vid;
1002	}
1003	if(checkFile){
1004	zFileUuid = fileedit_file_uuid(zFilename, vid, 0);
1005	if(zFileUuid==0){
1006	ajax_route_error(404, "Check-in does not contain file.");
1007	return 0;
1008	}
1009	}
1010	if(zRevUuid!=0){
1011	*zRevUuid = rid_to_uuid(vid);
	@@ -1036,11 +1036,11 @@
1036	** Extra response headers:
1037	**
1038	** x-fileedit-file-perm: empty or "x" or "l", representing PERM_REG,
1039	** PERM_EXE, or PERM_LINK, respectively.
1040	**
1041	** x-fileedit-checkin-branch: branch name for the passed-in check-in.
1042	*/
1043	static void fileedit_ajax_content(void){
1044	const char * zFilename = 0;
1045	const char * zRev = 0;
1046	int vid, frid;
	@@ -1087,11 +1087,11 @@
1087	**
1088	** Required query parameters:
1089	**
1090	** filename=FILENAME
1091	** content=text
1092	** checkin=check-in version
1093	**
1094	** Optional parameters:
1095	**
1096	** sbs=integer (1=side-by-side or 0=unified, default=0)
1097	**
	@@ -1155,11 +1155,11 @@
1155	fossil_free(zRevUuid);
1156	blob_reset(&content);
1157	}
1158
1159	/*
1160	** Sets up and validates most, but not all, of p's check-in-related
1161	** state from the CGI environment. Returns 0 on success or a suggested
1162	** HTTP result code on error, in which case a message will have been
1163	** written to pErr.
1164	**
1165	** It always fails if it cannot completely resolve the 'file' and 'r'
	@@ -1177,11 +1177,11 @@
1177	*/
1178	static int fileedit_setup_cimi_from_p(CheckinMiniInfo * p, Blob * pErr,
1179	int * bIsMissingArg){
1180	char * zFileUuid = 0; /* UUID of file content */
1181	const char * zFlag; /* generic flag */
1182	int rc = 0, vid = 0, frid = 0; /* result code, check-in/file rids */
1183
1184	#define fail(EXPR) blob_appendf EXPR; goto end_fail
1185	zFlag = PD("filename",P("fn"));
1186	if(zFlag==0 \|\| !*zFlag){
1187	rc = 400;
	@@ -1209,21 +1209,21 @@
1209	fail((pErr,"Missing required 'checkin' parameter."));
1210	}
1211	vid = symbolic_name_to_rid(zFlag, "ci");
1212	if(0==vid){
1213	rc = 404;
1214	fail((pErr,"Could not resolve check-in version."));
1215	}else if(vid<0){
1216	rc = 400;
1217	fail((pErr,"Check-in name is ambiguous."));
1218	}
1219	p->zParentUuid = rid_to_uuid(vid)/fully expand it/;
1220
1221	zFileUuid = fileedit_file_uuid(p->zFilename, vid, &p->filePerm);
1222	if(!zFileUuid){
1223	rc = 404;
1224	fail((pErr,"Check-in [%S] does not contain file: "
1225	"[%h]", p->zParentUuid, p->zFilename));
1226	}else if(PERM_LNK==p->filePerm){
1227	rc = 400;
1228	fail((pErr,"Editing symlinks is not permitted."));
1229	}
	@@ -1342,11 +1342,11 @@
1342	db_finalize(&q);
1343	}
1344
1345	/*
1346	** For the given fully resolved UUID, renders a JSON object containing
1347	** the fileeedit-editable files in that check-in:
1348	**
1349	** {
1350	** checkin: UUID,
1351	** editableFiles: [ filename1, ... filenameN ]
1352	** }
	@@ -1392,11 +1392,11 @@
1392	** ]
1393	**
1394	** The entries are ordered newest first.
1395	**
1396	** 'checkin=CHECKIN_NAME': fetch the current list of is-editable files
1397	** for the current user and given check-in name:
1398	**
1399	** {
1400	** checkin: UUID,
1401	** editableFiles: [ filename1, ... filenameN ] // sorted by name
1402	** }
	@@ -1430,11 +1430,11 @@
1430	** AJAX route /fileedit?ajax=commit
1431	**
1432	** Required query parameters:
1433	**
1434	** filename=FILENAME
1435	** checkin=Parent check-in UUID
1436	** content=text
1437	** comment=non-empty text
1438	**
1439	** Optional query parameters:
1440	**
	@@ -1454,11 +1454,11 @@
1454	**
1455	** {
1456	** checkin: newUUID,
1457	** filename: theFilename,
1458	** mimetype: string,
1459	** branch: name of the check-in's branch,
1460	** isExe: bool,
1461	** dryRun: bool,
1462	** manifest: text of manifest,
1463	** }
1464	**
	@@ -1466,11 +1466,11 @@
1466	** ajax_route_error().
1467	*/
1468	static void fileedit_ajax_commit(void){
1469	Blob err = empty_blob; /* Error messages */
1470	Blob manifest = empty_blob; /* raw new manifest */
1471	CheckinMiniInfo cimi; /* check-in state */
1472	int rc; /* generic result code */
1473	int newVid = 0; /* new version's RID */
1474	char * zNewUuid = 0; /* newVid's UUID */
1475	char const * zMimetype;
1476	char * zBranch = 0;
	@@ -1484,11 +1484,11 @@
1484	if(0!=rc){
1485	ajax_route_error(rc,"%b",&err);
1486	goto end_cleanup;
1487	}
1488	if(blob_size(&cimi.comment)==0){
1489	ajax_route_error(400,"Empty check-in comment is not permitted.");
1490	goto end_cleanup;
1491	}
1492	if(0!=atoi(PD("include_manifest","0"))){
1493	cimi.pMfOut = &manifest;
1494	}
	@@ -1540,27 +1540,27 @@
1540	** set on any repositories where this page should be activated.
1541	**
1542	** Optional query parameters:
1543	**
1544	** filename=FILENAME Repo-relative path to the file.
1545	** checkin=VERSION Check-in version, using any unambiguous
1546	** symbolic version name.
1547	**
1548	** If passed a filename but no check-in then it will attempt to
1549	** load that file from the most recent leaf check-in.
1550	**
1551	** Once the page is loaded, files may be selected from any open leaf
1552	** version. The only way to edit files from non-leaf checkins is to
1553	** pass both the filename and check-in as URL parameters to the page.
1554	** Users with the proper permissions will be presented with "Edit"
1555	** links in various file-specific contexts for files which match the
1556	** fileedit-glob, regardless of whether they refer to leaf versions or
1557	** not.
1558	*/
1559	void fileedit_page(void){
1560	const char * zFileMime = 0; /* File mime type guess */
1561	CheckinMiniInfo cimi; /* Check-in state */
1562	int previewRenderMode = AJAX_RENDER_GUESS; /* preview mode */
1563	Blob err = empty_blob; /* Error report */
1564	const char zAjax = P("name"); / Name of AJAX route for
1565	sub-dispatching. */
1566
	@@ -2021,11 +2021,11 @@
2021	CX(";\n");
2022	if(blob_size(&err)>0){
2023	CX("fossil.error(%!j);\n", blob_str(&err));
2024	}
2025	/* Populate the page with the current leaves and, if available,
2026	the selected check-in's file list, to save 1 or 2 XHR requests
2027	at startup. That makes this page uncacheable, but compressed
2028	delivery of this page is currently less than 6k. */
2029	CX("fossil.page.initialLeaves = ");
2030	fileedit_render_leaves_list(cimi.zParentUuid ? 0 : &zFirstLeafUuid);
2031	CX(";\n");
2032

M src/finfo.c

+3 -3

		--- src/finfo.c
		+++ src/finfo.c
		@@ -41,11 +41,11 @@
41	41	**
42	42	** In the -s mode prints the status as <status> <revision>. This is
43	43	** a quick status and does not check for up-to-date-ness of the file.
44	44	**
45	45	** In the -p mode, there's an optional flag "-r\|--revision REVISION".
46		-** The specified version (or the latest checked out version) is printed
	46	+** The specified version (or the latest checked-out version) is printed
47	47	** to stdout. The -p mode is another form of the "cat" command.
48	48	**
49	49	** Options:
50	50	** -b\|--brief Display a brief (one line / revision) summary
51	51	** --case-sensitive B Enable or disable case-sensitive filenames. B is a
		@@ -78,11 +78,11 @@
78	78	verify_all_options();
79	79
80	80	if( g.argc!=3 ) usage("-s\|--status FILENAME");
81	81	vid = db_lget_int("checkout", 0);
82	82	if( vid==0 ){
83		- fossil_fatal("no checkout to finfo files in");
	83	+ fossil_fatal("no check-out to finfo files in");
84	84	}
85	85	vfile_check_signature(vid, CKSIG_ENOTFILE);
86	86	file_tree_name(g.argv[2], &fname, 0, 1);
87	87	db_prepare(&q,
88	88	"SELECT pathname, deleted, rid, chnged, coalesce(origname!=pathname,0)"
		@@ -558,11 +558,11 @@
558	558	}
559	559	}else if( ridCi ){
560	560	blob_appendf(&title, "History of the file that is called ");
561	561	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
562	562	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
563		- blob_appendf(&title, " at checkin %z%h</a>",
	563	+ blob_appendf(&title, " at check-in %z%h</a>",
564	564	href("%R/info?name=%t",zCI), zCI);
565	565	}else{
566	566	blob_appendf(&title, "History for ");
567	567	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
568	568	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
569	569

	--- src/finfo.c
	+++ src/finfo.c
	@@ -41,11 +41,11 @@
41	**
42	** In the -s mode prints the status as <status> <revision>. This is
43	** a quick status and does not check for up-to-date-ness of the file.
44	**
45	** In the -p mode, there's an optional flag "-r\|--revision REVISION".
46	** The specified version (or the latest checked out version) is printed
47	** to stdout. The -p mode is another form of the "cat" command.
48	**
49	** Options:
50	** -b\|--brief Display a brief (one line / revision) summary
51	** --case-sensitive B Enable or disable case-sensitive filenames. B is a
	@@ -78,11 +78,11 @@
78	verify_all_options();
79
80	if( g.argc!=3 ) usage("-s\|--status FILENAME");
81	vid = db_lget_int("checkout", 0);
82	if( vid==0 ){
83	fossil_fatal("no checkout to finfo files in");
84	}
85	vfile_check_signature(vid, CKSIG_ENOTFILE);
86	file_tree_name(g.argv[2], &fname, 0, 1);
87	db_prepare(&q,
88	"SELECT pathname, deleted, rid, chnged, coalesce(origname!=pathname,0)"
	@@ -558,11 +558,11 @@
558	}
559	}else if( ridCi ){
560	blob_appendf(&title, "History of the file that is called ");
561	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
562	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
563	blob_appendf(&title, " at checkin %z%h</a>",
564	href("%R/info?name=%t",zCI), zCI);
565	}else{
566	blob_appendf(&title, "History for ");
567	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
568	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
569

	--- src/finfo.c
	+++ src/finfo.c
	@@ -41,11 +41,11 @@
41	**
42	** In the -s mode prints the status as <status> <revision>. This is
43	** a quick status and does not check for up-to-date-ness of the file.
44	**
45	** In the -p mode, there's an optional flag "-r\|--revision REVISION".
46	** The specified version (or the latest checked-out version) is printed
47	** to stdout. The -p mode is another form of the "cat" command.
48	**
49	** Options:
50	** -b\|--brief Display a brief (one line / revision) summary
51	** --case-sensitive B Enable or disable case-sensitive filenames. B is a
	@@ -78,11 +78,11 @@
78	verify_all_options();
79
80	if( g.argc!=3 ) usage("-s\|--status FILENAME");
81	vid = db_lget_int("checkout", 0);
82	if( vid==0 ){
83	fossil_fatal("no check-out to finfo files in");
84	}
85	vfile_check_signature(vid, CKSIG_ENOTFILE);
86	file_tree_name(g.argv[2], &fname, 0, 1);
87	db_prepare(&q,
88	"SELECT pathname, deleted, rid, chnged, coalesce(origname!=pathname,0)"
	@@ -558,11 +558,11 @@
558	}
559	}else if( ridCi ){
560	blob_appendf(&title, "History of the file that is called ");
561	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
562	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
563	blob_appendf(&title, " at check-in %z%h</a>",
564	href("%R/info?name=%t",zCI), zCI);
565	}else{
566	blob_appendf(&title, "History for ");
567	hyperlinked_path(zFilename, &title, 0, "tree", "", LINKPATH_FILE);
568	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
569

M src/import.c

+2 -2

		--- src/import.c
		+++ src/import.c
		@@ -542,11 +542,11 @@
542	542	}
543	543
544	544
545	545	static struct{
546	546	const char zMasterName; / Name of master branch */
547		- int authorFlag; /* Use author as checkin committer */
	547	+ int authorFlag; /* Use author as check-in committer */
548	548	int nGitAttr; /* Number of Git --attribute entries */
549	549	struct { /* Git --attribute details */
550	550	char *zUser;
551	551	char *zEmail;
552	552	} *gitUserInfo;
		@@ -850,11 +850,11 @@
850	850	const char zBranches; / Name of branches folder in repo root */
851	851	int lenBranches; /* String length of zBranches */
852	852	const char zTags; / Name of tags folder in repo root */
853	853	int lenTags; /* String length of zTags */
854	854	Bag newBranches; /* Branches that were created in this revision */
855		- int revFlag; /* Add svn-rev-nn tags on every checkin */
	855	+ int revFlag; /* Add svn-rev-nn tags on every check-in */
856	856	const char zRevPre; / Prepended to revision tag names */
857	857	const char zRevSuf; / Appended to revision tag names */
858	858	const char *azIgnTree; / NULL-terminated list of dirs to ignore */
859	859	} gsvn;
860	860	typedef struct {
861	861

	--- src/import.c
	+++ src/import.c
	@@ -542,11 +542,11 @@
542	}
543
544
545	static struct{
546	const char zMasterName; / Name of master branch */
547	int authorFlag; /* Use author as checkin committer */
548	int nGitAttr; /* Number of Git --attribute entries */
549	struct { /* Git --attribute details */
550	char *zUser;
551	char *zEmail;
552	} *gitUserInfo;
	@@ -850,11 +850,11 @@
850	const char zBranches; / Name of branches folder in repo root */
851	int lenBranches; /* String length of zBranches */
852	const char zTags; / Name of tags folder in repo root */
853	int lenTags; /* String length of zTags */
854	Bag newBranches; /* Branches that were created in this revision */
855	int revFlag; /* Add svn-rev-nn tags on every checkin */
856	const char zRevPre; / Prepended to revision tag names */
857	const char zRevSuf; / Appended to revision tag names */
858	const char *azIgnTree; / NULL-terminated list of dirs to ignore */
859	} gsvn;
860	typedef struct {
861

	--- src/import.c
	+++ src/import.c
	@@ -542,11 +542,11 @@
542	}
543
544
545	static struct{
546	const char zMasterName; / Name of master branch */
547	int authorFlag; /* Use author as check-in committer */
548	int nGitAttr; /* Number of Git --attribute entries */
549	struct { /* Git --attribute details */
550	char *zUser;
551	char *zEmail;
552	} *gitUserInfo;
	@@ -850,11 +850,11 @@
850	const char zBranches; / Name of branches folder in repo root */
851	int lenBranches; /* String length of zBranches */
852	const char zTags; / Name of tags folder in repo root */
853	int lenTags; /* String length of zTags */
854	Bag newBranches; /* Branches that were created in this revision */
855	int revFlag; /* Add svn-rev-nn tags on every check-in */
856	const char zRevPre; / Prepended to revision tag names */
857	const char zRevSuf; / Appended to revision tag names */
858	const char *azIgnTree; / NULL-terminated list of dirs to ignore */
859	} gsvn;
860	typedef struct {
861

M src/info.c

+7 -7

		--- src/info.c
		+++ src/info.c
		@@ -52,11 +52,11 @@
52	52	** * who signed it
53	53	**
54	54	*/
55	55	void show_common_info(
56	56	int rid, /* The rid for the check-in to display info for */
57		- const char zRecDesc, / Brief record description; e.g. "checkout:" */
	57	+ const char zRecDesc, / Brief record description; e.g. "check-out:" */
58	58	int showComment, /* True to show the check-in comment */
59	59	int showFamily /* True to show parents and children */
60	60	){
61	61	Stmt q;
62	62	char *zComment = 0;
		@@ -184,11 +184,11 @@
184	184	** all known check-out locations for that repository and all URLs used
185	185	** to access the repository. The --verbose is (currently) a no-op if
186	186	** the argument is the name of an object within the repository.
187	187	**
188	188	** Use the "finfo" command to get information about a specific
189		-** file in a checkout.
	189	+** file in a check-out.
190	190	**
191	191	** Options:
192	192	**
193	193	** -R\|--repository REPO Extract info from repository REPO
194	194	** -v\|--verbose Show extra information about repositories
		@@ -365,11 +365,11 @@
365	365	/*
366	366	** Write a line of web-page output that shows changes that have occurred
367	367	** to a file between two check-ins.
368	368	*/
369	369	static void append_file_change_line(
370		- const char zCkin, / The checkin on which the change occurs */
	370	+ const char zCkin, / The check-in on which the change occurs */
371	371	const char zName, / Name of the file that has changed */
372	372	const char zOld, / blob.uuid before change. NULL for added files */
373	373	const char zNew, / blob.uuid after change. NULL for deletes */
374	374	const char zOldName, / Prior name. NULL if no name change. */
375	375	DiffConfig pCfg, / Flags for text_diff() or NULL to omit all */
		@@ -819,11 +819,11 @@
819	819	&& db_get_boolean("wiki-about",1)
820	820	){
821	821	const char *zLinks = blob_str(&wiki_read_links);
822	822	@ <tr><th>Edit Wiki:</th><td>\
823	823	if( okWiki ){
824		- @ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>\
	824	+ @ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this check-in</a>\
825	825	}else if( zLinks[0] ){
826	826	zLinks += 3;
827	827	}
828	828	@ %s(zLinks)</td></tr>
829	829	}
		@@ -837,11 +837,11 @@
837	837	&& db_get_boolean("wiki-about",1)
838	838	){
839	839	const char *zLinks = blob_str(&wiki_add_links);
840	840	@ <tr><th>Add Wiki:</th><td>\
841	841	if( !okWiki ){
842		- @ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>\
	842	+ @ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this check-in</a>\
843	843	}else if( zLinks[0] ){
844	844	zLinks += 3;
845	845	}
846	846	@ %s(zLinks)</td></tr>
847	847	}
		@@ -3806,11 +3806,11 @@
3806	3806	** Provide a description of the given VERSION by showing a non-propagating
3807	3807	** tag of the youngest tagged ancestor, followed by the number of commits
3808	3808	** since that, and the short hash of VERSION. Only tags applied to a single
3809	3809	** check-in are considered.
3810	3810	**
3811		-** If no VERSION is provided, describe the current checked-out version.
	3811	+** If no VERSION is provided, describe the currently checked-out version.
3812	3812	**
3813	3813	** If VERSION and the found ancestor refer to the same commit, the last two
3814	3814	** components are omitted, unless --long is provided. When no fitting tagged
3815	3815	** ancestor is found, show only the short hash of VERSION.
3816	3816	**
		@@ -3848,11 +3848,11 @@
3848	3848	}else{
3849	3849	zName = g.argv[2];
3850	3850	}
3851	3851
3852	3852	if( bDirtyFlag ){
3853		- if ( g.argc>=3 ) fossil_fatal("cannot use --dirty with specific checkin");
	3853	+ if ( g.argc>=3 ) fossil_fatal("cannot use --dirty with specific check-in");
3854	3854	}
3855	3855
3856	3856	switch( describe_commit(zName, zMatchGlob, &descr) ){
3857	3857	case -1:
3858	3858	fossil_fatal("commit %s does not exist", zName);
3859	3859

	--- src/info.c
	+++ src/info.c
	@@ -52,11 +52,11 @@
52	** * who signed it
53	**
54	*/
55	void show_common_info(
56	int rid, /* The rid for the check-in to display info for */
57	const char zRecDesc, / Brief record description; e.g. "checkout:" */
58	int showComment, /* True to show the check-in comment */
59	int showFamily /* True to show parents and children */
60	){
61	Stmt q;
62	char *zComment = 0;
	@@ -184,11 +184,11 @@
184	** all known check-out locations for that repository and all URLs used
185	** to access the repository. The --verbose is (currently) a no-op if
186	** the argument is the name of an object within the repository.
187	**
188	** Use the "finfo" command to get information about a specific
189	** file in a checkout.
190	**
191	** Options:
192	**
193	** -R\|--repository REPO Extract info from repository REPO
194	** -v\|--verbose Show extra information about repositories
	@@ -365,11 +365,11 @@
365	/*
366	** Write a line of web-page output that shows changes that have occurred
367	** to a file between two check-ins.
368	*/
369	static void append_file_change_line(
370	const char zCkin, / The checkin on which the change occurs */
371	const char zName, / Name of the file that has changed */
372	const char zOld, / blob.uuid before change. NULL for added files */
373	const char zNew, / blob.uuid after change. NULL for deletes */
374	const char zOldName, / Prior name. NULL if no name change. */
375	DiffConfig pCfg, / Flags for text_diff() or NULL to omit all */
	@@ -819,11 +819,11 @@
819	&& db_get_boolean("wiki-about",1)
820	){
821	const char *zLinks = blob_str(&wiki_read_links);
822	@ <tr><th>Edit Wiki:</th><td>\
823	if( okWiki ){
824	@ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>\
825	}else if( zLinks[0] ){
826	zLinks += 3;
827	}
828	@ %s(zLinks)</td></tr>
829	}
	@@ -837,11 +837,11 @@
837	&& db_get_boolean("wiki-about",1)
838	){
839	const char *zLinks = blob_str(&wiki_add_links);
840	@ <tr><th>Add Wiki:</th><td>\
841	if( !okWiki ){
842	@ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>\
843	}else if( zLinks[0] ){
844	zLinks += 3;
845	}
846	@ %s(zLinks)</td></tr>
847	}
	@@ -3806,11 +3806,11 @@
3806	** Provide a description of the given VERSION by showing a non-propagating
3807	** tag of the youngest tagged ancestor, followed by the number of commits
3808	** since that, and the short hash of VERSION. Only tags applied to a single
3809	** check-in are considered.
3810	**
3811	** If no VERSION is provided, describe the current checked-out version.
3812	**
3813	** If VERSION and the found ancestor refer to the same commit, the last two
3814	** components are omitted, unless --long is provided. When no fitting tagged
3815	** ancestor is found, show only the short hash of VERSION.
3816	**
	@@ -3848,11 +3848,11 @@
3848	}else{
3849	zName = g.argv[2];
3850	}
3851
3852	if( bDirtyFlag ){
3853	if ( g.argc>=3 ) fossil_fatal("cannot use --dirty with specific checkin");
3854	}
3855
3856	switch( describe_commit(zName, zMatchGlob, &descr) ){
3857	case -1:
3858	fossil_fatal("commit %s does not exist", zName);
3859

	--- src/info.c
	+++ src/info.c
	@@ -52,11 +52,11 @@
52	** * who signed it
53	**
54	*/
55	void show_common_info(
56	int rid, /* The rid for the check-in to display info for */
57	const char zRecDesc, / Brief record description; e.g. "check-out:" */
58	int showComment, /* True to show the check-in comment */
59	int showFamily /* True to show parents and children */
60	){
61	Stmt q;
62	char *zComment = 0;
	@@ -184,11 +184,11 @@
184	** all known check-out locations for that repository and all URLs used
185	** to access the repository. The --verbose is (currently) a no-op if
186	** the argument is the name of an object within the repository.
187	**
188	** Use the "finfo" command to get information about a specific
189	** file in a check-out.
190	**
191	** Options:
192	**
193	** -R\|--repository REPO Extract info from repository REPO
194	** -v\|--verbose Show extra information about repositories
	@@ -365,11 +365,11 @@
365	/*
366	** Write a line of web-page output that shows changes that have occurred
367	** to a file between two check-ins.
368	*/
369	static void append_file_change_line(
370	const char zCkin, / The check-in on which the change occurs */
371	const char zName, / Name of the file that has changed */
372	const char zOld, / blob.uuid before change. NULL for added files */
373	const char zNew, / blob.uuid after change. NULL for deletes */
374	const char zOldName, / Prior name. NULL if no name change. */
375	DiffConfig pCfg, / Flags for text_diff() or NULL to omit all */
	@@ -819,11 +819,11 @@
819	&& db_get_boolean("wiki-about",1)
820	){
821	const char *zLinks = blob_str(&wiki_read_links);
822	@ <tr><th>Edit Wiki:</th><td>\
823	if( okWiki ){
824	@ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this check-in</a>\
825	}else if( zLinks[0] ){
826	zLinks += 3;
827	}
828	@ %s(zLinks)</td></tr>
829	}
	@@ -837,11 +837,11 @@
837	&& db_get_boolean("wiki-about",1)
838	){
839	const char *zLinks = blob_str(&wiki_add_links);
840	@ <tr><th>Add Wiki:</th><td>\
841	if( !okWiki ){
842	@ %z(href("%R/wikiedit?name=checkin/%s",zUuid))this check-in</a>\
843	}else if( zLinks[0] ){
844	zLinks += 3;
845	}
846	@ %s(zLinks)</td></tr>
847	}
	@@ -3806,11 +3806,11 @@
3806	** Provide a description of the given VERSION by showing a non-propagating
3807	** tag of the youngest tagged ancestor, followed by the number of commits
3808	** since that, and the short hash of VERSION. Only tags applied to a single
3809	** check-in are considered.
3810	**
3811	** If no VERSION is provided, describe the currently checked-out version.
3812	**
3813	** If VERSION and the found ancestor refer to the same commit, the last two
3814	** components are omitted, unless --long is provided. When no fitting tagged
3815	** ancestor is found, show only the short hash of VERSION.
3816	**
	@@ -3848,11 +3848,11 @@
3848	}else{
3849	zName = g.argv[2];
3850	}
3851
3852	if( bDirtyFlag ){
3853	if ( g.argc>=3 ) fossil_fatal("cannot use --dirty with specific check-in");
3854	}
3855
3856	switch( describe_commit(zName, zMatchGlob, &descr) ){
3857	case -1:
3858	fossil_fatal("commit %s does not exist", zName);
3859

M src/json.c

+1 -1

		--- src/json.c
		+++ src/json.c
		@@ -154,11 +154,11 @@
154	154	C(STMT_EXEC,"Statement execution/stepping failed");
155	155	C(DB_LOCKED,"Database is locked");
156	156	C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt");
157	157	C(DB_NOT_FOUND,"Fossil repository db file could not be found.");
158	158	C(DB_NOT_VALID, "Fossil repository db file is not valid.");
159		- C(DB_NEEDS_CHECKOUT, "Command requires a local checkout.");
	159	+ C(DB_NEEDS_CHECKOUT, "Command requires a local check-out.");
160	160	#undef C
161	161	default:
162	162	return "Unknown Error";
163	163	}
164	164	}
165	165

	--- src/json.c
	+++ src/json.c
	@@ -154,11 +154,11 @@
154	C(STMT_EXEC,"Statement execution/stepping failed");
155	C(DB_LOCKED,"Database is locked");
156	C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt");
157	C(DB_NOT_FOUND,"Fossil repository db file could not be found.");
158	C(DB_NOT_VALID, "Fossil repository db file is not valid.");
159	C(DB_NEEDS_CHECKOUT, "Command requires a local checkout.");
160	#undef C
161	default:
162	return "Unknown Error";
163	}
164	}
165

	--- src/json.c
	+++ src/json.c
	@@ -154,11 +154,11 @@
154	C(STMT_EXEC,"Statement execution/stepping failed");
155	C(DB_LOCKED,"Database is locked");
156	C(DB_NEEDS_REBUILD,"Fossil repository needs to be rebuilt");
157	C(DB_NOT_FOUND,"Fossil repository db file could not be found.");
158	C(DB_NOT_VALID, "Fossil repository db file is not valid.");
159	C(DB_NEEDS_CHECKOUT, "Command requires a local check-out.");
160	#undef C
161	default:
162	return "Unknown Error";
163	}
164	}
165

M src/login.c

+5 -5

		--- src/login.c
		+++ src/login.c
		@@ -2125,26 +2125,26 @@
2125	2125	** Run various subcommands to manage login-group related settings of the open
2126	2126	** repository or of the repository identified by the -R or --repository option.
2127	2127	**
2128	2128	** > fossil login-group ?-R REPO?
2129	2129	**
2130		-** Show the login-group to which REPO, or if invoked from within a checkout
2131		-** the repository on which the current checkout is based, belongs.
	2130	+** Show the login-group to which REPO, or if invoked from within a check-out
	2131	+** the repository on which the current check-out is based, belongs.
2132	2132	**
2133	2133	** > fossil login-group join ?-R? REPO ?--name NAME?
2134	2134	**
2135		-** This subcommand must be invoked from within a checkout to either: add
	2135	+** This subcommand must be invoked from within a check-out to either: add
2136	2136	** the open repository to the login group that REPO is a member, in which
2137	2137	** case the optional "--name" argument is not required; or create a new
2138	2138	** login group between the open repository and REPO, in which case the new
2139	2139	** group NAME is determined by the mandatory "--name" option. REPO may be
2140	2140	** specified with or without the -R flag.
2141	2141	**
2142	2142	** > fossil login-group leave ?-R REPO?
2143	2143	**
2144		-** Take the repository REPO, or if invoked from within a checkout the
2145		-** repository on which the current checkout is based, out of whatever
	2144	+** Take the repository REPO, or if invoked from within a check-out the
	2145	+** repository on which the current check-out is based, out of whatever
2146	2146	** login group it is a member.
2147	2147	**
2148	2148	** About Login Groups:
2149	2149	**
2150	2150	** A login-group is a set of repositories that share user credentials.
2151	2151

	--- src/login.c
	+++ src/login.c
	@@ -2125,26 +2125,26 @@
2125	** Run various subcommands to manage login-group related settings of the open
2126	** repository or of the repository identified by the -R or --repository option.
2127	**
2128	** > fossil login-group ?-R REPO?
2129	**
2130	** Show the login-group to which REPO, or if invoked from within a checkout
2131	** the repository on which the current checkout is based, belongs.
2132	**
2133	** > fossil login-group join ?-R? REPO ?--name NAME?
2134	**
2135	** This subcommand must be invoked from within a checkout to either: add
2136	** the open repository to the login group that REPO is a member, in which
2137	** case the optional "--name" argument is not required; or create a new
2138	** login group between the open repository and REPO, in which case the new
2139	** group NAME is determined by the mandatory "--name" option. REPO may be
2140	** specified with or without the -R flag.
2141	**
2142	** > fossil login-group leave ?-R REPO?
2143	**
2144	** Take the repository REPO, or if invoked from within a checkout the
2145	** repository on which the current checkout is based, out of whatever
2146	** login group it is a member.
2147	**
2148	** About Login Groups:
2149	**
2150	** A login-group is a set of repositories that share user credentials.
2151

	--- src/login.c
	+++ src/login.c
	@@ -2125,26 +2125,26 @@
2125	** Run various subcommands to manage login-group related settings of the open
2126	** repository or of the repository identified by the -R or --repository option.
2127	**
2128	** > fossil login-group ?-R REPO?
2129	**
2130	** Show the login-group to which REPO, or if invoked from within a check-out
2131	** the repository on which the current check-out is based, belongs.
2132	**
2133	** > fossil login-group join ?-R? REPO ?--name NAME?
2134	**
2135	** This subcommand must be invoked from within a check-out to either: add
2136	** the open repository to the login group that REPO is a member, in which
2137	** case the optional "--name" argument is not required; or create a new
2138	** login group between the open repository and REPO, in which case the new
2139	** group NAME is determined by the mandatory "--name" option. REPO may be
2140	** specified with or without the -R flag.
2141	**
2142	** > fossil login-group leave ?-R REPO?
2143	**
2144	** Take the repository REPO, or if invoked from within a check-out the
2145	** repository on which the current check-out is based, out of whatever
2146	** login group it is a member.
2147	**
2148	** About Login Groups:
2149	**
2150	** A login-group is a set of repositories that share user credentials.
2151

M src/main.c

+5 -5

		--- src/main.c
		+++ src/main.c
		@@ -2975,19 +2975,19 @@
2975	2975	**
2976	2976	** Open a socket and begin listening and responding to HTTP requests on
2977	2977	** TCP port 8080, or on any other TCP port defined by the -P or
2978	2978	** --port option. The optional REPOSITORY argument is the name of the
2979	2979	** Fossil repository to be served. The REPOSITORY argument may be omitted
2980		-** if the working directory is within an open checkout, in which case the
2981		-** repository associated with that checkout is used.
	2980	+** if the working directory is within an open check-out, in which case the
	2981	+** repository associated with that check-out is used.
2982	2982	**
2983	2983	** The "ui" command automatically starts a web browser after initializing
2984	2984	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2985	2985	** only process HTTP traffic from the local machine.
2986	2986	**
2987	2987	** If REPOSITORY is a directory name which is the root of a
2988		-** checkout, then use the repository associated with that checkout.
	2988	+** check-out, then use the repository associated with that check-out.
2989	2989	** This only works for the "fossil ui" command, not the "fossil server"
2990	2990	** command.
2991	2991	**
2992	2992	** If REPOSITORY begins with a "HOST:" or "USER@HOST:" prefix, then
2993	2993	** the command is run on the remote host specified and the results are
		@@ -3178,12 +3178,12 @@
3178	3178	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
3179	3179	if( g.httpUseSSL && (flags & HTTP_SERVER_SCGI)!=0 ){
3180	3180	fossil_fatal("SCGI does not (yet) support TLS-encrypted connections");
3181	3181	}
3182	3182	if( isUiCmd && 3==g.argc && file_isdir(g.argv[2], ExtFILE)>0 ){
3183		- /* If REPOSITORY arg is the root of a checkout,
3184		- ** chdir to that checkout so that the current version
	3183	+ /* If REPOSITORY arg is the root of a check-out,
	3184	+ ** chdir to that check-out so that the current version
3185	3185	** gets highlighted in the timeline by default. */
3186	3186	const char * zDir = g.argv[2];
3187	3187	if(dir_has_ckout_db(zDir)){
3188	3188	if(0!=file_chdir(zDir, 0)){
3189	3189	fossil_fatal("Cannot chdir to %s", zDir);
3190	3190

	--- src/main.c
	+++ src/main.c
	@@ -2975,19 +2975,19 @@
2975	**
2976	** Open a socket and begin listening and responding to HTTP requests on
2977	** TCP port 8080, or on any other TCP port defined by the -P or
2978	** --port option. The optional REPOSITORY argument is the name of the
2979	** Fossil repository to be served. The REPOSITORY argument may be omitted
2980	** if the working directory is within an open checkout, in which case the
2981	** repository associated with that checkout is used.
2982	**
2983	** The "ui" command automatically starts a web browser after initializing
2984	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2985	** only process HTTP traffic from the local machine.
2986	**
2987	** If REPOSITORY is a directory name which is the root of a
2988	** checkout, then use the repository associated with that checkout.
2989	** This only works for the "fossil ui" command, not the "fossil server"
2990	** command.
2991	**
2992	** If REPOSITORY begins with a "HOST:" or "USER@HOST:" prefix, then
2993	** the command is run on the remote host specified and the results are
	@@ -3178,12 +3178,12 @@
3178	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
3179	if( g.httpUseSSL && (flags & HTTP_SERVER_SCGI)!=0 ){
3180	fossil_fatal("SCGI does not (yet) support TLS-encrypted connections");
3181	}
3182	if( isUiCmd && 3==g.argc && file_isdir(g.argv[2], ExtFILE)>0 ){
3183	/* If REPOSITORY arg is the root of a checkout,
3184	** chdir to that checkout so that the current version
3185	** gets highlighted in the timeline by default. */
3186	const char * zDir = g.argv[2];
3187	if(dir_has_ckout_db(zDir)){
3188	if(0!=file_chdir(zDir, 0)){
3189	fossil_fatal("Cannot chdir to %s", zDir);
3190

	--- src/main.c
	+++ src/main.c
	@@ -2975,19 +2975,19 @@
2975	**
2976	** Open a socket and begin listening and responding to HTTP requests on
2977	** TCP port 8080, or on any other TCP port defined by the -P or
2978	** --port option. The optional REPOSITORY argument is the name of the
2979	** Fossil repository to be served. The REPOSITORY argument may be omitted
2980	** if the working directory is within an open check-out, in which case the
2981	** repository associated with that check-out is used.
2982	**
2983	** The "ui" command automatically starts a web browser after initializing
2984	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2985	** only process HTTP traffic from the local machine.
2986	**
2987	** If REPOSITORY is a directory name which is the root of a
2988	** check-out, then use the repository associated with that check-out.
2989	** This only works for the "fossil ui" command, not the "fossil server"
2990	** command.
2991	**
2992	** If REPOSITORY begins with a "HOST:" or "USER@HOST:" prefix, then
2993	** the command is run on the remote host specified and the results are
	@@ -3178,12 +3178,12 @@
3178	if( g.argc!=2 && g.argc!=3 ) usage("?REPOSITORY?");
3179	if( g.httpUseSSL && (flags & HTTP_SERVER_SCGI)!=0 ){
3180	fossil_fatal("SCGI does not (yet) support TLS-encrypted connections");
3181	}
3182	if( isUiCmd && 3==g.argc && file_isdir(g.argv[2], ExtFILE)>0 ){
3183	/* If REPOSITORY arg is the root of a check-out,
3184	** chdir to that check-out so that the current version
3185	** gets highlighted in the timeline by default. */
3186	const char * zDir = g.argv[2];
3187	if(dir_has_ckout_db(zDir)){
3188	if(0!=file_chdir(zDir, 0)){
3189	fossil_fatal("Cannot chdir to %s", zDir);
3190

M src/manifest.c

+1 -1

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1934,11 +1934,11 @@
1934	1934	}
1935	1935	return parentid;
1936	1936	}
1937	1937
1938	1938	/*
1939		-** There exists a "parent" tag against checkin rid that has value zValue.
	1939	+** There exists a "parent" tag against check-in rid that has value zValue.
1940	1940	** If value is well-formed (meaning that it is a list of hashes), then use
1941	1941	** zValue to reparent check-in rid.
1942	1942	*/
1943	1943	void manifest_reparent_checkin(int rid, const char *zValue){
1944	1944	int nParent = 0;
1945	1945

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1934,11 +1934,11 @@
1934	}
1935	return parentid;
1936	}
1937
1938	/*
1939	** There exists a "parent" tag against checkin rid that has value zValue.
1940	** If value is well-formed (meaning that it is a list of hashes), then use
1941	** zValue to reparent check-in rid.
1942	*/
1943	void manifest_reparent_checkin(int rid, const char *zValue){
1944	int nParent = 0;
1945

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1934,11 +1934,11 @@
1934	}
1935	return parentid;
1936	}
1937
1938	/*
1939	** There exists a "parent" tag against check-in rid that has value zValue.
1940	** If value is well-formed (meaning that it is a list of hashes), then use
1941	** zValue to reparent check-in rid.
1942	*/
1943	void manifest_reparent_checkin(int rid, const char *zValue){
1944	int nParent = 0;
1945

M src/merge.c

+11 -11

		--- src/merge.c
		+++ src/merge.c
		@@ -135,12 +135,12 @@
135	135	** Add an entry to the FV table for all files renamed between
136	136	** version N and the version specified by vid.
137	137	*/
138	138	static void add_renames(
139	139	const char zFnCol, / The FV column for the filename in vid */
140		- int vid, /* The desired version's checkin RID */
141		- int nid, /* The checkin rid for the name pivot */
	140	+ int vid, /* The desired version's- RID */
	141	+ int nid, /* The check-in rid for the name pivot */
142	142	int revOK, /* OK to move backwards (child->parent) if true */
143	143	const char zDebug / Generate trace output if not NULL */
144	144	){
145	145	int nChng; /* Number of file name changes */
146	146	int aChng; / An array of file name changes */
		@@ -279,23 +279,23 @@
279	279	** COMMAND: cherry-pick
280	280	**
281	281	** Usage: %fossil merge ?OPTIONS? ?VERSION?
282	282	**
283	283	** The argument VERSION is a version that should be merged into the
284		-** current checkout. All changes from VERSION back to the nearest
	284	+** current check-out. All changes from VERSION back to the nearest
285	285	** common ancestor are merged. Except, if either of the --cherrypick or
286	286	** --backout options are used only the changes associated with the
287	287	** single check-in VERSION are merged. The --backout option causes
288	288	** the changes associated with VERSION to be removed from the current
289		-** checkout rather than added. When invoked with the name cherry-pick,
	289	+** check-out rather than added. When invoked with the name cherry-pick,
290	290	** this command works exactly like merge --cherrypick.
291	291	**
292	292	** If the VERSION argument is omitted, then Fossil attempts to find
293	293	** a recent fork on the current branch to merge.
294	294	**
295	295	** Only file content is merged. The result continues to use the
296		-** file and directory names from the current checkout even if those
	296	+** file and directory names from the current check-out even if those
297	297	** names might have been changed in the branch being merged in.
298	298	**
299	299	** Options:
300	300	**
301	301	** --backout Do a reverse cherrypick merge against VERSION.
		@@ -310,11 +310,11 @@
310	310	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
311	311	** and do not try to merge parallel changes. This
312	312	** option overrides the "binary-glob" setting.
313	313	**
314	314	** --cherrypick Do a cherrypick merge VERSION into the current
315		-** checkout. A cherrypick merge pulls in the changes
	315	+** check-out. A cherrypick merge pulls in the changes
316	316	** of the single check-in VERSION, rather than all
317	317	** changes back to the nearest common ancestor.
318	318	**
319	319	** -f\|--force Force the merge even if it would be a no-op
320	320	**
		@@ -353,11 +353,11 @@
353	353	Stmt q;
354	354
355	355
356	356	/* Notation:
357	357	**
358		- ** V The current checkout
	358	+ ** V The current check-out
359	359	** M The version being merged in
360	360	** P The "pivot" - the most recent common ancestor of V and M.
361	361	** N The "name pivot" - for detecting renames
362	362	*/
363	363
		@@ -423,13 +423,13 @@
423	423	fossil_fatal("not a version: %s", g.argv[2]);
424	424	}
425	425	}else if( g.argc==2 ){
426	426	/* No version specified on the command-line so pick the most recent
427	427	** leaf that is (1) not the version currently checked out and (2)
428		- ** has not already been merged into the current checkout and (3)
	428	+ ** has not already been merged into the current check-out and (3)
429	429	** the leaf is not closed and (4) the leaf is in the same branch
430		- ** as the current checkout.
	430	+ ** as the current check-out.
431	431	*/
432	432	Stmt q;
433	433	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
434	434	fossil_fatal("cannot use --backout, --cherrypick or --integrate "
435	435	"with a fork merge");
		@@ -492,11 +492,11 @@
492	492	}
493	493	db_finalize(&q);
494	494	pid = pivot_find(0);
495	495	if( pid<=0 ){
496	496	fossil_fatal("cannot find a common ancestor between the current "
497		- "checkout and %s", g.argv[2]);
	497	+ "check-out and %s", g.argv[2]);
498	498	}
499	499	}
500	500	pivot_set_primary(mid);
501	501	pivot_set_secondary(vid);
502	502	nid = pivot_find(1);
		@@ -571,11 +571,11 @@
571	571	if( showVfileFlag ) debug_show_vfile();
572	572
573	573	/*
574	574	** The vfile.pathname field is used to match files against each other. The
575	575	** FV table contains one row for each each unique filename in
576		- ** in the current checkout, the pivot, and the version being merged.
	576	+ ** in the current check-out, the pivot, and the version being merged.
577	577	*/
578	578	db_multi_exec(
579	579	"DROP TABLE IF EXISTS fv;"
580	580	"CREATE TEMP TABLE fv(\n"
581	581	" fn TEXT UNIQUE %s,\n" /* The filename */
582	582

	--- src/merge.c
	+++ src/merge.c
	@@ -135,12 +135,12 @@
135	** Add an entry to the FV table for all files renamed between
136	** version N and the version specified by vid.
137	*/
138	static void add_renames(
139	const char zFnCol, / The FV column for the filename in vid */
140	int vid, /* The desired version's checkin RID */
141	int nid, /* The checkin rid for the name pivot */
142	int revOK, /* OK to move backwards (child->parent) if true */
143	const char zDebug / Generate trace output if not NULL */
144	){
145	int nChng; /* Number of file name changes */
146	int aChng; / An array of file name changes */
	@@ -279,23 +279,23 @@
279	** COMMAND: cherry-pick
280	**
281	** Usage: %fossil merge ?OPTIONS? ?VERSION?
282	**
283	** The argument VERSION is a version that should be merged into the
284	** current checkout. All changes from VERSION back to the nearest
285	** common ancestor are merged. Except, if either of the --cherrypick or
286	** --backout options are used only the changes associated with the
287	** single check-in VERSION are merged. The --backout option causes
288	** the changes associated with VERSION to be removed from the current
289	** checkout rather than added. When invoked with the name cherry-pick,
290	** this command works exactly like merge --cherrypick.
291	**
292	** If the VERSION argument is omitted, then Fossil attempts to find
293	** a recent fork on the current branch to merge.
294	**
295	** Only file content is merged. The result continues to use the
296	** file and directory names from the current checkout even if those
297	** names might have been changed in the branch being merged in.
298	**
299	** Options:
300	**
301	** --backout Do a reverse cherrypick merge against VERSION.
	@@ -310,11 +310,11 @@
310	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
311	** and do not try to merge parallel changes. This
312	** option overrides the "binary-glob" setting.
313	**
314	** --cherrypick Do a cherrypick merge VERSION into the current
315	** checkout. A cherrypick merge pulls in the changes
316	** of the single check-in VERSION, rather than all
317	** changes back to the nearest common ancestor.
318	**
319	** -f\|--force Force the merge even if it would be a no-op
320	**
	@@ -353,11 +353,11 @@
353	Stmt q;
354
355
356	/* Notation:
357	**
358	** V The current checkout
359	** M The version being merged in
360	** P The "pivot" - the most recent common ancestor of V and M.
361	** N The "name pivot" - for detecting renames
362	*/
363
	@@ -423,13 +423,13 @@
423	fossil_fatal("not a version: %s", g.argv[2]);
424	}
425	}else if( g.argc==2 ){
426	/* No version specified on the command-line so pick the most recent
427	** leaf that is (1) not the version currently checked out and (2)
428	** has not already been merged into the current checkout and (3)
429	** the leaf is not closed and (4) the leaf is in the same branch
430	** as the current checkout.
431	*/
432	Stmt q;
433	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
434	fossil_fatal("cannot use --backout, --cherrypick or --integrate "
435	"with a fork merge");
	@@ -492,11 +492,11 @@
492	}
493	db_finalize(&q);
494	pid = pivot_find(0);
495	if( pid<=0 ){
496	fossil_fatal("cannot find a common ancestor between the current "
497	"checkout and %s", g.argv[2]);
498	}
499	}
500	pivot_set_primary(mid);
501	pivot_set_secondary(vid);
502	nid = pivot_find(1);
	@@ -571,11 +571,11 @@
571	if( showVfileFlag ) debug_show_vfile();
572
573	/*
574	** The vfile.pathname field is used to match files against each other. The
575	** FV table contains one row for each each unique filename in
576	** in the current checkout, the pivot, and the version being merged.
577	*/
578	db_multi_exec(
579	"DROP TABLE IF EXISTS fv;"
580	"CREATE TEMP TABLE fv(\n"
581	" fn TEXT UNIQUE %s,\n" /* The filename */
582

	--- src/merge.c
	+++ src/merge.c
	@@ -135,12 +135,12 @@
135	** Add an entry to the FV table for all files renamed between
136	** version N and the version specified by vid.
137	*/
138	static void add_renames(
139	const char zFnCol, / The FV column for the filename in vid */
140	int vid, /* The desired version's- RID */
141	int nid, /* The check-in rid for the name pivot */
142	int revOK, /* OK to move backwards (child->parent) if true */
143	const char zDebug / Generate trace output if not NULL */
144	){
145	int nChng; /* Number of file name changes */
146	int aChng; / An array of file name changes */
	@@ -279,23 +279,23 @@
279	** COMMAND: cherry-pick
280	**
281	** Usage: %fossil merge ?OPTIONS? ?VERSION?
282	**
283	** The argument VERSION is a version that should be merged into the
284	** current check-out. All changes from VERSION back to the nearest
285	** common ancestor are merged. Except, if either of the --cherrypick or
286	** --backout options are used only the changes associated with the
287	** single check-in VERSION are merged. The --backout option causes
288	** the changes associated with VERSION to be removed from the current
289	** check-out rather than added. When invoked with the name cherry-pick,
290	** this command works exactly like merge --cherrypick.
291	**
292	** If the VERSION argument is omitted, then Fossil attempts to find
293	** a recent fork on the current branch to merge.
294	**
295	** Only file content is merged. The result continues to use the
296	** file and directory names from the current check-out even if those
297	** names might have been changed in the branch being merged in.
298	**
299	** Options:
300	**
301	** --backout Do a reverse cherrypick merge against VERSION.
	@@ -310,11 +310,11 @@
310	** --binary GLOBPATTERN Treat files that match GLOBPATTERN as binary
311	** and do not try to merge parallel changes. This
312	** option overrides the "binary-glob" setting.
313	**
314	** --cherrypick Do a cherrypick merge VERSION into the current
315	** check-out. A cherrypick merge pulls in the changes
316	** of the single check-in VERSION, rather than all
317	** changes back to the nearest common ancestor.
318	**
319	** -f\|--force Force the merge even if it would be a no-op
320	**
	@@ -353,11 +353,11 @@
353	Stmt q;
354
355
356	/* Notation:
357	**
358	** V The current check-out
359	** M The version being merged in
360	** P The "pivot" - the most recent common ancestor of V and M.
361	** N The "name pivot" - for detecting renames
362	*/
363
	@@ -423,13 +423,13 @@
423	fossil_fatal("not a version: %s", g.argv[2]);
424	}
425	}else if( g.argc==2 ){
426	/* No version specified on the command-line so pick the most recent
427	** leaf that is (1) not the version currently checked out and (2)
428	** has not already been merged into the current check-out and (3)
429	** the leaf is not closed and (4) the leaf is in the same branch
430	** as the current check-out.
431	*/
432	Stmt q;
433	if( pickFlag \|\| backoutFlag \|\| integrateFlag){
434	fossil_fatal("cannot use --backout, --cherrypick or --integrate "
435	"with a fork merge");
	@@ -492,11 +492,11 @@
492	}
493	db_finalize(&q);
494	pid = pivot_find(0);
495	if( pid<=0 ){
496	fossil_fatal("cannot find a common ancestor between the current "
497	"check-out and %s", g.argv[2]);
498	}
499	}
500	pivot_set_primary(mid);
501	pivot_set_secondary(vid);
502	nid = pivot_find(1);
	@@ -571,11 +571,11 @@
571	if( showVfileFlag ) debug_show_vfile();
572
573	/*
574	** The vfile.pathname field is used to match files against each other. The
575	** FV table contains one row for each each unique filename in
576	** in the current check-out, the pivot, and the version being merged.
577	*/
578	db_multi_exec(
579	"DROP TABLE IF EXISTS fv;"
580	"CREATE TEMP TABLE fv(\n"
581	" fn TEXT UNIQUE %s,\n" /* The filename */
582

M src/name.c

+2 -2

		--- src/name.c
		+++ src/name.c
		@@ -265,11 +265,11 @@
265	265	** * "root:BR" = The origin of the branch named BR.
266	266	** * "start:BR" = The first check-in of the branch named BR.
267	267	** * "merge-in:BR" = The most recent merge-in for the branch named BR.
268	268	**
269	269	** In those forms, BR may be any symbolic form but is assumed to be a
270		-** checkin. Thus root:2021-02-01 would resolve to a checkin, possibly
	270	+** check-in. Thus root:2021-02-01 would resolve to a check-in, possibly
271	271	** in a branch and possibly in the trunk, but never a wiki edit or
272	272	** forum post.
273	273	**
274	274	** Return the RID of the matching artifact. Or return 0 if the name does not
275	275	** match any known object. Or return -1 if the name is ambiguous.
		@@ -1150,11 +1150,11 @@
1150	1150	@ CREATE TEMP TABLE IF NOT EXISTS description(
1151	1151	@ rid INTEGER PRIMARY KEY, -- RID of the object
1152	1152	@ uuid TEXT, -- hash of the object
1153	1153	@ ctime DATETIME, -- Time of creation
1154	1154	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
1155		-@ type TEXT, -- file, checkin, wiki, ticket, etc.
	1155	+@ type TEXT, -- file, check-in, wiki, ticket, etc.
1156	1156	@ rcvid INT, -- When the artifact was received
1157	1157	@ summary TEXT, -- Summary comment for the object
1158	1158	@ ref TEXT -- hash of an object to link against
1159	1159	@ );
1160	1160	@ CREATE INDEX IF NOT EXISTS desctype
1161	1161

	--- src/name.c
	+++ src/name.c
	@@ -265,11 +265,11 @@
265	** * "root:BR" = The origin of the branch named BR.
266	** * "start:BR" = The first check-in of the branch named BR.
267	** * "merge-in:BR" = The most recent merge-in for the branch named BR.
268	**
269	** In those forms, BR may be any symbolic form but is assumed to be a
270	** checkin. Thus root:2021-02-01 would resolve to a checkin, possibly
271	** in a branch and possibly in the trunk, but never a wiki edit or
272	** forum post.
273	**
274	** Return the RID of the matching artifact. Or return 0 if the name does not
275	** match any known object. Or return -1 if the name is ambiguous.
	@@ -1150,11 +1150,11 @@
1150	@ CREATE TEMP TABLE IF NOT EXISTS description(
1151	@ rid INTEGER PRIMARY KEY, -- RID of the object
1152	@ uuid TEXT, -- hash of the object
1153	@ ctime DATETIME, -- Time of creation
1154	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
1155	@ type TEXT, -- file, checkin, wiki, ticket, etc.
1156	@ rcvid INT, -- When the artifact was received
1157	@ summary TEXT, -- Summary comment for the object
1158	@ ref TEXT -- hash of an object to link against
1159	@ );
1160	@ CREATE INDEX IF NOT EXISTS desctype
1161

	--- src/name.c
	+++ src/name.c
	@@ -265,11 +265,11 @@
265	** * "root:BR" = The origin of the branch named BR.
266	** * "start:BR" = The first check-in of the branch named BR.
267	** * "merge-in:BR" = The most recent merge-in for the branch named BR.
268	**
269	** In those forms, BR may be any symbolic form but is assumed to be a
270	** check-in. Thus root:2021-02-01 would resolve to a check-in, possibly
271	** in a branch and possibly in the trunk, but never a wiki edit or
272	** forum post.
273	**
274	** Return the RID of the matching artifact. Or return 0 if the name does not
275	** match any known object. Or return -1 if the name is ambiguous.
	@@ -1150,11 +1150,11 @@
1150	@ CREATE TEMP TABLE IF NOT EXISTS description(
1151	@ rid INTEGER PRIMARY KEY, -- RID of the object
1152	@ uuid TEXT, -- hash of the object
1153	@ ctime DATETIME, -- Time of creation
1154	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
1155	@ type TEXT, -- file, check-in, wiki, ticket, etc.
1156	@ rcvid INT, -- When the artifact was received
1157	@ summary TEXT, -- Summary comment for the object
1158	@ ref TEXT -- hash of an object to link against
1159	@ );
1160	@ CREATE INDEX IF NOT EXISTS desctype
1161

M src/patch.c

+2 -2

		--- src/patch.c
		+++ src/patch.c
		@@ -48,11 +48,11 @@
48	48	#define PATCH_VERBOSE 0x0002
49	49	#define PATCH_FORCE 0x0004
50	50
51	51	/*
52	52	** Implementation of the "readfile(X)" SQL function. The entire content
53		-** of the checkout file named X is read and returned as a BLOB.
	53	+** of the check-out file named X is read and returned as a BLOB.
54	54	*/
55	55	static void readfileFunc(
56	56	sqlite3_context *context,
57	57	int argc,
58	58	sqlite3_value **argv
		@@ -375,11 +375,11 @@
375	375	Blob cmd;
376	376
377	377	blob_init(&cmd, 0, 0);
378	378	if( unsaved_changes(0) ){
379	379	if( (mFlags & PATCH_FORCE)==0 ){
380		- fossil_fatal("there are unsaved changes in the current checkout");
	380	+ fossil_fatal("there are unsaved changes in the current check-out");
381	381	}else{
382	382	blob_appendf(&cmd, "%$ revert", g.nameOfExe);
383	383	if( mFlags & PATCH_DRYRUN ){
384	384	fossil_print("%s\n", blob_str(&cmd));
385	385	}else{
386	386

	--- src/patch.c
	+++ src/patch.c
	@@ -48,11 +48,11 @@
48	#define PATCH_VERBOSE 0x0002
49	#define PATCH_FORCE 0x0004
50
51	/*
52	** Implementation of the "readfile(X)" SQL function. The entire content
53	** of the checkout file named X is read and returned as a BLOB.
54	*/
55	static void readfileFunc(
56	sqlite3_context *context,
57	int argc,
58	sqlite3_value **argv
	@@ -375,11 +375,11 @@
375	Blob cmd;
376
377	blob_init(&cmd, 0, 0);
378	if( unsaved_changes(0) ){
379	if( (mFlags & PATCH_FORCE)==0 ){
380	fossil_fatal("there are unsaved changes in the current checkout");
381	}else{
382	blob_appendf(&cmd, "%$ revert", g.nameOfExe);
383	if( mFlags & PATCH_DRYRUN ){
384	fossil_print("%s\n", blob_str(&cmd));
385	}else{
386

	--- src/patch.c
	+++ src/patch.c
	@@ -48,11 +48,11 @@
48	#define PATCH_VERBOSE 0x0002
49	#define PATCH_FORCE 0x0004
50
51	/*
52	** Implementation of the "readfile(X)" SQL function. The entire content
53	** of the check-out file named X is read and returned as a BLOB.
54	*/
55	static void readfileFunc(
56	sqlite3_context *context,
57	int argc,
58	sqlite3_value **argv
	@@ -375,11 +375,11 @@
375	Blob cmd;
376
377	blob_init(&cmd, 0, 0);
378	if( unsaved_changes(0) ){
379	if( (mFlags & PATCH_FORCE)==0 ){
380	fossil_fatal("there are unsaved changes in the current check-out");
381	}else{
382	blob_appendf(&cmd, "%$ revert", g.nameOfExe);
383	if( mFlags & PATCH_DRYRUN ){
384	fossil_print("%s\n", blob_str(&cmd));
385	}else{
386

M src/pikchrshow.c

+1 -1

		--- src/pikchrshow.c
		+++ src/pikchrshow.c
		@@ -567,11 +567,11 @@
567	567	** The -div-indent/center/left/right flags may not be combined.
568	568	**
569	569	** TH1-related Notes and Caveats:
570	570	**
571	571	** If the -th flag is used, this command must open a fossil database
572		-** for certain functionality to work (via a checkout or the -R REPO
	572	+** for certain functionality to work (via a check-out or the -R REPO
573	573	** flag). If opening a db fails, execution will continue but any TH1
574	574	** commands which require a db will trigger a fatal error.
575	575	**
576	576	** In Fossil skins, TH1 variables in the form $varName are expanded
577	577	** as-is and those in the form $<varName> are htmlized in the
578	578

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -567,11 +567,11 @@
567	** The -div-indent/center/left/right flags may not be combined.
568	**
569	** TH1-related Notes and Caveats:
570	**
571	** If the -th flag is used, this command must open a fossil database
572	** for certain functionality to work (via a checkout or the -R REPO
573	** flag). If opening a db fails, execution will continue but any TH1
574	** commands which require a db will trigger a fatal error.
575	**
576	** In Fossil skins, TH1 variables in the form $varName are expanded
577	** as-is and those in the form $<varName> are htmlized in the
578

	--- src/pikchrshow.c
	+++ src/pikchrshow.c
	@@ -567,11 +567,11 @@
567	** The -div-indent/center/left/right flags may not be combined.
568	**
569	** TH1-related Notes and Caveats:
570	**
571	** If the -th flag is used, this command must open a fossil database
572	** for certain functionality to work (via a check-out or the -R REPO
573	** flag). If opening a db fails, execution will continue but any TH1
574	** commands which require a db will trigger a fatal error.
575	**
576	** In Fossil skins, TH1 variables in the form $varName are expanded
577	** as-is and those in the form $<varName> are htmlized in the
578

M src/pivot.c

+2 -2

		--- src/pivot.c
		+++ src/pivot.c
		@@ -30,11 +30,11 @@
30	30	** There can be multiple secondaries but only a single primary.
31	31	** The primary must be set first.
32	32	**
33	33	** In the merge algorithm, the file being merged in is the primary.
34	34	** The current check-out or other files that have been merged into
35		-** the current checkout are the secondaries.
	35	+** the current check-out are the secondaries.
36	36	**
37	37	** The act of setting the primary resets the pivot-finding algorithm.
38	38	*/
39	39	void pivot_set_primary(int rid){
40	40	/* Set up table used to do the search */
		@@ -156,11 +156,11 @@
156	156	/*
157	157	** COMMAND: merge-base
158	158	**
159	159	** Usage: %fossil merge-base ?options? PRIMARY SECONDARY ...
160	160	**
161		-** Find a common ancestor given two or more checkin versions to
	161	+** Find a common ancestor given two or more check-in versions to
162	162	** hypothetically merge.
163	163	**
164	164	** Options:
165	165	** --ignore-merges Ignore merges for discovering name pivots
166	166	*/
167	167

	--- src/pivot.c
	+++ src/pivot.c
	@@ -30,11 +30,11 @@
30	** There can be multiple secondaries but only a single primary.
31	** The primary must be set first.
32	**
33	** In the merge algorithm, the file being merged in is the primary.
34	** The current check-out or other files that have been merged into
35	** the current checkout are the secondaries.
36	**
37	** The act of setting the primary resets the pivot-finding algorithm.
38	*/
39	void pivot_set_primary(int rid){
40	/* Set up table used to do the search */
	@@ -156,11 +156,11 @@
156	/*
157	** COMMAND: merge-base
158	**
159	** Usage: %fossil merge-base ?options? PRIMARY SECONDARY ...
160	**
161	** Find a common ancestor given two or more checkin versions to
162	** hypothetically merge.
163	**
164	** Options:
165	** --ignore-merges Ignore merges for discovering name pivots
166	*/
167

	--- src/pivot.c
	+++ src/pivot.c
	@@ -30,11 +30,11 @@
30	** There can be multiple secondaries but only a single primary.
31	** The primary must be set first.
32	**
33	** In the merge algorithm, the file being merged in is the primary.
34	** The current check-out or other files that have been merged into
35	** the current check-out are the secondaries.
36	**
37	** The act of setting the primary resets the pivot-finding algorithm.
38	*/
39	void pivot_set_primary(int rid){
40	/* Set up table used to do the search */
	@@ -156,11 +156,11 @@
156	/*
157	** COMMAND: merge-base
158	**
159	** Usage: %fossil merge-base ?options? PRIMARY SECONDARY ...
160	**
161	** Find a common ancestor given two or more check-in versions to
162	** hypothetically merge.
163	**
164	** Options:
165	** --ignore-merges Ignore merges for discovering name pivots
166	*/
167

M src/purge.c

+1 -1

		--- src/purge.c
		+++ src/purge.c
		@@ -560,11 +560,11 @@
560	560	int r = name_to_typed_rid(g.argv[i], "br");
561	561	compute_descendants(r, 1000000000);
562	562	}
563	563	vid = db_lget_int("checkout",0);
564	564	if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
565		- fossil_fatal("cannot purge the current checkout");
	565	+ fossil_fatal("cannot purge the current check-out");
566	566	}
567	567	find_checkin_associates("ok", 1);
568	568	purge_artifact_list("ok", "", purgeFlags);
569	569	db_end_transaction(0);
570	570	}else if( strncmp(zSubcmd, "files", n)==0 ){
571	571

	--- src/purge.c
	+++ src/purge.c
	@@ -560,11 +560,11 @@
560	int r = name_to_typed_rid(g.argv[i], "br");
561	compute_descendants(r, 1000000000);
562	}
563	vid = db_lget_int("checkout",0);
564	if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
565	fossil_fatal("cannot purge the current checkout");
566	}
567	find_checkin_associates("ok", 1);
568	purge_artifact_list("ok", "", purgeFlags);
569	db_end_transaction(0);
570	}else if( strncmp(zSubcmd, "files", n)==0 ){
571

	--- src/purge.c
	+++ src/purge.c
	@@ -560,11 +560,11 @@
560	int r = name_to_typed_rid(g.argv[i], "br");
561	compute_descendants(r, 1000000000);
562	}
563	vid = db_lget_int("checkout",0);
564	if( db_exists("SELECT 1 FROM ok WHERE rid=%d",vid) ){
565	fossil_fatal("cannot purge the current check-out");
566	}
567	find_checkin_associates("ok", 1);
568	purge_artifact_list("ok", "", purgeFlags);
569	db_end_transaction(0);
570	}else if( strncmp(zSubcmd, "files", n)==0 ){
571

M src/schema.c

+6 -6

		--- src/schema.c
		+++ src/schema.c
		@@ -522,17 +522,17 @@
522	522	#endif
523	523
524	524	/*
525	525	** The schema for the local FOSSIL database file found at the root
526	526	** of every check-out. This database contains the complete state of
527		-** the checkout. See also the addendum in zLocalSchemaVmerge[].
	527	+** the check-out. See also the addendum in zLocalSchemaVmerge[].
528	528	*/
529	529	const char zLocalSchema[] =
530	530	@ -- The VVAR table holds miscellanous information about the local database
531	531	@ -- in the form of name-value pairs. This is similar to the VAR table
532	532	@ -- table in the repository except that this table holds information that
533		-@ -- is specific to the local checkout.
	533	+@ -- is specific to the local check-out.
534	534	@ --
535	535	@ -- Important Variables:
536	536	@ --
537	537	@ -- repository Full pathname of the repository database
538	538	@ -- user-id Userid to use
		@@ -542,11 +542,11 @@
542	542	@ value CLOB, -- Content of the named parameter
543	543	@ CHECK( typeof(name)='text' AND length(name)>=1 )
544	544	@ );
545	545	@
546	546	@ -- Each entry in the vfile table represents a single file in the
547		-@ -- current checkout.
	547	+@ -- current check-out.
548	548	@ --
549	549	@ -- The file.rid field is 0 for files or folders that have been
550	550	@ -- added but not yet committed.
551	551	@ --
552	552	@ -- Vfile.chnged meaning:
		@@ -555,12 +555,12 @@
555	555	@ -- 2 Replaced by a merge command
556	556	@ -- 3 Added by a merge command
557	557	@ -- 4,5 Same as 2,3 except merge using --integrate
558	558	@ --
559	559	@ CREATE TABLE vfile(
560		-@ id INTEGER PRIMARY KEY, -- ID of the checked out file
561		-@ vid INTEGER REFERENCES blob, -- The checkin this file is part of.
	560	+@ id INTEGER PRIMARY KEY, -- ID of the checked-out file
	561	+@ vid INTEGER REFERENCES blob, -- The check-in this file is part of.
562	562	@ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add
563	563	@ deleted BOOLEAN DEFAULT 0, -- True if deleted
564	564	@ isexe BOOLEAN, -- True if file should be executable
565	565	@ islink BOOLEAN, -- True if file should be symlink
566	566	@ rid INTEGER, -- Originally from this repository record
		@@ -605,11 +605,11 @@
605	605	@ -- a NOT NULL constraint to be silently ignored.
606	606	@
607	607	@ CREATE TRIGGER vmerge_ck1 AFTER INSERT ON vmerge
608	608	@ WHEN new.mhash IS NULL BEGIN
609	609	@ SELECT raise(FAIL,
610		-@ 'trying to update a newer checkout with an older version of Fossil');
	610	+@ 'trying to update a newer check-out with an older version of Fossil');
611	611	@ END;
612	612	@
613	613	;
614	614
615	615	/*
616	616

	--- src/schema.c
	+++ src/schema.c
	@@ -522,17 +522,17 @@
522	#endif
523
524	/*
525	** The schema for the local FOSSIL database file found at the root
526	** of every check-out. This database contains the complete state of
527	** the checkout. See also the addendum in zLocalSchemaVmerge[].
528	*/
529	const char zLocalSchema[] =
530	@ -- The VVAR table holds miscellanous information about the local database
531	@ -- in the form of name-value pairs. This is similar to the VAR table
532	@ -- table in the repository except that this table holds information that
533	@ -- is specific to the local checkout.
534	@ --
535	@ -- Important Variables:
536	@ --
537	@ -- repository Full pathname of the repository database
538	@ -- user-id Userid to use
	@@ -542,11 +542,11 @@
542	@ value CLOB, -- Content of the named parameter
543	@ CHECK( typeof(name)='text' AND length(name)>=1 )
544	@ );
545	@
546	@ -- Each entry in the vfile table represents a single file in the
547	@ -- current checkout.
548	@ --
549	@ -- The file.rid field is 0 for files or folders that have been
550	@ -- added but not yet committed.
551	@ --
552	@ -- Vfile.chnged meaning:
	@@ -555,12 +555,12 @@
555	@ -- 2 Replaced by a merge command
556	@ -- 3 Added by a merge command
557	@ -- 4,5 Same as 2,3 except merge using --integrate
558	@ --
559	@ CREATE TABLE vfile(
560	@ id INTEGER PRIMARY KEY, -- ID of the checked out file
561	@ vid INTEGER REFERENCES blob, -- The checkin this file is part of.
562	@ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add
563	@ deleted BOOLEAN DEFAULT 0, -- True if deleted
564	@ isexe BOOLEAN, -- True if file should be executable
565	@ islink BOOLEAN, -- True if file should be symlink
566	@ rid INTEGER, -- Originally from this repository record
	@@ -605,11 +605,11 @@
605	@ -- a NOT NULL constraint to be silently ignored.
606	@
607	@ CREATE TRIGGER vmerge_ck1 AFTER INSERT ON vmerge
608	@ WHEN new.mhash IS NULL BEGIN
609	@ SELECT raise(FAIL,
610	@ 'trying to update a newer checkout with an older version of Fossil');
611	@ END;
612	@
613	;
614
615	/*
616

	--- src/schema.c
	+++ src/schema.c
	@@ -522,17 +522,17 @@
522	#endif
523
524	/*
525	** The schema for the local FOSSIL database file found at the root
526	** of every check-out. This database contains the complete state of
527	** the check-out. See also the addendum in zLocalSchemaVmerge[].
528	*/
529	const char zLocalSchema[] =
530	@ -- The VVAR table holds miscellanous information about the local database
531	@ -- in the form of name-value pairs. This is similar to the VAR table
532	@ -- table in the repository except that this table holds information that
533	@ -- is specific to the local check-out.
534	@ --
535	@ -- Important Variables:
536	@ --
537	@ -- repository Full pathname of the repository database
538	@ -- user-id Userid to use
	@@ -542,11 +542,11 @@
542	@ value CLOB, -- Content of the named parameter
543	@ CHECK( typeof(name)='text' AND length(name)>=1 )
544	@ );
545	@
546	@ -- Each entry in the vfile table represents a single file in the
547	@ -- current check-out.
548	@ --
549	@ -- The file.rid field is 0 for files or folders that have been
550	@ -- added but not yet committed.
551	@ --
552	@ -- Vfile.chnged meaning:
	@@ -555,12 +555,12 @@
555	@ -- 2 Replaced by a merge command
556	@ -- 3 Added by a merge command
557	@ -- 4,5 Same as 2,3 except merge using --integrate
558	@ --
559	@ CREATE TABLE vfile(
560	@ id INTEGER PRIMARY KEY, -- ID of the checked-out file
561	@ vid INTEGER REFERENCES blob, -- The check-in this file is part of.
562	@ chnged INT DEFAULT 0, -- 0:unchng 1:edit 2:m-chng 3:m-add 4:i-chng 5:i-add
563	@ deleted BOOLEAN DEFAULT 0, -- True if deleted
564	@ isexe BOOLEAN, -- True if file should be executable
565	@ islink BOOLEAN, -- True if file should be symlink
566	@ rid INTEGER, -- Originally from this repository record
	@@ -605,11 +605,11 @@
605	@ -- a NOT NULL constraint to be silently ignored.
606	@
607	@ CREATE TRIGGER vmerge_ck1 AFTER INSERT ON vmerge
608	@ WHEN new.mhash IS NULL BEGIN
609	@ SELECT raise(FAIL,
610	@ 'trying to update a newer check-out with an older version of Fossil');
611	@ END;
612	@
613	;
614
615	/*
616

M src/setup.c

+2 -2

		--- src/setup.c
		+++ src/setup.c
		@@ -1240,15 +1240,15 @@
1240	1240	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
1241	1241	"wiki-about", "wiki-about", 1, 0);
1242	1242	@ <p>
1243	1243	@ Associate wiki pages with branches, tags, or checkins, based on
1244	1244	@ the wiki page name. Wiki pages that begin with "branch/", "checkin/"
1245		- @ or "tag/" and which continue with the name of an existing branch, checkin
	1245	+ @ or "tag/" and which continue with the name of an existing branch, check-in
1246	1246	@ or tag are treated specially when this feature is enabled.
1247	1247	@ <ul>
1248	1248	@ <li> <b>branch/</b><i>branch-name</i>
1249		- @ <li> <b>checkin/</b><i>full-checkin-hash</i>
	1249	+ @ <li> <b>checkin/</b><i>full-check-in-hash</i>
1250	1250	@ <li> <b>tag/</b><i>tag-name</i>
1251	1251	@ </ul>
1252	1252	@ (Property: "wiki-about")</p>
1253	1253	@ <hr />
1254	1254	entry_attribute("Allow Unsafe HTML In Markdown", 6,
1255	1255

	--- src/setup.c
	+++ src/setup.c
	@@ -1240,15 +1240,15 @@
1240	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
1241	"wiki-about", "wiki-about", 1, 0);
1242	@ <p>
1243	@ Associate wiki pages with branches, tags, or checkins, based on
1244	@ the wiki page name. Wiki pages that begin with "branch/", "checkin/"
1245	@ or "tag/" and which continue with the name of an existing branch, checkin
1246	@ or tag are treated specially when this feature is enabled.
1247	@ <ul>
1248	@ <li> <b>branch/</b><i>branch-name</i>
1249	@ <li> <b>checkin/</b><i>full-checkin-hash</i>
1250	@ <li> <b>tag/</b><i>tag-name</i>
1251	@ </ul>
1252	@ (Property: "wiki-about")</p>
1253	@ <hr />
1254	entry_attribute("Allow Unsafe HTML In Markdown", 6,
1255

	--- src/setup.c
	+++ src/setup.c
	@@ -1240,15 +1240,15 @@
1240	onoff_attribute("Associate Wiki Pages With Branches, Tags, or Checkins",
1241	"wiki-about", "wiki-about", 1, 0);
1242	@ <p>
1243	@ Associate wiki pages with branches, tags, or checkins, based on
1244	@ the wiki page name. Wiki pages that begin with "branch/", "checkin/"
1245	@ or "tag/" and which continue with the name of an existing branch, check-in
1246	@ or tag are treated specially when this feature is enabled.
1247	@ <ul>
1248	@ <li> <b>branch/</b><i>branch-name</i>
1249	@ <li> <b>checkin/</b><i>full-check-in-hash</i>
1250	@ <li> <b>tag/</b><i>tag-name</i>
1251	@ </ul>
1252	@ (Property: "wiki-about")</p>
1253	@ <hr />
1254	entry_attribute("Allow Unsafe HTML In Markdown", 6,
1255

M src/stash.c

+5 -5

		--- src/stash.c
		+++ src/stash.c
		@@ -256,11 +256,11 @@
256	256	** files.
257	257	*/
258	258	static int stash_create(void){
259	259	const char zComment; / Comment to add to the stash */
260	260	int stashid; /* ID of the new stash */
261		- int vid; /* Current checkout */
	261	+ int vid; /* Current check-out */
262	262
263	263	zComment = find_option("comment", "m", 1);
264	264	verify_all_options();
265	265	if( zComment==0 ){
266	266	Blob prompt; /* Prompt for stash comment */
		@@ -301,11 +301,11 @@
301	301	}
302	302	return stashid;
303	303	}
304	304
305	305	/*
306		-** Apply a stash to the current checkout.
	306	+** Apply a stash to the current check-out.
307	307	*/
308	308	static void stash_apply(int stashid, int nConflict){
309	309	int vid;
310	310	Stmt q;
311	311	db_prepare(&q,
		@@ -513,11 +513,11 @@
513	513	** Save the current changes in the working tree as a new stash.
514	514	** Then revert the changes back to the last check-in. If FILES
515	515	** are listed, then only stash and revert the named files. The
516	516	** "save" verb can be omitted if and only if there are no other
517	517	** arguments. The "snapshot" verb works the same as "save" but
518		-** omits the revert, keeping the checkout unchanged.
	518	+** omits the revert, keeping the check-out unchanged.
519	519	**
520	520	** > fossil stash list\|ls ?-v\|--verbose? ?-W\|--width NUM?
521	521	**
522	522	** List all changes sets currently stashed. Show information about
523	523	** individual files in each changeset if -v or --verbose is used.
		@@ -531,17 +531,17 @@
531	531	**
532	532	** > fossil stash pop
533	533	** > fossil stash apply ?STASHID?
534	534	**
535	535	** Apply STASHID or the most recently created stash to the current
536		-** working checkout. The "pop" command deletes that changeset from
	536	+** working check-out. The "pop" command deletes that changeset from
537	537	** the stash after applying it but the "apply" command retains the
538	538	** changeset.
539	539	**
540	540	** > fossil stash goto ?STASHID?
541	541	**
542		-** Update to the baseline checkout for STASHID then apply the
	542	+** Update to the baseline check-out for STASHID then apply the
543	543	** changes of STASHID. Keep STASHID so that it can be reused
544	544	** This command is undoable.
545	545	**
546	546	** > fossil stash drop\|rm ?STASHID? ?-a\|--all?
547	547	**
548	548

	--- src/stash.c
	+++ src/stash.c
	@@ -256,11 +256,11 @@
256	** files.
257	*/
258	static int stash_create(void){
259	const char zComment; / Comment to add to the stash */
260	int stashid; /* ID of the new stash */
261	int vid; /* Current checkout */
262
263	zComment = find_option("comment", "m", 1);
264	verify_all_options();
265	if( zComment==0 ){
266	Blob prompt; /* Prompt for stash comment */
	@@ -301,11 +301,11 @@
301	}
302	return stashid;
303	}
304
305	/*
306	** Apply a stash to the current checkout.
307	*/
308	static void stash_apply(int stashid, int nConflict){
309	int vid;
310	Stmt q;
311	db_prepare(&q,
	@@ -513,11 +513,11 @@
513	** Save the current changes in the working tree as a new stash.
514	** Then revert the changes back to the last check-in. If FILES
515	** are listed, then only stash and revert the named files. The
516	** "save" verb can be omitted if and only if there are no other
517	** arguments. The "snapshot" verb works the same as "save" but
518	** omits the revert, keeping the checkout unchanged.
519	**
520	** > fossil stash list\|ls ?-v\|--verbose? ?-W\|--width NUM?
521	**
522	** List all changes sets currently stashed. Show information about
523	** individual files in each changeset if -v or --verbose is used.
	@@ -531,17 +531,17 @@
531	**
532	** > fossil stash pop
533	** > fossil stash apply ?STASHID?
534	**
535	** Apply STASHID or the most recently created stash to the current
536	** working checkout. The "pop" command deletes that changeset from
537	** the stash after applying it but the "apply" command retains the
538	** changeset.
539	**
540	** > fossil stash goto ?STASHID?
541	**
542	** Update to the baseline checkout for STASHID then apply the
543	** changes of STASHID. Keep STASHID so that it can be reused
544	** This command is undoable.
545	**
546	** > fossil stash drop\|rm ?STASHID? ?-a\|--all?
547	**
548

	--- src/stash.c
	+++ src/stash.c
	@@ -256,11 +256,11 @@
256	** files.
257	*/
258	static int stash_create(void){
259	const char zComment; / Comment to add to the stash */
260	int stashid; /* ID of the new stash */
261	int vid; /* Current check-out */
262
263	zComment = find_option("comment", "m", 1);
264	verify_all_options();
265	if( zComment==0 ){
266	Blob prompt; /* Prompt for stash comment */
	@@ -301,11 +301,11 @@
301	}
302	return stashid;
303	}
304
305	/*
306	** Apply a stash to the current check-out.
307	*/
308	static void stash_apply(int stashid, int nConflict){
309	int vid;
310	Stmt q;
311	db_prepare(&q,
	@@ -513,11 +513,11 @@
513	** Save the current changes in the working tree as a new stash.
514	** Then revert the changes back to the last check-in. If FILES
515	** are listed, then only stash and revert the named files. The
516	** "save" verb can be omitted if and only if there are no other
517	** arguments. The "snapshot" verb works the same as "save" but
518	** omits the revert, keeping the check-out unchanged.
519	**
520	** > fossil stash list\|ls ?-v\|--verbose? ?-W\|--width NUM?
521	**
522	** List all changes sets currently stashed. Show information about
523	** individual files in each changeset if -v or --verbose is used.
	@@ -531,17 +531,17 @@
531	**
532	** > fossil stash pop
533	** > fossil stash apply ?STASHID?
534	**
535	** Apply STASHID or the most recently created stash to the current
536	** working check-out. The "pop" command deletes that changeset from
537	** the stash after applying it but the "apply" command retains the
538	** changeset.
539	**
540	** > fossil stash goto ?STASHID?
541	**
542	** Update to the baseline check-out for STASHID then apply the
543	** changes of STASHID. Keep STASHID so that it can be reused
544	** This command is undoable.
545	**
546	** > fossil stash drop\|rm ?STASHID? ?-a\|--all?
547	**
548

M src/sync.c

+5 -5

		--- src/sync.c
		+++ src/sync.c
		@@ -105,11 +105,11 @@
105	105	** If the repository is configured for autosyncing, then do an
106	106	** autosync. Bits of the "flags" parameter determine details of behavior:
107	107	**
108	108	** SYNC_PULL Pull content from the server to the local repo
109	109	** SYNC_PUSH Push content from local up to the server
110		-** SYNC_CKIN_LOCK Take a check-in lock on the current checkout.
	110	+** SYNC_CKIN_LOCK Take a check-in lock on the current check-out.
111	111	** SYNC_VERBOSE Extra output
112	112	**
113	113	** Return the number of errors.
114	114	**
115	115	** The autosync setting can be a boolean or "pullonly". No autosync
		@@ -512,13 +512,13 @@
512	512	**
513	513	** Delete a named URL previously created by the "add" subcommand.
514	514	**
515	515	** > fossil remote hyperlink ?FILENAME? ?LINENUM? ?LINENUM?
516	516	**
517		-** Print a URL that will access the current checkout on the remote
	517	+** Print a URL that will access the current check-out on the remote
518	518	** repository. Or if the FILENAME argument is included, print the
519		-** URL to access that particular file within the current checkout.
	519	+** URL to access that particular file within the current check-out.
520	520	** If one or two linenumber arguments are provided after the filename,
521	521	** then the URL is for the line or range of lines specified.
522	522	**
523	523	** > fossil remote list\|ls
524	524	**
		@@ -546,11 +546,11 @@
546	546	** password the next time it is needed.
547	547	**
548	548	** > fossil remote ui ?FILENAME? ?LINENUM? ?LINENUM?
549	549	**
550	550	** Bring up a web browser pointing at the remote repository, and
551		-** specifically to the page that describes the current checkout
	551	+** specifically to the page that describes the current check-out
552	552	** on that remote repository. Or if FILENAME and/or LINENUM arguments
553	553	** are provided, to the specific file and range of lines. This
554	554	** command is similar to "fossil remote hyperlink" except that instead
555	555	** of printing the URL, it passes the URL off to the web browser.
556	556	**
		@@ -816,11 +816,11 @@
816	816	** directory. This backup is guaranteed to be consistent even if there are
817	817	** concurrent changes taking place on the repository. In other words, it
818	818	** is safe to run "fossil backup" on a repository that is in active use.
819	819	**
820	820	** Only the main repository database is backed up by this command. The
821		-** open checkout file (if any) is not saved. Nor is the global configuration
	821	+** open check-out file (if any) is not saved. Nor is the global configuration
822	822	** database.
823	823	**
824	824	** Options:
825	825	**
826	826	** --overwrite OK to overwrite an existing file
827	827

	--- src/sync.c
	+++ src/sync.c
	@@ -105,11 +105,11 @@
105	** If the repository is configured for autosyncing, then do an
106	** autosync. Bits of the "flags" parameter determine details of behavior:
107	**
108	** SYNC_PULL Pull content from the server to the local repo
109	** SYNC_PUSH Push content from local up to the server
110	** SYNC_CKIN_LOCK Take a check-in lock on the current checkout.
111	** SYNC_VERBOSE Extra output
112	**
113	** Return the number of errors.
114	**
115	** The autosync setting can be a boolean or "pullonly". No autosync
	@@ -512,13 +512,13 @@
512	**
513	** Delete a named URL previously created by the "add" subcommand.
514	**
515	** > fossil remote hyperlink ?FILENAME? ?LINENUM? ?LINENUM?
516	**
517	** Print a URL that will access the current checkout on the remote
518	** repository. Or if the FILENAME argument is included, print the
519	** URL to access that particular file within the current checkout.
520	** If one or two linenumber arguments are provided after the filename,
521	** then the URL is for the line or range of lines specified.
522	**
523	** > fossil remote list\|ls
524	**
	@@ -546,11 +546,11 @@
546	** password the next time it is needed.
547	**
548	** > fossil remote ui ?FILENAME? ?LINENUM? ?LINENUM?
549	**
550	** Bring up a web browser pointing at the remote repository, and
551	** specifically to the page that describes the current checkout
552	** on that remote repository. Or if FILENAME and/or LINENUM arguments
553	** are provided, to the specific file and range of lines. This
554	** command is similar to "fossil remote hyperlink" except that instead
555	** of printing the URL, it passes the URL off to the web browser.
556	**
	@@ -816,11 +816,11 @@
816	** directory. This backup is guaranteed to be consistent even if there are
817	** concurrent changes taking place on the repository. In other words, it
818	** is safe to run "fossil backup" on a repository that is in active use.
819	**
820	** Only the main repository database is backed up by this command. The
821	** open checkout file (if any) is not saved. Nor is the global configuration
822	** database.
823	**
824	** Options:
825	**
826	** --overwrite OK to overwrite an existing file
827

	--- src/sync.c
	+++ src/sync.c
	@@ -105,11 +105,11 @@
105	** If the repository is configured for autosyncing, then do an
106	** autosync. Bits of the "flags" parameter determine details of behavior:
107	**
108	** SYNC_PULL Pull content from the server to the local repo
109	** SYNC_PUSH Push content from local up to the server
110	** SYNC_CKIN_LOCK Take a check-in lock on the current check-out.
111	** SYNC_VERBOSE Extra output
112	**
113	** Return the number of errors.
114	**
115	** The autosync setting can be a boolean or "pullonly". No autosync
	@@ -512,13 +512,13 @@
512	**
513	** Delete a named URL previously created by the "add" subcommand.
514	**
515	** > fossil remote hyperlink ?FILENAME? ?LINENUM? ?LINENUM?
516	**
517	** Print a URL that will access the current check-out on the remote
518	** repository. Or if the FILENAME argument is included, print the
519	** URL to access that particular file within the current check-out.
520	** If one or two linenumber arguments are provided after the filename,
521	** then the URL is for the line or range of lines specified.
522	**
523	** > fossil remote list\|ls
524	**
	@@ -546,11 +546,11 @@
546	** password the next time it is needed.
547	**
548	** > fossil remote ui ?FILENAME? ?LINENUM? ?LINENUM?
549	**
550	** Bring up a web browser pointing at the remote repository, and
551	** specifically to the page that describes the current check-out
552	** on that remote repository. Or if FILENAME and/or LINENUM arguments
553	** are provided, to the specific file and range of lines. This
554	** command is similar to "fossil remote hyperlink" except that instead
555	** of printing the URL, it passes the URL off to the web browser.
556	**
	@@ -816,11 +816,11 @@
816	** directory. This backup is guaranteed to be consistent even if there are
817	** concurrent changes taking place on the repository. In other words, it
818	** is safe to run "fossil backup" on a repository that is in active use.
819	**
820	** Only the main repository database is backed up by this command. The
821	** open check-out file (if any) is not saved. Nor is the global configuration
822	** database.
823	**
824	** Options:
825	**
826	** --overwrite OK to overwrite an existing file
827

M src/tag.c

+1 -1

		--- src/tag.c
		+++ src/tag.c
		@@ -395,11 +395,11 @@
395	395	** Run various subcommands to control tags and properties.
396	396	**
397	397	** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE?
398	398	**
399	399	** Add a new tag or property to an artifact referenced by
400		-** ARTIFACT-ID. For checkins, the tag will be usable instead
	400	+** ARTIFACT-ID. For check-ins, the tag will be usable instead
401	401	** of a CHECK-IN in commands such as update and merge. If the
402	402	** --propagate flag is present and ARTIFACT-ID refers to a
403	403	** wiki page, forum post, technote, or check-in, the tag
404	404	** propagates to all descendants of that artifact.
405	405	**
406	406

	--- src/tag.c
	+++ src/tag.c
	@@ -395,11 +395,11 @@
395	** Run various subcommands to control tags and properties.
396	**
397	** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE?
398	**
399	** Add a new tag or property to an artifact referenced by
400	** ARTIFACT-ID. For checkins, the tag will be usable instead
401	** of a CHECK-IN in commands such as update and merge. If the
402	** --propagate flag is present and ARTIFACT-ID refers to a
403	** wiki page, forum post, technote, or check-in, the tag
404	** propagates to all descendants of that artifact.
405	**
406

	--- src/tag.c
	+++ src/tag.c
	@@ -395,11 +395,11 @@
395	** Run various subcommands to control tags and properties.
396	**
397	** > fossil tag add ?OPTIONS? TAGNAME ARTIFACT-ID ?VALUE?
398	**
399	** Add a new tag or property to an artifact referenced by
400	** ARTIFACT-ID. For check-ins, the tag will be usable instead
401	** of a CHECK-IN in commands such as update and merge. If the
402	** --propagate flag is present and ARTIFACT-ID refers to a
403	** wiki page, forum post, technote, or check-in, the tag
404	** propagates to all descendants of that artifact.
405	**
406

M src/tar.c

+2 -2

		--- src/tar.c
		+++ src/tar.c
		@@ -465,11 +465,11 @@
465	465	** politely expands into a subdir instead of filling your current dir
466	466	** with source files. For example, pass an artifact hash or "ProjectName".
467	467	**
468	468	*/
469	469	void tarball_of_checkin(
470		- int rid, /* The RID of the checkin from which to form a tarball */
	470	+ int rid, /* The RID of the check-in from which to form a tarball*/
471	471	Blob pTar, / Write the tarball into this blob */
472	472	const char zDir, / Directory prefix for all file added to tarball */
473	473	Glob pInclude, / Only add files matching this pattern */
474	474	Glob pExclude, / Exclude files matching this pattern */
475	475	int listFlag /* Show filenames on stdout */
		@@ -676,11 +676,11 @@
676	676	}
677	677
678	678	/*
679	679	** Check to see if the input string is of the form:
680	680	**
681		-** checkin-name/filename.ext
	681	+** check-in-name/filename.ext
682	682	**
683	683	** In other words, check to see if the input contains a single '/'
684	684	** character that separates a valid check-in name from a filename.
685	685	**
686	686	** If the condition is true, return the check-in name and set the
687	687

	--- src/tar.c
	+++ src/tar.c
	@@ -465,11 +465,11 @@
465	** politely expands into a subdir instead of filling your current dir
466	** with source files. For example, pass an artifact hash or "ProjectName".
467	**
468	*/
469	void tarball_of_checkin(
470	int rid, /* The RID of the checkin from which to form a tarball */
471	Blob pTar, / Write the tarball into this blob */
472	const char zDir, / Directory prefix for all file added to tarball */
473	Glob pInclude, / Only add files matching this pattern */
474	Glob pExclude, / Exclude files matching this pattern */
475	int listFlag /* Show filenames on stdout */
	@@ -676,11 +676,11 @@
676	}
677
678	/*
679	** Check to see if the input string is of the form:
680	**
681	** checkin-name/filename.ext
682	**
683	** In other words, check to see if the input contains a single '/'
684	** character that separates a valid check-in name from a filename.
685	**
686	** If the condition is true, return the check-in name and set the
687

	--- src/tar.c
	+++ src/tar.c
	@@ -465,11 +465,11 @@
465	** politely expands into a subdir instead of filling your current dir
466	** with source files. For example, pass an artifact hash or "ProjectName".
467	**
468	*/
469	void tarball_of_checkin(
470	int rid, /* The RID of the check-in from which to form a tarball*/
471	Blob pTar, / Write the tarball into this blob */
472	const char zDir, / Directory prefix for all file added to tarball */
473	Glob pInclude, / Only add files matching this pattern */
474	Glob pExclude, / Exclude files matching this pattern */
475	int listFlag /* Show filenames on stdout */
	@@ -676,11 +676,11 @@
676	}
677
678	/*
679	** Check to see if the input string is of the form:
680	**
681	** check-in-name/filename.ext
682	**
683	** In other words, check to see if the input contains a single '/'
684	** character that separates a valid check-in name from a filename.
685	**
686	** If the condition is true, return the check-in name and set the
687

M src/th_main.c

+4 -4

		--- src/th_main.c
		+++ src/th_main.c
		@@ -156,11 +156,11 @@
156	156	/*
157	157	** - adopted from ls_cmd_rev in checkin.c
158	158	** - adopted commands/error handling for usage within th1
159	159	** - interface adopted to allow result creation as TH1 List
160	160	**
161		-** Takes a checkin identifier in zRev and an optiona glob pattern in zGLOB
	161	+** Takes a check-in identifier in zRev and an optiona glob pattern in zGLOB
162	162	** as parameter returns a TH list in pzList,pnList with filenames matching
163	163	** glob pattern with the checking
164	164	*/
165	165	static void dir_cmd_rev(
166	166	Th_Interp *interp,
		@@ -1267,13 +1267,13 @@
1267	1267	}
1268	1268
1269	1269	/*
1270	1270	** TH1 command: checkout ?BOOLEAN?
1271	1271	**
1272		-** Return the fully qualified directory name of the current checkout or an
	1272	+** Return the fully qualified directory name of the current check-out or an
1273	1273	** empty string if it is not available. Optionally, it will attempt to find
1274		-** the current checkout, opening the configuration ("user") database and the
	1274	+** the current check-out, opening the configuration ("user") database and the
1275	1275	** repository as necessary, if the boolean argument is non-zero.
1276	1276	*/
1277	1277	static int checkoutCmd(
1278	1278	Th_Interp *interp,
1279	1279	void *p,
		@@ -1322,11 +1322,11 @@
1322	1322	**
1323	1323	** Returns a string containing the value of the specified global state
1324	1324	** variable -OR- the specified default value. Currently, the supported
1325	1325	** items are:
1326	1326	**
1327		-** "checkout" = The active local checkout directory, if any.
	1327	+** "checkout" = The active local check-out directory, if any.
1328	1328	** "configuration" = The active configuration database file name,
1329	1329	** if any.
1330	1330	** "executable" = The fully qualified executable file name.
1331	1331	** "flags" = The TH1 initialization flags.
1332	1332	** "log" = The error log file name, if any.
1333	1333

	--- src/th_main.c
	+++ src/th_main.c
	@@ -156,11 +156,11 @@
156	/*
157	** - adopted from ls_cmd_rev in checkin.c
158	** - adopted commands/error handling for usage within th1
159	** - interface adopted to allow result creation as TH1 List
160	**
161	** Takes a checkin identifier in zRev and an optiona glob pattern in zGLOB
162	** as parameter returns a TH list in pzList,pnList with filenames matching
163	** glob pattern with the checking
164	*/
165	static void dir_cmd_rev(
166	Th_Interp *interp,
	@@ -1267,13 +1267,13 @@
1267	}
1268
1269	/*
1270	** TH1 command: checkout ?BOOLEAN?
1271	**
1272	** Return the fully qualified directory name of the current checkout or an
1273	** empty string if it is not available. Optionally, it will attempt to find
1274	** the current checkout, opening the configuration ("user") database and the
1275	** repository as necessary, if the boolean argument is non-zero.
1276	*/
1277	static int checkoutCmd(
1278	Th_Interp *interp,
1279	void *p,
	@@ -1322,11 +1322,11 @@
1322	**
1323	** Returns a string containing the value of the specified global state
1324	** variable -OR- the specified default value. Currently, the supported
1325	** items are:
1326	**
1327	** "checkout" = The active local checkout directory, if any.
1328	** "configuration" = The active configuration database file name,
1329	** if any.
1330	** "executable" = The fully qualified executable file name.
1331	** "flags" = The TH1 initialization flags.
1332	** "log" = The error log file name, if any.
1333

	--- src/th_main.c
	+++ src/th_main.c
	@@ -156,11 +156,11 @@
156	/*
157	** - adopted from ls_cmd_rev in checkin.c
158	** - adopted commands/error handling for usage within th1
159	** - interface adopted to allow result creation as TH1 List
160	**
161	** Takes a check-in identifier in zRev and an optiona glob pattern in zGLOB
162	** as parameter returns a TH list in pzList,pnList with filenames matching
163	** glob pattern with the checking
164	*/
165	static void dir_cmd_rev(
166	Th_Interp *interp,
	@@ -1267,13 +1267,13 @@
1267	}
1268
1269	/*
1270	** TH1 command: checkout ?BOOLEAN?
1271	**
1272	** Return the fully qualified directory name of the current check-out or an
1273	** empty string if it is not available. Optionally, it will attempt to find
1274	** the current check-out, opening the configuration ("user") database and the
1275	** repository as necessary, if the boolean argument is non-zero.
1276	*/
1277	static int checkoutCmd(
1278	Th_Interp *interp,
1279	void *p,
	@@ -1322,11 +1322,11 @@
1322	**
1323	** Returns a string containing the value of the specified global state
1324	** variable -OR- the specified default value. Currently, the supported
1325	** items are:
1326	**
1327	** "checkout" = The active local check-out directory, if any.
1328	** "configuration" = The active configuration database file name,
1329	** if any.
1330	** "executable" = The fully qualified executable file name.
1331	** "flags" = The TH1 initialization flags.
1332	** "log" = The error log file name, if any.
1333

M src/timeline.c

+5 -5

		--- src/timeline.c
		+++ src/timeline.c
		@@ -182,11 +182,11 @@
182	182	int prevWasDivider = 0; /* True if previous output row was <hr> */
183	183	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
184	184	Stmt fchngQuery; /* Query for file changes on check-ins */
185	185	static Stmt qbranch;
186	186	int pendingEndTr = 0; /* True if a </td></tr> is needed */
187		- int vid = 0; /* Current checkout version */
	187	+ int vid = 0; /* Current check-out version */
188	188	int dateFormat = 0; /* 0: HH:MM (default) */
189	189	int bCommentGitStyle = 0; /* Only show comments through first blank line */
190	190	const char zStyle; / Sub-name for classes for the style */
191	191	const char *zDateFmt;
192	192	int iTableId = timeline_tableid();
		@@ -3138,11 +3138,11 @@
3138	3138	** zero, no limit. Default is -20 meaning 20 lines.
3139	3139	** --offset P Skip P changes
3140	3140	** -p\|--path PATH Output items affecting PATH only.
3141	3141	** PATH can be a file or a sub directory.
3142	3142	** -R REPO_FILE Specifies the repository db to use. Default is
3143		-** the current checkout's repository.
	3143	+** the current check-out's repository.
3144	3144	** --sql Show the SQL used to generate the timeline
3145	3145	** -t\|--type TYPE Output items from the given types only, such as:
3146	3146	** ci = file commits only
3147	3147	** e = technical notes only
3148	3148	** f = forum posts only
		@@ -3188,11 +3188,11 @@
3188	3188	zFilePattern = find_option("path","p",1);
3189	3189	zFormat = find_option("format","F",1);
3190	3190	zBr = find_option("branch","b",1);
3191	3191	if( find_option("current-branch","c",0)!=0 ){
3192	3192	if( !g.localOpen ){
3193		- fossil_fatal("not within an open checkout");
	3193	+ fossil_fatal("not within an open check-out");
3194	3194	}else{
3195	3195	int vid = db_lget_int("checkout", 0);
3196	3196	zBr = db_text(0, "SELECT value FROM tagxref WHERE rid=%d AND tagid=%d",
3197	3197	vid, TAG_BRANCH);
3198	3198	}
		@@ -3264,11 +3264,11 @@
3264	3264	fossil_fatal("cannot compute descendants or ancestors of a date");
3265	3265	}
3266	3266	zDate = mprintf("(SELECT datetime('now'))");
3267	3267	}else if( strncmp(zOrigin, "current", k)==0 ){
3268	3268	if( !g.localOpen ){
3269		- fossil_fatal("must be within a local checkout to use 'current'");
	3269	+ fossil_fatal("must be within a local check-out to use 'current'");
3270	3270	}
3271	3271	objid = db_lget_int("checkout",0);
3272	3272	zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
3273	3273	}else if( fossil_is_julianday(zOrigin) ){
3274	3274	const char *zShift = "";
		@@ -3351,11 +3351,11 @@
3351	3351	" SELECT srcid FROM tagxref WHERE origid IN (\n"
3352	3352	" SELECT rid FROM tagxref NATURAL JOIN tag\n"
3353	3353	" WHERE tagname='sym-%q')\n"
3354	3354	" UNION\n" /* Branch wikis */
3355	3355	" SELECT objid FROM event WHERE comment LIKE '_branch/%q'\n"
3356		- " UNION\n" /* Checkin wikis */
	3356	+ " UNION\n" /* Check-in wikis */
3357	3357	" SELECT e.objid FROM event e\n"
3358	3358	" INNER JOIN blob b ON b.uuid=substr(e.comment, 10)\n"
3359	3359	" AND e.comment LIKE '_checkin/%%'\n"
3360	3360	" LEFT JOIN tagxref tx ON tx.rid=b.rid AND tx.tagid=%d\n"
3361	3361	" WHERE tx.value='%q'\n"
3362	3362

	--- src/timeline.c
	+++ src/timeline.c
	@@ -182,11 +182,11 @@
182	int prevWasDivider = 0; /* True if previous output row was <hr> */
183	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
184	Stmt fchngQuery; /* Query for file changes on check-ins */
185	static Stmt qbranch;
186	int pendingEndTr = 0; /* True if a </td></tr> is needed */
187	int vid = 0; /* Current checkout version */
188	int dateFormat = 0; /* 0: HH:MM (default) */
189	int bCommentGitStyle = 0; /* Only show comments through first blank line */
190	const char zStyle; / Sub-name for classes for the style */
191	const char *zDateFmt;
192	int iTableId = timeline_tableid();
	@@ -3138,11 +3138,11 @@
3138	** zero, no limit. Default is -20 meaning 20 lines.
3139	** --offset P Skip P changes
3140	** -p\|--path PATH Output items affecting PATH only.
3141	** PATH can be a file or a sub directory.
3142	** -R REPO_FILE Specifies the repository db to use. Default is
3143	** the current checkout's repository.
3144	** --sql Show the SQL used to generate the timeline
3145	** -t\|--type TYPE Output items from the given types only, such as:
3146	** ci = file commits only
3147	** e = technical notes only
3148	** f = forum posts only
	@@ -3188,11 +3188,11 @@
3188	zFilePattern = find_option("path","p",1);
3189	zFormat = find_option("format","F",1);
3190	zBr = find_option("branch","b",1);
3191	if( find_option("current-branch","c",0)!=0 ){
3192	if( !g.localOpen ){
3193	fossil_fatal("not within an open checkout");
3194	}else{
3195	int vid = db_lget_int("checkout", 0);
3196	zBr = db_text(0, "SELECT value FROM tagxref WHERE rid=%d AND tagid=%d",
3197	vid, TAG_BRANCH);
3198	}
	@@ -3264,11 +3264,11 @@
3264	fossil_fatal("cannot compute descendants or ancestors of a date");
3265	}
3266	zDate = mprintf("(SELECT datetime('now'))");
3267	}else if( strncmp(zOrigin, "current", k)==0 ){
3268	if( !g.localOpen ){
3269	fossil_fatal("must be within a local checkout to use 'current'");
3270	}
3271	objid = db_lget_int("checkout",0);
3272	zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
3273	}else if( fossil_is_julianday(zOrigin) ){
3274	const char *zShift = "";
	@@ -3351,11 +3351,11 @@
3351	" SELECT srcid FROM tagxref WHERE origid IN (\n"
3352	" SELECT rid FROM tagxref NATURAL JOIN tag\n"
3353	" WHERE tagname='sym-%q')\n"
3354	" UNION\n" /* Branch wikis */
3355	" SELECT objid FROM event WHERE comment LIKE '_branch/%q'\n"
3356	" UNION\n" /* Checkin wikis */
3357	" SELECT e.objid FROM event e\n"
3358	" INNER JOIN blob b ON b.uuid=substr(e.comment, 10)\n"
3359	" AND e.comment LIKE '_checkin/%%'\n"
3360	" LEFT JOIN tagxref tx ON tx.rid=b.rid AND tx.tagid=%d\n"
3361	" WHERE tx.value='%q'\n"
3362

	--- src/timeline.c
	+++ src/timeline.c
	@@ -182,11 +182,11 @@
182	int prevWasDivider = 0; /* True if previous output row was <hr> */
183	int fchngQueryInit = 0; /* True if fchngQuery is initialized */
184	Stmt fchngQuery; /* Query for file changes on check-ins */
185	static Stmt qbranch;
186	int pendingEndTr = 0; /* True if a </td></tr> is needed */
187	int vid = 0; /* Current check-out version */
188	int dateFormat = 0; /* 0: HH:MM (default) */
189	int bCommentGitStyle = 0; /* Only show comments through first blank line */
190	const char zStyle; / Sub-name for classes for the style */
191	const char *zDateFmt;
192	int iTableId = timeline_tableid();
	@@ -3138,11 +3138,11 @@
3138	** zero, no limit. Default is -20 meaning 20 lines.
3139	** --offset P Skip P changes
3140	** -p\|--path PATH Output items affecting PATH only.
3141	** PATH can be a file or a sub directory.
3142	** -R REPO_FILE Specifies the repository db to use. Default is
3143	** the current check-out's repository.
3144	** --sql Show the SQL used to generate the timeline
3145	** -t\|--type TYPE Output items from the given types only, such as:
3146	** ci = file commits only
3147	** e = technical notes only
3148	** f = forum posts only
	@@ -3188,11 +3188,11 @@
3188	zFilePattern = find_option("path","p",1);
3189	zFormat = find_option("format","F",1);
3190	zBr = find_option("branch","b",1);
3191	if( find_option("current-branch","c",0)!=0 ){
3192	if( !g.localOpen ){
3193	fossil_fatal("not within an open check-out");
3194	}else{
3195	int vid = db_lget_int("checkout", 0);
3196	zBr = db_text(0, "SELECT value FROM tagxref WHERE rid=%d AND tagid=%d",
3197	vid, TAG_BRANCH);
3198	}
	@@ -3264,11 +3264,11 @@
3264	fossil_fatal("cannot compute descendants or ancestors of a date");
3265	}
3266	zDate = mprintf("(SELECT datetime('now'))");
3267	}else if( strncmp(zOrigin, "current", k)==0 ){
3268	if( !g.localOpen ){
3269	fossil_fatal("must be within a local check-out to use 'current'");
3270	}
3271	objid = db_lget_int("checkout",0);
3272	zDate = mprintf("(SELECT mtime FROM plink WHERE cid=%d)", objid);
3273	}else if( fossil_is_julianday(zOrigin) ){
3274	const char *zShift = "";
	@@ -3351,11 +3351,11 @@
3351	" SELECT srcid FROM tagxref WHERE origid IN (\n"
3352	" SELECT rid FROM tagxref NATURAL JOIN tag\n"
3353	" WHERE tagname='sym-%q')\n"
3354	" UNION\n" /* Branch wikis */
3355	" SELECT objid FROM event WHERE comment LIKE '_branch/%q'\n"
3356	" UNION\n" /* Check-in wikis */
3357	" SELECT e.objid FROM event e\n"
3358	" INNER JOIN blob b ON b.uuid=substr(e.comment, 10)\n"
3359	" AND e.comment LIKE '_checkin/%%'\n"
3360	" LEFT JOIN tagxref tx ON tx.rid=b.rid AND tx.tagid=%d\n"
3361	" WHERE tx.value='%q'\n"
3362

M src/tkt.c

+1 -1

		--- src/tkt.c
		+++ src/tkt.c
		@@ -1549,11 +1549,11 @@
1549	1549	int n;
1550	1550	const char *zUser;
1551	1551	const char *zDate;
1552	1552	const char *zTktUuid;
1553	1553
1554		- /* do some ints, we want to be inside a checkout */
	1554	+ /* do some ints, we want to be inside a check-out */
1555	1555	db_find_and_open_repository(0, 0);
1556	1556	user_select();
1557	1557
1558	1558	zUser = find_option("user-override",0,1);
1559	1559	if( zUser==0 ) zUser = login_name();
1560	1560

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1549,11 +1549,11 @@
1549	int n;
1550	const char *zUser;
1551	const char *zDate;
1552	const char *zTktUuid;
1553
1554	/* do some ints, we want to be inside a checkout */
1555	db_find_and_open_repository(0, 0);
1556	user_select();
1557
1558	zUser = find_option("user-override",0,1);
1559	if( zUser==0 ) zUser = login_name();
1560

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1549,11 +1549,11 @@
1549	int n;
1550	const char *zUser;
1551	const char *zDate;
1552	const char *zTktUuid;
1553
1554	/* do some ints, we want to be inside a check-out */
1555	db_find_and_open_repository(0, 0);
1556	user_select();
1557
1558	zUser = find_option("user-override",0,1);
1559	if( zUser==0 ) zUser = login_name();
1560

M src/undo.c

+1 -1

		--- src/undo.c
		+++ src/undo.c
		@@ -455,11 +455,11 @@
455	455	** prior to the last undoable command, or it might be a no-op. If in
456	456	** doubt about what the undo command will do, first run it with the -n
457	457	** option.
458	458	**
459	459	** A single level of undo/redo is supported. The undo/redo stack
460		-** is cleared by the commit and checkout commands. Other commands may
	460	+** is cleared by the commit and check-out commands. Other commands may
461	461	** or may not clear the undo stack.
462	462	**
463	463	** Future versions of Fossil might add new commands to the set of commands
464	464	** that are undoable.
465	465	**
466	466

	--- src/undo.c
	+++ src/undo.c
	@@ -455,11 +455,11 @@
455	** prior to the last undoable command, or it might be a no-op. If in
456	** doubt about what the undo command will do, first run it with the -n
457	** option.
458	**
459	** A single level of undo/redo is supported. The undo/redo stack
460	** is cleared by the commit and checkout commands. Other commands may
461	** or may not clear the undo stack.
462	**
463	** Future versions of Fossil might add new commands to the set of commands
464	** that are undoable.
465	**
466

	--- src/undo.c
	+++ src/undo.c
	@@ -455,11 +455,11 @@
455	** prior to the last undoable command, or it might be a no-op. If in
456	** doubt about what the undo command will do, first run it with the -n
457	** option.
458	**
459	** A single level of undo/redo is supported. The undo/redo stack
460	** is cleared by the commit and check-out commands. Other commands may
461	** or may not clear the undo stack.
462	**
463	** Future versions of Fossil might add new commands to the set of commands
464	** that are undoable.
465	**
466

M src/update.c

+25 -25

		--- src/update.c
		+++ src/update.c
		@@ -14,11 +14,11 @@
14	14	** http://www.hwaci.com/drh/
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to merge the changes in the current
19		-** checkout into a different version and switch to that version.
	19	+** check-out into a different version and switch to that version.
20	20	*/
21	21	#include "config.h"
22	22	#include "update.h"
23	23	#include <assert.h>
24	24
		@@ -62,12 +62,12 @@
62	62	/*
63	63	** COMMAND: update
64	64	**
65	65	** Usage: %fossil update ?OPTIONS? ?VERSION? ?FILES...?
66	66	**
67		-** Change the version of the current checkout to VERSION. Any
68		-** uncommitted changes are retained and applied to the new checkout.
	67	+** Change the version of the current check-out to VERSION. Any
	68	+** uncommitted changes are retained and applied to the new check-out.
69	69	**
70	70	** The VERSION argument can be a specific version or tag or branch
71	71	** name. If the VERSION argument is omitted, then the leaf of the
72	72	** subtree that begins at the current version is used, if there is
73	73	** only a single leaf. VERSION can also be "current" to select the
		@@ -78,18 +78,18 @@
78	78	** named files are candidates to be updated, and any updates to them
79	79	** will be treated as edits to the current version. Using a directory
80	80	** name for one of the FILES arguments is the same as using every
81	81	** subdirectory and file beneath that directory.
82	82	**
83		-** If FILES is omitted, all files in the current checkout are subject
84		-** to being updated and the version of the current checkout is changed
	83	+** If FILES is omitted, all files in the current check-out are subject
	84	+** to being updated and the version of the current check-out is changed
85	85	** to VERSION. Any uncommitted changes are retained and applied to the
86		-** new checkout.
	86	+** new check-out.
87	87	**
88	88	** The -n or --dry-run option causes this command to do a "dry run".
89	89	** It prints out what would have happened but does not actually make
90		-** any changes to the current checkout or the repository.
	90	+** any changes to the current check-out or the repository.
91	91	**
92	92	** The -v or --verbose option prints status information about
93	93	** unchanged files in addition to those file that actually do change.
94	94	**
95	95	** Options:
		@@ -103,11 +103,11 @@
103	103	** --latest Acceptable in place of VERSION, update to
104	104	** latest version
105	105	** --nosync Do not auto-sync prior to update
106	106	** --setmtime Set timestamps of all files to match their
107	107	** SCM-side times (the timestamp of the last
108		-** checkin which modified them).
	108	+** check-in which modified them).
109	109	** -v\|--verbose Print status information about all files
110	110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
111	111	** Must be more than 20 or 0 (= no limit,
112	112	** resulting in a single line per entry).
113	113	**
		@@ -252,11 +252,11 @@
252	252	};
253	253
254	254	/*
255	255	** The record.fn field is used to match files against each other. The
256	256	** FV table contains one row for each each unique filename in
257		- ** in the current checkout, the pivot, and the version being merged.
	257	+ ** in the current check-out, the pivot, and the version being merged.
258	258	*/
259	259	db_multi_exec(
260	260	"DROP TABLE IF EXISTS fv;"
261	261	"CREATE TEMP TABLE fv("
262	262	" fn TEXT %s PRIMARY KEY," /* The filename relative to root */
		@@ -389,11 +389,11 @@
389	389	db_multi_exec("%s", blob_sql_text(&sql));
390	390	blob_reset(&sql);
391	391	}
392	392
393	393	/*
394		- ** Alter the content of the checkout so that it conforms with the
	394	+ ** Alter the content of the check-out so that it conforms with the
395	395	** target
396	396	*/
397	397	db_prepare(&q,
398	398	"SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
399	399	" isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
		@@ -427,12 +427,12 @@
427	427	nUpdate++;
428	428	if( deleted ){
429	429	db_multi_exec("UPDATE vfile SET deleted=1 WHERE id=%d", idt);
430	430	}
431	431	if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
432		- /* Conflict. This file has been added to the current checkout
433		- ** but also exists in the target checkout. Use the current version.
	432	+ /* Conflict. This file has been added to the current check-out
	433	+ ** but also exists in the target check-out. Use the current version.
434	434	*/
435	435	fossil_print("CONFLICT %s\n", zName);
436	436	nConflict++;
437	437	}else if( idt>0 && idv==0 ){
438	438	/* File added in the target. */
		@@ -466,11 +466,11 @@
466	466	fossil_print("UPDATE %s\n", zName);
467	467	if( !dryRunFlag && !internalUpdate ) undo_save(zName);
468	468	if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
469	469	}else if( idt==0 && idv>0 ){
470	470	if( ridv==0 ){
471		- /* Added in current checkout. Continue to hold the file as
	471	+ /* Added in current check-out. Continue to hold the file as
472	472	** as an addition */
473	473	db_multi_exec("UPDATE vfile SET vid=%d WHERE id=%d", tid, idv);
474	474	}else if( chnged ){
475	475	/* Edited locally but deleted from the target. Do not track the
476	476	** file but keep the edited version around. */
		@@ -629,18 +629,18 @@
629	629	" WHERE (%Q\|\|name)<>%Q ORDER BY name DESC",
630	630	g.zLocalRoot, g.zLocalRoot, zPwd
631	631	);
632	632	fossil_free(zPwd);
633	633	if( g.argc<=3 ){
634		- /* All files updated. Shift the current checkout to the target. */
	634	+ /* All files updated. Shift the current check-out to the target. */
635	635	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid);
636	636	checkout_set_all_exe(tid);
637	637	manifest_to_disk(tid);
638	638	db_set_checkout(tid);
639	639	}else{
640	640	/* A subset of files have been checked out. Keep the current
641		- ** checkout unchanged. */
	641	+ ** check-out unchanged. */
642	642	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
643	643	}
644	644	if( !internalUpdate ) undo_finish();
645	645	if( setmtimeFlag ) vfile_check_signature(tid, CKSIG_SETMTIME);
646	646	db_end_transaction(0);
		@@ -696,11 +696,11 @@
696	696	fossil_free(zEmptyDirs);
697	697	}
698	698	}
699	699
700	700	/*
701		-** Get the manifest record for a given revision, or the current checkout if
	701	+** Get the manifest record for a given revision, or the current check-out if
702	702	** zRevision is NULL.
703	703	*/
704	704	Manifest *historical_manifest(
705	705	const char zRevision / The check-in to query, or NULL for current */
706	706	){
		@@ -716,23 +716,23 @@
716	716	vid = db_lget_int("checkout", 0);
717	717	if( !is_a_version(vid) ){
718	718	if( vid==0 ) return 0;
719	719	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
720	720	if( zRevision ){
721		- fossil_fatal("checkout artifact is not a check-in: %s", zRevision);
	721	+ fossil_fatal("check-out artifact is not a check-in: %s", zRevision);
722	722	}else{
723		- fossil_fatal("invalid checkout artifact ID: %d", vid);
	723	+ fossil_fatal("invalid check-out artifact ID: %d", vid);
724	724	}
725	725	}
726	726	}
727	727
728	728	/* Parse the manifest, given its artifact ID. Panic on failure. */
729	729	if( !(pManifest = manifest_get(vid, CFTYPE_MANIFEST, 0)) ){
730	730	if( zRevision ){
731	731	fossil_fatal("could not parse manifest for check-in: %s", zRevision);
732	732	}else{
733		- fossil_fatal("could not parse manifest for current checkout");
	733	+ fossil_fatal("could not parse manifest for current check-out");
734	734	}
735	735	}
736	736
737	737	/* Return the manifest pointer. The caller must use manifest_destroy() to
738	738	* clean up when finished using the manifest. */
		@@ -739,11 +739,11 @@
739	739	return pManifest;
740	740	}
741	741
742	742	/*
743	743	** Get the contents of a file within the check-in "zRevision". If
744		-** zRevision==NULL then get the file content for the current checkout.
	744	+** zRevision==NULL then get the file content for the current check-out.
745	745	*/
746	746	int historical_blob(
747	747	const char zRevision, / The check-in containing the file */
748	748	const char zFile, / Full treename of the file */
749	749	Blob pBlob, / Put the content here */
		@@ -813,15 +813,15 @@
813	813	** VERSION
814	814	**
815	815	** See also: [[redo]], [[undo]], [[checkout]], [[update]]
816	816	*/
817	817	void revert_cmd(void){
818		- Manifest pCoManifest; / Manifest of current checkout */
	818	+ Manifest pCoManifest; / Manifest of current check-out */
819	819	Manifest pRvManifest; / Manifest of selected revert version */
820		- ManifestFile pCoFile; / File within current checkout manifest */
	820	+ ManifestFile pCoFile; / File within current check-out manifest */
821	821	ManifestFile pRvFile; / File within revert version manifest */
822		- const char zFile; / Filename relative to checkout root */
	822	+ const char zFile; / Filename relative to check-out root */
823	823	const char zRevision; / Selected revert version, NULL if current */
824	824	Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */
825	825	int i;
826	826	Stmt q;
827	827	int revertAll = 0;
		@@ -838,11 +838,11 @@
838	838	fossil_fatal("directories or the entire tree can only be reverted"
839	839	" back to current version");
840	840	}
841	841	db_must_be_within_tree();
842	842
843		- /* Get manifests of revert version and (if different) current checkout. */
	843	+ /* Get manifests of revert version and (if different) current check-out. */
844	844	pRvManifest = historical_manifest(zRevision);
845	845	pCoManifest = zRevision ? historical_manifest(0) : 0;
846	846
847	847	db_begin_transaction();
848	848	undo_begin();
		@@ -958,11 +958,11 @@
958	958	}else{
959	959	sqlite3_int64 mtime;
960	960	int rvChnged = 0;
961	961	int rvPerm = manifest_file_mperm(pRvFile);
962	962
963		- /* Determine if reverted-to file is different than checked out file. */
	963	+ /* Determine if reverted-to file is different than checked-out file. */
964	964	if( pCoManifest && (pCoFile = manifest_file_find(pCoManifest, zFile)) ){
965	965	rvChnged = manifest_file_mperm(pRvFile)!=rvPerm
966	966	\|\| fossil_strcmp(pRvFile->zUuid, pCoFile->zUuid)!=0;
967	967	}
968	968
969	969

	--- src/update.c
	+++ src/update.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to merge the changes in the current
19	** checkout into a different version and switch to that version.
20	*/
21	#include "config.h"
22	#include "update.h"
23	#include <assert.h>
24
	@@ -62,12 +62,12 @@
62	/*
63	** COMMAND: update
64	**
65	** Usage: %fossil update ?OPTIONS? ?VERSION? ?FILES...?
66	**
67	** Change the version of the current checkout to VERSION. Any
68	** uncommitted changes are retained and applied to the new checkout.
69	**
70	** The VERSION argument can be a specific version or tag or branch
71	** name. If the VERSION argument is omitted, then the leaf of the
72	** subtree that begins at the current version is used, if there is
73	** only a single leaf. VERSION can also be "current" to select the
	@@ -78,18 +78,18 @@
78	** named files are candidates to be updated, and any updates to them
79	** will be treated as edits to the current version. Using a directory
80	** name for one of the FILES arguments is the same as using every
81	** subdirectory and file beneath that directory.
82	**
83	** If FILES is omitted, all files in the current checkout are subject
84	** to being updated and the version of the current checkout is changed
85	** to VERSION. Any uncommitted changes are retained and applied to the
86	** new checkout.
87	**
88	** The -n or --dry-run option causes this command to do a "dry run".
89	** It prints out what would have happened but does not actually make
90	** any changes to the current checkout or the repository.
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those file that actually do change.
94	**
95	** Options:
	@@ -103,11 +103,11 @@
103	** --latest Acceptable in place of VERSION, update to
104	** latest version
105	** --nosync Do not auto-sync prior to update
106	** --setmtime Set timestamps of all files to match their
107	** SCM-side times (the timestamp of the last
108	** checkin which modified them).
109	** -v\|--verbose Print status information about all files
110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
111	** Must be more than 20 or 0 (= no limit,
112	** resulting in a single line per entry).
113	**
	@@ -252,11 +252,11 @@
252	};
253
254	/*
255	** The record.fn field is used to match files against each other. The
256	** FV table contains one row for each each unique filename in
257	** in the current checkout, the pivot, and the version being merged.
258	*/
259	db_multi_exec(
260	"DROP TABLE IF EXISTS fv;"
261	"CREATE TEMP TABLE fv("
262	" fn TEXT %s PRIMARY KEY," /* The filename relative to root */
	@@ -389,11 +389,11 @@
389	db_multi_exec("%s", blob_sql_text(&sql));
390	blob_reset(&sql);
391	}
392
393	/*
394	** Alter the content of the checkout so that it conforms with the
395	** target
396	*/
397	db_prepare(&q,
398	"SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
399	" isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
	@@ -427,12 +427,12 @@
427	nUpdate++;
428	if( deleted ){
429	db_multi_exec("UPDATE vfile SET deleted=1 WHERE id=%d", idt);
430	}
431	if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
432	/* Conflict. This file has been added to the current checkout
433	** but also exists in the target checkout. Use the current version.
434	*/
435	fossil_print("CONFLICT %s\n", zName);
436	nConflict++;
437	}else if( idt>0 && idv==0 ){
438	/* File added in the target. */
	@@ -466,11 +466,11 @@
466	fossil_print("UPDATE %s\n", zName);
467	if( !dryRunFlag && !internalUpdate ) undo_save(zName);
468	if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
469	}else if( idt==0 && idv>0 ){
470	if( ridv==0 ){
471	/* Added in current checkout. Continue to hold the file as
472	** as an addition */
473	db_multi_exec("UPDATE vfile SET vid=%d WHERE id=%d", tid, idv);
474	}else if( chnged ){
475	/* Edited locally but deleted from the target. Do not track the
476	** file but keep the edited version around. */
	@@ -629,18 +629,18 @@
629	" WHERE (%Q\|\|name)<>%Q ORDER BY name DESC",
630	g.zLocalRoot, g.zLocalRoot, zPwd
631	);
632	fossil_free(zPwd);
633	if( g.argc<=3 ){
634	/* All files updated. Shift the current checkout to the target. */
635	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid);
636	checkout_set_all_exe(tid);
637	manifest_to_disk(tid);
638	db_set_checkout(tid);
639	}else{
640	/* A subset of files have been checked out. Keep the current
641	** checkout unchanged. */
642	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
643	}
644	if( !internalUpdate ) undo_finish();
645	if( setmtimeFlag ) vfile_check_signature(tid, CKSIG_SETMTIME);
646	db_end_transaction(0);
	@@ -696,11 +696,11 @@
696	fossil_free(zEmptyDirs);
697	}
698	}
699
700	/*
701	** Get the manifest record for a given revision, or the current checkout if
702	** zRevision is NULL.
703	*/
704	Manifest *historical_manifest(
705	const char zRevision / The check-in to query, or NULL for current */
706	){
	@@ -716,23 +716,23 @@
716	vid = db_lget_int("checkout", 0);
717	if( !is_a_version(vid) ){
718	if( vid==0 ) return 0;
719	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
720	if( zRevision ){
721	fossil_fatal("checkout artifact is not a check-in: %s", zRevision);
722	}else{
723	fossil_fatal("invalid checkout artifact ID: %d", vid);
724	}
725	}
726	}
727
728	/* Parse the manifest, given its artifact ID. Panic on failure. */
729	if( !(pManifest = manifest_get(vid, CFTYPE_MANIFEST, 0)) ){
730	if( zRevision ){
731	fossil_fatal("could not parse manifest for check-in: %s", zRevision);
732	}else{
733	fossil_fatal("could not parse manifest for current checkout");
734	}
735	}
736
737	/* Return the manifest pointer. The caller must use manifest_destroy() to
738	* clean up when finished using the manifest. */
	@@ -739,11 +739,11 @@
739	return pManifest;
740	}
741
742	/*
743	** Get the contents of a file within the check-in "zRevision". If
744	** zRevision==NULL then get the file content for the current checkout.
745	*/
746	int historical_blob(
747	const char zRevision, / The check-in containing the file */
748	const char zFile, / Full treename of the file */
749	Blob pBlob, / Put the content here */
	@@ -813,15 +813,15 @@
813	** VERSION
814	**
815	** See also: [[redo]], [[undo]], [[checkout]], [[update]]
816	*/
817	void revert_cmd(void){
818	Manifest pCoManifest; / Manifest of current checkout */
819	Manifest pRvManifest; / Manifest of selected revert version */
820	ManifestFile pCoFile; / File within current checkout manifest */
821	ManifestFile pRvFile; / File within revert version manifest */
822	const char zFile; / Filename relative to checkout root */
823	const char zRevision; / Selected revert version, NULL if current */
824	Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */
825	int i;
826	Stmt q;
827	int revertAll = 0;
	@@ -838,11 +838,11 @@
838	fossil_fatal("directories or the entire tree can only be reverted"
839	" back to current version");
840	}
841	db_must_be_within_tree();
842
843	/* Get manifests of revert version and (if different) current checkout. */
844	pRvManifest = historical_manifest(zRevision);
845	pCoManifest = zRevision ? historical_manifest(0) : 0;
846
847	db_begin_transaction();
848	undo_begin();
	@@ -958,11 +958,11 @@
958	}else{
959	sqlite3_int64 mtime;
960	int rvChnged = 0;
961	int rvPerm = manifest_file_mperm(pRvFile);
962
963	/* Determine if reverted-to file is different than checked out file. */
964	if( pCoManifest && (pCoFile = manifest_file_find(pCoManifest, zFile)) ){
965	rvChnged = manifest_file_mperm(pRvFile)!=rvPerm
966	\|\| fossil_strcmp(pRvFile->zUuid, pCoFile->zUuid)!=0;
967	}
968
969

	--- src/update.c
	+++ src/update.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to merge the changes in the current
19	** check-out into a different version and switch to that version.
20	*/
21	#include "config.h"
22	#include "update.h"
23	#include <assert.h>
24
	@@ -62,12 +62,12 @@
62	/*
63	** COMMAND: update
64	**
65	** Usage: %fossil update ?OPTIONS? ?VERSION? ?FILES...?
66	**
67	** Change the version of the current check-out to VERSION. Any
68	** uncommitted changes are retained and applied to the new check-out.
69	**
70	** The VERSION argument can be a specific version or tag or branch
71	** name. If the VERSION argument is omitted, then the leaf of the
72	** subtree that begins at the current version is used, if there is
73	** only a single leaf. VERSION can also be "current" to select the
	@@ -78,18 +78,18 @@
78	** named files are candidates to be updated, and any updates to them
79	** will be treated as edits to the current version. Using a directory
80	** name for one of the FILES arguments is the same as using every
81	** subdirectory and file beneath that directory.
82	**
83	** If FILES is omitted, all files in the current check-out are subject
84	** to being updated and the version of the current check-out is changed
85	** to VERSION. Any uncommitted changes are retained and applied to the
86	** new check-out.
87	**
88	** The -n or --dry-run option causes this command to do a "dry run".
89	** It prints out what would have happened but does not actually make
90	** any changes to the current check-out or the repository.
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those file that actually do change.
94	**
95	** Options:
	@@ -103,11 +103,11 @@
103	** --latest Acceptable in place of VERSION, update to
104	** latest version
105	** --nosync Do not auto-sync prior to update
106	** --setmtime Set timestamps of all files to match their
107	** SCM-side times (the timestamp of the last
108	** check-in which modified them).
109	** -v\|--verbose Print status information about all files
110	** -W\|--width WIDTH Width of lines (default is to auto-detect).
111	** Must be more than 20 or 0 (= no limit,
112	** resulting in a single line per entry).
113	**
	@@ -252,11 +252,11 @@
252	};
253
254	/*
255	** The record.fn field is used to match files against each other. The
256	** FV table contains one row for each each unique filename in
257	** in the current check-out, the pivot, and the version being merged.
258	*/
259	db_multi_exec(
260	"DROP TABLE IF EXISTS fv;"
261	"CREATE TEMP TABLE fv("
262	" fn TEXT %s PRIMARY KEY," /* The filename relative to root */
	@@ -389,11 +389,11 @@
389	db_multi_exec("%s", blob_sql_text(&sql));
390	blob_reset(&sql);
391	}
392
393	/*
394	** Alter the content of the check-out so that it conforms with the
395	** target
396	*/
397	db_prepare(&q,
398	"SELECT fn, idv, ridv, idt, ridt, chnged, fnt,"
399	" isexe, islinkv, islinkt, deleted FROM fv ORDER BY 1"
	@@ -427,12 +427,12 @@
427	nUpdate++;
428	if( deleted ){
429	db_multi_exec("UPDATE vfile SET deleted=1 WHERE id=%d", idt);
430	}
431	if( idv>0 && ridv==0 && idt>0 && ridt>0 ){
432	/* Conflict. This file has been added to the current check-out
433	** but also exists in the target check-out. Use the current version.
434	*/
435	fossil_print("CONFLICT %s\n", zName);
436	nConflict++;
437	}else if( idt>0 && idv==0 ){
438	/* File added in the target. */
	@@ -466,11 +466,11 @@
466	fossil_print("UPDATE %s\n", zName);
467	if( !dryRunFlag && !internalUpdate ) undo_save(zName);
468	if( !dryRunFlag ) vfile_to_disk(0, idt, 0, 0);
469	}else if( idt==0 && idv>0 ){
470	if( ridv==0 ){
471	/* Added in current check-out. Continue to hold the file as
472	** as an addition */
473	db_multi_exec("UPDATE vfile SET vid=%d WHERE id=%d", tid, idv);
474	}else if( chnged ){
475	/* Edited locally but deleted from the target. Do not track the
476	** file but keep the edited version around. */
	@@ -629,18 +629,18 @@
629	" WHERE (%Q\|\|name)<>%Q ORDER BY name DESC",
630	g.zLocalRoot, g.zLocalRoot, zPwd
631	);
632	fossil_free(zPwd);
633	if( g.argc<=3 ){
634	/* All files updated. Shift the current check-out to the target. */
635	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid);
636	checkout_set_all_exe(tid);
637	manifest_to_disk(tid);
638	db_set_checkout(tid);
639	}else{
640	/* A subset of files have been checked out. Keep the current
641	** check-out unchanged. */
642	db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
643	}
644	if( !internalUpdate ) undo_finish();
645	if( setmtimeFlag ) vfile_check_signature(tid, CKSIG_SETMTIME);
646	db_end_transaction(0);
	@@ -696,11 +696,11 @@
696	fossil_free(zEmptyDirs);
697	}
698	}
699
700	/*
701	** Get the manifest record for a given revision, or the current check-out if
702	** zRevision is NULL.
703	*/
704	Manifest *historical_manifest(
705	const char zRevision / The check-in to query, or NULL for current */
706	){
	@@ -716,23 +716,23 @@
716	vid = db_lget_int("checkout", 0);
717	if( !is_a_version(vid) ){
718	if( vid==0 ) return 0;
719	zRevision = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", vid);
720	if( zRevision ){
721	fossil_fatal("check-out artifact is not a check-in: %s", zRevision);
722	}else{
723	fossil_fatal("invalid check-out artifact ID: %d", vid);
724	}
725	}
726	}
727
728	/* Parse the manifest, given its artifact ID. Panic on failure. */
729	if( !(pManifest = manifest_get(vid, CFTYPE_MANIFEST, 0)) ){
730	if( zRevision ){
731	fossil_fatal("could not parse manifest for check-in: %s", zRevision);
732	}else{
733	fossil_fatal("could not parse manifest for current check-out");
734	}
735	}
736
737	/* Return the manifest pointer. The caller must use manifest_destroy() to
738	* clean up when finished using the manifest. */
	@@ -739,11 +739,11 @@
739	return pManifest;
740	}
741
742	/*
743	** Get the contents of a file within the check-in "zRevision". If
744	** zRevision==NULL then get the file content for the current check-out.
745	*/
746	int historical_blob(
747	const char zRevision, / The check-in containing the file */
748	const char zFile, / Full treename of the file */
749	Blob pBlob, / Put the content here */
	@@ -813,15 +813,15 @@
813	** VERSION
814	**
815	** See also: [[redo]], [[undo]], [[checkout]], [[update]]
816	*/
817	void revert_cmd(void){
818	Manifest pCoManifest; / Manifest of current check-out */
819	Manifest pRvManifest; / Manifest of selected revert version */
820	ManifestFile pCoFile; / File within current check-out manifest */
821	ManifestFile pRvFile; / File within revert version manifest */
822	const char zFile; / Filename relative to check-out root */
823	const char zRevision; / Selected revert version, NULL if current */
824	Blob record = BLOB_INITIALIZER; /* Contents of each reverted file */
825	int i;
826	Stmt q;
827	int revertAll = 0;
	@@ -838,11 +838,11 @@
838	fossil_fatal("directories or the entire tree can only be reverted"
839	" back to current version");
840	}
841	db_must_be_within_tree();
842
843	/* Get manifests of revert version and (if different) current check-out. */
844	pRvManifest = historical_manifest(zRevision);
845	pCoManifest = zRevision ? historical_manifest(0) : 0;
846
847	db_begin_transaction();
848	undo_begin();
	@@ -958,11 +958,11 @@
958	}else{
959	sqlite3_int64 mtime;
960	int rvChnged = 0;
961	int rvPerm = manifest_file_mperm(pRvFile);
962
963	/* Determine if reverted-to file is different than checked-out file. */
964	if( pCoManifest && (pCoFile = manifest_file_find(pCoManifest, zFile)) ){
965	rvChnged = manifest_file_mperm(pRvFile)!=rvPerm
966	\|\| fossil_strcmp(pRvFile->zUuid, pCoFile->zUuid)!=0;
967	}
968
969

M src/user.c

+2 -2

		--- src/user.c
		+++ src/user.c
		@@ -559,12 +559,12 @@
559	559	void test_usernames_cmd(void){
560	560	db_find_and_open_repository(0, 0);
561	561
562	562	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
563	563	fossil_print("Initial g.userUid: %d\n", g.userUid);
564		- fossil_print("checkout default-user: %s\n", g.localOpen ?
565		- db_lget("default-user","") : "<<no open checkout>>");
	564	+ fossil_print("check-out default-user: %s\n", g.localOpen ?
	565	+ db_lget("default-user","") : "<<no open check-out>>");
566	566	fossil_print("default-user: %s\n", db_get("default-user",""));
567	567	fossil_print("FOSSIL_USER: %s\n", fossil_getenv("FOSSIL_USER"));
568	568	fossil_print("USER: %s\n", fossil_getenv("USER"));
569	569	fossil_print("LOGNAME: %s\n", fossil_getenv("LOGNAME"));
570	570	fossil_print("USERNAME: %s\n", fossil_getenv("USERNAME"));
571	571

	--- src/user.c
	+++ src/user.c
	@@ -559,12 +559,12 @@
559	void test_usernames_cmd(void){
560	db_find_and_open_repository(0, 0);
561
562	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
563	fossil_print("Initial g.userUid: %d\n", g.userUid);
564	fossil_print("checkout default-user: %s\n", g.localOpen ?
565	db_lget("default-user","") : "<<no open checkout>>");
566	fossil_print("default-user: %s\n", db_get("default-user",""));
567	fossil_print("FOSSIL_USER: %s\n", fossil_getenv("FOSSIL_USER"));
568	fossil_print("USER: %s\n", fossil_getenv("USER"));
569	fossil_print("LOGNAME: %s\n", fossil_getenv("LOGNAME"));
570	fossil_print("USERNAME: %s\n", fossil_getenv("USERNAME"));
571

	--- src/user.c
	+++ src/user.c
	@@ -559,12 +559,12 @@
559	void test_usernames_cmd(void){
560	db_find_and_open_repository(0, 0);
561
562	fossil_print("Initial g.zLogin: %s\n", g.zLogin);
563	fossil_print("Initial g.userUid: %d\n", g.userUid);
564	fossil_print("check-out default-user: %s\n", g.localOpen ?
565	db_lget("default-user","") : "<<no open check-out>>");
566	fossil_print("default-user: %s\n", db_get("default-user",""));
567	fossil_print("FOSSIL_USER: %s\n", fossil_getenv("FOSSIL_USER"));
568	fossil_print("USER: %s\n", fossil_getenv("USER"));
569	fossil_print("LOGNAME: %s\n", fossil_getenv("LOGNAME"));
570	fossil_print("USERNAME: %s\n", fossil_getenv("USERNAME"));
571

M src/vfile.c

+2 -2

		--- src/vfile.c
		+++ src/vfile.c
		@@ -363,11 +363,11 @@
363	363	}
364	364	db_finalize(&q);
365	365	}
366	366
367	367	/*
368		-** Check to see if the directory named in zPath is the top of a checkout.
	368	+** Check to see if the directory named in zPath is the top of a check-out.
369	369	** In other words, check to see if directory pPath contains a file named
370	370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	371	*/
372	372	int vfile_top_of_checkout(const char *zPath){
373	373	char *zFile;
		@@ -381,11 +381,11 @@
381	381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	382	fossil_free(zFile);
383	383	}
384	384
385	385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386		- ** per-checkout database name is deprecated. At some point, all support
	386	+ ** per-check-out database name is deprecated. At some point, all support
387	387	** for ".fos" will end and this code should be removed. This comment
388	388	** added on 2012-02-04.
389	389	*/
390	390	if( !fileFound ){
391	391	zFile = mprintf("%s/.fos", zPath);
392	392

	--- src/vfile.c
	+++ src/vfile.c
	@@ -363,11 +363,11 @@
363	}
364	db_finalize(&q);
365	}
366
367	/*
368	** Check to see if the directory named in zPath is the top of a checkout.
369	** In other words, check to see if directory pPath contains a file named
370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	*/
372	int vfile_top_of_checkout(const char *zPath){
373	char *zFile;
	@@ -381,11 +381,11 @@
381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	fossil_free(zFile);
383	}
384
385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386	** per-checkout database name is deprecated. At some point, all support
387	** for ".fos" will end and this code should be removed. This comment
388	** added on 2012-02-04.
389	*/
390	if( !fileFound ){
391	zFile = mprintf("%s/.fos", zPath);
392

	--- src/vfile.c
	+++ src/vfile.c
	@@ -363,11 +363,11 @@
363	}
364	db_finalize(&q);
365	}
366
367	/*
368	** Check to see if the directory named in zPath is the top of a check-out.
369	** In other words, check to see if directory pPath contains a file named
370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	*/
372	int vfile_top_of_checkout(const char *zPath){
373	char *zFile;
	@@ -381,11 +381,11 @@
381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	fossil_free(zFile);
383	}
384
385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386	** per-check-out database name is deprecated. At some point, all support
387	** for ".fos" will end and this code should be removed. This comment
388	** added on 2012-02-04.
389	*/
390	if( !fileFound ){
391	zFile = mprintf("%s/.fos", zPath);
392

M src/vfile.c

+2 -2

		--- src/vfile.c
		+++ src/vfile.c
		@@ -363,11 +363,11 @@
363	363	}
364	364	db_finalize(&q);
365	365	}
366	366
367	367	/*
368		-** Check to see if the directory named in zPath is the top of a checkout.
	368	+** Check to see if the directory named in zPath is the top of a check-out.
369	369	** In other words, check to see if directory pPath contains a file named
370	370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	371	*/
372	372	int vfile_top_of_checkout(const char *zPath){
373	373	char *zFile;
		@@ -381,11 +381,11 @@
381	381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	382	fossil_free(zFile);
383	383	}
384	384
385	385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386		- ** per-checkout database name is deprecated. At some point, all support
	386	+ ** per-check-out database name is deprecated. At some point, all support
387	387	** for ".fos" will end and this code should be removed. This comment
388	388	** added on 2012-02-04.
389	389	*/
390	390	if( !fileFound ){
391	391	zFile = mprintf("%s/.fos", zPath);
392	392

	--- src/vfile.c
	+++ src/vfile.c
	@@ -363,11 +363,11 @@
363	}
364	db_finalize(&q);
365	}
366
367	/*
368	** Check to see if the directory named in zPath is the top of a checkout.
369	** In other words, check to see if directory pPath contains a file named
370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	*/
372	int vfile_top_of_checkout(const char *zPath){
373	char *zFile;
	@@ -381,11 +381,11 @@
381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	fossil_free(zFile);
383	}
384
385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386	** per-checkout database name is deprecated. At some point, all support
387	** for ".fos" will end and this code should be removed. This comment
388	** added on 2012-02-04.
389	*/
390	if( !fileFound ){
391	zFile = mprintf("%s/.fos", zPath);
392

	--- src/vfile.c
	+++ src/vfile.c
	@@ -363,11 +363,11 @@
363	}
364	db_finalize(&q);
365	}
366
367	/*
368	** Check to see if the directory named in zPath is the top of a check-out.
369	** In other words, check to see if directory pPath contains a file named
370	** "_FOSSIL_" or ".fslckout". Return true or false.
371	*/
372	int vfile_top_of_checkout(const char *zPath){
373	char *zFile;
	@@ -381,11 +381,11 @@
381	fileFound = file_size(zFile, ExtFILE)>=1024;
382	fossil_free(zFile);
383	}
384
385	/* Check for ".fos" for legacy support. But the use of ".fos" as the
386	** per-check-out database name is deprecated. At some point, all support
387	** for ".fos" will end and this code should be removed. This comment
388	** added on 2012-02-04.
389	*/
390	if( !fileFound ){
391	zFile = mprintf("%s/.fos", zPath);
392

M src/wiki.c

+5 -5

		--- src/wiki.c
		+++ src/wiki.c
		@@ -467,13 +467,13 @@
467	467	case WIKITYPE_CHECKIN: {
468	468	zPageName += 8;
469	469	if( zExtra[0]==0 && !P("p") ){
470	470	cgi_redirectf("%R/info/%s",zPageName);
471	471	}else{
472		- style_header("Notes About Checkin %S", zPageName);
473		- style_submenu_element("Checkin Timeline","%R/timeline?f=%s", zPageName);
474		- style_submenu_element("Checkin Info","%R/info/%s", zPageName);
	472	+ style_header("Notes About Check-in %S", zPageName);
	473	+ style_submenu_element("Check-in Timeline","%R/timeline?f=%s", zPageName);
	474	+ style_submenu_element("Check-in Info","%R/info/%s", zPageName);
475	475	}
476	476	break;
477	477	}
478	478	case WIKITYPE_BRANCH: {
479	479	zPageName += 7;
		@@ -1133,11 +1133,11 @@
1133	1133	** an array of objects in this form:
1134	1134	**
1135	1135	** { name: string, version: string or null of sandbox box,
1136	1136	** parent: uuid or null for first version or sandbox,
1137	1137	** mimetype: string,
1138		-** type: string (normal, branch, tag, checkin, or sandbox)
	1138	+** type: string (normal, branch, tag, check-in, or sandbox)
1139	1139	** }
1140	1140	**
1141	1141	** If includeContent is true, the object contains a "content" member
1142	1142	** with the raw page content. includeContent is ignored if verbose is
1143	1143	** false.
		@@ -2504,11 +2504,11 @@
2504	2504	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2505	2505	){
2506	2506	if( (mFlags & WIKIASSOC_FULL_TITLE)==0 ){
2507	2507	@ <div class="section accordion">About</div>
2508	2508	}else if( zPrefix[0]=='c' ){ /* checkin/... */
2509		- @ <div class="section accordion">About checkin %.20h(zName)</div>
	2509	+ @ <div class="section accordion">About check-in %.20h(zName)</div>
2510	2510	}else{
2511	2511	@ <div class="section accordion">About %s(zPrefix) %h(zName)</div>
2512	2512	}
2513	2513	}
2514	2514
2515	2515

	--- src/wiki.c
	+++ src/wiki.c
	@@ -467,13 +467,13 @@
467	case WIKITYPE_CHECKIN: {
468	zPageName += 8;
469	if( zExtra[0]==0 && !P("p") ){
470	cgi_redirectf("%R/info/%s",zPageName);
471	}else{
472	style_header("Notes About Checkin %S", zPageName);
473	style_submenu_element("Checkin Timeline","%R/timeline?f=%s", zPageName);
474	style_submenu_element("Checkin Info","%R/info/%s", zPageName);
475	}
476	break;
477	}
478	case WIKITYPE_BRANCH: {
479	zPageName += 7;
	@@ -1133,11 +1133,11 @@
1133	** an array of objects in this form:
1134	**
1135	** { name: string, version: string or null of sandbox box,
1136	** parent: uuid or null for first version or sandbox,
1137	** mimetype: string,
1138	** type: string (normal, branch, tag, checkin, or sandbox)
1139	** }
1140	**
1141	** If includeContent is true, the object contains a "content" member
1142	** with the raw page content. includeContent is ignored if verbose is
1143	** false.
	@@ -2504,11 +2504,11 @@
2504	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2505	){
2506	if( (mFlags & WIKIASSOC_FULL_TITLE)==0 ){
2507	@ <div class="section accordion">About</div>
2508	}else if( zPrefix[0]=='c' ){ /* checkin/... */
2509	@ <div class="section accordion">About checkin %.20h(zName)</div>
2510	}else{
2511	@ <div class="section accordion">About %s(zPrefix) %h(zName)</div>
2512	}
2513	}
2514
2515

	--- src/wiki.c
	+++ src/wiki.c
	@@ -467,13 +467,13 @@
467	case WIKITYPE_CHECKIN: {
468	zPageName += 8;
469	if( zExtra[0]==0 && !P("p") ){
470	cgi_redirectf("%R/info/%s",zPageName);
471	}else{
472	style_header("Notes About Check-in %S", zPageName);
473	style_submenu_element("Check-in Timeline","%R/timeline?f=%s", zPageName);
474	style_submenu_element("Check-in Info","%R/info/%s", zPageName);
475	}
476	break;
477	}
478	case WIKITYPE_BRANCH: {
479	zPageName += 7;
	@@ -1133,11 +1133,11 @@
1133	** an array of objects in this form:
1134	**
1135	** { name: string, version: string or null of sandbox box,
1136	** parent: uuid or null for first version or sandbox,
1137	** mimetype: string,
1138	** type: string (normal, branch, tag, check-in, or sandbox)
1139	** }
1140	**
1141	** If includeContent is true, the object contains a "content" member
1142	** with the raw page content. includeContent is ignored if verbose is
1143	** false.
	@@ -2504,11 +2504,11 @@
2504	unsigned int mFlags /* Zero or more WIKIASSOC_* flags */
2505	){
2506	if( (mFlags & WIKIASSOC_FULL_TITLE)==0 ){
2507	@ <div class="section accordion">About</div>
2508	}else if( zPrefix[0]=='c' ){ /* checkin/... */
2509	@ <div class="section accordion">About check-in %.20h(zName)</div>
2510	}else{
2511	@ <div class="section accordion">About %s(zPrefix) %h(zName)</div>
2512	}
2513	}
2514
2515

M src/winhttp.c

+3 -3

		--- src/winhttp.c
		+++ src/winhttp.c
		@@ -409,12 +409,12 @@
409	409	}
410	410	wanted -= got;
411	411	}
412	412
413	413	/*
414		- ** The repository name is only needed if there was no open checkout. This
415		- ** is designed to allow the open checkout for the interactive user to work
	414	+ ** The repository name is only needed if there was no open check-out. This
	415	+ ** is designed to allow the open check-out for the interactive user to work
416	416	** with the local Fossil server started via the "ui" command.
417	417	*/
418	418	zIp = SocketAddr_toString(&p->addr);
419	419	if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){
420	420	assert( g.zRepositoryName && g.zRepositoryName[0] );
		@@ -1028,11 +1028,11 @@
1028	1028	**
1029	1029	** -R\|--repository REPO
1030	1030	**
1031	1031	** Specifies the name of the repository to be served.
1032	1032	** The repository option may be omitted if the working directory
1033		-** is within an open checkout.
	1033	+** is within an open check-out.
1034	1034	** The REPOSITORY can be a directory (aka folder) that contains
1035	1035	** one or more repositories with names ending in ".fossil".
1036	1036	** In that case, the first element of the URL is used to select
1037	1037	** among the various repositories.
1038	1038	**
1039	1039

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -409,12 +409,12 @@
409	}
410	wanted -= got;
411	}
412
413	/*
414	** The repository name is only needed if there was no open checkout. This
415	** is designed to allow the open checkout for the interactive user to work
416	** with the local Fossil server started via the "ui" command.
417	*/
418	zIp = SocketAddr_toString(&p->addr);
419	if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){
420	assert( g.zRepositoryName && g.zRepositoryName[0] );
	@@ -1028,11 +1028,11 @@
1028	**
1029	** -R\|--repository REPO
1030	**
1031	** Specifies the name of the repository to be served.
1032	** The repository option may be omitted if the working directory
1033	** is within an open checkout.
1034	** The REPOSITORY can be a directory (aka folder) that contains
1035	** one or more repositories with names ending in ".fossil".
1036	** In that case, the first element of the URL is used to select
1037	** among the various repositories.
1038	**
1039

	--- src/winhttp.c
	+++ src/winhttp.c
	@@ -409,12 +409,12 @@
409	}
410	wanted -= got;
411	}
412
413	/*
414	** The repository name is only needed if there was no open check-out. This
415	** is designed to allow the open check-out for the interactive user to work
416	** with the local Fossil server started via the "ui" command.
417	*/
418	zIp = SocketAddr_toString(&p->addr);
419	if( (p->flags & HTTP_SERVER_HAD_CHECKOUT)==0 ){
420	assert( g.zRepositoryName && g.zRepositoryName[0] );
	@@ -1028,11 +1028,11 @@
1028	**
1029	** -R\|--repository REPO
1030	**
1031	** Specifies the name of the repository to be served.
1032	** The repository option may be omitted if the working directory
1033	** is within an open check-out.
1034	** The REPOSITORY can be a directory (aka folder) that contains
1035	** one or more repositories with names ending in ".fossil".
1036	** In that case, the first element of the URL is used to select
1037	** among the various repositories.
1038	**
1039

M src/zip.c

+1 -1

		--- src/zip.c
		+++ src/zip.c
		@@ -614,11 +614,11 @@
614	614	** with source files. For example, pass a commit hash or "ProjectName".
615	615	**
616	616	*/
617	617	static void zip_of_checkin(
618	618	int eType, /* Type of archive (ZIP or SQLAR) */
619		- int rid, /* The RID of the checkin to build the archive from */
	619	+ int rid, /* The RID of the check-in to build the archive from */
620	620	Blob pZip, / Write the archive content into this blob */
621	621	const char zDir, / Top-level directory of the archive */
622	622	Glob pInclude, / Only include files that match this pattern */
623	623	Glob pExclude, / Exclude files that match this pattern */
624	624	int listFlag /* Print each file on stdout */
625	625

	--- src/zip.c
	+++ src/zip.c
	@@ -614,11 +614,11 @@
614	** with source files. For example, pass a commit hash or "ProjectName".
615	**
616	*/
617	static void zip_of_checkin(
618	int eType, /* Type of archive (ZIP or SQLAR) */
619	int rid, /* The RID of the checkin to build the archive from */
620	Blob pZip, / Write the archive content into this blob */
621	const char zDir, / Top-level directory of the archive */
622	Glob pInclude, / Only include files that match this pattern */
623	Glob pExclude, / Exclude files that match this pattern */
624	int listFlag /* Print each file on stdout */
625

	--- src/zip.c
	+++ src/zip.c
	@@ -614,11 +614,11 @@
614	** with source files. For example, pass a commit hash or "ProjectName".
615	**
616	*/
617	static void zip_of_checkin(
618	int eType, /* Type of archive (ZIP or SQLAR) */
619	int rid, /* The RID of the check-in to build the archive from */
620	Blob pZip, / Write the archive content into this blob */
621	const char zDir, / Top-level directory of the archive */
622	Glob pInclude, / Only include files that match this pattern */
623	Glob pExclude, / Exclude files that match this pattern */
624	int listFlag /* Print each file on stdout */
625

Fossil SCM

Keyboard Shortcuts