7c30266a455… — Fossil SCM

M src/add.c

+1 -1

		--- src/add.c
		+++ src/add.c
		@@ -623,11 +623,11 @@
623	623	** Move or rename one or more files or directories within the repository tree.
624	624	** You can either rename a file or directory or move it to another subdirectory.
625	625	**
626	626	** This command does NOT rename or move the files on disk. This command merely
627	627	** records the fact that filenames have changed so that appropriate notations
628		-** can be made at the next commit/checkin.
	628	+** can be made at the next commit/check-in.
629	629	**
630	630	** Options:
631	631	** --case-sensitive <BOOL> Override the case-sensitive setting.
632	632	**
633	633	** See also: changes, status
634	634

	--- src/add.c
	+++ src/add.c
	@@ -623,11 +623,11 @@
623	** Move or rename one or more files or directories within the repository tree.
624	** You can either rename a file or directory or move it to another subdirectory.
625	**
626	** This command does NOT rename or move the files on disk. This command merely
627	** records the fact that filenames have changed so that appropriate notations
628	** can be made at the next commit/checkin.
629	**
630	** Options:
631	** --case-sensitive <BOOL> Override the case-sensitive setting.
632	**
633	** See also: changes, status
634

	--- src/add.c
	+++ src/add.c
	@@ -623,11 +623,11 @@
623	** Move or rename one or more files or directories within the repository tree.
624	** You can either rename a file or directory or move it to another subdirectory.
625	**
626	** This command does NOT rename or move the files on disk. This command merely
627	** records the fact that filenames have changed so that appropriate notations
628	** can be made at the next commit/check-in.
629	**
630	** Options:
631	** --case-sensitive <BOOL> Override the case-sensitive setting.
632	**
633	** See also: changes, status
634

M src/browse.c

+5 -5

		--- src/browse.c
		+++ src/browse.c
		@@ -873,11 +873,11 @@
