Fossil SCM

More places where the %S and/or %!S formatter are useful.

jan.nijtmans 2015-02-11 15:57 trunk

Commit d93f5ee3e64eb9cb4c9e2e56f984ba3d523bffd4

Parent 245e398384bc812…

6 files changed +1 -1 +1 -1 +13 -13 +5 -5 +1 -1 +1 -1

~ src/browse.c ~ src/diff.c ~ src/manifest.c ~ src/name.c ~ src/timeline.c ~ src/wikiformat.c

M src/browse.c

+1 -1

		--- src/browse.c
		+++ src/browse.c
		@@ -905,11 +905,11 @@
905	905	@ AND filename.name=foci.filename
906	906	@ AND blob.uuid=foci.uuid
907	907	@ AND mlink.fid=blob.rid
908	908	@ AND mlink.fid!=mlink.pid
909	909	@ AND mlink.mid IN (SELECT x FROM ckin)
910		-@ AND event.objid=mlink.mid
	910	+@ AND event.objid=mlink.mid
911	911	@ ORDER BY event.mtime ASC;
912	912	;
913	913
914	914	/*
915	915	** Look at all file containing in the version "vid". Construct a
916	916

	--- src/browse.c
	+++ src/browse.c
	@@ -905,11 +905,11 @@
905	@ AND filename.name=foci.filename
906	@ AND blob.uuid=foci.uuid
907	@ AND mlink.fid=blob.rid
908	@ AND mlink.fid!=mlink.pid
909	@ AND mlink.mid IN (SELECT x FROM ckin)
910	@ AND event.objid=mlink.mid
911	@ ORDER BY event.mtime ASC;
912	;
913
914	/*
915	** Look at all file containing in the version "vid". Construct a
916

	--- src/browse.c
	+++ src/browse.c
	@@ -905,11 +905,11 @@
905	@ AND filename.name=foci.filename
906	@ AND blob.uuid=foci.uuid
907	@ AND mlink.fid=blob.rid
908	@ AND mlink.fid!=mlink.pid
909	@ AND mlink.mid IN (SELECT x FROM ckin)
910	@ AND event.objid=mlink.mid
911	@ ORDER BY event.mtime ASC;
912	;
913
914	/*
915	** Look at all file containing in the version "vid". Construct a
916

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2434,11 +2434,11 @@
2434	2434	if( find_option("ignore-all-space","w",0)!=0 ){
2435	2435	annFlags = DIFF_IGNORE_ALLWS; /* stronger than DIFF_IGNORE_EOLWS */
2436	2436	}
2437	2437	fileVers = find_option("filevers",0,0)!=0;
2438	2438	db_must_be_within_tree();
2439		-
	2439	+
