6ec2c2e3d96… — Fossil SCM

M src/finfo.c

+1 -1

		--- src/finfo.c
		+++ src/finfo.c
		@@ -503,11 +503,11 @@
503	503	const char *z = zFilename;
504	504	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
505	505	@ [annotate]</a>
506	506	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
507	507	@ [blame]</a>
508		- @ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[checkins using]</a>
	508	+ @ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins using]</a>
509	509	if( fpid ){
510	510	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
511	511	}
512	512	}
513	513	if( fDebug & FINFO_DEBUG_MLINK ){
514	514

	--- src/finfo.c
	+++ src/finfo.c
	@@ -503,11 +503,11 @@
503	const char *z = zFilename;
504	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
505	@ [annotate]</a>
506	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
507	@ [blame]</a>
508	@ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[checkins using]</a>
509	if( fpid ){
510	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
511	}
512	}
513	if( fDebug & FINFO_DEBUG_MLINK ){
514

	--- src/finfo.c
	+++ src/finfo.c
	@@ -503,11 +503,11 @@
503	const char *z = zFilename;
504	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
505	@ [annotate]</a>
506	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
507	@ [blame]</a>
508	@ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins using]</a>
509	if( fpid ){
510	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
511	}
512	}
513	if( fDebug & FINFO_DEBUG_MLINK ){
514

M src/info.c

+3 -3

		--- src/info.c
		+++ src/info.c
		@@ -976,11 +976,11 @@
976	976	** v=BOOLEAN Default true. If false, only list files that have changed
977	977	** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false
978	978	** glob=STRING only diff files matching this glob
979	979	**
980	980	**
981		-** Show all differences between two checkins.
	981	+** Show all differences between two check-ins.
982	982	*/
983	983	void vdiff_page(void){
984	984	int ridFrom, ridTo;
985	985	int verboseFlag = 0;
986	986	int sideBySide = 0;
		@@ -1238,14 +1238,14 @@
1238	1238	prevName = fossil_strdup(zName);
1239	1239	}
1240	1240	if( showDetail ){
1241	1241	@ <li>
1242	1242	hyperlink_to_date(zDate,"");
1243		- @ — part of checkin
	1243	+ @ — part of check-in
1244	1244	hyperlink_to_uuid(zVers);
1245	1245	}else{
1246		- @ — part of checkin
	1246	+ @ — part of check-in
1247	1247	hyperlink_to_uuid(zVers);
1248	1248	@ at
1249	1249	hyperlink_to_date(zDate,"");
1250	1250	}
1251	1251	if( zBr && zBr[0] ){
1252	1252

	--- src/info.c
	+++ src/info.c
	@@ -976,11 +976,11 @@
976	** v=BOOLEAN Default true. If false, only list files that have changed
977	** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false
978	** glob=STRING only diff files matching this glob
979	**
980	**
981	** Show all differences between two checkins.
982	*/
983	void vdiff_page(void){
984	int ridFrom, ridTo;
985	int verboseFlag = 0;
986	int sideBySide = 0;
	@@ -1238,14 +1238,14 @@
1238	prevName = fossil_strdup(zName);
1239	}
1240	if( showDetail ){
1241	@ <li>
1242	hyperlink_to_date(zDate,"");
1243	@ — part of checkin
1244	hyperlink_to_uuid(zVers);
1245	}else{
1246	@ — part of checkin
1247	hyperlink_to_uuid(zVers);
1248	@ at
1249	hyperlink_to_date(zDate,"");
1250	}
1251	if( zBr && zBr[0] ){
1252

	--- src/info.c
	+++ src/info.c
	@@ -976,11 +976,11 @@
976	** v=BOOLEAN Default true. If false, only list files that have changed
977	** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false
978	** glob=STRING only diff files matching this glob
979	**
980	**
981	** Show all differences between two check-ins.
982	*/
983	void vdiff_page(void){
984	int ridFrom, ridTo;
985	int verboseFlag = 0;
986	int sideBySide = 0;
	@@ -1238,14 +1238,14 @@
1238	prevName = fossil_strdup(zName);
1239	}
1240	if( showDetail ){
1241	@ <li>
1242	hyperlink_to_date(zDate,"");
1243	@ — part of check-in
1244	hyperlink_to_uuid(zVers);
1245	}else{
1246	@ — part of check-in
1247	hyperlink_to_uuid(zVers);
1248	@ at
1249	hyperlink_to_date(zDate,"");
1250	}
1251	if( zBr && zBr[0] ){
1252

M src/json_artifact.c

+5 -5

		--- src/json_artifact.c
		+++ src/json_artifact.c
		@@ -207,15 +207,15 @@
207	207	manifest_destroy(pTktChng);
208	208	return cson_object_value(pay);
209	209	}
210	210
211	211	/*
212		-** Sub-impl of /json/artifact for checkins.
	212	+** Sub-impl of /json/artifact for check-ins.
213	213	*/
214	214	static cson_value * json_artifact_ci( cson_object * zParent, int rid ){
215	215	if(!g.perm.Read){
216		- json_set_err( FSL_JSON_E_DENIED, "Viewing checkins requires 'o' privileges." );
	216	+ json_set_err( FSL_JSON_E_DENIED, "Viewing check-ins requires 'o' privileges." );
217	217	return NULL;
218	218	}else{
219	219	cson_value * artV = json_artifact_for_ci(rid, 1);
220	220	cson_object * art = cson_value_get_object(artV);
221	221	if(art){
		@@ -346,20 +346,20 @@
346	346	if(parentUuid){
347	347	cson_object_set( zParent, "parent", json_new_string(parentUuid) );
348	348	fossil_free(parentUuid);
349	349	}
350	350
351		- /* Find checkins associated with this file... */
	351	+ /* Find check-ins associated with this file... */
352	352	db_prepare(&q,
353	353	"SELECT filename.name AS name, "
354	354	" (mlink.pid==0) AS isNew,"
355	355	" (mlink.fid==0) AS isDel,"
356	356	" cast(strftime('%%s',event.mtime) as int) AS timestamp,"
357	357	" coalesce(event.ecomment,event.comment) as comment,"
358	358	" coalesce(event.euser,event.user) as user,"
359	359	#if 0
360		- " a.size AS size," /* same for all checkins. */
	360	+ " a.size AS size," /* same for all check-ins. */
361	361	#endif
362	362	" b.uuid as checkin, "
363	363	#if 0
364	364	" mlink.mperm as mperm,"
365	365	#endif
		@@ -373,11 +373,11 @@
373	373	" AND b.rid=mlink.mid"
374	374	" AND mlink.fid=%d"
375	375	" ORDER BY filename.name, event.mtime",
376	376	TAG_BRANCH, rid
377	377	);
378		- /* TODO: add a "state" flag for the file in each checkin,
	378	+ /* TODO: add a "state" flag for the file in each check-in,
379	379	e.g. "modified", "new", "deleted".
380	380	*/
381	381	checkin_arr = cson_new_array();
382	382	cson_object_set(pay, "checkins", cson_array_value(checkin_arr));
383	383	while( (SQLITE_ROW==db_step(&q) ) ){
384	384

	--- src/json_artifact.c
	+++ src/json_artifact.c
	@@ -207,15 +207,15 @@
207	manifest_destroy(pTktChng);
208	return cson_object_value(pay);
209	}
210
211	/*
212	** Sub-impl of /json/artifact for checkins.
213	*/
214	static cson_value * json_artifact_ci( cson_object * zParent, int rid ){
215	if(!g.perm.Read){
216	json_set_err( FSL_JSON_E_DENIED, "Viewing checkins requires 'o' privileges." );
217	return NULL;
218	}else{
219	cson_value * artV = json_artifact_for_ci(rid, 1);
220	cson_object * art = cson_value_get_object(artV);
221	if(art){
	@@ -346,20 +346,20 @@
346	if(parentUuid){
347	cson_object_set( zParent, "parent", json_new_string(parentUuid) );
348	fossil_free(parentUuid);
349	}
350
351	/* Find checkins associated with this file... */
352	db_prepare(&q,
353	"SELECT filename.name AS name, "
354	" (mlink.pid==0) AS isNew,"
355	" (mlink.fid==0) AS isDel,"
356	" cast(strftime('%%s',event.mtime) as int) AS timestamp,"
357	" coalesce(event.ecomment,event.comment) as comment,"
358	" coalesce(event.euser,event.user) as user,"
359	#if 0
360	" a.size AS size," /* same for all checkins. */
361	#endif
362	" b.uuid as checkin, "
363	#if 0
364	" mlink.mperm as mperm,"
365	#endif
	@@ -373,11 +373,11 @@
373	" AND b.rid=mlink.mid"
374	" AND mlink.fid=%d"
375	" ORDER BY filename.name, event.mtime",
376	TAG_BRANCH, rid
377	);
378	/* TODO: add a "state" flag for the file in each checkin,
379	e.g. "modified", "new", "deleted".
380	*/
381	checkin_arr = cson_new_array();
382	cson_object_set(pay, "checkins", cson_array_value(checkin_arr));
383	while( (SQLITE_ROW==db_step(&q) ) ){
384

	--- src/json_artifact.c
	+++ src/json_artifact.c
	@@ -207,15 +207,15 @@
207	manifest_destroy(pTktChng);
208	return cson_object_value(pay);
209	}
210
211	/*
212	** Sub-impl of /json/artifact for check-ins.
213	*/
214	static cson_value * json_artifact_ci( cson_object * zParent, int rid ){
215	if(!g.perm.Read){
216	json_set_err( FSL_JSON_E_DENIED, "Viewing check-ins requires 'o' privileges." );
217	return NULL;
218	}else{
219	cson_value * artV = json_artifact_for_ci(rid, 1);
220	cson_object * art = cson_value_get_object(artV);
221	if(art){
	@@ -346,20 +346,20 @@
346	if(parentUuid){
347	cson_object_set( zParent, "parent", json_new_string(parentUuid) );
348	fossil_free(parentUuid);
349	}
350
351	/* Find check-ins associated with this file... */
352	db_prepare(&q,
353	"SELECT filename.name AS name, "
354	" (mlink.pid==0) AS isNew,"
355	" (mlink.fid==0) AS isDel,"
356	" cast(strftime('%%s',event.mtime) as int) AS timestamp,"
357	" coalesce(event.ecomment,event.comment) as comment,"
358	" coalesce(event.euser,event.user) as user,"
359	#if 0
360	" a.size AS size," /* same for all check-ins. */
361	#endif
362	" b.uuid as checkin, "
363	#if 0
364	" mlink.mperm as mperm,"
365	#endif
	@@ -373,11 +373,11 @@
373	" AND b.rid=mlink.mid"
374	" AND mlink.fid=%d"
375	" ORDER BY filename.name, event.mtime",
376	TAG_BRANCH, rid
377	);
378	/* TODO: add a "state" flag for the file in each check-in,
379	e.g. "modified", "new", "deleted".
380	*/
381	checkin_arr = cson_new_array();
382	cson_object_set(pay, "checkins", cson_array_value(checkin_arr));
383	while( (SQLITE_ROW==db_step(&q) ) ){
384

M src/json_tag.c

+2 -2

		--- src/json_tag.c
		+++ src/json_tag.c
		@@ -353,11 +353,11 @@
353	353	payV = cson_value_new_object();
354	354	pay = cson_value_get_object(payV);
355	355	cson_object_set(pay, "raw", cson_value_new_bool(fRaw) );
356	356	if( zCheckin ){
357	357	/**
358		- Tags for a specific checkin. Output format:
	358	+ Tags for a specific check-in. Output format:
359	359
360	360	RAW mode:
361	361
362	362	{
363	363	"sym-tagname": (value \|\| null),
		@@ -374,11 +374,11 @@
374	374	cson_value * objV = NULL;
375	375	cson_object * obj = NULL;
376	376	int const rid = name_to_rid(zCheckin);
377	377	if(0==rid){
378	378	json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
379		- "Could not find artifact for checkin [%s].",
	379	+ "Could not find artifact for check-in [%s].",
380	380	zCheckin);
381	381	goto error;
382	382	}
383	383	cson_object_set(pay, "checkin", json_new_string(zCheckin));
384	384	db_prepare(&q,
385	385

	--- src/json_tag.c
	+++ src/json_tag.c
	@@ -353,11 +353,11 @@
353	payV = cson_value_new_object();
354	pay = cson_value_get_object(payV);
355	cson_object_set(pay, "raw", cson_value_new_bool(fRaw) );
356	if( zCheckin ){
357	/**
358	Tags for a specific checkin. Output format:
359
360	RAW mode:
361
362	{
363	"sym-tagname": (value \|\| null),
	@@ -374,11 +374,11 @@
374	cson_value * objV = NULL;
375	cson_object * obj = NULL;
376	int const rid = name_to_rid(zCheckin);
377	if(0==rid){
378	json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
379	"Could not find artifact for checkin [%s].",
380	zCheckin);
381	goto error;
382	}
383	cson_object_set(pay, "checkin", json_new_string(zCheckin));
384	db_prepare(&q,
385

	--- src/json_tag.c
	+++ src/json_tag.c
	@@ -353,11 +353,11 @@
353	payV = cson_value_new_object();
354	pay = cson_value_get_object(payV);
355	cson_object_set(pay, "raw", cson_value_new_bool(fRaw) );
356	if( zCheckin ){
357	/**
358	Tags for a specific check-in. Output format:
359
360	RAW mode:
361
362	{
363	"sym-tagname": (value \|\| null),
	@@ -374,11 +374,11 @@
374	cson_value * objV = NULL;
375	cson_object * obj = NULL;
376	int const rid = name_to_rid(zCheckin);
377	if(0==rid){
378	json_set_err(FSL_JSON_E_UNRESOLVED_UUID,
379	"Could not find artifact for check-in [%s].",
380	zCheckin);
381	goto error;
382	}
383	cson_object_set(pay, "checkin", json_new_string(zCheckin));
384	db_prepare(&q,
385

M src/leaf.c

+1 -1

		--- src/leaf.c
		+++ src/leaf.c
		@@ -96,11 +96,11 @@
96	96	TAG_BRANCH, TAG_BRANCH
97	97	);
98	98	}
99	99
100	100	/*
101		-** A bag of checkins whose leaf status needs to be checked.
	101	+** A bag of check-ins whose leaf status needs to be checked.
102	102	*/
103	103	static Bag needToCheck;
104	104
105	105	/*
106	106	** Check to see if check-in "rid" is a leaf and either add it to the LEAF
107	107

	--- src/leaf.c
	+++ src/leaf.c
	@@ -96,11 +96,11 @@
96	TAG_BRANCH, TAG_BRANCH
97	);
98	}
99
100	/*
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

	--- src/leaf.c
	+++ src/leaf.c
	@@ -96,11 +96,11 @@
96	TAG_BRANCH, TAG_BRANCH
97	);
98	}
99
100	/*
101	** A bag of check-ins 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

M src/manifest.c

+3 -3

		--- src/manifest.c
		+++ src/manifest.c
		@@ -699,11 +699,11 @@
699	699	}
700	700
701	701	/*
702	702	** Q (+\|-)<uuid> ?<uuid>?
703	703	**
704		- ** Specify one or a range of checkins that are cherrypicked into
	704	+ ** Specify one or a range of check-ins that are cherrypicked into
705	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");
		@@ -1370,11 +1370,11 @@
1370	1370	rc = db_step(&eq);
1371	1371	db_reset(&eq);
1372	1372	if( rc==SQLITE_ROW ) return;
1373	1373
1374	1374	/* Compute the value of the missing pParent or pChild parameter.
1375		- ** Fetch the baseline checkins for both.
	1375	+ ** Fetch the baseline check-ins for both.
1376	1376	*/
1377	1377	assert( pParent==0 \|\| pChild==0 );
1378	1378	if( pParent==0 ){
1379	1379	ppOther = &pParent;
1380	1380	otherRid = pmid;
		@@ -1510,11 +1510,11 @@
1510	1510	");"
1511	1511	);
1512	1512	}
1513	1513
1514	1514	#if INTERFACE
1515		-/* Timestamps might be adjusted slightly to ensure that checkins appear
	1515	+/* Timestamps might be adjusted slightly to ensure that check-ins appear
1516	1516	** on the timeline in chronological order. This is the maximum amount
1517	1517	** of the adjustment window, in days.
1518	1518	*/
1519	1519	#define AGE_FUDGE_WINDOW (2.0/86400.0) /* 2 seconds */
1520	1520
1521	1521

	--- src/manifest.c
	+++ src/manifest.c
	@@ -699,11 +699,11 @@
699	}
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");
	@@ -1370,11 +1370,11 @@
1370	rc = db_step(&eq);
1371	db_reset(&eq);
1372	if( rc==SQLITE_ROW ) return;
1373
1374	/* Compute the value of the missing pParent or pChild parameter.
1375	** Fetch the baseline checkins for both.
1376	*/
1377	assert( pParent==0 \|\| pChild==0 );
1378	if( pParent==0 ){
1379	ppOther = &pParent;
1380	otherRid = pmid;
	@@ -1510,11 +1510,11 @@
1510	");"
1511	);
1512	}
1513
1514	#if INTERFACE
1515	/* Timestamps might be adjusted slightly to ensure that checkins appear
1516	** on the timeline in chronological order. This is the maximum amount
1517	** of the adjustment window, in days.
1518	*/
1519	#define AGE_FUDGE_WINDOW (2.0/86400.0) /* 2 seconds */
1520
1521

	--- src/manifest.c
	+++ src/manifest.c
	@@ -699,11 +699,11 @@
699	}
700
701	/*
702	** Q (+\|-)<uuid> ?<uuid>?
703	**
704	** Specify one or a range of check-ins 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");
	@@ -1370,11 +1370,11 @@
1370	rc = db_step(&eq);
1371	db_reset(&eq);
1372	if( rc==SQLITE_ROW ) return;
1373
1374	/* Compute the value of the missing pParent or pChild parameter.
1375	** Fetch the baseline check-ins for both.
1376	*/
1377	assert( pParent==0 \|\| pChild==0 );
1378	if( pParent==0 ){
1379	ppOther = &pParent;
1380	otherRid = pmid;
	@@ -1510,11 +1510,11 @@
1510	");"
1511	);
1512	}
1513
1514	#if INTERFACE
1515	/* Timestamps might be adjusted slightly to ensure that check-ins appear
1516	** on the timeline in chronological order. This is the maximum amount
1517	** of the adjustment window, in days.
1518	*/
1519	#define AGE_FUDGE_WINDOW (2.0/86400.0) /* 2 seconds */
1520
1521

M src/name.c

+1 -1

		--- src/name.c
		+++ src/name.c
		@@ -802,11 +802,11 @@
802	802	** whose RID matches the SQL expression in zWhere.
803	803	*/
804	804	void describe_artifacts(const char *zWhere){
805	805	db_multi_exec("%s", zDescTab/safe-for-%s/);
806	806
807		- /* Describe checkins */
	807	+ /* Describe check-ins */
808	808	db_multi_exec(
809	809	"INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810	810	"SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811	811	" 'check-in on ' \|\| strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812	812	" FROM event, blob\n"
813	813

	--- src/name.c
	+++ src/name.c
	@@ -802,11 +802,11 @@
802	** whose RID matches the SQL expression in zWhere.
803	*/
804	void describe_artifacts(const char *zWhere){
805	db_multi_exec("%s", zDescTab/safe-for-%s/);
806
807	/* Describe checkins */
808	db_multi_exec(
809	"INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810	"SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811	" 'check-in on ' \|\| strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812	" FROM event, blob\n"
813

	--- src/name.c
	+++ src/name.c
	@@ -802,11 +802,11 @@
802	** whose RID matches the SQL expression in zWhere.
803	*/
804	void describe_artifacts(const char *zWhere){
805	db_multi_exec("%s", zDescTab/safe-for-%s/);
806
807	/* Describe check-ins */
808	db_multi_exec(
809	"INSERT OR IGNORE INTO description(rid,uuid,ctime,type,summary)\n"
810	"SELECT blob.rid, blob.uuid, event.mtime, 'checkin',\n"
811	" 'check-in on ' \|\| strftime('%%Y-%%m-%%d %%H:%%M',event.mtime)\n"
812	" FROM event, blob\n"
813

M src/path.c

+2 -2

		--- src/path.c
		+++ src/path.c
		@@ -13,11 +13,11 @@
13	13	** [email protected]
14	14	**
15	15	*******************************************************************************
16	16	**
17	17	** This file contains code used to trace paths of through the
18		-** directed acyclic graph (DAG) of checkins.
	18	+** directed acyclic graph (DAG) of check-ins.
19	19	*/
20	20	#include "config.h"
21	21	#include "path.h"
22	22	#include <assert.h>
23	23
		@@ -199,11 +199,11 @@
199	199	/*
200	200	** COMMAND: test-shortest-path
201	201	**
202	202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	203	**
204		-** Report the shortest path between two checkins. If the --no-merge flag
	204	+** Report the shortest path between two check-ins. If the --no-merge flag
205	205	** is used, follow only direct parent-child paths and omit merge links.
206	206	*/
207	207	void shortest_path_test_cmd(void){
208	208	int iFrom;
209	209	int iTo;
210	210

	--- src/path.c
	+++ src/path.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	**
15	*******************************************************************************
16	**
17	** This file contains code used to trace paths of through the
18	** directed acyclic graph (DAG) of checkins.
19	*/
20	#include "config.h"
21	#include "path.h"
22	#include <assert.h>
23
	@@ -199,11 +199,11 @@
199	/*
200	** COMMAND: test-shortest-path
201	**
202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	**
204	** Report the shortest path between two checkins. If the --no-merge flag
205	** is used, follow only direct parent-child paths and omit merge links.
206	*/
207	void shortest_path_test_cmd(void){
208	int iFrom;
209	int iTo;
210

	--- src/path.c
	+++ src/path.c
	@@ -13,11 +13,11 @@
13	** [email protected]
14	**
15	*******************************************************************************
16	**
17	** This file contains code used to trace paths of through the
18	** directed acyclic graph (DAG) of check-ins.
19	*/
20	#include "config.h"
21	#include "path.h"
22	#include <assert.h>
23
	@@ -199,11 +199,11 @@
199	/*
200	** COMMAND: test-shortest-path
201	**
202	** Usage: %fossil test-shortest-path ?--no-merge? VERSION1 VERSION2
203	**
204	** Report the shortest path between two check-ins. If the --no-merge flag
205	** is used, follow only direct parent-child paths and omit merge links.
206	*/
207	void shortest_path_test_cmd(void){
208	int iFrom;
209	int iTo;
210

M src/publish.c

+5 -5

		--- src/publish.c
		+++ src/publish.c
		@@ -28,15 +28,15 @@
28	28	** Usage: %fossil unpublished ?OPTIONS?
29	29	**
30	30	** Show a list of unpublished or "private" artifacts. Unpublished artifacts
31	31	** will never push and hence will not be shared with collaborators.
32	32	**
33		-** By default, this command only shows unpublished checkins. To show
	33	+** By default, this command only shows unpublished check-ins. To show
34	34	** all unpublished artifacts, use the --all command-line option.
35	35	**
36	36	** OPTIONS:
37		-** --all Show all artifacts, not just checkins
	37	+** --all Show all artifacts, not just check-ins
38	38	*/
39	39	void unpublished_cmd(void){
40	40	int bAll = find_option("all",0,0)!=0;
41	41
42	42	db_find_and_open_repository(0,0);
		@@ -58,15 +58,15 @@
58	58	**
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		-** If any of TAGS names a branch, then all checkins on the most recent
	63	+** If any of TAGS names a branch, then all check-ins on the most recent
64	64	** instance of that branch are included, not just the most recent check-in.
65	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
	66	+** If any of TAGS name check-ins then all files and tags associated with
	67	+** those check-ins 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	**
71	71	** If a TAG is already public, this command is a harmless no-op.
72	72	*/
73	73

	--- src/publish.c
	+++ src/publish.c
	@@ -28,15 +28,15 @@
28	** Usage: %fossil unpublished ?OPTIONS?
29	**
30	** Show a list of unpublished or "private" artifacts. Unpublished artifacts
31	** will never push and hence will not be shared with collaborators.
32	**
33	** By default, this command only shows unpublished checkins. To show
34	** all unpublished artifacts, use the --all command-line option.
35	**
36	** OPTIONS:
37	** --all Show all artifacts, not just checkins
38	*/
39	void unpublished_cmd(void){
40	int bAll = find_option("all",0,0)!=0;
41
42	db_find_and_open_repository(0,0);
	@@ -58,15 +58,15 @@
58	**
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	**
71	** If a TAG is already public, this command is a harmless no-op.
72	*/
73

	--- src/publish.c
	+++ src/publish.c
	@@ -28,15 +28,15 @@
28	** Usage: %fossil unpublished ?OPTIONS?
29	**
30	** Show a list of unpublished or "private" artifacts. Unpublished artifacts
31	** will never push and hence will not be shared with collaborators.
32	**
33	** By default, this command only shows unpublished check-ins. To show
34	** all unpublished artifacts, use the --all command-line option.
35	**
36	** OPTIONS:
37	** --all Show all artifacts, not just check-ins
38	*/
39	void unpublished_cmd(void){
40	int bAll = find_option("all",0,0)!=0;
41
42	db_find_and_open_repository(0,0);
	@@ -58,15 +58,15 @@
58	**
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 check-ins 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 check-ins then all files and tags associated with
67	** those check-ins are also published automatically. Except if the --only
68	** option is used, then only the specific artifacts identified by TAGS
69	** are published.
70	**
71	** If a TAG is already public, this command is a harmless no-op.
72	*/
73

M src/purge.c

+10 -10

		--- src/purge.c
		+++ src/purge.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 implement the "purge" command and
19		-** related functionality for removing checkins from a repository. It also
	19	+** related functionality for removing check-ins from a repository. It also
20	20	** manages the graveyard of purged content.
21	21	*/
22	22	#include "config.h"
23	23	#include "purge.h"
24	24	#include <assert.h>
		@@ -193,19 +193,19 @@
193	193	db_end_transaction(0);
194	194	return peid;
195	195	}
196	196
197	197	/*
198		-** The TEMP table named zTab contains RIDs for a set of checkins.
	198	+** The TEMP table named zTab contains RIDs for a set of check-ins.
199	199	**
200	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		-** This is a database integrity preservation check. The checkins in zTab
	204	+** This is a database integrity preservation check. The check-ins in zTab
205	205	** are about to be deleted or otherwise made inaccessible. This routine
206		-** is checking to ensure that purging the checkins in zTab will not delete
	206	+** is checking to ensure that purging the check-ins in zTab will not delete
207	207	** a baseline manifest out from under a delta.
208	208	*/
209	209	int purge_baseline_out_from_under_delta(const char *zTab){
210	210	if( !db_table_has_column("repository","plink","baseid") ){
211	211	/* Skip this check if the current database is an older schema that
		@@ -220,17 +220,17 @@
220	220
221	221
222	222	/*
223	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		-** all other artifacts that are used the set of checkins in
	225	+** all other artifacts that are used the set of check-ins in
226	226	** the original list.
227	227	**
228	228	** If the bExclusive flag is true, then the set is only expanded by
229		-** artifacts that are used exclusively by the checkins in the set.
230		-** When bExclusive is false, then all artifacts used by the checkins
231		-** are added even if those artifacts are also used by other checkins
	229	+** artifacts that are used exclusively by the check-ins in the set.
	230	+** When bExclusive is false, then all artifacts used by the check-ins
	231	+** are added even if those artifacts are also used by other check-ins
232	232	** not in the set.
233	233	**
234	234	** The "fossil publish" command with the (undocumented) --test and
235	235	** --exclusive options can be used for interactiving testing of this
236	236	** function.
		@@ -435,16 +435,16 @@
435	435	** Write the content of one or more artifacts in the graveyard onto
436	436	** standard output.
437	437	**
438	438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	439	**
440		-** Move the checkins identified by TAGS and all of their descendants
	440	+** Move the check-ins identified by TAGS and all of their descendants
441	441	** out of the repository and into the graveyard. The "checkins"
442	442	** subcommand keyword is option and can be omitted as long as TAGS
443	443	** does not conflict with any other subcommand.
444	444	**
445		-** If a TAGS includes a branch name then it means all the checkins
	445	+** If a TAGS includes a branch name then it means all the check-ins
446	446	** on the most recent occurrance of that branch.
447	447	**
448	448	** --explain Make no changes, but show what would happen.
449	449	** --dry-run Make no chances.
450	450	**
451	451

	--- src/purge.c
	+++ src/purge.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to implement the "purge" command and
19	** related functionality for removing checkins from a repository. It also
20	** manages the graveyard of purged content.
21	*/
22	#include "config.h"
23	#include "purge.h"
24	#include <assert.h>
	@@ -193,19 +193,19 @@
193	db_end_transaction(0);
194	return peid;
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
206	** is checking to ensure that purging the checkins in zTab will not delete
207	** a baseline manifest out from under a delta.
208	*/
209	int purge_baseline_out_from_under_delta(const char *zTab){
210	if( !db_table_has_column("repository","plink","baseid") ){
211	/* Skip this check if the current database is an older schema that
	@@ -220,17 +220,17 @@
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	** artifacts that are used exclusively by the checkins in the set.
230	** When bExclusive is false, then all artifacts used by the checkins
231	** are added even if those artifacts are also used by other checkins
232	** not in the set.
233	**
234	** The "fossil publish" command with the (undocumented) --test and
235	** --exclusive options can be used for interactiving testing of this
236	** function.
	@@ -435,16 +435,16 @@
435	** Write the content of one or more artifacts in the graveyard onto
436	** standard output.
437	**
438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	**
440	** Move the checkins identified by TAGS and all of their descendants
441	** out of the repository and into the graveyard. The "checkins"
442	** subcommand keyword is option and can be omitted as long as TAGS
443	** does not conflict with any other subcommand.
444	**
445	** If a TAGS includes a branch name then it means all the checkins
446	** on the most recent occurrance of that branch.
447	**
448	** --explain Make no changes, but show what would happen.
449	** --dry-run Make no chances.
450	**
451

	--- src/purge.c
	+++ src/purge.c
	@@ -14,11 +14,11 @@
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code used to implement the "purge" command and
19	** related functionality for removing check-ins from a repository. It also
20	** manages the graveyard of purged content.
21	*/
22	#include "config.h"
23	#include "purge.h"
24	#include <assert.h>
	@@ -193,19 +193,19 @@
193	db_end_transaction(0);
194	return peid;
195	}
196
197	/*
198	** The TEMP table named zTab contains RIDs for a set of check-ins.
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 check-ins in zTab
205	** are about to be deleted or otherwise made inaccessible. This routine
206	** is checking to ensure that purging the check-ins in zTab will not delete
207	** a baseline manifest out from under a delta.
208	*/
209	int purge_baseline_out_from_under_delta(const char *zTab){
210	if( !db_table_has_column("repository","plink","baseid") ){
211	/* Skip this check if the current database is an older schema that
	@@ -220,17 +220,17 @@
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 check-ins in
226	** the original list.
227	**
228	** If the bExclusive flag is true, then the set is only expanded by
229	** artifacts that are used exclusively by the check-ins in the set.
230	** When bExclusive is false, then all artifacts used by the check-ins
231	** are added even if those artifacts are also used by other check-ins
232	** not in the set.
233	**
234	** The "fossil publish" command with the (undocumented) --test and
235	** --exclusive options can be used for interactiving testing of this
236	** function.
	@@ -435,16 +435,16 @@
435	** Write the content of one or more artifacts in the graveyard onto
436	** standard output.
437	**
438	** fossil purge ?checkins? TAGS... ?OPTIONS?
439	**
440	** Move the check-ins identified by TAGS and all of their descendants
441	** out of the repository and into the graveyard. The "checkins"
442	** subcommand keyword is option and can be omitted as long as TAGS
443	** does not conflict with any other subcommand.
444	**
445	** If a TAGS includes a branch name then it means all the check-ins
446	** on the most recent occurrance of that branch.
447	**
448	** --explain Make no changes, but show what would happen.
449	** --dry-run Make no chances.
450	**
451

M src/rss.c

+2 -2

		--- src/rss.c
		+++ src/rss.c
		@@ -26,11 +26,11 @@
26	26	** WEBPAGE: timeline.rss
27	27	** URL: /timeline.rss?y=TYPE&n=LIMIT&tkt=UUID&tag=TAG&wiki=NAME&name=FILENAME
28	28	**
29	29	** Produce an RSS feed of the timeline.
30	30	**
31		-** TYPE may be: all, ci (show checkins only), t (show tickets only),
	31	+** TYPE may be: all, ci (show check-ins only), t (show tickets only),
32	32	** w (show wiki only).
33	33	**
34	34	** LIMIT is the number of items to show.
35	35	**
36	36	** tkt=UUID filters for only those events for the specified ticket. tag=TAG
		@@ -213,11 +213,11 @@
213	213	**
214	214	** The CLI variant of the /timeline.rss page, this produces an RSS
215	215	** feed of the timeline to stdout. Options:
216	216	**
217	217	** -type\|y FLAG
218		-** may be: all (default), ci (show checkins only), t (show tickets only),
	218	+** may be: all (default), ci (show check-ins only), t (show tickets only),
219	219	** w (show wiki only).
220	220	**
221	221	** -limit\|n LIMIT
222	222	** The maximum number of items to show.
223	223	**
224	224

	--- src/rss.c
	+++ src/rss.c
	@@ -26,11 +26,11 @@
26	** WEBPAGE: timeline.rss
27	** URL: /timeline.rss?y=TYPE&n=LIMIT&tkt=UUID&tag=TAG&wiki=NAME&name=FILENAME
28	**
29	** Produce an RSS feed of the timeline.
30	**
31	** TYPE may be: all, ci (show checkins only), t (show tickets only),
32	** w (show wiki only).
33	**
34	** LIMIT is the number of items to show.
35	**
36	** tkt=UUID filters for only those events for the specified ticket. tag=TAG
	@@ -213,11 +213,11 @@
213	**
214	** The CLI variant of the /timeline.rss page, this produces an RSS
215	** feed of the timeline to stdout. Options:
216	**
217	** -type\|y FLAG
218	** may be: all (default), ci (show checkins only), t (show tickets only),
219	** w (show wiki only).
220	**
221	** -limit\|n LIMIT
222	** The maximum number of items to show.
223	**
224

	--- src/rss.c
	+++ src/rss.c
	@@ -26,11 +26,11 @@
26	** WEBPAGE: timeline.rss
27	** URL: /timeline.rss?y=TYPE&n=LIMIT&tkt=UUID&tag=TAG&wiki=NAME&name=FILENAME
28	**
29	** Produce an RSS feed of the timeline.
30	**
31	** TYPE may be: all, ci (show check-ins only), t (show tickets only),
32	** w (show wiki only).
33	**
34	** LIMIT is the number of items to show.
35	**
36	** tkt=UUID filters for only those events for the specified ticket. tag=TAG
	@@ -213,11 +213,11 @@
213	**
214	** The CLI variant of the /timeline.rss page, this produces an RSS
215	** feed of the timeline to stdout. Options:
216	**
217	** -type\|y FLAG
218	** may be: all (default), ci (show check-ins only), t (show tickets only),
219	** w (show wiki only).
220	**
221	** -limit\|n LIMIT
222	** The maximum number of items to show.
223	**
224

M src/schema.c

+9 -9

		--- src/schema.c
		+++ src/schema.c
		@@ -228,19 +228,19 @@
228	228	@ CREATE TABLE filename(
229	229	@ fnid INTEGER PRIMARY KEY, -- Filename ID
230	230	@ name TEXT UNIQUE -- Name of file page
231	231	@ );
232	232	@
233		-@ -- Linkages between checkins, files created by each checkin, and
	233	+@ -- Linkages between check-ins, files created by each check-in, and
234	234	@ -- the names of those files.
235	235	@ --
236	236	@ -- Each entry represents a file that changed content from pid to fid
237	237	@ -- due to the check-in that goes from pmid to mid. fnid is the name
238	238	@ -- of the file in the mid check-in. If the file was renamed as part
239	239	@ -- of the mid check-in, then pfnid is the previous filename.
240	240	@
241		-@ -- There can be multiple entries for (mid,fid) if the mid checkin was
	241	+@ -- There can be multiple entries for (mid,fid) if the mid check-in was
242	242	@ -- a merge. Entries with isaux==0 are from the primary parent. Merge
243	243	@ -- parents have isaux set to true.
244	244	@ --
245	245	@ -- Field name mnemonics:
246	246	@ -- mid = Manifest ID. (Each check-in is stored as a "Manifest")
		@@ -249,12 +249,12 @@
249	249	@ -- pid = Parent file ID.
250	250	@ -- fnid = File Name ID.
251	251	@ -- pfnid = Parent File Name ID.
252	252	@ -- isaux = pmid IS AUXiliary parent, not primary parent
253	253	@ --
254		-@ -- pid==0 if the file is added by checkin mid.
255		-@ -- fid==0 if the file is removed by checkin mid.
	254	+@ -- pid==0 if the file is added by check-in mid.
	255	+@ -- fid==0 if the file is removed by check-in mid.
256	256	@ --
257	257	@ CREATE TABLE mlink(
258	258	@ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
259	259	@ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260	260	@ pmid INTEGER REFERENCES plink(cid), -- Checkin that contains pid
		@@ -267,11 +267,11 @@
267	267	@ CREATE INDEX mlink_i1 ON mlink(mid);
268	268	@ CREATE INDEX mlink_i2 ON mlink(fnid);
269	269	@ CREATE INDEX mlink_i3 ON mlink(fid);
270	270	@ CREATE INDEX mlink_i4 ON mlink(pid);
271	271	@
272		-@ -- Parent/child linkages between checkins
	272	+@ -- Parent/child linkages between check-ins
273	273	@ --
274	274	@ CREATE TABLE plink(
275	275	@ pid INTEGER REFERENCES blob, -- Parent manifest
276	276	@ cid INTEGER REFERENCES blob, -- Child manifest
277	277	@ isprim BOOLEAN, -- pid is the primary parent of cid
		@@ -279,14 +279,14 @@
279	279	@ baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest.
280	280	@ UNIQUE(pid, cid)
281	281	@ );
282	282	@ CREATE INDEX plink_i2 ON plink(cid,pid);
283	283	@
284		-@ -- A "leaf" checkin is a checkin that has no children in the same
	284	+@ -- A "leaf" check-in is a check-in that has no children in the same
285	285	@ -- branch. The set of all leaves is easily computed with a join,
286	286	@ -- between the plink and tagxref tables, but it is a slower join for
287		-@ -- very large repositories (repositories with 100,000 or more checkins)
	287	+@ -- very large repositories (repositories with 100,000 or more check-ins)
288	288	@ -- and so it makes sense to precompute the set of leaves. There is
289	289	@ -- one entry in the following table for each leaf.
290	290	@ --
291	291	@ CREATE TABLE leaf(rid INTEGER PRIMARY KEY);
292	292	@
		@@ -393,11 +393,11 @@
393	393	@ -- facilitate the display of "back links".
394	394	@ --
395	395	@ CREATE TABLE backlink(
396	396	@ target TEXT, -- Where the hyperlink points to
397	397	@ srctype INT, -- 0: check-in 1: ticket 2: wiki
398		-@ srcid INT, -- rid for checkin or wiki. tkt_id for ticket.
	398	+@ srcid INT, -- rid for check-in or wiki. tkt_id for ticket.
399	399	@ mtime TIMESTAMP, -- time that the hyperlink was added. Julian day.
400	400	@ UNIQUE(target, srctype, srcid)
401	401	@ );
402	402	@ CREATE INDEX backlink_src ON backlink(srcid, srctype);
403	403	@
		@@ -465,11 +465,11 @@
465	465	# define TAG_HIDDEN 5 /* Do not display in timeline */
466	466	# define TAG_PRIVATE 6 /* Do not sync */
467	467	# define TAG_CLUSTER 7 /* A cluster */
468	468	# define TAG_BRANCH 8 /* Value is name of the current branch */
469	469	# define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
470		-# define TAG_PARENT 10 /* Change to parentage on a checkin */
	470	+# define TAG_PARENT 10 /* Change to parentage on a check-in */
471	471	#endif
472	472	#if EXPORT_INTERFACE
473	473	# define MAX_INT_TAG 16 /* The largest pre-assigned tag id */
474	474	#endif
475	475
476	476

	--- src/schema.c
	+++ src/schema.c
	@@ -228,19 +228,19 @@
228	@ CREATE TABLE filename(
229	@ fnid INTEGER PRIMARY KEY, -- Filename ID
230	@ name TEXT UNIQUE -- Name of file page
231	@ );
232	@
233	@ -- Linkages between checkins, files created by each checkin, and
234	@ -- the names of those files.
235	@ --
236	@ -- Each entry represents a file that changed content from pid to fid
237	@ -- due to the check-in that goes from pmid to mid. fnid is the name
238	@ -- of the file in the mid check-in. If the file was renamed as part
239	@ -- of the mid check-in, then pfnid is the previous filename.
240	@
241	@ -- There can be multiple entries for (mid,fid) if the mid checkin was
242	@ -- a merge. Entries with isaux==0 are from the primary parent. Merge
243	@ -- parents have isaux set to true.
244	@ --
245	@ -- Field name mnemonics:
246	@ -- mid = Manifest ID. (Each check-in is stored as a "Manifest")
	@@ -249,12 +249,12 @@
249	@ -- pid = Parent file ID.
250	@ -- fnid = File Name ID.
251	@ -- pfnid = Parent File Name ID.
252	@ -- isaux = pmid IS AUXiliary parent, not primary parent
253	@ --
254	@ -- pid==0 if the file is added by checkin mid.
255	@ -- fid==0 if the file is removed by checkin mid.
256	@ --
257	@ CREATE TABLE mlink(
258	@ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
259	@ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260	@ pmid INTEGER REFERENCES plink(cid), -- Checkin that contains pid
	@@ -267,11 +267,11 @@
267	@ CREATE INDEX mlink_i1 ON mlink(mid);
268	@ CREATE INDEX mlink_i2 ON mlink(fnid);
269	@ CREATE INDEX mlink_i3 ON mlink(fid);
270	@ CREATE INDEX mlink_i4 ON mlink(pid);
271	@
272	@ -- Parent/child linkages between checkins
273	@ --
274	@ CREATE TABLE plink(
275	@ pid INTEGER REFERENCES blob, -- Parent manifest
276	@ cid INTEGER REFERENCES blob, -- Child manifest
277	@ isprim BOOLEAN, -- pid is the primary parent of cid
	@@ -279,14 +279,14 @@
279	@ baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest.
280	@ UNIQUE(pid, cid)
281	@ );
282	@ CREATE INDEX plink_i2 ON plink(cid,pid);
283	@
284	@ -- A "leaf" checkin is a checkin that has no children in the same
285	@ -- branch. The set of all leaves is easily computed with a join,
286	@ -- between the plink and tagxref tables, but it is a slower join for
287	@ -- very large repositories (repositories with 100,000 or more checkins)
288	@ -- and so it makes sense to precompute the set of leaves. There is
289	@ -- one entry in the following table for each leaf.
290	@ --
291	@ CREATE TABLE leaf(rid INTEGER PRIMARY KEY);
292	@
	@@ -393,11 +393,11 @@
393	@ -- facilitate the display of "back links".
394	@ --
395	@ CREATE TABLE backlink(
396	@ target TEXT, -- Where the hyperlink points to
397	@ srctype INT, -- 0: check-in 1: ticket 2: wiki
398	@ srcid INT, -- rid for checkin or wiki. tkt_id for ticket.
399	@ mtime TIMESTAMP, -- time that the hyperlink was added. Julian day.
400	@ UNIQUE(target, srctype, srcid)
401	@ );
402	@ CREATE INDEX backlink_src ON backlink(srcid, srctype);
403	@
	@@ -465,11 +465,11 @@
465	# define TAG_HIDDEN 5 /* Do not display in timeline */
466	# define TAG_PRIVATE 6 /* Do not sync */
467	# define TAG_CLUSTER 7 /* A cluster */
468	# define TAG_BRANCH 8 /* Value is name of the current branch */
469	# define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
470	# define TAG_PARENT 10 /* Change to parentage on a checkin */
471	#endif
472	#if EXPORT_INTERFACE
473	# define MAX_INT_TAG 16 /* The largest pre-assigned tag id */
474	#endif
475
476

	--- src/schema.c
	+++ src/schema.c
	@@ -228,19 +228,19 @@
228	@ CREATE TABLE filename(
229	@ fnid INTEGER PRIMARY KEY, -- Filename ID
230	@ name TEXT UNIQUE -- Name of file page
231	@ );
232	@
233	@ -- Linkages between check-ins, files created by each check-in, and
234	@ -- the names of those files.
235	@ --
236	@ -- Each entry represents a file that changed content from pid to fid
237	@ -- due to the check-in that goes from pmid to mid. fnid is the name
238	@ -- of the file in the mid check-in. If the file was renamed as part
239	@ -- of the mid check-in, then pfnid is the previous filename.
240	@
241	@ -- There can be multiple entries for (mid,fid) if the mid check-in was
242	@ -- a merge. Entries with isaux==0 are from the primary parent. Merge
243	@ -- parents have isaux set to true.
244	@ --
245	@ -- Field name mnemonics:
246	@ -- mid = Manifest ID. (Each check-in is stored as a "Manifest")
	@@ -249,12 +249,12 @@
249	@ -- pid = Parent file ID.
250	@ -- fnid = File Name ID.
251	@ -- pfnid = Parent File Name ID.
252	@ -- isaux = pmid IS AUXiliary parent, not primary parent
253	@ --
254	@ -- pid==0 if the file is added by check-in mid.
255	@ -- fid==0 if the file is removed by check-in mid.
256	@ --
257	@ CREATE TABLE mlink(
258	@ mid INTEGER REFERENCES plink(cid), -- Checkin that contains fid
259	@ fid INTEGER REFERENCES blob, -- New file content. 0 if deleted
260	@ pmid INTEGER REFERENCES plink(cid), -- Checkin that contains pid
	@@ -267,11 +267,11 @@
267	@ CREATE INDEX mlink_i1 ON mlink(mid);
268	@ CREATE INDEX mlink_i2 ON mlink(fnid);
269	@ CREATE INDEX mlink_i3 ON mlink(fid);
270	@ CREATE INDEX mlink_i4 ON mlink(pid);
271	@
272	@ -- Parent/child linkages between check-ins
273	@ --
274	@ CREATE TABLE plink(
275	@ pid INTEGER REFERENCES blob, -- Parent manifest
276	@ cid INTEGER REFERENCES blob, -- Child manifest
277	@ isprim BOOLEAN, -- pid is the primary parent of cid
	@@ -279,14 +279,14 @@
279	@ baseid INTEGER REFERENCES blob, -- Baseline if cid is a delta manifest.
280	@ UNIQUE(pid, cid)
281	@ );
282	@ CREATE INDEX plink_i2 ON plink(cid,pid);
283	@
284	@ -- A "leaf" check-in is a check-in that has no children in the same
285	@ -- branch. The set of all leaves is easily computed with a join,
286	@ -- between the plink and tagxref tables, but it is a slower join for
287	@ -- very large repositories (repositories with 100,000 or more check-ins)
288	@ -- and so it makes sense to precompute the set of leaves. There is
289	@ -- one entry in the following table for each leaf.
290	@ --
291	@ CREATE TABLE leaf(rid INTEGER PRIMARY KEY);
292	@
	@@ -393,11 +393,11 @@
393	@ -- facilitate the display of "back links".
394	@ --
395	@ CREATE TABLE backlink(
396	@ target TEXT, -- Where the hyperlink points to
397	@ srctype INT, -- 0: check-in 1: ticket 2: wiki
398	@ srcid INT, -- rid for check-in or wiki. tkt_id for ticket.
399	@ mtime TIMESTAMP, -- time that the hyperlink was added. Julian day.
400	@ UNIQUE(target, srctype, srcid)
401	@ );
402	@ CREATE INDEX backlink_src ON backlink(srcid, srctype);
403	@
	@@ -465,11 +465,11 @@
465	# define TAG_HIDDEN 5 /* Do not display in timeline */
466	# define TAG_PRIVATE 6 /* Do not sync */
467	# define TAG_CLUSTER 7 /* A cluster */
468	# define TAG_BRANCH 8 /* Value is name of the current branch */
469	# define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
470	# define TAG_PARENT 10 /* Change to parentage on a check-in */
471	#endif
472	#if EXPORT_INTERFACE
473	# define MAX_INT_TAG 16 /* The largest pre-assigned tag id */
474	#endif
475
476

M src/style.c

+1 -1

		--- src/style.c
		+++ src/style.c
		@@ -1045,11 +1045,11 @@
1045	1045	@ border-width: thin;
1046	1046	@ border-color: #000000;
1047	1047	@ border-style: solid;
1048	1048	},
1049	1049	{ "input.checkinUserColor",
1050		- "format for user color input on checkin edit page",
	1050	+ "format for user color input on check-in edit page",
1051	1051	@ /* no special definitions, class defined, to enable color pickers, f.e.:
1052	1052	@ ** add the color picker found at http:jscolor.com as java script include
1053	1053	@ ** to the header and configure the java script file with
1054	1054	@ ** 1. use as bindClass :checkinUserColor
1055	1055	@ ** 2. change the default hash adding behaviour to ON
1056	1056

	--- src/style.c
	+++ src/style.c
	@@ -1045,11 +1045,11 @@
1045	@ border-width: thin;
1046	@ border-color: #000000;
1047	@ border-style: solid;
1048	},
1049	{ "input.checkinUserColor",
1050	"format for user color input on checkin edit page",
1051	@ /* no special definitions, class defined, to enable color pickers, f.e.:
1052	@ ** add the color picker found at http:jscolor.com as java script include
1053	@ ** to the header and configure the java script file with
1054	@ ** 1. use as bindClass :checkinUserColor
1055	@ ** 2. change the default hash adding behaviour to ON
1056

	--- src/style.c
	+++ src/style.c
	@@ -1045,11 +1045,11 @@
1045	@ border-width: thin;
1046	@ border-color: #000000;
1047	@ border-style: solid;
1048	},
1049	{ "input.checkinUserColor",
1050	"format for user color input on check-in edit page",
1051	@ /* no special definitions, class defined, to enable color pickers, f.e.:
1052	@ ** add the color picker found at http:jscolor.com as java script include
1053	@ ** to the header and configure the java script file with
1054	@ ** 1. use as bindClass :checkinUserColor
1055	@ ** 2. change the default hash adding behaviour to ON
1056

M src/tag.c

+3 -3

		--- src/tag.c
		+++ src/tag.c
		@@ -60,19 +60,19 @@
60	60	tagType==2, tagid
61	61	);
62	62	db_bind_double(&s, ":mtime", mtime);
63	63
64	64	if( tagType==2 ){
65		- /* Set the propagated tag marker on checkin :rid */
	65	+ /* Set the propagated tag marker on check-in :rid */
66	66	db_prepare(&ins,
67	67	"REPLACE INTO tagxref(tagid, tagtype, srcid, origid, value, mtime, rid)"
68	68	"VALUES(%d,2,0,%d,%Q,:mtime,:rid)",
69	69	tagid, origId, zValue
70	70	);
71	71	db_bind_double(&ins, ":mtime", mtime);
72	72	}else{
73		- /* Remove all references to the tag from checkin :rid */
	73	+ /* Remove all references to the tag from check-in :rid */
74	74	zValue = 0;
75	75	db_prepare(&ins,
76	76	"DELETE FROM tagxref WHERE tagid=%d AND rid=:rid", tagid
77	77	);
78	78	}
		@@ -352,11 +352,11 @@
352	352	** the propagation of the tag to any descendants.
353	353	**
354	354	** %fossil tag find ?--raw? ?-t\|--type TYPE? ?-n\|--limit #? TAGNAME
355	355	**
356	356	** List all objects that use TAGNAME. TYPE can be "ci" for
357		-** checkins or "e" for events. The limit option limits the number
	357	+** check-ins or "e" for events. The limit option limits the number
358	358	** of results to the given value.
359	359	**
360	360	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
361	361	**
362	362	** List all tags, or if CHECK-IN is supplied, list
363	363

	--- src/tag.c
	+++ src/tag.c
	@@ -60,19 +60,19 @@
60	tagType==2, tagid
61	);
62	db_bind_double(&s, ":mtime", mtime);
63
64	if( tagType==2 ){
65	/* Set the propagated tag marker on checkin :rid */
66	db_prepare(&ins,
67	"REPLACE INTO tagxref(tagid, tagtype, srcid, origid, value, mtime, rid)"
68	"VALUES(%d,2,0,%d,%Q,:mtime,:rid)",
69	tagid, origId, zValue
70	);
71	db_bind_double(&ins, ":mtime", mtime);
72	}else{
73	/* Remove all references to the tag from checkin :rid */
74	zValue = 0;
75	db_prepare(&ins,
76	"DELETE FROM tagxref WHERE tagid=%d AND rid=:rid", tagid
77	);
78	}
	@@ -352,11 +352,11 @@
352	** the propagation of the tag to any descendants.
353	**
354	** %fossil tag find ?--raw? ?-t\|--type TYPE? ?-n\|--limit #? TAGNAME
355	**
356	** List all objects that use TAGNAME. TYPE can be "ci" for
357	** checkins or "e" for events. The limit option limits the number
358	** of results to the given value.
359	**
360	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
361	**
362	** List all tags, or if CHECK-IN is supplied, list
363

	--- src/tag.c
	+++ src/tag.c
	@@ -60,19 +60,19 @@
60	tagType==2, tagid
61	);
62	db_bind_double(&s, ":mtime", mtime);
63
64	if( tagType==2 ){
65	/* Set the propagated tag marker on check-in :rid */
66	db_prepare(&ins,
67	"REPLACE INTO tagxref(tagid, tagtype, srcid, origid, value, mtime, rid)"
68	"VALUES(%d,2,0,%d,%Q,:mtime,:rid)",
69	tagid, origId, zValue
70	);
71	db_bind_double(&ins, ":mtime", mtime);
72	}else{
73	/* Remove all references to the tag from check-in :rid */
74	zValue = 0;
75	db_prepare(&ins,
76	"DELETE FROM tagxref WHERE tagid=%d AND rid=:rid", tagid
77	);
78	}
	@@ -352,11 +352,11 @@
352	** the propagation of the tag to any descendants.
353	**
354	** %fossil tag find ?--raw? ?-t\|--type TYPE? ?-n\|--limit #? TAGNAME
355	**
356	** List all objects that use TAGNAME. TYPE can be "ci" for
357	** check-ins or "e" for events. The limit option limits the number
358	** of results to the given value.
359	**
360	** %fossil tag list\|ls ?--raw? ?CHECK-IN?
361	**
362	** List all tags, or if CHECK-IN is supplied, list
363

Fossil SCM

Keyboard Shortcuts