873	873	}
874	874	return zClass;
875	875	}
876	876
877	877	/*
878		-** SQL used to compute the age of all files in checkin :ckin whose
	878	+** SQL used to compute the age of all files in check-in :ckin whose
879	879	** names match :glob
880	880	*/
881	881	static const char zComputeFileAgeSetup[] =
882	882	@ CREATE TABLE IF NOT EXISTS temp.fileage(
883	883	@ fnid INTEGER PRIMARY KEY,
		@@ -913,11 +913,11 @@
913	913
914	914	/*
915	915	** Look at all file containing in the version "vid". Construct a
916	916	** temporary table named "fileage" that contains the file-id for each
917	917	** files, the pathname, the check-in where the file was added, and the
918		-** mtime on that checkin. If zGlob and *zGlob then only files matching
	918	+** mtime on that check-in. If zGlob and *zGlob then only files matching
919	919	** the given glob are computed.
920	920	*/
921	921	int compute_fileage(int vid, const char* zGlob){
922	922	Stmt q;
923	923	db_multi_exec(zComputeFileAgeSetup /works-like:"constant"/);
		@@ -987,21 +987,21 @@
987	987
988	988	/*
989	989	** WEBPAGE: fileage
990	990	**
991	991	** Parameters:
992		-** name=VERSION Selects the checkin version (default=tip).
	992	+** name=VERSION Selects the check-in version (default=tip).
993	993	** glob=STRING Only shows files matching this glob pattern
994	994	** (e.g. .c or .txt).
995	995	** showid Show RID values for debugging
996	996	*/
997	997	void fileage_page(void){
998	998	int rid;
999	999	const char *zName;
1000	1000	const char *zGlob;
1001	1001	const char *zUuid;
1002		- const char zNow; / Time of checkin */
	1002	+ const char zNow; / Time of check-in */
1003	1003	int showId = PB("showid");
1004	1004	Stmt q1, q2;
1005	1005	double baseTime;
1006	1006	login_check_credentials();
1007	1007	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
		@@ -1028,11 +1028,11 @@
1028	1028	if( zGlob && zGlob[0] ){
1029	1029	@ that match "%h(zGlob)" and
1030	1030	}
1031	1031	@ ordered by check-in time</h2>
1032	1032	@
1033		- @ <p>Times are relative to the checkin time for
	1033	+ @ <p>Times are relative to the check-in time for
1034	1034	@ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
1035	1035	@ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
1036	1036	@
1037	1037	@ <div class='fileage'><table>
1038	1038	@ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
1039	1039

	--- src/browse.c
	+++ src/browse.c
	@@ -873,11 +873,11 @@
873	}
874	return zClass;
875	}
876
877	/*
878	** SQL used to compute the age of all files in checkin :ckin whose
879	** names match :glob
880	*/
881	static const char zComputeFileAgeSetup[] =
882	@ CREATE TABLE IF NOT EXISTS temp.fileage(
883	@ fnid INTEGER PRIMARY KEY,
	@@ -913,11 +913,11 @@
913
914	/*
915	** Look at all file containing in the version "vid". Construct a
916	** temporary table named "fileage" that contains the file-id for each
917	** files, the pathname, the check-in where the file was added, and the
918	** mtime on that checkin. If zGlob and *zGlob then only files matching
919	** the given glob are computed.
920	*/
921	int compute_fileage(int vid, const char* zGlob){
922	Stmt q;
923	db_multi_exec(zComputeFileAgeSetup /works-like:"constant"/);
	@@ -987,21 +987,21 @@
987
988	/*
989	** WEBPAGE: fileage
990	**
991	** Parameters:
992	** name=VERSION Selects the checkin version (default=tip).
993	** glob=STRING Only shows files matching this glob pattern
994	** (e.g. .c or .txt).
995	** showid Show RID values for debugging
996	*/
997	void fileage_page(void){
998	int rid;
999	const char *zName;
1000	const char *zGlob;
1001	const char *zUuid;
1002	const char zNow; / Time of checkin */
1003	int showId = PB("showid");
1004	Stmt q1, q2;
1005	double baseTime;
1006	login_check_credentials();
1007	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
	@@ -1028,11 +1028,11 @@
1028	if( zGlob && zGlob[0] ){
1029	@ that match "%h(zGlob)" and
1030	}
1031	@ ordered by check-in time</h2>
1032	@
1033	@ <p>Times are relative to the checkin time for
1034	@ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
1035	@ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
1036	@
1037	@ <div class='fileage'><table>
1038	@ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
1039

	--- src/browse.c
	+++ src/browse.c
	@@ -873,11 +873,11 @@
873	}
874	return zClass;
875	}
876
877	/*
878	** SQL used to compute the age of all files in check-in :ckin whose
879	** names match :glob
880	*/
881	static const char zComputeFileAgeSetup[] =
882	@ CREATE TABLE IF NOT EXISTS temp.fileage(
883	@ fnid INTEGER PRIMARY KEY,
	@@ -913,11 +913,11 @@
913
914	/*
915	** Look at all file containing in the version "vid". Construct a
916	** temporary table named "fileage" that contains the file-id for each
917	** files, the pathname, the check-in where the file was added, and the
918	** mtime on that check-in. If zGlob and *zGlob then only files matching
919	** the given glob are computed.
920	*/
921	int compute_fileage(int vid, const char* zGlob){
922	Stmt q;
923	db_multi_exec(zComputeFileAgeSetup /works-like:"constant"/);
	@@ -987,21 +987,21 @@
987
988	/*
989	** WEBPAGE: fileage
990	**
991	** Parameters:
992	** name=VERSION Selects the check-in version (default=tip).
993	** glob=STRING Only shows files matching this glob pattern
994	** (e.g. .c or .txt).
995	** showid Show RID values for debugging
996	*/
997	void fileage_page(void){
998	int rid;
999	const char *zName;
1000	const char *zGlob;
1001	const char *zUuid;
1002	const char zNow; / Time of check-in */
1003	int showId = PB("showid");
1004	Stmt q1, q2;
1005	double baseTime;
1006	login_check_credentials();
1007	if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
	@@ -1028,11 +1028,11 @@
1028	if( zGlob && zGlob[0] ){
1029	@ that match "%h(zGlob)" and
1030	}
1031	@ ordered by check-in time</h2>
1032	@
1033	@ <p>Times are relative to the check-in time for
1034	@ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
1035	@ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
1036	@
1037	@ <div class='fileage'><table>
1038	@ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
1039

M src/bundle.c

+21 -21

		--- src/bundle.c
		+++ src/bundle.c
		@@ -179,20 +179,20 @@
179	179	db_end_transaction(0);
180	180	db_finalize(&q);
181	181	}
182	182
183	183	/*
184		-** Identify a subsection of the checkin tree using command-line switches.
	184	+** Identify a subsection of the check-in tree using command-line switches.
185	185	** There must be one of the following switch available:
186	186	**
187		-** --branch BRANCHNAME All checkins on the most recent
	187	+** --branch BRANCHNAME All check-ins on the most recent
188	188	** instance of BRANCHNAME
189		-** --from TAG1 [--to TAG2] Checkin TAG1 and all primary descendants
	189	+** --from TAG1 [--to TAG2] Check-in TAG1 and all primary descendants
190	190	** up to and including TAG2
191		-** --checkin TAG Checkin TAG only
	191	+** --checkin TAG Check-in TAG only
192	192	**
193		-** Store the RIDs for all applicable checkins in the zTab table that
	193	+** Store the RIDs for all applicable check-ins in the zTab table that
194	194	** should already exist. Invoke fossil_fatal() if any kind of error is
195	195	** seen.
196	196	*/
197	197	void subtree_from_arguments(const char *zTab){
198	198	const char *zBr;
		@@ -254,22 +254,22 @@
254	254	/*
255	255	** COMMAND: test-subtree
256	256	**
257	257	** Usage: %fossil test-subtree ?OPTIONS?
258	258	**
259		-** Show the subset of checkins that match the supplied options. This
	259	+** Show the subset of check-ins that match the supplied options. This
260	260	** command is used to test the subtree_from_options() subroutine in the
261	261	** implementation and does not really have any other practical use that
262	262	** we know of.
263	263	**
264	264	** Options:
265		-** --branch BRANCH Include only checkins on BRANCH
	265	+** --branch BRANCH Include only check-ins on BRANCH
266	266	** --from TAG Start the subtree at TAG
267	267	** --to TAG End the subtree at TAG
268		-** --checkin TAG The subtree is the single checkin TAG
	268	+** --checkin TAG The subtree is the single check-in TAG
269	269	** --all Include FILE and TAG artifacts
270		-** --exclusive Include FILES exclusively on checkins
	270	+** --exclusive Include FILES exclusively on check-ins
271	271	*/
272	272	void test_subtree_cmd(void){
273	273	int bAll = find_option("all",0,0)!=0;
274	274	int bExcl = find_option("exclusive",0,0)!=0;
275	275	db_find_and_open_repository(0,0);
		@@ -631,11 +631,11 @@
631	631	/* fossil bundle purge BUNDLE
632	632	**
633	633	** Try to undo a prior "bundle import BUNDLE".
634	634	**
635	635	** If the --force option is omitted, then this will only work if
636		-** there have been no checkins or tags added that use the import.
	636	+** there have been no check-ins or tags added that use the import.
637	637	**
638	638	** This routine never removes content that is not already in the bundle
639	639	** so the bundle serves as a backup. The purge can be undone using
640	640	** "fossil bundle import BUNDLE".
641	641	*/
		@@ -646,19 +646,19 @@
646	646	verify_all_options();
647	647	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
648	648	bundle_attach_file(zFile, "b1", 0);
649	649	db_begin_transaction();
650	650
651		- /* Find all checkins of the bundle */
	651	+ /* Find all check-ins of the bundle */
652	652	db_multi_exec(
653	653	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
654	654	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
655	655	" WHERE bblob.uuid=blob.uuid"
656	656	" AND plink.cid=blob.rid;"
657	657	);
658	658
659		- /* Check to see if new checkins have been committed to checkins in
	659	+ /* Check to see if new check-ins have been committed to check-ins in
660	660	** the bundle. Do not allow the purge if that is true and if --force
661	661	** is omitted.
662	662	*/
663	663	if( !bForce ){
664	664	Stmt q;
		@@ -671,11 +671,11 @@
671	671	fossil_print("%.78c\n", '-');
672	672	n++;
673	673	}
674	674	db_finalize(&q);
675	675	if( n>0 ){
676		- fossil_fatal("checkins above are derived from checkins in the bundle.");
	676	+ fossil_fatal("check-ins above are derived from check-ins in the bundle.");
677	677	}
678	678	}
679	679
680	680	/* Find all files associated with those check-ins that are used
681	681	** nowhere else. */
		@@ -692,11 +692,11 @@
692	692	" WHERE blob.rid=ok.rid"
693	693	" AND blob.uuid NOT IN (SELECT uuid FROM bblob);"
694	694	);
695	695	if( db_changes() ){
696	696	describe_artifacts_to_stdout("IN err1", 0);
697		- fossil_fatal("artifacts above associated with bundle checkins "
	697	+ fossil_fatal("artifacts above associated with bundle check-ins "
698	698	" are not in the bundle");
699	699	}else{
700	700	db_multi_exec("DROP TABLE err1;");
701	701	}
702	702	}
		@@ -740,25 +740,25 @@
740	740	** commonly used.
741	741	**
742	742	** fossil bundle export BUNDLE ?OPTIONS?
743	743	**
744	744	** Generate a new bundle, in the file named BUNDLE, that contains a
745		-** subset of the checkins in the repository (usually a single branch)
	745	+** subset of the check-ins in the repository (usually a single branch)
746	746	** described by the --branch, --from, --to, and/or --checkin options,
747	747	** at least one of which is required. If BUNDLE already exists, the
748	748	** specified content is added to the bundle.
749	749	**
750	750	** --branch BRANCH Package all check-ins on BRANCH.
751		-** --from TAG1 --to TAG2 Package checkins between TAG1 and TAG2.
752		-** --checkin TAG Package the single checkin TAG
	751	+** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2.
	752	+** --checkin TAG Package the single check-in TAG
753	753	** --standalone Do no use delta-encoding against
754	754	** artifacts not in the bundle
755	755	**
756	756	** fossil bundle extend BUNDLE
757	757	**
758	758	** The BUNDLE must already exist. This subcommand adds to the bundle
759		-** any checkins that are descendants of checkins already in the bundle,
	759	+** any check-ins that are descendants of check-ins already in the bundle,
760	760	** and any tags that apply to artifacts in the bundle.
761	761	**
762	762	** fossil bundle import BUNDLE ?--publish?
763	763	**
764	764	** Import all content from BUNDLE into the repository. By default, the
		@@ -770,19 +770,19 @@
770	770	** List the contents of BUNDLE on standard output
771	771	**
772	772	** fossil bundle purge BUNDLE
773	773	**
774	774	** Remove from the repository all files that are used exclusively
775		-** by checkins in BUNDLE. This has the effect of undoing a
	775	+** by check-ins in BUNDLE. This has the effect of undoing a
776	776	** "fossil bundle import".
777	777	**
778	778	** SUMMARY:
779	779	** fossil bundle append BUNDLE FILE... Add files to BUNDLE
780	780	** fossil bundle cat BUNDLE UUID... Extract file from BUNDLE
781	781	** fossil bundle export BUNDLE ?OPTIONS? Create a new BUNDLE
782		-** --branch BRANCH --from TAG1 --to TAG2 Checkins to include
783		-** --checkin TAG Use only checkin TAG
	782	+** --branch BRANCH --from TAG1 --to TAG2 Check-ins to include
	783	+** --checkin TAG Use only check-in TAG
784	784	** --standalone Omit dependencies
785	785	** fossil bundle extend BUNDLE Update with newer content
786	786	** fossil bundle import BUNDLE ?OPTIONS? Import a bundle
787	787	** --publish Publish the import
788	788	** --force Cross-repo import
789	789

	--- src/bundle.c
	+++ src/bundle.c
	@@ -179,20 +179,20 @@
179	db_end_transaction(0);
180	db_finalize(&q);
181	}
182
183	/*
184	** Identify a subsection of the checkin tree using command-line switches.
185	** There must be one of the following switch available:
186	**
187	** --branch BRANCHNAME All checkins on the most recent
188	** instance of BRANCHNAME
189	** --from TAG1 [--to TAG2] Checkin TAG1 and all primary descendants
190	** up to and including TAG2
191	** --checkin TAG Checkin TAG only
192	**
193	** Store the RIDs for all applicable checkins in the zTab table that
194	** should already exist. Invoke fossil_fatal() if any kind of error is
195	** seen.
196	*/
197	void subtree_from_arguments(const char *zTab){
198	const char *zBr;
	@@ -254,22 +254,22 @@
254	/*
255	** COMMAND: test-subtree
256	**
257	** Usage: %fossil test-subtree ?OPTIONS?
258	**
259	** Show the subset of checkins that match the supplied options. This
260	** command is used to test the subtree_from_options() subroutine in the
261	** implementation and does not really have any other practical use that
262	** we know of.
263	**
264	** Options:
265	** --branch BRANCH Include only checkins on BRANCH
266	** --from TAG Start the subtree at TAG
267	** --to TAG End the subtree at TAG
268	** --checkin TAG The subtree is the single checkin TAG
269	** --all Include FILE and TAG artifacts
270	** --exclusive Include FILES exclusively on checkins
271	*/
272	void test_subtree_cmd(void){
273	int bAll = find_option("all",0,0)!=0;
274	int bExcl = find_option("exclusive",0,0)!=0;
275	db_find_and_open_repository(0,0);
	@@ -631,11 +631,11 @@
631	/* fossil bundle purge BUNDLE
632	**
633	** Try to undo a prior "bundle import BUNDLE".
634	**
635	** If the --force option is omitted, then this will only work if
636	** there have been no checkins or tags added that use the import.
637	**
638	** This routine never removes content that is not already in the bundle
639	** so the bundle serves as a backup. The purge can be undone using
640	** "fossil bundle import BUNDLE".
641	*/
	@@ -646,19 +646,19 @@
646	verify_all_options();
647	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
648	bundle_attach_file(zFile, "b1", 0);
649	db_begin_transaction();
650
651	/* Find all checkins of the bundle */
652	db_multi_exec(
653	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
654	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
655	" WHERE bblob.uuid=blob.uuid"
656	" AND plink.cid=blob.rid;"
657	);
658
659	/* Check to see if new checkins have been committed to checkins in
660	** the bundle. Do not allow the purge if that is true and if --force
661	** is omitted.
662	*/
663	if( !bForce ){
664	Stmt q;
	@@ -671,11 +671,11 @@
671	fossil_print("%.78c\n", '-');
672	n++;
673	}
674	db_finalize(&q);
675	if( n>0 ){
676	fossil_fatal("checkins above are derived from checkins in the bundle.");
677	}
678	}
679
680	/* Find all files associated with those check-ins that are used
681	** nowhere else. */
	@@ -692,11 +692,11 @@
692	" WHERE blob.rid=ok.rid"
693	" AND blob.uuid NOT IN (SELECT uuid FROM bblob);"
694	);
695	if( db_changes() ){
696	describe_artifacts_to_stdout("IN err1", 0);
697	fossil_fatal("artifacts above associated with bundle checkins "
698	" are not in the bundle");
699	}else{
700	db_multi_exec("DROP TABLE err1;");
701	}
702	}
	@@ -740,25 +740,25 @@
740	** commonly used.
741	**
742	** fossil bundle export BUNDLE ?OPTIONS?
743	**
744	** Generate a new bundle, in the file named BUNDLE, that contains a
745	** subset of the checkins in the repository (usually a single branch)
746	** described by the --branch, --from, --to, and/or --checkin options,
747	** at least one of which is required. If BUNDLE already exists, the
748	** specified content is added to the bundle.
749	**
750	** --branch BRANCH Package all check-ins on BRANCH.
751	** --from TAG1 --to TAG2 Package checkins between TAG1 and TAG2.
752	** --checkin TAG Package the single checkin TAG
753	** --standalone Do no use delta-encoding against
754	** artifacts not in the bundle
755	**
756	** fossil bundle extend BUNDLE
757	**
758	** The BUNDLE must already exist. This subcommand adds to the bundle
759	** any checkins that are descendants of checkins already in the bundle,
760	** and any tags that apply to artifacts in the bundle.
761	**
762	** fossil bundle import BUNDLE ?--publish?
763	**
764	** Import all content from BUNDLE into the repository. By default, the
	@@ -770,19 +770,19 @@
770	** List the contents of BUNDLE on standard output
771	**
772	** fossil bundle purge BUNDLE
773	**
774	** Remove from the repository all files that are used exclusively
775	** by checkins in BUNDLE. This has the effect of undoing a
776	** "fossil bundle import".
777	**
778	** SUMMARY:
779	** fossil bundle append BUNDLE FILE... Add files to BUNDLE
780	** fossil bundle cat BUNDLE UUID... Extract file from BUNDLE
781	** fossil bundle export BUNDLE ?OPTIONS? Create a new BUNDLE
782	** --branch BRANCH --from TAG1 --to TAG2 Checkins to include
783	** --checkin TAG Use only checkin TAG
784	** --standalone Omit dependencies
785	** fossil bundle extend BUNDLE Update with newer content
786	** fossil bundle import BUNDLE ?OPTIONS? Import a bundle
787	** --publish Publish the import
788	** --force Cross-repo import
789

	--- src/bundle.c
	+++ src/bundle.c
	@@ -179,20 +179,20 @@
179	db_end_transaction(0);
180	db_finalize(&q);
181	}
182
183	/*
184	** Identify a subsection of the check-in tree using command-line switches.
185	** There must be one of the following switch available:
186	**
187	** --branch BRANCHNAME All check-ins on the most recent
188	** instance of BRANCHNAME
189	** --from TAG1 [--to TAG2] Check-in TAG1 and all primary descendants
190	** up to and including TAG2
191	** --checkin TAG Check-in TAG only
192	**
193	** Store the RIDs for all applicable check-ins in the zTab table that
194	** should already exist. Invoke fossil_fatal() if any kind of error is
195	** seen.
196	*/
197	void subtree_from_arguments(const char *zTab){
198	const char *zBr;
	@@ -254,22 +254,22 @@
254	/*
255	** COMMAND: test-subtree
256	**
257	** Usage: %fossil test-subtree ?OPTIONS?
258	**
259	** Show the subset of check-ins that match the supplied options. This
260	** command is used to test the subtree_from_options() subroutine in the
261	** implementation and does not really have any other practical use that
262	** we know of.
263	**
264	** Options:
265	** --branch BRANCH Include only check-ins on BRANCH
266	** --from TAG Start the subtree at TAG
267	** --to TAG End the subtree at TAG
268	** --checkin TAG The subtree is the single check-in TAG
269	** --all Include FILE and TAG artifacts
270	** --exclusive Include FILES exclusively on check-ins
271	*/
272	void test_subtree_cmd(void){
273	int bAll = find_option("all",0,0)!=0;
274	int bExcl = find_option("exclusive",0,0)!=0;
275	db_find_and_open_repository(0,0);
	@@ -631,11 +631,11 @@
631	/* fossil bundle purge BUNDLE
632	**
633	** Try to undo a prior "bundle import BUNDLE".
634	**
635	** If the --force option is omitted, then this will only work if
636	** there have been no check-ins or tags added that use the import.
637	**
638	** This routine never removes content that is not already in the bundle
639	** so the bundle serves as a backup. The purge can be undone using
640	** "fossil bundle import BUNDLE".
641	*/
	@@ -646,19 +646,19 @@
646	verify_all_options();
647	if ( g.argc!=4 ) usage("purge BUNDLE ?OPTIONS?");
648	bundle_attach_file(zFile, "b1", 0);
649	db_begin_transaction();
650
651	/* Find all check-ins of the bundle */
652	db_multi_exec(
653	"CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY);"
654	"INSERT OR IGNORE INTO ok SELECT blob.rid FROM bblob, blob, plink"
655	" WHERE bblob.uuid=blob.uuid"
656	" AND plink.cid=blob.rid;"
657	);
658
659	/* Check to see if new check-ins have been committed to check-ins in
660	** the bundle. Do not allow the purge if that is true and if --force
661	** is omitted.
662	*/
663	if( !bForce ){
664	Stmt q;
	@@ -671,11 +671,11 @@
671	fossil_print("%.78c\n", '-');
672	n++;
673	}
674	db_finalize(&q);
675	if( n>0 ){
676	fossil_fatal("check-ins above are derived from check-ins in the bundle.");
677	}
678	}
679
680	/* Find all files associated with those check-ins that are used
681	** nowhere else. */
	@@ -692,11 +692,11 @@
692	" WHERE blob.rid=ok.rid"
693	" AND blob.uuid NOT IN (SELECT uuid FROM bblob);"
694	);
695	if( db_changes() ){
696	describe_artifacts_to_stdout("IN err1", 0);
697	fossil_fatal("artifacts above associated with bundle check-ins "
698	" are not in the bundle");
699	}else{
700	db_multi_exec("DROP TABLE err1;");
701	}
702	}
	@@ -740,25 +740,25 @@