2440	2440	/* We should be done with options.. */
2441	2441	verify_all_options();
2442	2442
2443	2443	if( g.argc<3 ) {
2444	2444	usage("FILENAME");
2445	2445

	--- src/diff.c
	+++ src/diff.c
	@@ -2434,11 +2434,11 @@
2434	if( find_option("ignore-all-space","w",0)!=0 ){
2435	annFlags = DIFF_IGNORE_ALLWS; /* stronger than DIFF_IGNORE_EOLWS */
2436	}
2437	fileVers = find_option("filevers",0,0)!=0;
2438	db_must_be_within_tree();
2439
2440	/* We should be done with options.. */
2441	verify_all_options();
2442
2443	if( g.argc<3 ) {
2444	usage("FILENAME");
2445

	--- src/diff.c
	+++ src/diff.c
	@@ -2434,11 +2434,11 @@
2434	if( find_option("ignore-all-space","w",0)!=0 ){
2435	annFlags = DIFF_IGNORE_ALLWS; /* stronger than DIFF_IGNORE_EOLWS */
2436	}
2437	fileVers = find_option("filevers",0,0)!=0;
2438	db_must_be_within_tree();
2439
2440	/* We should be done with options.. */
2441	verify_all_options();
2442
2443	if( g.argc<3 ) {
2444	usage("FILENAME");
2445

M src/manifest.c

+13 -13

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1621,40 +1621,40 @@
1621	1621	if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
1622	1622	zNewStatus = pManifest->aField[i].zValue;
1623	1623	}
1624	1624	}
1625	1625	if( zNewStatus ){
1626		- blob_appendf(&comment, "%h ticket [%s\|%S]: <i>%h</i>",
	1626	+ blob_appendf(&comment, "%h ticket [%!S\|%S]: <i>%h</i>",
1627	1627	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1628	1628	);
1629	1629	if( pManifest->nField>1 ){
1630	1630	blob_appendf(&comment, " plus %d other change%s",
1631	1631	pManifest->nField-1, pManifest->nField==2 ? "" : "s");
1632	1632	}
1633		- blob_appendf(&brief, "%h ticket [%s\|%S].",
	1633	+ blob_appendf(&brief, "%h ticket [%!S\|%S].",
1634	1634	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid);
1635	1635	}else{
1636	1636	zNewStatus = db_text("unknown",
1637	1637	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1638	1638	zStatusColumn, pManifest->zTicketUuid
1639	1639	);
1640		- blob_appendf(&comment, "Ticket [%s\|%S] <i>%h</i> status still %h with "
	1640	+ blob_appendf(&comment, "Ticket [%!S\|%S] <i>%h</i> status still %h with "
1641	1641	"%d other change%s",
1642	1642	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle, zNewStatus,
1643	1643	pManifest->nField, pManifest->nField==1 ? "" : "s"
1644	1644	);
1645	1645	fossil_free(zNewStatus);
1646		- blob_appendf(&brief, "Ticket [%s\|%S]: %d change%s",
	1646	+ blob_appendf(&brief, "Ticket [%!S\|%S]: %d change%s",
1647	1647	pManifest->zTicketUuid, pManifest->zTicketUuid, pManifest->nField,
1648	1648	pManifest->nField==1 ? "" : "s"
1649	1649	);
1650	1650	}
1651	1651	}else{
1652		- blob_appendf(&comment, "New ticket [%s\|%S] <i>%h</i>.",
	1652	+ blob_appendf(&comment, "New ticket [%!S\|%S] <i>%h</i>.",
1653	1653	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1654	1654	);
1655		- blob_appendf(&brief, "New ticket [%s\|%S].", pManifest->zTicketUuid,
	1655	+ blob_appendf(&brief, "New ticket [%!S\|%S].", pManifest->zTicketUuid,
1656	1656	pManifest->zTicketUuid);
1657	1657	}
1658	1658	fossil_free(zTitle);
1659	1659	db_multi_exec(
1660	1660	"REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
		@@ -1756,11 +1756,11 @@
1756	1756	if( (p = manifest_cache_find(rid))!=0 ){
1757	1757	blob_reset(pContent);
1758	1758	}else if( (p = manifest_parse(pContent, rid, 0))==0 ){
1759	1759	assert( blob_is_reset(pContent) \|\| pContent==0 );
1760	1760	if( (flags & MC_NO_ERRORS)==0 ){
1761		- fossil_error(1, "syntax error in manifest [%s]",
	1761	+ fossil_error(1, "syntax error in manifest [%S]",
1762	1762	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1763	1763	}
1764	1764	return 0;
1765	1765	}
1766	1766	if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){
		@@ -1771,11 +1771,11 @@
1771	1771	}
1772	1772	if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){
1773	1773	manifest_destroy(p);
1774	1774	assert( blob_is_reset(pContent) );
1775	1775	if( (flags & MC_NO_ERRORS)==0 ){
1776		- fossil_error(1, "cannot fetch baseline for manifest [%s]",
	1776	+ fossil_error(1, "cannot fetch baseline for manifest [%S]",
1777	1777	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1778	1778	}
1779	1779	return 0;
1780	1780	}
1781	1781	db_begin_transaction();
		@@ -2031,23 +2031,23 @@
2031	2031	p->zAttachTarget, p->zAttachName
2032	2032	);
2033	2033	if( 'w' == attachToType ){
2034	2034	if( isAdd ){
2035	2035	zComment = mprintf(
2036		- "Add attachment [/artifact/%s\|%h] to wiki page [%h]",
	2036	+ "Add attachment [/artifact/%!S\|%h] to wiki page [%h]",
2037	2037	p->zAttachSrc, p->zAttachName, p->zAttachTarget);
2038	2038	}else{
2039	2039	zComment = mprintf("Delete attachment \"%h\" from wiki page [%h]",
2040	2040	p->zAttachName, p->zAttachTarget);
2041	2041	}
2042	2042	}else{
2043	2043	if( isAdd ){
2044	2044	zComment = mprintf(
2045		- "Add attachment [/artifact/%s\|%h] to ticket [%s\|%S]",
	2045	+ "Add attachment [/artifact/%!S\|%h] to ticket [%!S\|%S]",
2046	2046	p->zAttachSrc, p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2047	2047	}else{
2048		- zComment = mprintf("Delete attachment \"%h\" from ticket [%s\|%S]",
	2048	+ zComment = mprintf("Delete attachment \"%h\" from ticket [%!S\|%S]",
2049	2049	p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2050	2050	}
2051	2051	}
2052	2052	db_multi_exec(
2053	2053	"REPLACE INTO event(type,mtime,objid,user,comment)"
		@@ -2072,11 +2072,11 @@
2072	2072	for(i=0; i<p->nTag; i++){
2073	2073	zTagUuid = p->aTag[i].zUuid;
2074	2074	if( !zTagUuid ) continue;
2075	2075	if( i==0 \|\| fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
2076	2076	blob_appendf(&comment,
2077		- " Edit [%s\|%S]:",
	2077	+ " Edit [%!S\|%S]:",
2078	2078	zTagUuid, zTagUuid);
2079	2079	branchMove = 0;
2080	2080	if( permitHooks && db_exists("SELECT 1 FROM event, blob"
2081	2081	" WHERE event.type='ci' AND event.objid=blob.rid"
2082	2082	" AND blob.uuid=%Q", zTagUuid) ){
		@@ -2086,11 +2086,11 @@
2086	2086	}
2087	2087	zName = p->aTag[i].zName;
2088	2088	zValue = p->aTag[i].zValue;
2089	2089	if( strcmp(zName, "*branch")==0 ){
2090	2090	blob_appendf(&comment,
2091		- " Move to branch [/timeline?r=%h&nd&dp=%s&unhide \| %h].",
	2091	+ " Move to branch [/timeline?r=%h&nd&dp=%!S&unhide \| %h].",
2092	2092	zValue, zTagUuid, zValue);
2093	2093	branchMove = 1;
2094	2094	continue;
2095	2095	}else if( strcmp(zName, "*bgcolor")==0 ){
2096	2096	blob_appendf(&comment,
2097	2097

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1621,40 +1621,40 @@
1621	if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
1622	zNewStatus = pManifest->aField[i].zValue;
1623	}
1624	}
1625	if( zNewStatus ){
1626	blob_appendf(&comment, "%h ticket [%s\|%S]: <i>%h</i>",
1627	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1628	);
1629	if( pManifest->nField>1 ){
1630	blob_appendf(&comment, " plus %d other change%s",
1631	pManifest->nField-1, pManifest->nField==2 ? "" : "s");
1632	}
1633	blob_appendf(&brief, "%h ticket [%s\|%S].",
1634	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid);
1635	}else{
1636	zNewStatus = db_text("unknown",
1637	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1638	zStatusColumn, pManifest->zTicketUuid
1639	);
1640	blob_appendf(&comment, "Ticket [%s\|%S] <i>%h</i> status still %h with "
1641	"%d other change%s",
1642	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle, zNewStatus,
1643	pManifest->nField, pManifest->nField==1 ? "" : "s"
1644	);
1645	fossil_free(zNewStatus);
1646	blob_appendf(&brief, "Ticket [%s\|%S]: %d change%s",
1647	pManifest->zTicketUuid, pManifest->zTicketUuid, pManifest->nField,
1648	pManifest->nField==1 ? "" : "s"
1649	);
1650	}
1651	}else{
1652	blob_appendf(&comment, "New ticket [%s\|%S] <i>%h</i>.",
1653	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1654	);
1655	blob_appendf(&brief, "New ticket [%s\|%S].", pManifest->zTicketUuid,
1656	pManifest->zTicketUuid);
1657	}
1658	fossil_free(zTitle);
1659	db_multi_exec(
1660	"REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
	@@ -1756,11 +1756,11 @@
1756	if( (p = manifest_cache_find(rid))!=0 ){
1757	blob_reset(pContent);
1758	}else if( (p = manifest_parse(pContent, rid, 0))==0 ){
1759	assert( blob_is_reset(pContent) \|\| pContent==0 );
1760	if( (flags & MC_NO_ERRORS)==0 ){
1761	fossil_error(1, "syntax error in manifest [%s]",
1762	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1763	}
1764	return 0;
1765	}
1766	if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){
	@@ -1771,11 +1771,11 @@
1771	}
1772	if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){
1773	manifest_destroy(p);
1774	assert( blob_is_reset(pContent) );
1775	if( (flags & MC_NO_ERRORS)==0 ){
1776	fossil_error(1, "cannot fetch baseline for manifest [%s]",
1777	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1778	}
1779	return 0;
1780	}
1781	db_begin_transaction();
	@@ -2031,23 +2031,23 @@
2031	p->zAttachTarget, p->zAttachName
2032	);
2033	if( 'w' == attachToType ){
2034	if( isAdd ){
2035	zComment = mprintf(
2036	"Add attachment [/artifact/%s\|%h] to wiki page [%h]",
2037	p->zAttachSrc, p->zAttachName, p->zAttachTarget);
2038	}else{
2039	zComment = mprintf("Delete attachment \"%h\" from wiki page [%h]",
2040	p->zAttachName, p->zAttachTarget);
2041	}
2042	}else{
2043	if( isAdd ){
2044	zComment = mprintf(
2045	"Add attachment [/artifact/%s\|%h] to ticket [%s\|%S]",
2046	p->zAttachSrc, p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2047	}else{
2048	zComment = mprintf("Delete attachment \"%h\" from ticket [%s\|%S]",
2049	p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2050	}
2051	}
2052	db_multi_exec(
2053	"REPLACE INTO event(type,mtime,objid,user,comment)"
	@@ -2072,11 +2072,11 @@
2072	for(i=0; i<p->nTag; i++){
2073	zTagUuid = p->aTag[i].zUuid;
2074	if( !zTagUuid ) continue;
2075	if( i==0 \|\| fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
2076	blob_appendf(&comment,
2077	" Edit [%s\|%S]:",
2078	zTagUuid, zTagUuid);
2079	branchMove = 0;
2080	if( permitHooks && db_exists("SELECT 1 FROM event, blob"
2081	" WHERE event.type='ci' AND event.objid=blob.rid"
2082	" AND blob.uuid=%Q", zTagUuid) ){
	@@ -2086,11 +2086,11 @@
2086	}
2087	zName = p->aTag[i].zName;
2088	zValue = p->aTag[i].zValue;
2089	if( strcmp(zName, "*branch")==0 ){
2090	blob_appendf(&comment,
2091	" Move to branch [/timeline?r=%h&nd&dp=%s&unhide \| %h].",
2092	zValue, zTagUuid, zValue);
2093	branchMove = 1;
2094	continue;
2095	}else if( strcmp(zName, "*bgcolor")==0 ){
2096	blob_appendf(&comment,
2097

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1621,40 +1621,40 @@
1621	if( fossil_strcmp(pManifest->aField[i].zName, zStatusColumn)==0 ){
1622	zNewStatus = pManifest->aField[i].zValue;
1623	}
1624	}
1625	if( zNewStatus ){
1626	blob_appendf(&comment, "%h ticket [%!S\|%S]: <i>%h</i>",
1627	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1628	);
1629	if( pManifest->nField>1 ){
1630	blob_appendf(&comment, " plus %d other change%s",
1631	pManifest->nField-1, pManifest->nField==2 ? "" : "s");
1632	}
1633	blob_appendf(&brief, "%h ticket [%!S\|%S].",
1634	zNewStatus, pManifest->zTicketUuid, pManifest->zTicketUuid);
1635	}else{
1636	zNewStatus = db_text("unknown",
1637	"SELECT \"%w\" FROM ticket WHERE tkt_uuid=%Q",
1638	zStatusColumn, pManifest->zTicketUuid
1639	);
1640	blob_appendf(&comment, "Ticket [%!S\|%S] <i>%h</i> status still %h with "
1641	"%d other change%s",
1642	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle, zNewStatus,
1643	pManifest->nField, pManifest->nField==1 ? "" : "s"
1644	);
1645	fossil_free(zNewStatus);
1646	blob_appendf(&brief, "Ticket [%!S\|%S]: %d change%s",
1647	pManifest->zTicketUuid, pManifest->zTicketUuid, pManifest->nField,
1648	pManifest->nField==1 ? "" : "s"
1649	);
1650	}
1651	}else{
1652	blob_appendf(&comment, "New ticket [%!S\|%S] <i>%h</i>.",
1653	pManifest->zTicketUuid, pManifest->zTicketUuid, zTitle
1654	);
1655	blob_appendf(&brief, "New ticket [%!S\|%S].", pManifest->zTicketUuid,
1656	pManifest->zTicketUuid);
1657	}
1658	fossil_free(zTitle);
1659	db_multi_exec(
1660	"REPLACE INTO event(type,tagid,mtime,objid,user,comment,brief)"
	@@ -1756,11 +1756,11 @@
1756	if( (p = manifest_cache_find(rid))!=0 ){
1757	blob_reset(pContent);
1758	}else if( (p = manifest_parse(pContent, rid, 0))==0 ){
1759	assert( blob_is_reset(pContent) \|\| pContent==0 );
1760	if( (flags & MC_NO_ERRORS)==0 ){
1761	fossil_error(1, "syntax error in manifest [%S]",
1762	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1763	}
1764	return 0;
1765	}
1766	if( g.xlinkClusterOnly && p->type!=CFTYPE_CLUSTER ){
	@@ -1771,11 +1771,11 @@
1771	}
1772	if( p->type==CFTYPE_MANIFEST && fetch_baseline(p, 0) ){
1773	manifest_destroy(p);
1774	assert( blob_is_reset(pContent) );
1775	if( (flags & MC_NO_ERRORS)==0 ){
1776	fossil_error(1, "cannot fetch baseline for manifest [%S]",
1777	db_text(0, "SELECT uuid FROM blob WHERE rid=%d",rid));
1778	}
1779	return 0;
1780	}
1781	db_begin_transaction();
	@@ -2031,23 +2031,23 @@
2031	p->zAttachTarget, p->zAttachName
2032	);
2033	if( 'w' == attachToType ){
2034	if( isAdd ){
2035	zComment = mprintf(
2036	"Add attachment [/artifact/%!S\|%h] to wiki page [%h]",
2037	p->zAttachSrc, p->zAttachName, p->zAttachTarget);
2038	}else{
2039	zComment = mprintf("Delete attachment \"%h\" from wiki page [%h]",
2040	p->zAttachName, p->zAttachTarget);
2041	}
2042	}else{
2043	if( isAdd ){
2044	zComment = mprintf(
2045	"Add attachment [/artifact/%!S\|%h] to ticket [%!S\|%S]",
2046	p->zAttachSrc, p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2047	}else{
2048	zComment = mprintf("Delete attachment \"%h\" from ticket [%!S\|%S]",
2049	p->zAttachName, p->zAttachTarget, p->zAttachTarget);
2050	}
2051	}
2052	db_multi_exec(
2053	"REPLACE INTO event(type,mtime,objid,user,comment)"
	@@ -2072,11 +2072,11 @@
2072	for(i=0; i<p->nTag; i++){
2073	zTagUuid = p->aTag[i].zUuid;
2074	if( !zTagUuid ) continue;
2075	if( i==0 \|\| fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){
2076	blob_appendf(&comment,
2077	" Edit [%!S\|%S]:",
2078	zTagUuid, zTagUuid);
2079	branchMove = 0;
2080	if( permitHooks && db_exists("SELECT 1 FROM event, blob"
2081	" WHERE event.type='ci' AND event.objid=blob.rid"
2082	" AND blob.uuid=%Q", zTagUuid) ){
	@@ -2086,11 +2086,11 @@
2086	}
2087	zName = p->aTag[i].zName;
2088	zValue = p->aTag[i].zValue;
2089	if( strcmp(zName, "*branch")==0 ){
2090	blob_appendf(&comment,
2091	" Move to branch [/timeline?r=%h&nd&dp=%!S&unhide \| %h].",
2092	zValue, zTagUuid, zValue);
2093	branchMove = 1;
2094	continue;
2095	}else if( strcmp(zName, "*bgcolor")==0 ){
2096	blob_appendf(&comment,
2097

M src/name.c

+5 -5

		--- src/name.c
		+++ src/name.c
		@@ -782,18 +782,18 @@
782	782	}
783	783
784	784	/*
785	785	** Schema for the description table
786	786	*/
787		-static const char zDescTab[] =
	787	+static const char zDescTab[] =
788	788	@ CREATE TEMP TABLE IF NOT EXISTS description(
789		-@ rid INTEGER PRIMARY KEY, -- RID of the object
790		-@ uuid TEXT, -- SHA1 hash of the object
791		-@ ctime DATETIME, -- Time of creation
	789	+@ rid INTEGER PRIMARY KEY, -- RID of the object
	790	+@ uuid TEXT, -- SHA1 hash of the object
	791	+@ ctime DATETIME, -- Time of creation
792	792	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793	793	@ type TEXT, -- file, checkin, wiki, ticket, etc.
794		-@ summary TEXT, -- Summary comment for the object
	794	+@ summary TEXT, -- Summary comment for the object
795	795	@ detail TEXT -- filename, checkin comment, etc
796	796	@ );
797	797	;
798	798
799	799	/*
800	800

	--- src/name.c
	+++ src/name.c
	@@ -782,18 +782,18 @@
782	}
783
784	/*
785	** Schema for the description table
786	*/
787	static const char zDescTab[] =
788	@ CREATE TEMP TABLE IF NOT EXISTS description(
789	@ rid INTEGER PRIMARY KEY, -- RID of the object
790	@ uuid TEXT, -- SHA1 hash of the object
791	@ ctime DATETIME, -- Time of creation
792	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793	@ type TEXT, -- file, checkin, wiki, ticket, etc.
794	@ summary TEXT, -- Summary comment for the object
795	@ detail TEXT -- filename, checkin comment, etc
796	@ );
797	;
798
799	/*
800

	--- src/name.c
	+++ src/name.c
	@@ -782,18 +782,18 @@
782	}
783
784	/*
785	** Schema for the description table
786	*/
787	static const char zDescTab[] =
788	@ CREATE TEMP TABLE IF NOT EXISTS description(
789	@ rid INTEGER PRIMARY KEY, -- RID of the object
790	@ uuid TEXT, -- SHA1 hash of the object
791	@ ctime DATETIME, -- Time of creation
792	@ isPrivate BOOLEAN DEFAULT 0, -- True for unpublished artifacts
793	@ type TEXT, -- file, checkin, wiki, ticket, etc.
794	@ summary TEXT, -- Summary comment for the object
795	@ detail TEXT -- filename, checkin comment, etc
796	@ );
797	;
798
799	/*
800

M src/timeline.c

+1 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1501,11 +1501,11 @@
1501	1501	" AND event.mtime<=%f ORDER BY event.mtime DESC LIMIT %d",
1502	1502	rCirca, (nEntry+1)/2
1503	1503	);
1504	1504	db_multi_exec("%s", blob_sql_text(&sql2));
1505	1505	blob_reset(&sql2);
1506		- blob_append_sql(&sql,
	1506	+ blob_append_sql(&sql,
1507	1507	" AND event.mtime>=%f ORDER BY event.mtime ASC",
1508	1508	rCirca
1509	1509	);
1510	1510	nEntry -= (nEntry+1)/2;
1511	1511	if( zMark==0 ) zMark = zCirca;
1512	1512

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1501,11 +1501,11 @@
1501	" AND event.mtime<=%f ORDER BY event.mtime DESC LIMIT %d",
1502	rCirca, (nEntry+1)/2
1503	);
1504	db_multi_exec("%s", blob_sql_text(&sql2));
1505	blob_reset(&sql2);
1506	blob_append_sql(&sql,
1507	" AND event.mtime>=%f ORDER BY event.mtime ASC",
1508	rCirca
1509	);
1510	nEntry -= (nEntry+1)/2;
1511	if( zMark==0 ) zMark = zCirca;
1512

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1501,11 +1501,11 @@
1501	" AND event.mtime<=%f ORDER BY event.mtime DESC LIMIT %d",
1502	rCirca, (nEntry+1)/2
1503	);
1504	db_multi_exec("%s", blob_sql_text(&sql2));
1505	blob_reset(&sql2);
1506	blob_append_sql(&sql,
1507	" AND event.mtime>=%f ORDER BY event.mtime ASC",
1508	rCirca
1509	);
1510	nEntry -= (nEntry+1)/2;
1511	if( zMark==0 ) zMark = zCirca;
1512

M src/wikiformat.c

+1 -1

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -2131,11 +2131,11 @@
2131	2131	}
2132	2132	if( zIn[0]=='<' ) zIn += n;
2133	2133	continue;
2134	2134	}
2135	2135	if( !isCloseTag && (eType & (MUTYPE_BLOCK\|MUTYPE_TABLE))!=0 ){
2136		- if( nNL==0 ){
	2136	+ if( nNL==0 ){
2137	2137	blob_append(pOut, "\n", 1);
2138	2138	nNL++;
2139	2139	}
2140	2140	nWS = 1;
2141	2141	}
2142	2142

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -2131,11 +2131,11 @@
2131	}
2132	if( zIn[0]=='<' ) zIn += n;
2133	continue;
2134	}
2135	if( !isCloseTag && (eType & (MUTYPE_BLOCK\|MUTYPE_TABLE))!=0 ){
2136	if( nNL==0 ){
2137	blob_append(pOut, "\n", 1);
2138	nNL++;
2139	}
2140	nWS = 1;
2141	}
2142

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -2131,11 +2131,11 @@
2131	}
2132	if( zIn[0]=='<' ) zIn += n;
2133	continue;
2134	}
2135	if( !isCloseTag && (eType & (MUTYPE_BLOCK\|MUTYPE_TABLE))!=0 ){
2136	if( nNL==0 ){
2137	blob_append(pOut, "\n", 1);
2138	nNL++;
2139	}
2140	nWS = 1;
2141	}
2142

Fossil SCM

Keyboard Shortcuts