740	** commonly used.
741	**
742	** fossil bundle export BUNDLE ?OPTIONS?
743	**
744	** Generate a new bundle, in the file named BUNDLE, that contains a
745	** subset of the check-ins in the repository (usually a single branch)
746	** described by the --branch, --from, --to, and/or --checkin options,
747	** at least one of which is required. If BUNDLE already exists, the
748	** specified content is added to the bundle.
749	**
750	** --branch BRANCH Package all check-ins on BRANCH.
751	** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2.
752	** --checkin TAG Package the single check-in TAG
753	** --standalone Do no use delta-encoding against
754	** artifacts not in the bundle
755	**
756	** fossil bundle extend BUNDLE
757	**
758	** The BUNDLE must already exist. This subcommand adds to the bundle
759	** any check-ins that are descendants of check-ins already in the bundle,
760	** and any tags that apply to artifacts in the bundle.
761	**
762	** fossil bundle import BUNDLE ?--publish?
763	**
764	** Import all content from BUNDLE into the repository. By default, the
	@@ -770,19 +770,19 @@
770	** List the contents of BUNDLE on standard output
771	**
772	** fossil bundle purge BUNDLE
773	**
774	** Remove from the repository all files that are used exclusively
775	** by check-ins in BUNDLE. This has the effect of undoing a
776	** "fossil bundle import".
777	**
778	** SUMMARY:
779	** fossil bundle append BUNDLE FILE... Add files to BUNDLE
780	** fossil bundle cat BUNDLE UUID... Extract file from BUNDLE
781	** fossil bundle export BUNDLE ?OPTIONS? Create a new BUNDLE
782	** --branch BRANCH --from TAG1 --to TAG2 Check-ins to include
783	** --checkin TAG Use only check-in TAG
784	** --standalone Omit dependencies
785	** fossil bundle extend BUNDLE Update with newer content
786	** fossil bundle import BUNDLE ?OPTIONS? Import a bundle
787	** --publish Publish the import
788	** --force Cross-repo import
789

M src/checkin.c

+5 -5

		--- src/checkin.c
		+++ src/checkin.c
		@@ -1495,11 +1495,11 @@
1495	1495	** --no-warnings omit all warnings about file contents
1496	1496	** --nosign do not attempt to sign this commit with gpg
1497	1497	** --private do not sync changes and their descendants
1498	1498	** --sha1sum verify file status using SHA1 hashing rather
1499	1499	** than relying on file mtimes
1500		-** --tag TAG-NAME assign given tag TAG-NAME to the checkin
	1500	+** --tag TAG-NAME assign given tag TAG-NAME to the check-in
1501	1501	**
1502	1502	** See also: branch, changes, checkout, extras, sync
1503	1503	*/
1504	1504	void commit_cmd(void){
1505	1505	int hasChanges; /* True if unsaved changes exist */
		@@ -1729,15 +1729,15 @@
1729	1729	/*
1730	1730	** Do not allow a commit against a closed leaf unless the commit
1731	1731	** ends up on a different branch.
1732	1732	*/
1733	1733	if(
1734		- /* parent checkin has the "closed" tag... */
	1734	+ /* parent check-in has the "closed" tag... */
1735	1735	db_exists("SELECT 1 FROM tagxref"
1736	1736	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1737	1737	TAG_CLOSED, vid)
1738		- /* ... and the new checkin has no --branch option or the --branch
	1738	+ /* ... and the new check-in has no --branch option or the --branch
1739	1739	** option does not actually change the branch */
1740	1740	&& (sCiInfo.zBranch==0
1741	1741	\|\| db_exists("SELECT 1 FROM tagxref"
1742	1742	" WHERE tagid=%d AND rid=%d AND tagtype>0"
1743	1743	" AND value=%Q", TAG_BRANCH, vid, sCiInfo.zBranch))
		@@ -1869,11 +1869,11 @@
1869	1869	if( pBaseline ){
1870	1870	Blob delta;
1871	1871	create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD);
1872	1872	/*
1873	1873	** At this point, two manifests have been constructed, either of
1874		- ** which would work for this checkin. The first manifest (held
	1874	+ ** which would work for this check-in. The first manifest (held
1875	1875	** in the "manifest" variable) is a baseline manifest and the second
1876	1876	** (held in variable named "delta") is a delta manifest. The
1877	1877	** question now is: which manifest should we use?
1878	1878	**
1879	1879	** Let B be the number of F-cards in the baseline manifest and
		@@ -1967,11 +1967,11 @@
1967	1967	);
1968	1968	db_lset_int("checkout", nvid);
1969	1969
1970	1970	if( useCksum ){
1971	1971	/* Verify that the repository checksum matches the expected checksum
1972		- ** calculated before the checkin started (and stored as the R record
	1972	+ ** calculated before the check-in started (and stored as the R record
1973	1973	** of the manifest file).
1974	1974	*/
1975	1975	vfile_aggregate_checksum_repository(nvid, &cksum2);
1976	1976	if( blob_compare(&cksum1, &cksum2) ){
1977	1977	vfile_compare_repository_to_disk(nvid);
1978	1978

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1495,11 +1495,11 @@
1495	** --no-warnings omit all warnings about file contents
1496	** --nosign do not attempt to sign this commit with gpg
1497	** --private do not sync changes and their descendants
1498	** --sha1sum verify file status using SHA1 hashing rather
1499	** than relying on file mtimes
1500	** --tag TAG-NAME assign given tag TAG-NAME to the checkin
1501	**
1502	** See also: branch, changes, checkout, extras, sync
1503	*/
1504	void commit_cmd(void){
1505	int hasChanges; /* True if unsaved changes exist */
	@@ -1729,15 +1729,15 @@
1729	/*
1730	** Do not allow a commit against a closed leaf unless the commit
1731	** ends up on a different branch.
1732	*/
1733	if(
1734	/* parent checkin has the "closed" tag... */
1735	db_exists("SELECT 1 FROM tagxref"
1736	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1737	TAG_CLOSED, vid)
1738	/* ... and the new checkin has no --branch option or the --branch
1739	** option does not actually change the branch */
1740	&& (sCiInfo.zBranch==0
1741	\|\| db_exists("SELECT 1 FROM tagxref"
1742	" WHERE tagid=%d AND rid=%d AND tagtype>0"
1743	" AND value=%Q", TAG_BRANCH, vid, sCiInfo.zBranch))
	@@ -1869,11 +1869,11 @@
1869	if( pBaseline ){
1870	Blob delta;
1871	create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD);
1872	/*
1873	** At this point, two manifests have been constructed, either of
1874	** which would work for this checkin. The first manifest (held
1875	** in the "manifest" variable) is a baseline manifest and the second
1876	** (held in variable named "delta") is a delta manifest. The
1877	** question now is: which manifest should we use?
1878	**
1879	** Let B be the number of F-cards in the baseline manifest and
	@@ -1967,11 +1967,11 @@
1967	);
1968	db_lset_int("checkout", nvid);
1969
1970	if( useCksum ){
1971	/* Verify that the repository checksum matches the expected checksum
1972	** calculated before the checkin started (and stored as the R record
1973	** of the manifest file).
1974	*/
1975	vfile_aggregate_checksum_repository(nvid, &cksum2);
1976	if( blob_compare(&cksum1, &cksum2) ){
1977	vfile_compare_repository_to_disk(nvid);
1978

	--- src/checkin.c
	+++ src/checkin.c
	@@ -1495,11 +1495,11 @@
1495	** --no-warnings omit all warnings about file contents
1496	** --nosign do not attempt to sign this commit with gpg
1497	** --private do not sync changes and their descendants
1498	** --sha1sum verify file status using SHA1 hashing rather
1499	** than relying on file mtimes
1500	** --tag TAG-NAME assign given tag TAG-NAME to the check-in
1501	**
1502	** See also: branch, changes, checkout, extras, sync
1503	*/
1504	void commit_cmd(void){
1505	int hasChanges; /* True if unsaved changes exist */
	@@ -1729,15 +1729,15 @@
1729	/*
1730	** Do not allow a commit against a closed leaf unless the commit
1731	** ends up on a different branch.
1732	*/
1733	if(
1734	/* parent check-in has the "closed" tag... */
1735	db_exists("SELECT 1 FROM tagxref"
1736	" WHERE tagid=%d AND rid=%d AND tagtype>0",
1737	TAG_CLOSED, vid)
1738	/* ... and the new check-in has no --branch option or the --branch
1739	** option does not actually change the branch */
1740	&& (sCiInfo.zBranch==0
1741	\|\| db_exists("SELECT 1 FROM tagxref"
1742	" WHERE tagid=%d AND rid=%d AND tagtype>0"
1743	" AND value=%Q", TAG_BRANCH, vid, sCiInfo.zBranch))
	@@ -1869,11 +1869,11 @@
1869	if( pBaseline ){
1870	Blob delta;
1871	create_manifest(&delta, zBaselineUuid, pBaseline, vid, &sCiInfo, &szD);
1872	/*
1873	** At this point, two manifests have been constructed, either of
1874	** which would work for this check-in. The first manifest (held
1875	** in the "manifest" variable) is a baseline manifest and the second
1876	** (held in variable named "delta") is a delta manifest. The
1877	** question now is: which manifest should we use?
1878	**
1879	** Let B be the number of F-cards in the baseline manifest and
	@@ -1967,11 +1967,11 @@
1967	);
1968	db_lset_int("checkout", nvid);
1969
1970	if( useCksum ){
1971	/* Verify that the repository checksum matches the expected checksum
1972	** calculated before the check-in started (and stored as the R record
1973	** of the manifest file).
1974	*/
1975	vfile_aggregate_checksum_repository(nvid, &cksum2);
1976	if( blob_compare(&cksum1, &cksum2) ){
1977	vfile_compare_repository_to_disk(nvid);
1978

M src/db.c

+2 -2

		--- src/db.c
		+++ src/db.c
		@@ -1657,12 +1657,12 @@
1657	1657	** associated permissions will be copied.
1658	1658	**
1659	1659	** Options:
1660	1660	** --template FILE copy settings from repository file
1661	1661	** --admin-user\|-A USERNAME select given USERNAME as admin user
1662		-** --date-override DATETIME use DATETIME as time of the initial checkin
1663		-** (default: do not create an initial checkin)
	1662	+** --date-override DATETIME use DATETIME as time of the initial check-in
	1663	+** (default: do not create an initial check-in)
1664	1664	**
1665	1665	** See also: clone
1666	1666	*/
1667	1667	void create_repository_cmd(void){
1668	1668	char *zPassword;
1669	1669

	--- src/db.c
	+++ src/db.c
	@@ -1657,12 +1657,12 @@
1657	** associated permissions will be copied.
1658	**
1659	** Options:
1660	** --template FILE copy settings from repository file
1661	** --admin-user\|-A USERNAME select given USERNAME as admin user
1662	** --date-override DATETIME use DATETIME as time of the initial checkin
1663	** (default: do not create an initial checkin)
1664	**
1665	** See also: clone
1666	*/
1667	void create_repository_cmd(void){
1668	char *zPassword;
1669

	--- src/db.c
	+++ src/db.c
	@@ -1657,12 +1657,12 @@
1657	** associated permissions will be copied.
1658	**
1659	** Options:
1660	** --template FILE copy settings from repository file
1661	** --admin-user\|-A USERNAME select given USERNAME as admin user
1662	** --date-override DATETIME use DATETIME as time of the initial check-in
1663	** (default: do not create an initial check-in)
1664	**
1665	** See also: clone
1666	*/
1667	void create_repository_cmd(void){
1668	char *zPassword;
1669

M src/descendants.c

+3 -3

		--- src/descendants.c
		+++ src/descendants.c
		@@ -30,11 +30,11 @@
30	30	** check-in iBase.
31	31	**
32	32	** A "leaf" is a check-in that has no children in the same branch.
33	33	** There is a separate permanent table LEAF that contains all leaves
34	34	** in the tree. This routine is used to compute a subset of that
35		-** table consisting of leaves that are descended from a single checkin.
	35	+** table consisting of leaves that are descended from a single check-in.
36	36	**
37	37	** The closeMode flag determines behavior associated with the "closed"
38	38	** tag:
39	39	**
40	40	** closeMode==0 Show all leaves regardless of the "closed" tag.
		@@ -291,12 +291,12 @@
291	291	/*
292	292	** COMMAND: descendants*
293	293	**
294	294	** Usage: %fossil descendants ?CHECKIN? ?OPTIONS?
295	295	**
296		-** Find all leaf descendants of the checkin specified or if the argument
297		-** is omitted, of the checkin currently checked out.
	296	+** Find all leaf descendants of the check-in specified or if the argument
	297	+** is omitted, of the check-in currently checked out.
298	298	**
299	299	** Options:
300	300	** -R\|--repository FILE Extract info from repository FILE
301	301	** -W\|--width <num> Width of lines (default is to auto-detect).
302	302	** Must be >20 or 0 (= no limit, resulting in a
303	303

	--- src/descendants.c
	+++ src/descendants.c
	@@ -30,11 +30,11 @@
30	** check-in iBase.
31	**
32	** A "leaf" is a check-in that has no children in the same branch.
33	** There is a separate permanent table LEAF that contains all leaves
34	** in the tree. This routine is used to compute a subset of that
35	** table consisting of leaves that are descended from a single checkin.
36	**
37	** The closeMode flag determines behavior associated with the "closed"
38	** tag:
39	**
40	** closeMode==0 Show all leaves regardless of the "closed" tag.
	@@ -291,12 +291,12 @@
291	/*
292	** COMMAND: descendants*
293	**
294	** Usage: %fossil descendants ?CHECKIN? ?OPTIONS?
295	**
296	** Find all leaf descendants of the checkin specified or if the argument
297	** is omitted, of the checkin currently checked out.
298	**
299	** Options:
300	** -R\|--repository FILE Extract info from repository FILE
301	** -W\|--width <num> Width of lines (default is to auto-detect).
302	** Must be >20 or 0 (= no limit, resulting in a
303

	--- src/descendants.c
	+++ src/descendants.c
	@@ -30,11 +30,11 @@
30	** check-in iBase.
31	**
32	** A "leaf" is a check-in that has no children in the same branch.
33	** There is a separate permanent table LEAF that contains all leaves
34	** in the tree. This routine is used to compute a subset of that
35	** table consisting of leaves that are descended from a single check-in.
36	**
37	** The closeMode flag determines behavior associated with the "closed"
38	** tag:
39	**
40	** closeMode==0 Show all leaves regardless of the "closed" tag.
	@@ -291,12 +291,12 @@
291	/*
292	** COMMAND: descendants*
293	**
294	** Usage: %fossil descendants ?CHECKIN? ?OPTIONS?
295	**
296	** Find all leaf descendants of the check-in specified or if the argument
297	** is omitted, of the check-in currently checked out.
298	**
299	** Options:
300	** -R\|--repository FILE Extract info from repository FILE
301	** -W\|--width <num> Width of lines (default is to auto-detect).
302	** Must be >20 or 0 (= no limit, resulting in a
303

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2394,11 +2394,11 @@
2394	2394	** %fossil (annotate\|blame\|praise) ?OPTIONS? FILENAME
2395	2395	**
2396	2396	** Output the text of a file with markings to show when each line of
2397	2397	** the file was last modified. The "annotate" command shows line numbers
2398	2398	** and omits the username. The "blame" and "praise" commands show the user
2399		-** who made each checkin and omits the line number.
	2399	+** who made each check-in and omits the line number.
2400	2400	**
2401	2401	** Options:
2402	2402	** --filevers Show file version numbers rather than check-in versions
2403	2403	** -l\|--log List all versions analyzed
2404	2404	** -n\|--limit N Only look backwards in time by N versions
2405	2405

	--- src/diff.c
	+++ src/diff.c
	@@ -2394,11 +2394,11 @@
2394	** %fossil (annotate\|blame\|praise) ?OPTIONS? FILENAME
2395	**
2396	** Output the text of a file with markings to show when each line of
2397	** the file was last modified. The "annotate" command shows line numbers
2398	** and omits the username. The "blame" and "praise" commands show the user
2399	** who made each checkin and omits the line number.
2400	**
2401	** Options:
2402	** --filevers Show file version numbers rather than check-in versions
2403	** -l\|--log List all versions analyzed
2404	** -n\|--limit N Only look backwards in time by N versions
2405

	--- src/diff.c
	+++ src/diff.c
	@@ -2394,11 +2394,11 @@
2394	** %fossil (annotate\|blame\|praise) ?OPTIONS? FILENAME
2395	**
2396	** Output the text of a file with markings to show when each line of
2397	** the file was last modified. The "annotate" command shows line numbers
2398	** and omits the username. The "blame" and "praise" commands show the user
2399	** who made each check-in and omits the line number.
2400	**
2401	** Options:
2402	** --filevers Show file version numbers rather than check-in versions
2403	** -l\|--log List all versions analyzed
2404	** -n\|--limit N Only look backwards in time by N versions
2405

M src/doc.c

+4 -4

		--- src/doc.c
		+++ src/doc.c
		@@ -462,20 +462,20 @@
462	462	}
463	463	return seenClass;
464	464	}
465	465
466	466	/*
467		-** Look for a file named zName in the checkin with RID=vid. Load the content
	467	+** Look for a file named zName in the check-in with RID=vid. Load the content
468	468	** of that file into pContent and return the RID for the file. Or return 0
469	469	** if the file is not found or could not be loaded.
470	470	*/
471	471	int doc_load_content(int vid, const char zName, Blob pContent){
472	472	int rid; /* The RID of the file being loaded */
473	473	if( !db_table_exists("repository","vcache") ){
474	474	db_multi_exec(
475	475	"CREATE TABLE IF NOT EXISTS vcache(\n"
476		- " vid INTEGER, -- checkin ID\n"
	476	+ " vid INTEGER, -- check-in ID\n"
477	477	" fname TEXT, -- filename\n"
478	478	" rid INTEGER, -- artifact ID\n"
479	479	" PRIMARY KEY(vid,fname)\n"
480	480	") WITHOUT ROWID"
481	481	);
		@@ -531,12 +531,12 @@
531	531	*/
532	532	void doc_page(void){
533	533	const char zName; / Argument to the /doc page */
534	534	const char zOrigName = "?"; / Original document name */
535	535	const char zMime; / Document MIME type */
536		- char zCheckin = "tip"; / The checkin holding the document */
537		- int vid = 0; /* Artifact of checkin */
	536	+ char zCheckin = "tip"; / The check-in holding the document */
	537	+ int vid = 0; /* Artifact of check-in */
538	538	int rid = 0; /* Artifact of file */
539	539	int i; /* Loop counter */
540	540	Blob filebody; /* Content of the documentation file */
541	541	Blob title; /* Document title */
542	542	int nMiss = (-1); /* Failed attempts to find the document */
543	543

	--- src/doc.c
	+++ src/doc.c
	@@ -462,20 +462,20 @@
462	}
463	return seenClass;
464	}
465
466	/*
467	** Look for a file named zName in the checkin with RID=vid. Load the content
468	** of that file into pContent and return the RID for the file. Or return 0
469	** if the file is not found or could not be loaded.
470	*/
471	int doc_load_content(int vid, const char zName, Blob pContent){
472	int rid; /* The RID of the file being loaded */
473	if( !db_table_exists("repository","vcache") ){
474	db_multi_exec(
475	"CREATE TABLE IF NOT EXISTS vcache(\n"
476	" vid INTEGER, -- checkin ID\n"
477	" fname TEXT, -- filename\n"
478	" rid INTEGER, -- artifact ID\n"
479	" PRIMARY KEY(vid,fname)\n"
480	") WITHOUT ROWID"
481	);
	@@ -531,12 +531,12 @@
531	*/
532	void doc_page(void){
533	const char zName; / Argument to the /doc page */
534	const char zOrigName = "?"; / Original document name */
535	const char zMime; / Document MIME type */
536	char zCheckin = "tip"; / The checkin holding the document */
537	int vid = 0; /* Artifact of checkin */
538	int rid = 0; /* Artifact of file */
539	int i; /* Loop counter */
540	Blob filebody; /* Content of the documentation file */
541	Blob title; /* Document title */
542	int nMiss = (-1); /* Failed attempts to find the document */
543

	--- src/doc.c
	+++ src/doc.c
	@@ -462,20 +462,20 @@
462	}
463	return seenClass;
464	}
465
466	/*
467	** Look for a file named zName in the check-in with RID=vid. Load the content
468	** of that file into pContent and return the RID for the file. Or return 0
469	** if the file is not found or could not be loaded.
470	*/
471	int doc_load_content(int vid, const char zName, Blob pContent){
472	int rid; /* The RID of the file being loaded */
473	if( !db_table_exists("repository","vcache") ){
474	db_multi_exec(
475	"CREATE TABLE IF NOT EXISTS vcache(\n"
476	" vid INTEGER, -- check-in ID\n"
477	" fname TEXT, -- filename\n"
478	" rid INTEGER, -- artifact ID\n"
479	" PRIMARY KEY(vid,fname)\n"
480	") WITHOUT ROWID"
481	);
	@@ -531,12 +531,12 @@
531	*/
532	void doc_page(void){
533	const char zName; / Argument to the /doc page */
534	const char zOrigName = "?"; / Original document name */
535	const char zMime; / Document MIME type */
536	char zCheckin = "tip"; / The check-in holding the document */
537	int vid = 0; /* Artifact of check-in */
538	int rid = 0; /* Artifact of file */
539	int i; /* Loop counter */
540	Blob filebody; /* Content of the documentation file */
541	Blob title; /* Document title */
542	int nMiss = (-1); /* Failed attempts to find the document */
543

M src/foci.c

+5 -5

		--- src/foci.c
		+++ src/foci.c
		@@ -14,11 +14,11 @@
14	14	** http://www.hwaci.com/drh/
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This routine implements an SQLite virtual table that gives all of the
19		-** files associated with a single checkin.
	19	+** files associated with a single check-in.
20	20	**
21	21	** The filename "foci" is short for "Files Of CheckIn".
22	22	**
23	23	** Usage example:
24	24	**
		@@ -30,14 +30,14 @@
30	30	** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table
31	31	** decodes the manifest defined by that BLOB and returns all files described
32	32	** by that manifest. The "schema" for the temp.foci table is:
33	33	**
34	34	** CREATE TABLE files_of_checkin(
35		-** checkinID INTEGER, -- RID for the checkin manifest
	35	+** checkinID INTEGER, -- RID for the check-in manifest
36	36	** filename TEXT, -- Name of a file
37	37	** uuid TEXT, -- SHA1 hash of the file
38		-** previousName TEXT, -- Name of the file in previous checkin
	38	+** previousName TEXT, -- Name of the file in previous check-in
39	39	** perm TEXT -- Permissions on the file
40	40	** );
41	41	**
42	42	*/
43	43	#include "config.h"
		@@ -47,14 +47,14 @@
47	47	/*
48	48	** The schema for the virtual table:
49	49	*/
50	50	static const char zFociSchema[] =
51	51	@ CREATE TABLE files_of_checkin(
52		-@ checkinID INTEGER, -- RID for the checkin manifest
	52	+@ checkinID INTEGER, -- RID for the check-in manifest
53	53	@ filename TEXT, -- Name of a file
54	54	@ uuid TEXT, -- SHA1 hash of the file
55		-@ previousName TEXT, -- Name of the file in previous checkin
	55	+@ previousName TEXT, -- Name of the file in previous check-in
56	56	@ perm TEXT -- Permissions on the file
57	57	@ );
58	58	;
59	59
60	60	#if INTERFACE
61	61

	--- src/foci.c
	+++ src/foci.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This routine implements an SQLite virtual table that gives all of the
19	** files associated with a single checkin.
20	**
21	** The filename "foci" is short for "Files Of CheckIn".
22	**
23	** Usage example:
24	**
	@@ -30,14 +30,14 @@
30	** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table
31	** decodes the manifest defined by that BLOB and returns all files described
32	** by that manifest. The "schema" for the temp.foci table is:
33	**
34	** CREATE TABLE files_of_checkin(
35	** checkinID INTEGER, -- RID for the checkin manifest
36	** filename TEXT, -- Name of a file
37	** uuid TEXT, -- SHA1 hash of the file
38	** previousName TEXT, -- Name of the file in previous checkin
39	** perm TEXT -- Permissions on the file
40	** );
41	**
42	*/
43	#include "config.h"
	@@ -47,14 +47,14 @@
47	/*
48	** The schema for the virtual table:
49	*/
50	static const char zFociSchema[] =
51	@ CREATE TABLE files_of_checkin(
52	@ checkinID INTEGER, -- RID for the checkin manifest
53	@ filename TEXT, -- Name of a file
54	@ uuid TEXT, -- SHA1 hash of the file
55	@ previousName TEXT, -- Name of the file in previous checkin
56	@ perm TEXT -- Permissions on the file
57	@ );
58	;
59
60	#if INTERFACE
61

	--- src/foci.c
	+++ src/foci.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This routine implements an SQLite virtual table that gives all of the
19	** files associated with a single check-in.
20	**
21	** The filename "foci" is short for "Files Of CheckIn".
22	**
23	** Usage example:
24	**
	@@ -30,14 +30,14 @@
30	** corresponding to the 'trunk' tag. Then the files_of_checkin virtual table
31	** decodes the manifest defined by that BLOB and returns all files described
32	** by that manifest. The "schema" for the temp.foci table is:
33	**
34	** CREATE TABLE files_of_checkin(
35	** checkinID INTEGER, -- RID for the check-in manifest
36	** filename TEXT, -- Name of a file
37	** uuid TEXT, -- SHA1 hash of the file
38	** previousName TEXT, -- Name of the file in previous check-in
39	** perm TEXT -- Permissions on the file
40	** );
41	**
42	*/
43	#include "config.h"
	@@ -47,14 +47,14 @@
47	/*
48	** The schema for the virtual table:
49	*/
50	static const char zFociSchema[] =
51	@ CREATE TABLE files_of_checkin(
52	@ checkinID INTEGER, -- RID for the check-in manifest
53	@ filename TEXT, -- Name of a file
54	@ uuid TEXT, -- SHA1 hash of the file
55	@ previousName TEXT, -- Name of the file in previous check-in
56	@ perm TEXT -- Permissions on the file
57	@ );
58	;
59
60	#if INTERFACE
61

M src/fusefs.c

+3 -3

		--- src/fusefs.c
		+++ src/fusefs.c
		@@ -295,16 +295,16 @@
295	295	** DIRECTORY that contains the content of all check-ins in the
296	296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299	299	** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300		-** in the checkin. If DIRECTORY does not exist, then an attempt is
	300	+** in the check-in. If DIRECTORY does not exist, then an attempt is
301	301	** made to create it.
302	302	**
303	303	** The DIRECTORY/checkins directory is not searchable so one cannot
304		-** do "ls DIRECTORY/checkins" to get a listing of all possible checkin
305		-** names. There are countless variations on checkin names and it is
	304	+** do "ls DIRECTORY/checkins" to get a listing of all possible check-in
	305	+** names. There are countless variations on check-in names and it is
306	306	** impractical to list them all. But all other directories are searchable
307	307	** and so the "ls" command will work everywhere else in the fusefs
308	308	** file hierarchy.
309	309	**
310	310	** The FuseFS typically only works on Linux, and then only on Linux
311	311

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -295,16 +295,16 @@
295	** DIRECTORY that contains the content of all check-ins in the
296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299	** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300	** in the checkin. If DIRECTORY does not exist, then an attempt is
301	** made to create it.
302	**
303	** The DIRECTORY/checkins directory is not searchable so one cannot
304	** do "ls DIRECTORY/checkins" to get a listing of all possible checkin
305	** names. There are countless variations on checkin names and it is
306	** impractical to list them all. But all other directories are searchable
307	** and so the "ls" command will work everywhere else in the fusefs
308	** file hierarchy.
309	**
310	** The FuseFS typically only works on Linux, and then only on Linux
311

	--- src/fusefs.c
	+++ src/fusefs.c
	@@ -295,16 +295,16 @@
295	** DIRECTORY that contains the content of all check-ins in the
296	** repository. The names of files are DIRECTORY/checkins/VERSION/PATH
297	** where DIRECTORY is the root of the mount, VERSION is any valid
298	** check-in name (examples: "trunk" or "tip" or a tag or any unique
299	** prefix of a SHA1 hash, etc) and PATH is the pathname of the file
300	** in the check-in. If DIRECTORY does not exist, then an attempt is
301	** made to create it.
302	**
303	** The DIRECTORY/checkins directory is not searchable so one cannot
304	** do "ls DIRECTORY/checkins" to get a listing of all possible check-in
305	** names. There are countless variations on check-in names and it is
306	** impractical to list them all. But all other directories are searchable
307	** and so the "ls" command will work everywhere else in the fusefs
308	** file hierarchy.
309	**
310	** The FuseFS typically only works on Linux, and then only on Linux
311

M src/graph.c

+1 -1

		--- src/graph.c
		+++ src/graph.c
		@@ -363,11 +363,11 @@
363	363
364	364	/* Purge merge-parents that are out-of-graph if descenders are not
365	365	** drawn.
366	366	**
367	367	** Each node has one primary parent and zero or more "merge" parents.
368		- ** A merge parent is a prior checkin from which changes were merged into
	368	+ ** A merge parent is a prior check-in from which changes were merged into
369	369	** the current check-in. If a merge parent is not in the visible section
370	370	** of this graph, then no arrows will be drawn for it, so remove it from
371	371	** the aParent[] array.
372	372	*/
373	373	if( omitDescenders ){
374	374

	--- src/graph.c
	+++ src/graph.c
	@@ -363,11 +363,11 @@
363
364	/* Purge merge-parents that are out-of-graph if descenders are not
365	** drawn.
366	**
367	** Each node has one primary parent and zero or more "merge" parents.
368	** A merge parent is a prior checkin from which changes were merged into
369	** the current check-in. If a merge parent is not in the visible section
370	** of this graph, then no arrows will be drawn for it, so remove it from
371	** the aParent[] array.
372	*/
373	if( omitDescenders ){
374

	--- src/graph.c
	+++ src/graph.c
	@@ -363,11 +363,11 @@
363
364	/* Purge merge-parents that are out-of-graph if descenders are not
365	** drawn.
366	**
367	** Each node has one primary parent and zero or more "merge" parents.
368	** A merge parent is a prior check-in from which changes were merged into
369	** the current check-in. If a merge parent is not in the visible section
370	** of this graph, then no arrows will be drawn for it, so remove it from
371	** the aParent[] array.
372	*/
373	if( omitDescenders ){
374

M src/import.c

+1 -1

		--- src/import.c
		+++ src/import.c
		@@ -782,11 +782,11 @@
782	782	** Given any valid fast-import symbol, the corresponding fossil rid and
783	783	** uuid can found by searching against the xmark.tname field.
784	784	**
785	785	** The XBRANCH table maps commit marks and symbols into the branch those
786	786	** commits belong to. If xbranch.tname is a fast-import symbol for a
787		- ** checkin then xbranch.brnm is the branch that checkin is part of.
	787	+ ** check-in then xbranch.brnm is the branch that check-in is part of.
788	788	**
789	789	** The XTAG table records information about tags that need to be applied
790	790	** to various branches after the import finishes. The xtag.tcontent field
791	791	** contains the text of an artifact that will add a tag to a check-in.
792	792	** The git-fast-export file format might specify the same tag multiple
793	793

	--- src/import.c
	+++ src/import.c
	@@ -782,11 +782,11 @@
782	** Given any valid fast-import symbol, the corresponding fossil rid and
783	** uuid can found by searching against the xmark.tname field.
784	**
785	** The XBRANCH table maps commit marks and symbols into the branch those
786	** commits belong to. If xbranch.tname is a fast-import symbol for a
787	** checkin then xbranch.brnm is the branch that checkin is part of.
788	**
789	** The XTAG table records information about tags that need to be applied
790	** to various branches after the import finishes. The xtag.tcontent field
791	** contains the text of an artifact that will add a tag to a check-in.
792	** The git-fast-export file format might specify the same tag multiple
793

	--- src/import.c
	+++ src/import.c
	@@ -782,11 +782,11 @@
782	** Given any valid fast-import symbol, the corresponding fossil rid and
783	** uuid can found by searching against the xmark.tname field.
784	**
785	** The XBRANCH table maps commit marks and symbols into the branch those
786	** commits belong to. If xbranch.tname is a fast-import symbol for a
787	** check-in then xbranch.brnm is the branch that check-in is part of.
788	**
789	** The XTAG table records information about tags that need to be applied
790	** to various branches after the import finishes. The xtag.tcontent field
791	** contains the text of an artifact that will add a tag to a check-in.
792	** The git-fast-export file format might specify the same tag multiple
793

M src/info.c

+5 -5

		--- src/info.c
		+++ src/info.c
		@@ -517,13 +517,13 @@
517	517	int rid;
518	518	int isLeaf;
519	519	int verboseFlag; /* True to show diffs */
520	520	int sideBySide; /* True for side-by-side diffs */
521	521	u64 diffFlags; /* Flag parameter for text_diff() */
522		- const char zName; / Name of the checkin to be displayed */
	522	+ const char zName; / Name of the check-in to be displayed */
523	523	const char zUuid; / UUID of zName */
524		- const char zParent; / UUID of the parent checkin (if any) */
	524	+ const char zParent; / UUID of the parent check-in (if any) */
525	525	const char zRe; / regex parameter */
526	526	ReCompiled pRe = 0; / regex */
527	527	const char zW; / URL param for ignoring whitespace */
528	528	const char zPage = "vinfo"; / Page that shows diffs */
529	529	const char zPageHide = "ci"; / Page that hides diffs */
		@@ -879,11 +879,11 @@
879	879	@ <p>%h(z)</p>
880	880	style_footer();
881	881	}
882	882
883	883	/*
884		-** Find an checkin based on query parameter zParam and parse its
	884	+** Find an check-in based on query parameter zParam and parse its
885	885	** manifest. Return the number of errors.
886	886	*/
887	887	static Manifest vdiff_parse_manifest(const char zParam, int *pRid){
888	888	int rid;
889	889
		@@ -896,11 +896,11 @@
896	896	webpage_error("No such artifact: \"%s\"", z);
897	897	}
898	898	return 0;
899	899	}
900	900	if( !is_a_version(rid) ){
901		- webpage_error("Artifact %s is not a checkin.", P(zParam));
	901	+ webpage_error("Artifact %s is not a check-in.", P(zParam));
902	902	return 0;
903	903	}
904	904	return manifest_get(rid, CFTYPE_MANIFEST, 0);
905	905	}
906	906
		@@ -1639,11 +1639,11 @@
1639	1639	@ </pre></blockquote>
1640	1640	style_footer();
1641	1641	}
1642	1642
1643	1643	/*
1644		-** Attempt to lookup the specified checkin and file name into an rid.
	1644	+** Attempt to lookup the specified check-in and file name into an rid.
1645	1645	*/
1646	1646	int artifact_from_ci_and_filename(
1647	1647	const char *zCI,
1648	1648	const char *zFilename
1649	1649	){
1650	1650

	--- src/info.c
	+++ src/info.c
	@@ -517,13 +517,13 @@
517	int rid;
518	int isLeaf;
519	int verboseFlag; /* True to show diffs */
520	int sideBySide; /* True for side-by-side diffs */
521	u64 diffFlags; /* Flag parameter for text_diff() */
522	const char zName; / Name of the checkin to be displayed */
523	const char zUuid; / UUID of zName */
524	const char zParent; / UUID of the parent checkin (if any) */
525	const char zRe; / regex parameter */
526	ReCompiled pRe = 0; / regex */
527	const char zW; / URL param for ignoring whitespace */
528	const char zPage = "vinfo"; / Page that shows diffs */
529	const char zPageHide = "ci"; / Page that hides diffs */
	@@ -879,11 +879,11 @@
879	@ <p>%h(z)</p>
880	style_footer();
881	}
882
883	/*
884	** Find an checkin based on query parameter zParam and parse its
885	** manifest. Return the number of errors.
886	*/
887	static Manifest vdiff_parse_manifest(const char zParam, int *pRid){
888	int rid;
889
	@@ -896,11 +896,11 @@
896	webpage_error("No such artifact: \"%s\"", z);
897	}
898	return 0;
899	}
900	if( !is_a_version(rid) ){
901	webpage_error("Artifact %s is not a checkin.", P(zParam));
902	return 0;
903	}
904	return manifest_get(rid, CFTYPE_MANIFEST, 0);
905	}
906
	@@ -1639,11 +1639,11 @@
1639	@ </pre></blockquote>
1640	style_footer();
1641	}
1642
1643	/*
1644	** Attempt to lookup the specified checkin and file name into an rid.
1645	*/
1646	int artifact_from_ci_and_filename(
1647	const char *zCI,
1648	const char *zFilename
1649	){
1650

	--- src/info.c
	+++ src/info.c
	@@ -517,13 +517,13 @@
517	int rid;
518	int isLeaf;
519	int verboseFlag; /* True to show diffs */
520	int sideBySide; /* True for side-by-side diffs */
521	u64 diffFlags; /* Flag parameter for text_diff() */
522	const char zName; / Name of the check-in to be displayed */
523	const char zUuid; / UUID of zName */
524	const char zParent; / UUID of the parent check-in (if any) */
525	const char zRe; / regex parameter */
526	ReCompiled pRe = 0; / regex */
527	const char zW; / URL param for ignoring whitespace */
528	const char zPage = "vinfo"; / Page that shows diffs */
529	const char zPageHide = "ci"; / Page that hides diffs */
	@@ -879,11 +879,11 @@
879	@ <p>%h(z)</p>
880	style_footer();
881	}
882
883	/*
884	** Find an check-in based on query parameter zParam and parse its
885	** manifest. Return the number of errors.
886	*/
887	static Manifest vdiff_parse_manifest(const char zParam, int *pRid){
888	int rid;
889
	@@ -896,11 +896,11 @@
896	webpage_error("No such artifact: \"%s\"", z);
897	}
898	return 0;
899	}
900	if( !is_a_version(rid) ){
901	webpage_error("Artifact %s is not a check-in.", P(zParam));
902	return 0;
903	}
904	return manifest_get(rid, CFTYPE_MANIFEST, 0);
905	}
906
	@@ -1639,11 +1639,11 @@
1639	@ </pre></blockquote>
1640	style_footer();
1641	}
1642
1643	/*
1644	** Attempt to lookup the specified check-in and file name into an rid.
1645	*/
1646	int artifact_from_ci_and_filename(
1647	const char *zCI,
1648	const char *zFilename
1649	){
1650

M src/leaf.c

+3 -3

		--- src/leaf.c
		+++ src/leaf.c
		@@ -16,12 +16,12 @@
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code used to manage the "leaf" table of the
19	19	** repository.
20	20	**
21		-** The LEAF table contains the rids for all leaves in the checkin DAG.
22		-** A leaf is a checkin that has no children in the same branch.
	21	+** The LEAF table contains the rids for all leaves in the check-in DAG.
	22	+** A leaf is a check-in that has no children in the same branch.
23	23	*/
24	24	#include "config.h"
25	25	#include "leaf.h"
26	26	#include <assert.h>
27	27
		@@ -101,11 +101,11 @@
101	101	** A bag of checkins whose leaf status needs to be checked.
102	102	*/
103	103	static Bag needToCheck;
104	104
105	105	/*
106		-** Check to see if checkin "rid" is a leaf and either add it to the LEAF
	106	+** Check to see if check-in "rid" is a leaf and either add it to the LEAF
107	107	** table if it is, or remove it if it is not.
108	108	*/
109	109	void leaf_check(int rid){
110	110	static Stmt checkIfLeaf;
111	111	static Stmt addLeaf;
112	112

	--- src/leaf.c
	+++ src/leaf.c
	@@ -16,12 +16,12 @@
16	*******************************************************************************
17	**
18	** This file contains code used to manage the "leaf" table of the
19	** repository.
20	**
21	** The LEAF table contains the rids for all leaves in the checkin DAG.
22	** A leaf is a checkin that has no children in the same branch.
23	*/
24	#include "config.h"
25	#include "leaf.h"
26	#include <assert.h>
27
	@@ -101,11 +101,11 @@
101	** A bag of checkins whose leaf status needs to be checked.
102	*/
103	static Bag needToCheck;
104
105	/*
106	** Check to see if checkin "rid" is a leaf and either add it to the LEAF
107	** table if it is, or remove it if it is not.
108	*/
109	void leaf_check(int rid){
110	static Stmt checkIfLeaf;
111	static Stmt addLeaf;
112

	--- src/leaf.c
	+++ src/leaf.c
	@@ -16,12 +16,12 @@
16	*******************************************************************************
17	**
18	** This file contains code used to manage the "leaf" table of the
19	** repository.
20	**
21	** The LEAF table contains the rids for all leaves in the check-in DAG.
22	** A leaf is a check-in that has no children in the same branch.
23	*/
24	#include "config.h"
25	#include "leaf.h"
26	#include <assert.h>
27
	@@ -101,11 +101,11 @@
101	** A bag of checkins whose leaf status needs to be checked.
102	*/
103	static Bag needToCheck;
104
105	/*
106	** Check to see if check-in "rid" is a leaf and either add it to the LEAF
107	** table if it is, or remove it if it is not.
108	*/
109	void leaf_check(int rid){
110	static Stmt checkIfLeaf;
111	static Stmt addLeaf;
112

M src/manifest.c

+5 -5

		--- src/manifest.c
		+++ src/manifest.c
		@@ -678,11 +678,11 @@
678	678	** P <uuid> ...
679	679	**
680	680	** Specify one or more other artifacts which are the parents of
681	681	** this artifact. The first parent is the primary parent. All
682	682	** others are parents by merge. Note that the initial empty
683		- ** checkin historically has an empty P-card, so empty P-cards
	683	+ ** check-in historically has an empty P-card, so empty P-cards
684	684	** must be accepted.
685	685	*/
686	686	case 'P': {
687	687	while( (zUuid = next_token(&x, &sz))!=0 ){
688	688	if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card");
		@@ -700,11 +700,11 @@
700	700
701	701	/*
702	702	** Q (+\|-)<uuid> ?<uuid>?
703	703	**
704	704	** Specify one or a range of checkins that are cherrypicked into
705		- ** this checkin ("+") or backed out of this checkin ("-").
	705	+ ** this check-in ("+") or backed out of this check-in ("-").
706	706	*/
707	707	case 'Q': {
708	708	if( (zUuid=next_token(&x, &sz))==0 ) SYNTAX("missing UUID on Q-card");
709	709	if( sz!=UUID_SIZE+1 ) SYNTAX("wrong size UUID on Q-card");
710	710	if( zUuid[0]!='+' && zUuid[0]!='-' ){
		@@ -995,25 +995,25 @@
995	995	}
996	996	return p;
997	997	}
998	998
999	999	/*
1000		-** Given a checkin name, load and parse the manifest for that checkin.
	1000	+** Given a check-in name, load and parse the manifest for that check-in.
1001	1001	** Throw a fatal error if anything goes wrong.
1002	1002	*/
1003	1003	Manifest manifest_get_by_name(const char zName, int *pRid){
1004	1004	int rid;
1005	1005	Manifest *p;
1006	1006
1007	1007	rid = name_to_typed_rid(zName, "ci");
1008	1008	if( !is_a_version(rid) ){
1009		- fossil_fatal("no such checkin: %s", zName);
	1009	+ fossil_fatal("no such check-in: %s", zName);
1010	1010	}
1011	1011	if( pRid ) *pRid = rid;
1012	1012	p = manifest_get(rid, CFTYPE_MANIFEST, 0);
1013	1013	if( p==0 ){
1014		- fossil_fatal("cannot parse manifest for checkin: %s", zName);
	1014	+ fossil_fatal("cannot parse manifest for check-in: %s", zName);
1015	1015	}
1016	1016	return p;
1017	1017	}
1018	1018
1019	1019	/*
1020	1020

	--- src/manifest.c
	+++ src/manifest.c
	@@ -678,11 +678,11 @@
678	** P <uuid> ...
679	**
680	** Specify one or more other artifacts which are the parents of
681	** this artifact. The first parent is the primary parent. All
682	** others are parents by merge. Note that the initial empty
683	** checkin historically has an empty P-card, so empty P-cards
684	** must be accepted.
685	*/
686	case 'P': {
687	while( (zUuid = next_token(&x, &sz))!=0 ){
688	if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card");
	@@ -700,11 +700,11 @@
700
701	/*
702	** Q (+\|-)<uuid> ?<uuid>?
703	**
704	** Specify one or a range of checkins that are cherrypicked into
705	** this checkin ("+") or backed out of this checkin ("-").
706	*/
707	case 'Q': {
708	if( (zUuid=next_token(&x, &sz))==0 ) SYNTAX("missing UUID on Q-card");
709	if( sz!=UUID_SIZE+1 ) SYNTAX("wrong size UUID on Q-card");
710	if( zUuid[0]!='+' && zUuid[0]!='-' ){
	@@ -995,25 +995,25 @@
995	}
996	return p;
997	}
998
999	/*
1000	** Given a checkin name, load and parse the manifest for that checkin.
1001	** Throw a fatal error if anything goes wrong.
1002	*/
1003	Manifest manifest_get_by_name(const char zName, int *pRid){
1004	int rid;
1005	Manifest *p;
1006
1007	rid = name_to_typed_rid(zName, "ci");
1008	if( !is_a_version(rid) ){
1009	fossil_fatal("no such checkin: %s", zName);
1010	}
1011	if( pRid ) *pRid = rid;
1012	p = manifest_get(rid, CFTYPE_MANIFEST, 0);
1013	if( p==0 ){
1014	fossil_fatal("cannot parse manifest for checkin: %s", zName);
1015	}
1016	return p;
1017	}
1018
1019	/*
1020

	--- src/manifest.c
	+++ src/manifest.c
	@@ -678,11 +678,11 @@
678	** P <uuid> ...
679	**
680	** Specify one or more other artifacts which are the parents of
681	** this artifact. The first parent is the primary parent. All
682	** others are parents by merge. Note that the initial empty
683	** check-in historically has an empty P-card, so empty P-cards
684	** must be accepted.
685	*/
686	case 'P': {
687	while( (zUuid = next_token(&x, &sz))!=0 ){
688	if( sz!=UUID_SIZE ) SYNTAX("wrong size UUID on P-card");
	@@ -700,11 +700,11 @@
700
701	/*
702	** Q (+\|-)<uuid> ?<uuid>?
703	**
704	** Specify one or a range of checkins that are cherrypicked into
705	** this check-in ("+") or backed out of this check-in ("-").
706	*/
707	case 'Q': {
708	if( (zUuid=next_token(&x, &sz))==0 ) SYNTAX("missing UUID on Q-card");
709	if( sz!=UUID_SIZE+1 ) SYNTAX("wrong size UUID on Q-card");
710	if( zUuid[0]!='+' && zUuid[0]!='-' ){
	@@ -995,25 +995,25 @@
995	}
996	return p;
997	}
998
999	/*
1000	** Given a check-in name, load and parse the manifest for that check-in.
1001	** Throw a fatal error if anything goes wrong.
1002	*/
1003	Manifest manifest_get_by_name(const char zName, int *pRid){
1004	int rid;
1005	Manifest *p;
1006
1007	rid = name_to_typed_rid(zName, "ci");
1008	if( !is_a_version(rid) ){
1009	fossil_fatal("no such check-in: %s", zName);
1010	}
1011	if( pRid ) *pRid = rid;
1012	p = manifest_get(rid, CFTYPE_MANIFEST, 0);
1013	if( p==0 ){
1014	fossil_fatal("cannot parse manifest for check-in: %s", zName);
1015	}
1016	return p;
1017	}
1018
1019	/*
1020

M src/path.c

+2 -2

		--- src/path.c
		+++ src/path.c
		@@ -349,12 +349,12 @@
349	349	int newName; /* Name of file in next version */
350	350	NameChange pNext; / List of all name changes */
351	351	};
352	352
353	353	/*
354		-** Compute all file name changes that occur going from checkin iFrom
355		-** to checkin iTo.
	354	+** Compute all file name changes that occur going from check-in iFrom
	355	+** to check-in iTo.
356	356	**
357	357	** The number of name changes is written into *pnChng. For each name
358	358	** change, two integers are allocated for *piChng. The first is the
359	359	** filename.fnid for the original name as seen in check-in iFrom and
360	360	** the second is for new name as it is used in check-in iTo.
361	361

	--- src/path.c
	+++ src/path.c
	@@ -349,12 +349,12 @@
349	int newName; /* Name of file in next version */
350	NameChange pNext; / List of all name changes */
351	};
352
353	/*
354	** Compute all file name changes that occur going from checkin iFrom
355	** to checkin iTo.
356	**
357	** The number of name changes is written into *pnChng. For each name
358	** change, two integers are allocated for *piChng. The first is the
359	** filename.fnid for the original name as seen in check-in iFrom and
360	** the second is for new name as it is used in check-in iTo.
361

	--- src/path.c
	+++ src/path.c
	@@ -349,12 +349,12 @@
349	int newName; /* Name of file in next version */
350	NameChange pNext; / List of all name changes */
351	};
352
353	/*
354	** Compute all file name changes that occur going from check-in iFrom
355	** to check-in iTo.
356	**
357	** The number of name changes is written into *pnChng. For each name
358	** change, two integers are allocated for *piChng. The first is the
359	** filename.fnid for the original name as seen in check-in iFrom and
360	** the second is for new name as it is used in check-in iTo.
361

M src/publish.c

+1 -1

		--- src/publish.c
		+++ src/publish.c
		@@ -59,11 +59,11 @@
59	59	** Cause artifacts identified by TAGS... to be published (made non-private).
60	60	** This can be used (for example) to convert a private branch into a public
61	61	** branch, or to publish a bundle that was imported privately.
62	62	**
63	63	** If any of TAGS names a branch, then all checkins on the most recent
64		-** instance of that branch are included, not just the most recent checkin.
	64	+** instance of that branch are included, not just the most recent check-in.
65	65	**
66	66	** If any of TAGS name checkins then all files and tags associated with
67	67	** those checkins are also published automatically. Except if the --only
68	68	** option is used, then only the specific artifacts identified by TAGS
69	69	** are published.
70	70

	--- src/publish.c
	+++ src/publish.c
	@@ -59,11 +59,11 @@
59	** Cause artifacts identified by TAGS... to be published (made non-private).
60	** This can be used (for example) to convert a private branch into a public
61	** branch, or to publish a bundle that was imported privately.
62	**
63	** If any of TAGS names a branch, then all checkins on the most recent
64	** instance of that branch are included, not just the most recent checkin.
65	**
66	** If any of TAGS name checkins then all files and tags associated with
67	** those checkins are also published automatically. Except if the --only
68	** option is used, then only the specific artifacts identified by TAGS
69	** are published.
70

	--- src/publish.c
	+++ src/publish.c
	@@ -59,11 +59,11 @@
59	** Cause artifacts identified by TAGS... to be published (made non-private).
60	** This can be used (for example) to convert a private branch into a public
61	** branch, or to publish a bundle that was imported privately.
62	**
63	** If any of TAGS names a branch, then all checkins on the most recent
64	** instance of that branch are included, not just the most recent check-in.
65	**
66	** If any of TAGS name checkins then all files and tags associated with
67	** those checkins are also published automatically. Except if the --only
68	** option is used, then only the specific artifacts identified by TAGS
69	** are published.
70

M src/purge.c

+2 -2

		--- src/purge.c
		+++ src/purge.c
		@@ -195,11 +195,11 @@
195	195	}
196	196
197	197	/*
198	198	** The TEMP table named zTab contains RIDs for a set of checkins.
199	199	**
200		-** Check to see if any checkin in zTab is a baseline manifest for some
	200	+** Check to see if any check-in in zTab is a baseline manifest for some
201	201	** delta manifest that is not in zTab. Return true if zTab contains a
202	202	** baseline for a delta that is not in zTab.
203	203	**
204	204	** This is a database integrity preservation check. The checkins in zTab
205	205	** are about to be deleted or otherwise made inaccessible. This routine
		@@ -218,11 +218,11 @@
218	218	}
219	219	}
220	220
221	221
222	222	/*
223		-** The TEMP table named zTab contains the RIDs for a set of checkin
	223	+** The TEMP table named zTab contains the RIDs for a set of check-in
224	224	** artifacts. Expand this set (by adding new entries to zTab) to include
225	225	** all other artifacts that are used the set of checkins in
226	226	** the original list.
227	227	**
228	228	** If the bExclusive flag is true, then the set is only expanded by
229	229

	--- src/purge.c
	+++ src/purge.c
	@@ -195,11 +195,11 @@
195	}
196
197	/*
198	** The TEMP table named zTab contains RIDs for a set of checkins.
199	**
200	** Check to see if any checkin in zTab is a baseline manifest for some
201	** delta manifest that is not in zTab. Return true if zTab contains a
202	** baseline for a delta that is not in zTab.
203	**
204	** This is a database integrity preservation check. The checkins in zTab
205	** are about to be deleted or otherwise made inaccessible. This routine
	@@ -218,11 +218,11 @@
218	}
219	}
220
221
222	/*
223	** The TEMP table named zTab contains the RIDs for a set of checkin
224	** artifacts. Expand this set (by adding new entries to zTab) to include
225	** all other artifacts that are used the set of checkins in
226	** the original list.
227	**
228	** If the bExclusive flag is true, then the set is only expanded by
229

	--- src/purge.c
	+++ src/purge.c
	@@ -195,11 +195,11 @@
195	}
196
197	/*
198	** The TEMP table named zTab contains RIDs for a set of checkins.
199	**
200	** Check to see if any check-in in zTab is a baseline manifest for some
201	** delta manifest that is not in zTab. Return true if zTab contains a
202	** baseline for a delta that is not in zTab.
203	**
204	** This is a database integrity preservation check. The checkins in zTab
205	** are about to be deleted or otherwise made inaccessible. This routine
	@@ -218,11 +218,11 @@
218	}
219	}
220
221
222	/*
223	** The TEMP table named zTab contains the RIDs for a set of check-in
224	** artifacts. Expand this set (by adding new entries to zTab) to include
225	** all other artifacts that are used the set of checkins in
226	** the original list.
227	**
228	** If the bExclusive flag is true, then the set is only expanded by
229

M src/search.c

+1 -1

		--- src/search.c
		+++ src/search.c
		@@ -14,11 +14,11 @@
14	14	** http://www.hwaci.com/drh/
15	15	**
16	16	*******************************************************************************
17	17	**
18	18	** This file contains code to implement a very simple search function
19		-** against timeline comments, checkin content, wiki pages, and/or tickets.
	19	+** against timeline comments, check-in content, wiki pages, and/or tickets.
20	20	**
21	21	** The search is full-text like in that it is looking for words and ignores
22	22	** punctuation and capitalization. But it is more akin to "grep" in that
23	23	** it scans the entire corpus for the search, and it does not support the
24	24	** full functionality of FTS4.
25	25

	--- src/search.c
	+++ src/search.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code to implement a very simple search function
19	** against timeline comments, checkin content, wiki pages, and/or tickets.
20	**
21	** The search is full-text like in that it is looking for words and ignores
22	** punctuation and capitalization. But it is more akin to "grep" in that
23	** it scans the entire corpus for the search, and it does not support the
24	** full functionality of FTS4.
25

	--- src/search.c
	+++ src/search.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code to implement a very simple search function
19	** against timeline comments, check-in content, wiki pages, and/or tickets.
20	**
21	** The search is full-text like in that it is looking for words and ignores
22	** punctuation and capitalization. But it is more akin to "grep" in that
23	** it scans the entire corpus for the search, and it does not support the
24	** full functionality of FTS4.
25

M src/tar.c

+4 -4

		--- src/tar.c
		+++ src/tar.c
		@@ -445,12 +445,12 @@
445	445	tar_finish(&zip);
446	446	blob_write_to_file(&zip, g.argv[2]);
447	447	}
448	448
449	449	/*
450		-** Given the RID for a checkin, construct a tarball containing
451		-** all files in that checkin
	450	+** Given the RID for a check-in, construct a tarball containing
	451	+** all files in that check-in
452	452	**
453	453	** If RID is for an object that is not a real manifest, then the
454	454	** resulting tarball contains a single file which is the RID
455	455	** object.
456	456	**
		@@ -558,11 +558,11 @@
558	558	if( g.argc!=4 ){
559	559	usage("VERSION OUTPUTFILE");
560	560	}
561	561	rid = name_to_typed_rid(g.argv[2], "ci");
562	562	if( rid==0 ){
563		- fossil_fatal("Checkin not found: %s", g.argv[2]);
	563	+ fossil_fatal("Check-in not found: %s", g.argv[2]);
564	564	return;
565	565	}
566	566
567	567	if( zName==0 ){
568	568	zName = db_text("default-name",
		@@ -582,11 +582,11 @@
582	582
583	583	/*
584	584	** WEBPAGE: tarball
585	585	** URL: /tarball/RID.tar.gz
586	586	**
587		-** Generate a compressed tarball for a checkin.
	587	+** Generate a compressed tarball for a check-in.
588	588	** Return that tarball as the HTTP reply content.
589	589	**
590	590	** Optional URL Parameters:
591	591	**
592	592	** - name=NAME[.tar.gz] is base name of the output file. Defaults to
593	593

	--- src/tar.c
	+++ src/tar.c
	@@ -445,12 +445,12 @@
445	tar_finish(&zip);
446	blob_write_to_file(&zip, g.argv[2]);
447	}
448
449	/*
450	** Given the RID for a checkin, construct a tarball containing
451	** all files in that checkin
452	**
453	** If RID is for an object that is not a real manifest, then the
454	** resulting tarball contains a single file which is the RID
455	** object.
456	**
	@@ -558,11 +558,11 @@
558	if( g.argc!=4 ){
559	usage("VERSION OUTPUTFILE");
560	}
561	rid = name_to_typed_rid(g.argv[2], "ci");
562	if( rid==0 ){
563	fossil_fatal("Checkin not found: %s", g.argv[2]);
564	return;
565	}
566
567	if( zName==0 ){
568	zName = db_text("default-name",
	@@ -582,11 +582,11 @@
582
583	/*
584	** WEBPAGE: tarball
585	** URL: /tarball/RID.tar.gz
586	**
587	** Generate a compressed tarball for a checkin.
588	** Return that tarball as the HTTP reply content.
589	**
590	** Optional URL Parameters:
591	**
592	** - name=NAME[.tar.gz] is base name of the output file. Defaults to
593

	--- src/tar.c
	+++ src/tar.c
	@@ -445,12 +445,12 @@
445	tar_finish(&zip);
446	blob_write_to_file(&zip, g.argv[2]);
447	}
448
449	/*
450	** Given the RID for a check-in, construct a tarball containing
451	** all files in that check-in
452	**
453	** If RID is for an object that is not a real manifest, then the
454	** resulting tarball contains a single file which is the RID
455	** object.
456	**
	@@ -558,11 +558,11 @@
558	if( g.argc!=4 ){
559	usage("VERSION OUTPUTFILE");
560	}
561	rid = name_to_typed_rid(g.argv[2], "ci");
562	if( rid==0 ){
563	fossil_fatal("Check-in not found: %s", g.argv[2]);
564	return;
565	}
566
567	if( zName==0 ){
568	zName = db_text("default-name",
	@@ -582,11 +582,11 @@
582
583	/*
584	** WEBPAGE: tarball
585	** URL: /tarball/RID.tar.gz
586	**
587	** Generate a compressed tarball for a check-in.
588	** Return that tarball as the HTTP reply content.
589	**
590	** Optional URL Parameters:
591	**
592	** - name=NAME[.tar.gz] is base name of the output file. Defaults to
593

M src/th_main.c

+1 -1

		--- src/th_main.c
		+++ src/th_main.c
		@@ -270,11 +270,11 @@
270	270	}
271	271	return rid;
272	272	}
273	273
274	274	/*
275		-** Attempt to lookup the specified checkin and file name into an rid.
	275	+** Attempt to lookup the specified check-in and file name into an rid.
276	276	** This function was copied from artifact_from_ci_and_filename() in
277	277	** info.c; however, it has been modified to report TH1 script errors
278	278	** instead of "fatal errors".
279	279	*/
280	280	int th1_artifact_from_ci_and_filename(
281	281

	--- src/th_main.c
	+++ src/th_main.c
	@@ -270,11 +270,11 @@
270	}
271	return rid;
272	}
273
274	/*
275	** Attempt to lookup the specified checkin and file name into an rid.
276	** This function was copied from artifact_from_ci_and_filename() in
277	** info.c; however, it has been modified to report TH1 script errors
278	** instead of "fatal errors".
279	*/
280	int th1_artifact_from_ci_and_filename(
281

	--- src/th_main.c
	+++ src/th_main.c
	@@ -270,11 +270,11 @@
270	}
271	return rid;
272	}
273
274	/*
275	** Attempt to lookup the specified check-in and file name into an rid.
276	** This function was copied from artifact_from_ci_and_filename() in
277	** info.c; however, it has been modified to report TH1 script errors
278	** instead of "fatal errors".
279	*/
280	int th1_artifact_from_ci_and_filename(
281

Fossil SCM

Keyboard Shortcuts