Fossil SCM

Improve correctness, usability and efficiency for the case when values in a TICKET's column tend to be long and volatile. Owner of a repository may specify one or several TICKET's columns so that delta-compression is tried for the corresponding ticket change artifacts and the corresponding changes on the <tt>/tkthistory</tt> page are rendered via unified diffs. See details in the [/wiki?name=branch/deltify-tkt-blobs&p|associated wiki].

george 2022-10-28 17:08 trunk merge

Commit 872a3b232737c0e46891297ebf24cbc3924001457807ad7d4df640b6755850c7

Parent 52648d03847bd0e…

7 files changed +1 -1 +24 +10 -1 +2 -2 +220 -47 -2 +3

~ src/backlink.c ~ src/blob.c ~ src/default.css ~ src/info.c ~ src/tkt.c ~ src/wiki.c ~ www/changes.wiki

M src/backlink.c

+1 -1

		--- src/backlink.c
		+++ src/backlink.c
		@@ -132,11 +132,11 @@
132	132	" ELSE null END FROM backlink"
133	133	);
134	134	style_table_sorter();
135	135	@ <table border="1" cellpadding="2" cellspacing="0" \
136	136	@ class='sortable' data-column-types='ttt' data-init-sort='0'>
137		- @ <thead><tr><th> Source <th> Target <th> mtime </tr></thead>
	137	+ @ <thead><tr><th> Target <th> Source <th> mtime </tr></thead>
138	138	@ <tbody>
139	139	while( db_step(&q)==SQLITE_ROW ){
140	140	const char *zTarget = db_column_text(&q, 0);
141	141	int srctype = db_column_int(&q, 1);
142	142	int srcid = db_column_int(&q, 2);
143	143

	--- src/backlink.c
	+++ src/backlink.c
	@@ -132,11 +132,11 @@
132	" ELSE null END FROM backlink"
133	);
134	style_table_sorter();
135	@ <table border="1" cellpadding="2" cellspacing="0" \
136	@ class='sortable' data-column-types='ttt' data-init-sort='0'>
137	@ <thead><tr><th> Source <th> Target <th> mtime </tr></thead>
138	@ <tbody>
139	while( db_step(&q)==SQLITE_ROW ){
140	const char *zTarget = db_column_text(&q, 0);
141	int srctype = db_column_int(&q, 1);
142	int srcid = db_column_int(&q, 2);
143

	--- src/backlink.c
	+++ src/backlink.c
	@@ -132,11 +132,11 @@
132	" ELSE null END FROM backlink"
133	);
134	style_table_sorter();
135	@ <table border="1" cellpadding="2" cellspacing="0" \
136	@ class='sortable' data-column-types='ttt' data-init-sort='0'>
137	@ <thead><tr><th> Target <th> Source <th> mtime </tr></thead>
138	@ <tbody>
139	while( db_step(&q)==SQLITE_ROW ){
140	const char *zTarget = db_column_text(&q, 0);
141	int srctype = db_column_int(&q, 1);
142	int srcid = db_column_int(&q, 2);
143

M src/blob.c

+24

		--- src/blob.c
		+++ src/blob.c
		@@ -53,10 +53,15 @@
53	53	/*
54	54	** The buffer holding the blob data
55	55	*/
56	56	#define blob_buffer(X) ((X)->aData)
57	57
	58	+/*
	59	+** Number of elements that fits into the current blob's size
	60	+*/
	61	+#define blob_count(X,elType) (blob_size(X)/sizeof(elType))
	62	+
58	63	/*
59	64	** Append blob contents to another
60	65	*/
61	66	#define blob_appendb(dest, src) \
62	67	blob_append((dest), blob_buffer(src), blob_size(src))
		@@ -927,10 +932,29 @@
927	932	}
928	933	void blobarray_reset(Blob *aBlob, int n){
929	934	int i;
930	935	for(i=0; i<n; i++) blob_reset(&aBlob[i]);
931	936	}
	937	+/*
	938	+** Allocate array of n blobs and initialize each element with `empty_blob`
	939	+*/
	940	+Blob* blobarray_new(int n){
	941	+ int i;
	942	+ Blob aBlob = fossil_malloc(sizeof(Blob)n);
	943	+ for(i=0; i<n; i++) aBlob[i] = empty_blob;
	944	+ return aBlob;
	945	+}
	946	+/*
	947	+** Free array of n blobs some of which may be empty (have NULL buffer)
	948	+*/
	949	+void blobarray_delete(Blob *aBlob, int n){
	950	+ int i;
	951	+ for(i=0; i<n; i++){
	952	+ if( blob_buffer(aBlob+i) ) blob_reset(aBlob+i);
	953	+ }
	954	+ fossil_free(aBlob);
	955	+}
932	956
933	957	/*
934	958	** Parse a blob into space-separated tokens. Store each token in
935	959	** an element of the blobarray aToken[]. aToken[] is nToken elements in
936	960	** size. Return the number of tokens seen.
937	961

	--- src/blob.c
	+++ src/blob.c
	@@ -53,10 +53,15 @@
53	/*
54	** The buffer holding the blob data
55	*/
56	#define blob_buffer(X) ((X)->aData)
57





58	/*
59	** Append blob contents to another
60	*/
61	#define blob_appendb(dest, src) \
62	blob_append((dest), blob_buffer(src), blob_size(src))
	@@ -927,10 +932,29 @@
927	}
928	void blobarray_reset(Blob *aBlob, int n){
929	int i;
930	for(i=0; i<n; i++) blob_reset(&aBlob[i]);
931	}



















932
933	/*
934	** Parse a blob into space-separated tokens. Store each token in
935	** an element of the blobarray aToken[]. aToken[] is nToken elements in
936	** size. Return the number of tokens seen.
937

	--- src/blob.c
	+++ src/blob.c
	@@ -53,10 +53,15 @@
53	/*
54	** The buffer holding the blob data
55	*/
56	#define blob_buffer(X) ((X)->aData)
57
58	/*
59	** Number of elements that fits into the current blob's size
60	*/
61	#define blob_count(X,elType) (blob_size(X)/sizeof(elType))
62
63	/*
64	** Append blob contents to another
65	*/
66	#define blob_appendb(dest, src) \
67	blob_append((dest), blob_buffer(src), blob_size(src))
	@@ -927,10 +932,29 @@
932	}
933	void blobarray_reset(Blob *aBlob, int n){
934	int i;
935	for(i=0; i<n; i++) blob_reset(&aBlob[i]);
936	}
937	/*
938	** Allocate array of n blobs and initialize each element with `empty_blob`
939	*/
940	Blob* blobarray_new(int n){
941	int i;
942	Blob aBlob = fossil_malloc(sizeof(Blob)n);
943	for(i=0; i<n; i++) aBlob[i] = empty_blob;
944	return aBlob;
945	}
946	/*
947	** Free array of n blobs some of which may be empty (have NULL buffer)
948	*/
949	void blobarray_delete(Blob *aBlob, int n){
950	int i;
951	for(i=0; i<n; i++){
952	if( blob_buffer(aBlob+i) ) blob_reset(aBlob+i);
953	}
954	fossil_free(aBlob);
955	}
956
957	/*
958	** Parse a blob into space-separated tokens. Store each token in
959	** an element of the blobarray aToken[]. aToken[] is nToken elements in
960	** size. Return the number of tokens seen.
961

M src/default.css

+10 -1

		--- src/default.css
		+++ src/default.css
		@@ -707,11 +707,20 @@
707	707	td.difftxt ins > ins.edit {
708	708	background-color: #c0c0ff;
709	709	text-decoration: none;
710	710	font-weight: bold;
711	711	}
712		-
	712	+body.tkt div.content li > table.udiff {
	713	+ margin-left: 1.5em;
	714	+ margin-top: 0.5em;
	715	+}
	716	+body.tkt div.content ol.tkt-changes > li:target > p > span {
	717	+ border-bottom: 3px solid gold;
	718	+}
	719	+body.tkt div.content ol.tkt-changes > li:target > ol {
	720	+ border-left: 1px solid gold;
	721	+}
713	722
714	723	span.modpending {
715	724	color: #b03800;
716	725	font-style: italic;
717	726	}
718	727

	--- src/default.css
	+++ src/default.css
	@@ -707,11 +707,20 @@
707	td.difftxt ins > ins.edit {
708	background-color: #c0c0ff;
709	text-decoration: none;
710	font-weight: bold;
711	}
712









713
714	span.modpending {
715	color: #b03800;
716	font-style: italic;
717	}
718

	--- src/default.css
	+++ src/default.css
	@@ -707,11 +707,20 @@
707	td.difftxt ins > ins.edit {
708	background-color: #c0c0ff;
709	text-decoration: none;
710	font-weight: bold;
711	}
712	body.tkt div.content li > table.udiff {
713	margin-left: 1.5em;
714	margin-top: 0.5em;
715	}
716	body.tkt div.content ol.tkt-changes > li:target > p > span {
717	border-bottom: 3px solid gold;
718	}
719	body.tkt div.content ol.tkt-changes > li:target > ol {
720	border-left: 1px solid gold;
721	}
722
723	span.modpending {
724	color: #b03800;
725	font-style: italic;
726	}
727

M src/info.c

+2 -2

		--- src/info.c
		+++ src/info.c
		@@ -2783,11 +2783,11 @@
2783	2783	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2784	2784	: 0;
2785	2785	style_set_current_feature("tinfo");
2786	2786	style_header("Ticket Change Details");
2787	2787	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
2788		- style_submenu_element("History", "%R/tkthistory/%s", zTktName);
	2788	+ style_submenu_element("History", "%R/tkthistory/%s#%S", zTktName,zUuid);
2789	2789	style_submenu_element("Page", "%R/tktview/%t", zTktName);
2790	2790	style_submenu_element("Timeline", "%R/tkttimeline/%t", zTktName);
2791	2791	if( P("plaintext") ){
2792	2792	style_submenu_element("Formatted", "%R/info/%s", zUuid);
2793	2793	}else{
		@@ -2828,11 +2828,11 @@
2828	2828	@ </blockquote>
2829	2829	}
2830	2830
2831	2831	@ <div class="section">Changes</div>
2832	2832	@ <p>
2833		- ticket_output_change_artifact(pTktChng, 0, 1);
	2833	+ ticket_output_change_artifact(pTktChng, 0, 1, 0);
2834	2834	manifest_destroy(pTktChng);
2835	2835	style_finish_page();
2836	2836	}
2837	2837
2838	2838
2839	2839

	--- src/info.c
	+++ src/info.c
	@@ -2783,11 +2783,11 @@
2783	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2784	: 0;
2785	style_set_current_feature("tinfo");
2786	style_header("Ticket Change Details");
2787	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
2788	style_submenu_element("History", "%R/tkthistory/%s", zTktName);
2789	style_submenu_element("Page", "%R/tktview/%t", zTktName);
2790	style_submenu_element("Timeline", "%R/tkttimeline/%t", zTktName);
2791	if( P("plaintext") ){
2792	style_submenu_element("Formatted", "%R/info/%s", zUuid);
2793	}else{
	@@ -2828,11 +2828,11 @@
2828	@ </blockquote>
2829	}
2830
2831	@ <div class="section">Changes</div>
2832	@ <p>
2833	ticket_output_change_artifact(pTktChng, 0, 1);
2834	manifest_destroy(pTktChng);
2835	style_finish_page();
2836	}
2837
2838
2839

	--- src/info.c
	+++ src/info.c
	@@ -2783,11 +2783,11 @@
2783	"SELECT title FROM ticket WHERE tkt_uuid=%Q", zTktName)
2784	: 0;
2785	style_set_current_feature("tinfo");
2786	style_header("Ticket Change Details");
2787	style_submenu_element("Raw", "%R/artifact/%s", zUuid);
2788	style_submenu_element("History", "%R/tkthistory/%s#%S", zTktName,zUuid);
2789	style_submenu_element("Page", "%R/tktview/%t", zTktName);
2790	style_submenu_element("Timeline", "%R/tkttimeline/%t", zTktName);
2791	if( P("plaintext") ){
2792	style_submenu_element("Formatted", "%R/info/%s", zUuid);
2793	}else{
	@@ -2828,11 +2828,11 @@
2828	@ </blockquote>
2829	}
2830
2831	@ <div class="section">Changes</div>
2832	@ <p>
2833	ticket_output_change_artifact(pTktChng, 0, 1, 0);
2834	manifest_destroy(pTktChng);
2835	style_finish_page();
2836	}
2837
2838
2839

M src/tkt.c

+220 -47

		--- src/tkt.c
		+++ src/tkt.c
		@@ -30,22 +30,27 @@
30	30	static int nField = 0;
31	31	static struct tktFieldInfo {
32	32	char zName; / Name of the database field */
33	33	char zValue; / Value to store */
34	34	char zAppend; / Value to append */
	35	+ char zBsln; / "baseline for $zName" if that field exists*/
35	36	unsigned mUsed; /* 01: TICKET 02: TICKETCHNG */
36	37	} *aField;
37	38	#define USEDBY_TICKET 01
38	39	#define USEDBY_TICKETCHNG 02
39	40	#define USEDBY_BOTH 03
	41	+#define JCARD_ASSIGN ('=')
	42	+#define JCARD_APPEND ('+')
	43	+#define JCARD_PRIVATE ('p')
40	44	static u8 haveTicket = 0; /* True if the TICKET table exists */
41	45	static u8 haveTicketCTime = 0; /* True if TICKET.TKT_CTIME exists */
42	46	static u8 haveTicketChng = 0; /* True if the TICKETCHNG table exists */
43	47	static u8 haveTicketChngRid = 0; /* True if TICKETCHNG.TKT_RID exists */
44	48	static u8 haveTicketChngUser = 0;/* True if TICKETCHNG.TKT_USER exists */
45	49	static u8 useTicketGenMt = 0; /* use generated TICKET.MIMETYPE */
46	50	static u8 useTicketChngGenMt = 0;/* use generated TICKETCHNG.MIMETYPE */
	51	+static int nTicketBslns = 0; /* number of valid "baseline for ..." */
47	52
48	53
49	54	/*
50	55	** Compare two entries in aField[] for sorting purposes
51	56	*/
		@@ -73,31 +78,56 @@
73	78	** The haveTicket and haveTicketChng variables are set to 1 if the TICKET and
74	79	** TICKETCHANGE tables exist, respectively.
75	80	*/
76	81	static void getAllTicketFields(void){
77	82	Stmt q;
78		- int i, noRegularMimetype;
	83	+ int i, noRegularMimetype, nBaselines;
79	84	static int once = 0;
80	85	if( once ) return;
81	86	once = 1;
	87	+ nBaselines = 0;
82	88	db_prepare(&q, "PRAGMA table_info(ticket)");
83	89	while( db_step(&q)==SQLITE_ROW ){
84	90	const char *zFieldName = db_column_text(&q, 1);
85	91	haveTicket = 1;
86	92	if( memcmp(zFieldName,"tkt_",4)==0 ){
87	93	if( strcmp(zFieldName, "tkt_ctime")==0 ) haveTicketCTime = 1;
88	94	continue;
	95	+ }
	96	+ if( memcmp(zFieldName,"baseline for ",13)==0 ){
	97	+ if( strcmp(db_column_text(&q,2),"INTEGER")==0 ){
	98	+ nBaselines++;
	99	+ }
	100	+ continue;
89	101	}
90	102	if( strchr(zFieldName,' ')!=0 ) continue;
91	103	if( nField%10==0 ){
92	104	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
93	105	}
	106	+ aField[nField].zBsln = 0;
94	107	aField[nField].zName = mprintf("%s", zFieldName);
95	108	aField[nField].mUsed = USEDBY_TICKET;
96	109	nField++;
97	110	}
98	111	db_finalize(&q);
	112	+ if( nBaselines ){
	113	+ db_prepare(&q, "SELECT 1 FROM pragma_table_info('ticket') "
	114	+ "WHERE type = 'INTEGER' AND name = :n");
	115	+ for(i=0; i<nField && nBaselines!=0; i++){
	116	+ char *zBsln = mprintf("baseline for %s",aField[i].zName);
	117	+ db_bind_text(&q, ":n", zBsln);
	118	+ if( db_step(&q)==SQLITE_ROW ){
	119	+ aField[i].zBsln = zBsln;
	120	+ nTicketBslns++;
	121	+ nBaselines--;
	122	+ }else{
	123	+ free(zBsln);
	124	+ }
	125	+ db_reset(&q);
	126	+ }
	127	+ db_finalize(&q);
	128	+ }
99	129	db_prepare(&q, "PRAGMA table_info(ticketchng)");
100	130	while( db_step(&q)==SQLITE_ROW ){
101	131	const char *zFieldName = db_column_text(&q, 1);
102	132	haveTicketChng = 1;
103	133	if( memcmp(zFieldName,"tkt_",4)==0 ){
		@@ -114,10 +144,11 @@
114	144	continue;
115	145	}
116	146	if( nField%10==0 ){
117	147	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
118	148	}
	149	+ aField[nField].zBsln = 0;
119	150	aField[nField].zName = mprintf("%s", zFieldName);
120	151	aField[nField].mUsed = USEDBY_TICKETCHNG;
121	152	nField++;
122	153	}
123	154	db_finalize(&q);
		@@ -201,21 +232,39 @@
201	232	for(i=0; (z = cgi_parameter_name(i))!=0; i++){
202	233	Th_Store(z, P(z));
203	234	}
204	235	}
205	236
	237	+/*
	238	+** Information about a single J-card
	239	+*/
	240	+struct jCardInfo {
	241	+ char *zValue;
	242	+ int mimetype;
	243	+ int rid;
	244	+ double mtime;
	245	+};
	246	+
206	247	/*
207	248	** Update an entry of the TICKET and TICKETCHNG tables according to the
208	249	** information in the ticket artifact given in p. Attempt to create
209	250	** the appropriate TICKET table entry if tktid is zero. If tktid is nonzero
210	251	** then it will be the ROWID of an existing TICKET entry.
211	252	**
212	253	** Parameter rid is the recordID for the ticket artifact in the BLOB table.
	254	+** Upon assignment of a field this rid is stored into a corresponding
	255	+** zBsln integer column (provided that it is defined within TICKET table).
	256	+**
	257	+** If a field is USEDBY_TICKETCHNG table then back-references within it
	258	+** are extracted and inserted into the BACKLINK table; otherwise
	259	+** a corresponding blob in the `fields` array is updated so that the
	260	+** caller could extract backlinks from the most recent field's values.
213	261	**
214	262	** Return the new rowid of the TICKET table entry.
215	263	*/
216		-static int ticket_insert(const Manifest *p, const int rid, int tktid){
	264	+static int ticket_insert(const Manifest *p, const int rid, int tktid,
	265	+ Blob *fields){
217	266	Blob sql1; /* update or replace TICKET ... */
218	267	Blob sql2; /* list of TICKETCHNG's fields that are in the manifest */
219	268	Blob sql3; /* list of values which correspond to the previous list */
220	269	Stmt q;
221	270	int i, j;
		@@ -232,12 +281,11 @@
232	281	blob_zero(&sql3);
233	282	blob_append_sql(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
234	283	if( haveTicketCTime ){
235	284	blob_append_sql(&sql1, ", tkt_ctime=coalesce(tkt_ctime,:mtime)");
236	285	}
237		- aUsed = fossil_malloc( nField );
238		- memset(aUsed, 0, nField);
	286	+ aUsed = fossil_malloc_zero( nField );
239	287	for(i=0; i<p->nField; i++){
240	288	const char * const zName = p->aField[i].zName;
241	289	const char * const zBaseName = zName[0]=='+' ? zName+1 : zName;
242	290	j = fieldId(zBaseName);
243	291	if( j<0 ) continue;
		@@ -244,12 +292,16 @@
244	292	aUsed[j] = 1;
245	293	if( aField[j].mUsed & USEDBY_TICKET ){
246	294	if( zName[0]=='+' ){
247	295	blob_append_sql(&sql1,", \"%w\"=coalesce(\"%w\",'') \|\| %Q",
248	296	zBaseName, zBaseName, p->aField[i].zValue);
	297	+ /* when appending keep "baseline for ..." unchanged */
249	298	}else{
250	299	blob_append_sql(&sql1,", \"%w\"=%Q", zBaseName, p->aField[i].zValue);
	300	+ if( aField[j].zBsln ){
	301	+ blob_append_sql(&sql1,", \"%w\"=%d", aField[j].zBsln, rid);
	302	+ }
251	303	}
252	304	}
253	305	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
254	306	blob_append_sql(&sql2, ",\"%w\"", zBaseName);
255	307	blob_append_sql(&sql3, ",%Q", p->aField[i].zValue);
		@@ -327,24 +379,37 @@
327	379	}
328	380	blob_reset(&sql2);
329	381	blob_reset(&sql3);
330	382	fossil_free(aUsed);
331	383	if( rid>0 ){ /* extract backlinks */
332		- int bReplace = 1, mimetype;
333	384	for(i=0; i<p->nField; i++){
334	385	const char *zName = p->aField[i].zName;
335	386	const char *zBaseName = zName[0]=='+' ? zName+1 : zName;
336	387	j = fieldId(zBaseName);
337	388	if( j<0 ) continue;
338	389	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
339		- mimetype = mimetype_tktchng;
	390	+ backlink_extract(p->aField[i].zValue, mimetype_tktchng,
	391	+ rid, BKLNK_TICKET, p->rDate,
	392	+ /* existing backlinks must have been
	393	+ * already deleted by the caller */ 0 );
340	394	}else{
341		- mimetype = mimetype_tkt;
	395	+ /* update field's data with the most recent values */
	396	+ Blob *cards = fields + j;
	397	+ struct jCardInfo card = {
	398	+ fossil_strdup(p->aField[i].zValue),
	399	+ mimetype_tkt, rid, p->rDate
	400	+ };
	401	+ if( blob_size(cards) && zName[0]!='+' ){
	402	+ struct jCardInfo x = (struct jCardInfo )blob_buffer(cards);
	403	+ struct jCardInfo *end = x + blob_count(cards,struct jCardInfo);
	404	+ for(; x!=end; x++){
	405	+ fossil_free( x->zValue );
	406	+ }
	407	+ blob_truncate(cards,0);
	408	+ }
	409	+ blob_append(cards, (const char*)(&card), sizeof(card));
342	410	}
343		- backlink_extract(p->aField[i].zValue, mimetype, rid, BKLNK_TICKET,
344		- p->rDate, bReplace);
345		- bReplace = 0;
346	411	}
347	412	}
348	413	return tktid;
349	414	}
350	415
		@@ -377,12 +442,13 @@
377	442	void ticket_rebuild_entry(const char *zTktUuid){
378	443	char *zTag = mprintf("tkt-%s", zTktUuid);
379	444	int tagid = tag_findid(zTag, 1);
380	445	Stmt q;
381	446	Manifest *pTicket;
382		- int tktid;
	447	+ int tktid, i;
383	448	int createFlag = 1;
	449	+ Blob fields; / array of blobs; each blob holds array of jCardInfo */
384	450
385	451	fossil_free(zTag);
386	452	getAllTicketFields();
387	453	if( haveTicket==0 ) return;
388	454	tktid = db_int(0, "SELECT tkt_id FROM ticket WHERE tkt_uuid=%Q", zTktUuid);
		@@ -390,22 +456,41 @@
390	456	if( haveTicketChng ){
391	457	db_multi_exec("DELETE FROM ticketchng WHERE tkt_id=%d;", tktid);
392	458	}
393	459	db_multi_exec("DELETE FROM ticket WHERE tkt_id=%d", tktid);
394	460	tktid = 0;
	461	+ fields = blobarray_new( nField );
	462	+ db_multi_exec("DELETE FROM backlink WHERE srctype=%d AND srcid IN "
	463	+ "(SELECT rid FROM tagxref WHERE tagid=%d)",BKLNK_TICKET, tagid);
395	464	db_prepare(&q, "SELECT rid FROM tagxref WHERE tagid=%d ORDER BY mtime",tagid);
396	465	while( db_step(&q)==SQLITE_ROW ){
397	466	int rid = db_column_int(&q, 0);
398	467	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
399	468	if( pTicket ){
400		- tktid = ticket_insert(pTicket, rid, tktid);
	469	+ tktid = ticket_insert(pTicket, rid, tktid, fields);
401	470	manifest_ticket_event(rid, pTicket, createFlag, tagid);
402	471	manifest_destroy(pTicket);
403	472	}
404	473	createFlag = 0;
405	474	}
406	475	db_finalize(&q);
	476	+ /* Extract backlinks from the most recent values of TICKET fields */
	477	+ for(i=0; i<nField; i++){
	478	+ Blob *cards = fields + i;
	479	+ if( blob_size(cards) ){
	480	+ struct jCardInfo x = (struct jCardInfo )blob_buffer(cards);
	481	+ struct jCardInfo *end = x + blob_count(cards,struct jCardInfo);
	482	+ for(; x!=end; x++){
	483	+ assert( x->zValue );
	484	+ backlink_extract(x->zValue,x->mimetype,
	485	+ x->rid,BKLNK_TICKET,x->mtime,0);
	486	+ fossil_free( x->zValue );
	487	+ }
	488	+ }
	489	+ blob_truncate(cards,0);
	490	+ }
	491	+ blobarray_delete(fields,nField);
407	492	}
408	493
409	494
410	495	/*
411	496	** Create the TH1 interpreter and load the "common" code.
		@@ -738,23 +823,41 @@
738	823	return TH_OK;
739	824	}
740	825
741	826	/*
742	827	** Write a ticket into the repository.
	828	+** Upon reassignment of fields try to delta-compress an artifact against
	829	+** all artifacts that are referenced in the corresponding zBsln fields.
743	830	*/
744	831	static int ticket_put(
745	832	Blob pTicket, / The text of the ticket change record */
746	833	const char zTktId, / The ticket to which this change is applied */
	834	+ const char aUsed, / Indicators for fields' modifications */
747	835	int needMod /* True if moderation is needed */
748	836	){
749	837	int result;
750	838	int rid;
751	839	manifest_crosslink_begin();
752	840	rid = content_put_ex(pTicket, 0, 0, 0, needMod);
753	841	if( rid==0 ){
754	842	fossil_fatal("trouble committing ticket: %s", g.zErrMsg);
755	843	}
	844	+ if( nTicketBslns ){
	845	+ int i, s, buf[8], nSrc=0, *aSrc=&(buf[0]);
	846	+ if( nTicketBslns > count(buf) ){
	847	+ aSrc = (int)fossil_malloc(sizeof(int)nTicketBslns);
	848	+ }
	849	+ for(i=0; i<nField; i++){
	850	+ if( aField[i].zBsln && aUsed[i]==JCARD_ASSIGN ){
	851	+ s = db_int(0,"SELECT \"%w\" FROM ticket WHERE tkt_uuid = '%q'",
	852	+ aField[i].zBsln, zTktId );
	853	+ if( s > 0 ) aSrc[nSrc++] = s;
	854	+ }
	855	+ }
	856	+ if( nSrc ) content_deltify(rid, aSrc, nSrc, 0);
	857	+ if( aSrc!=&(buf[0]) ) fossil_free( aSrc );
	858	+ }
756	859	if( needMod ){
757	860	moderation_table_create();
758	861	db_multi_exec(
759	862	"INSERT INTO modreq(objid, tktid) VALUES(%d,%Q)",
760	863	rid, zTktId
		@@ -787,14 +890,14 @@
787	890	void *pUuid,
788	891	int argc,
789	892	const char **argv,
790	893	int *argl
791	894	){
792		- char *zDate;
	895	+ char zDate, aUsed;
793	896	const char *zUuid;
794	897	int i;
795		- int nJ = 0;
	898	+ int nJ = 0, rc = TH_OK;
796	899	Blob tktchng, cksum;
797	900	int needMod;
798	901
799	902	login_verify_csrf_secret();
800	903	if( !captcha_is_correct(0) ){
		@@ -804,15 +907,17 @@
804	907	zUuid = (const char *)pUuid;
805	908	blob_zero(&tktchng);
806	909	zDate = date_in_standard_format("now");
807	910	blob_appendf(&tktchng, "D %s\n", zDate);
808	911	free(zDate);
	912	+ aUsed = fossil_malloc_zero( nField );
809	913	for(i=0; i<nField; i++){
810	914	if( aField[i].zAppend ){
811	915	blob_appendf(&tktchng, "J +%s %z\n", aField[i].zName,
812	916	fossilize(aField[i].zAppend, -1));
813	917	++nJ;
	918	+ aUsed[i] = JCARD_APPEND;
814	919	}
815	920	}
816	921	for(i=0; i<nField; i++){
817	922	const char *zValue;
818	923	int nValue;
		@@ -825,12 +930,14 @@
825	930	\|\| strlen(aField[i].zValue)!=nValue
826	931	){
827	932	if( memcmp(aField[i].zName, "private_", 8)==0 ){
828	933	zValue = db_conceal(zValue, nValue);
829	934	blob_appendf(&tktchng, "J %s %s\n", aField[i].zName, zValue);
	935	+ aUsed[i] = JCARD_PRIVATE;
830	936	}else{
831	937	blob_appendf(&tktchng, "J %s %#F\n", aField[i].zName, nValue, zValue);
	938	+ aUsed[i] = JCARD_ASSIGN;
832	939	}
833	940	nJ++;
834	941	}
835	942	}
836	943	}
		@@ -846,11 +953,11 @@
846	953	blob_appendf(&tktchng, "U %F\n", login_name());
847	954	md5sum_blob(&tktchng, &cksum);
848	955	blob_appendf(&tktchng, "Z %b\n", &cksum);
849	956	if( nJ==0 ){
850	957	blob_reset(&tktchng);
851		- return TH_OK;
	958	+ goto finish;
852	959	}
853	960	needMod = ticket_need_moderation(0);
854	961	if( g.zPath[0]=='d' ){
855	962	const char *zNeedMod = needMod ? "required" : "skipped";
856	963	/* If called from /debug_tktnew or /debug_tktedit... */
		@@ -858,20 +965,22 @@
858	965	@ <p>Ticket artifact that would have been submitted:</p>
859	966	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
860	967	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
861	968	@ </div>
862	969	@ <hr />
863		- return TH_OK;
864	970	}else{
865	971	if( g.thTrace ){
866	972	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
867	973	"}<br />\n",
868	974	blob_str(&tktchng));
869	975	}
870		- ticket_put(&tktchng, zUuid, needMod);
	976	+ ticket_put(&tktchng, zUuid, aUsed, needMod);
	977	+ rc = ticket_change(zUuid);
871	978	}
872		- return ticket_change(zUuid);
	979	+ finish:
	980	+ fossil_free( aUsed );
	981	+ return rc;
873	982	}
874	983
875	984
876	985	/*
877	986	** WEBPAGE: tktnew
		@@ -1141,17 +1250,21 @@
1141	1250	** By default, the artifacts are decoded and formatted. Text fields
1142	1251	** are formatted as text/plain, since in the general case Fossil does
1143	1252	** not have knowledge of the encoding. If the "raw" query parameter
1144	1253	** is present, then the undecoded and unformatted text of each artifact
1145	1254	** is displayed.
	1255	+**
	1256	+** Reassignments of a field of the TICKET table that has a corresponding
	1257	+** "baseline for ..." companion are rendered as unified diffs.
1146	1258	*/
1147	1259	void tkthistory_page(void){
1148	1260	Stmt q;
1149	1261	char *zTitle;
1150	1262	const char *zUuid;
1151	1263	int tagid;
1152	1264	int nChng = 0;
	1265	+ Blob aLastVal = 0; / holds the last rendered value for each field */
1153	1266
1154	1267	login_check_credentials();
1155	1268	if( !g.perm.Hyperlink \|\| !g.perm.RdTkt ){
1156	1269	login_needed(g.anon.Hyperlink && g.anon.RdTkt);
1157	1270	return;
		@@ -1177,10 +1290,14 @@
1177	1290	}
1178	1291	if( P("raw")!=0 ){
1179	1292	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1180	1293	}else{
1181	1294	@ <h2>Artifacts Associated With Ticket %h(zUuid)</h2>
	1295	+ getAllTicketFields();
	1296	+ if( nTicketBslns ){
	1297	+ aLastVal = blobarray_new(nField);
	1298	+ }
1182	1299	}
1183	1300	db_prepare(&q,
1184	1301	"SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL"
1185	1302	" FROM event, blob"
1186	1303	" WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)"
		@@ -1198,33 +1315,33 @@
1198	1315	const char *zDate = db_column_text(&q, 0);
1199	1316	int rid = db_column_int(&q, 1);
1200	1317	const char *zChngUuid = db_column_text(&q, 2);
1201	1318	const char *zFile = db_column_text(&q, 4);
1202	1319	if( nChng==0 ){
1203		- @ <ol>
	1320	+ @ <ol class="tkt-changes">
1204	1321	}
1205	1322	if( zFile!=0 ){
1206	1323	const char *zSrc = db_column_text(&q, 3);
1207	1324	const char *zUser = db_column_text(&q, 5);
	1325	+ @
	1326	+ @ <li id="%S(zChngUuid)"><p><span>
1208	1327	if( zSrc==0 \|\| zSrc[0]==0 ){
1209		- @
1210		- @ <li><p>Delete attachment "%h(zFile)"
	1328	+ @ Delete attachment "%h(zFile)"
1211	1329	}else{
1212		- @
1213		- @ <li><p>Add attachment
	1330	+ @ Add attachment
1214	1331	@ "%z(href("%R/artifact/%!S",zSrc))%s(zFile)</a>"
1215	1332	}
1216		- @ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]
	1333	+ @ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]</span>
1217	1334	@ (rid %d(rid)) by
1218	1335	hyperlink_to_user(zUser,zDate," on");
1219	1336	hyperlink_to_date(zDate, ".</p>");
1220	1337	}else{
1221	1338	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
1222	1339	if( pTicket ){
1223	1340	@
1224		- @ <li><p>Ticket change
1225		- @ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]
	1341	+ @ <li id="%S(zChngUuid)"><p><span>Ticket change
	1342	+ @ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]</span>
1226	1343	@ (rid %d(rid)) by
1227	1344	hyperlink_to_user(pTicket->zUser,zDate," on");
1228	1345	hyperlink_to_date(zDate, ":");
1229	1346	@ </p>
1230	1347	if( P("raw")!=0 ){
		@@ -1233,21 +1350,23 @@
1233	1350	@ <blockquote><pre>
1234	1351	@ %h(blob_str(&c))
1235	1352	@ </pre></blockquote>
1236	1353	blob_reset(&c);
1237	1354	}else{
1238		- ticket_output_change_artifact(pTicket, "a", nChng);
	1355	+ ticket_output_change_artifact(pTicket, "a", nChng, aLastVal);
1239	1356	}
1240	1357	}
1241	1358	manifest_destroy(pTicket);
1242	1359	}
	1360	+ @ </li>
1243	1361	}
1244	1362	db_finalize(&q);
1245	1363	if( nChng ){
1246	1364	@ </ol>
1247	1365	}
1248	1366	style_finish_page();
	1367	+ if( aLastVal ) blobarray_delete(aLastVal, nField);
1249	1368	}
1250	1369
1251	1370	/*
1252	1371	** Return TRUE if the given BLOB contains a newline character.
1253	1372	*/
		@@ -1261,48 +1380,95 @@
1261	1380	}
1262	1381
1263	1382	/*
1264	1383	** The pTkt object is a ticket change artifact. Output a detailed
1265	1384	** description of this object.
	1385	+**
	1386	+** If `aLastVal` is not NULL then render selected fields as unified diffs
	1387	+** and update corresponding elements of that array with values from `pTkt`.
1266	1388	*/
1267	1389	void ticket_output_change_artifact(
1268	1390	Manifest pTkt, / Parsed artifact for the ticket change */
1269	1391	const char zListType, / Which type of list */
1270		- int n /* Which ticket change is this */
	1392	+ int n, /* Which ticket change is this */
	1393	+ Blob aLastVal / Array of the latest values for the diffs */
1271	1394	){
1272	1395	int i;
1273	1396	if( zListType==0 ) zListType = "1";
1274	1397	getAllTicketFields();
1275	1398	@ <ol type="%s(zListType)">
1276	1399	for(i=0; i<pTkt->nField; i++){
1277		- Blob val;
1278		- const char z, zX;
1279		- int id;
1280		- z = pTkt->aField[i].zName;
1281		- blob_set(&val, pTkt->aField[i].zValue);
1282		- zX = z[0]=='+' ? z+1 : z;
1283		- id = fieldId(zX);
	1400	+ const char *z = pTkt->aField[i].zName;
	1401	+ const char *zX = z[0]=='+' ? z+1 : z;
	1402	+ const int id = fieldId(zX);
	1403	+ const char *zValue = pTkt->aField[i].zValue;
	1404	+ const size_t nValue = strlen(zValue);
	1405	+ const int bLong = nValue>50 \|\| memchr(zValue,'\n',nValue)!=NULL;
	1406	+ /* zValue is long enough to justify a <blockquote> */
	1407	+ const int bCanDiff = aLastVal && id>=0 && aField[id].zBsln;
	1408	+ /* preliminary flag for rendering via unified diff */
	1409	+ int bAppend = 0; /* zValue is being appended to a TICKET's field */
	1410	+ int bRegular = 0; /* prev value of a TICKET's field is being superseded*/
1284	1411	@ <li>\
1285	1412	if( id<0 ){
1286	1413	@ Untracked field %h(zX):
1287	1414	}else if( aField[id].mUsed==USEDBY_TICKETCHNG ){
1288	1415	@ %h(zX):
1289	1416	}else if( n==0 ){
1290	1417	@ %h(zX) initialized to:
1291	1418	}else if( z[0]=='+' && (aField[id].mUsed&USEDBY_TICKET)!=0 ){
1292	1419	@ Appended to %h(zX):
1293		- }else{
1294		- @ %h(zX) changed to:
1295		- }
1296		- if( blob_size(&val)>50 \|\| contains_newline(&val) ){
1297		- @ <blockquote><pre class='verbatim'>
1298		- @ %h(blob_str(&val))
1299		- @ </pre></blockquote></li>
1300		- }else{
1301		- @ "%h(blob_str(&val))"</li>
1302		- }
1303		- blob_reset(&val);
	1420	+ bAppend = 1;
	1421	+ }else{
	1422	+ if( !bCanDiff ){
	1423	+ @ %h(zX) changed to: \
	1424	+ }
	1425	+ bRegular = 1;
	1426	+ }
	1427	+ if( bCanDiff ){
	1428	+ Blob *prev = aLastVal+id;
	1429	+ Blob val = BLOB_INITIALIZER;
	1430	+ if( nValue ){
	1431	+ blob_init(&val, zValue, nValue+1);
	1432	+ val.nUsed--; /* makes blob_str() faster */
	1433	+ }
	1434	+ if( bRegular && nValue && blob_buffer(prev) && blob_size(prev) ){
	1435	+ Blob d = BLOB_INITIALIZER;
	1436	+ DiffConfig DCfg;
	1437	+ construct_diff_flags(1, &DCfg);
	1438	+ DCfg.diffFlags \|= DIFF_HTML \| DIFF_LINENO;
	1439	+ text_diff(prev, &val, &d, &DCfg);
	1440	+ @ %h(zX) changed as:
	1441	+ @ %s(blob_str(&d))
	1442	+ @ </li>
	1443	+ blob_reset(&d);
	1444	+ }else{
	1445	+ if( bRegular ){
	1446	+ @ %h(zX) changed to:
	1447	+ }
	1448	+ if( bLong ){
	1449	+ @ <blockquote><pre class='verbatim'>
	1450	+ @ %h(zValue)
	1451	+ @ </pre></blockquote></li>
	1452	+ }else{
	1453	+ @ "%h(zValue)"</li>
	1454	+ }
	1455	+ }
	1456	+ if( blob_buffer(prev) && blob_size(prev) && !bAppend ){
	1457	+ blob_truncate(prev,0);
	1458	+ }
	1459	+ if( nValue ) blob_appendb(prev, &val);
	1460	+ blob_reset(&val);
	1461	+ }else{
	1462	+ if( bLong ){
	1463	+ @ <blockquote><pre class='verbatim'>
	1464	+ @ %h(zValue)
	1465	+ @ </pre></blockquote></li>
	1466	+ }else{
	1467	+ @ "%h(zValue)"</li>
	1468	+ }
	1469	+ }
1304	1470	}
1305	1471	@ </ol>
1306	1472	}
1307	1473
1308	1474	/*
		@@ -1460,10 +1626,11 @@
1460	1626	}else{
1461	1627	/* add a new ticket or update an existing ticket */
1462	1628	enum { set,add,history,err } eCmd = err;
1463	1629	int i = 0;
1464	1630	Blob tktchng, cksum;
	1631	+ char *aUsed;
1465	1632
1466	1633	/* get command type (set/add) and get uuid, if needed for set */
1467	1634	if( strncmp(g.argv[2],"set",n)==0 \|\| strncmp(g.argv[2],"change",n)==0 \|\|
1468	1635	strncmp(g.argv[2],"history",n)==0 ){
1469	1636	if( strncmp(g.argv[2],"history",n)==0 ){
		@@ -1602,10 +1769,11 @@
1602	1769	}else{
1603	1770	aField[j].zValue = zFValue;
1604	1771	}
1605	1772	}
1606	1773	}
	1774	+ aUsed = fossil_malloc_zero( nField );
1607	1775
1608	1776	/* now add the needed artifacts to the repository */
1609	1777	blob_zero(&tktchng);
1610	1778	/* add the time to the ticket manifest */
1611	1779	blob_appendf(&tktchng, "D %s\n", zDate);
		@@ -1615,34 +1783,39 @@
1615	1783	char *zPfx;
1616	1784
1617	1785	if( aField[i].zAppend && aField[i].zAppend[0] ){
1618	1786	zPfx = " +";
1619	1787	zValue = aField[i].zAppend;
	1788	+ aUsed[i] = JCARD_APPEND;
1620	1789	}else if( aField[i].zValue && aField[i].zValue[0] ){
1621	1790	zPfx = " ";
1622	1791	zValue = aField[i].zValue;
	1792	+ aUsed[i] = JCARD_ASSIGN;
1623	1793	}else{
1624	1794	continue;
1625	1795	}
1626	1796	if( memcmp(aField[i].zName, "private_", 8)==0 ){
1627	1797	zValue = db_conceal(zValue, strlen(zValue));
1628	1798	blob_appendf(&tktchng, "J%s%s %s\n", zPfx, aField[i].zName, zValue);
	1799	+ aUsed[i] = JCARD_PRIVATE;
1629	1800	}else{
1630	1801	blob_appendf(&tktchng, "J%s%s %#F\n", zPfx,
1631	1802	aField[i].zName, strlen(zValue), zValue);
1632	1803	}
1633	1804	}
1634	1805	blob_appendf(&tktchng, "K %s\n", zTktUuid);
1635	1806	blob_appendf(&tktchng, "U %F\n", zUser);
1636	1807	md5sum_blob(&tktchng, &cksum);
1637	1808	blob_appendf(&tktchng, "Z %b\n", &cksum);
1638		- if( ticket_put(&tktchng, zTktUuid, ticket_need_moderation(1))==0 ){
	1809	+ if( ticket_put(&tktchng, zTktUuid, aUsed,
	1810	+ ticket_need_moderation(1) )==0 ){
1639	1811	fossil_fatal("%s", g.zErrMsg);
1640	1812	}else{
1641	1813	fossil_print("ticket %s succeeded for %s\n",
1642	1814	(eCmd==set?"set":"add"),zTktUuid);
1643	1815	}
	1816	+ fossil_free( aUsed );
1644	1817	}
1645	1818	}
1646	1819	}
1647	1820
1648	1821
1649	1822

	--- src/tkt.c
	+++ src/tkt.c
	@@ -30,22 +30,27 @@
30	static int nField = 0;
31	static struct tktFieldInfo {
32	char zName; / Name of the database field */
33	char zValue; / Value to store */
34	char zAppend; / Value to append */

35	unsigned mUsed; /* 01: TICKET 02: TICKETCHNG */
36	} *aField;
37	#define USEDBY_TICKET 01
38	#define USEDBY_TICKETCHNG 02
39	#define USEDBY_BOTH 03



40	static u8 haveTicket = 0; /* True if the TICKET table exists */
41	static u8 haveTicketCTime = 0; /* True if TICKET.TKT_CTIME exists */
42	static u8 haveTicketChng = 0; /* True if the TICKETCHNG table exists */
43	static u8 haveTicketChngRid = 0; /* True if TICKETCHNG.TKT_RID exists */
44	static u8 haveTicketChngUser = 0;/* True if TICKETCHNG.TKT_USER exists */
45	static u8 useTicketGenMt = 0; /* use generated TICKET.MIMETYPE */
46	static u8 useTicketChngGenMt = 0;/* use generated TICKETCHNG.MIMETYPE */

47
48
49	/*
50	** Compare two entries in aField[] for sorting purposes
51	*/
	@@ -73,31 +78,56 @@
73	** The haveTicket and haveTicketChng variables are set to 1 if the TICKET and
74	** TICKETCHANGE tables exist, respectively.
75	*/
76	static void getAllTicketFields(void){
77	Stmt q;
78	int i, noRegularMimetype;
79	static int once = 0;
80	if( once ) return;
81	once = 1;

82	db_prepare(&q, "PRAGMA table_info(ticket)");
83	while( db_step(&q)==SQLITE_ROW ){
84	const char *zFieldName = db_column_text(&q, 1);
85	haveTicket = 1;
86	if( memcmp(zFieldName,"tkt_",4)==0 ){
87	if( strcmp(zFieldName, "tkt_ctime")==0 ) haveTicketCTime = 1;
88	continue;






89	}
90	if( strchr(zFieldName,' ')!=0 ) continue;
91	if( nField%10==0 ){
92	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
93	}

94	aField[nField].zName = mprintf("%s", zFieldName);
95	aField[nField].mUsed = USEDBY_TICKET;
96	nField++;
97	}
98	db_finalize(&q);

















99	db_prepare(&q, "PRAGMA table_info(ticketchng)");
100	while( db_step(&q)==SQLITE_ROW ){
101	const char *zFieldName = db_column_text(&q, 1);
102	haveTicketChng = 1;
103	if( memcmp(zFieldName,"tkt_",4)==0 ){
	@@ -114,10 +144,11 @@
114	continue;
115	}
116	if( nField%10==0 ){
117	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
118	}

119	aField[nField].zName = mprintf("%s", zFieldName);
120	aField[nField].mUsed = USEDBY_TICKETCHNG;
121	nField++;
122	}
123	db_finalize(&q);
	@@ -201,21 +232,39 @@
201	for(i=0; (z = cgi_parameter_name(i))!=0; i++){
202	Th_Store(z, P(z));
203	}
204	}
205










206	/*
207	** Update an entry of the TICKET and TICKETCHNG tables according to the
208	** information in the ticket artifact given in p. Attempt to create
209	** the appropriate TICKET table entry if tktid is zero. If tktid is nonzero
210	** then it will be the ROWID of an existing TICKET entry.
211	**
212	** Parameter rid is the recordID for the ticket artifact in the BLOB table.







213	**
214	** Return the new rowid of the TICKET table entry.
215	*/
216	static int ticket_insert(const Manifest *p, const int rid, int tktid){

217	Blob sql1; /* update or replace TICKET ... */
218	Blob sql2; /* list of TICKETCHNG's fields that are in the manifest */
219	Blob sql3; /* list of values which correspond to the previous list */
220	Stmt q;
221	int i, j;
	@@ -232,12 +281,11 @@
232	blob_zero(&sql3);
233	blob_append_sql(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
234	if( haveTicketCTime ){
235	blob_append_sql(&sql1, ", tkt_ctime=coalesce(tkt_ctime,:mtime)");
236	}
237	aUsed = fossil_malloc( nField );
238	memset(aUsed, 0, nField);
239	for(i=0; i<p->nField; i++){
240	const char * const zName = p->aField[i].zName;
241	const char * const zBaseName = zName[0]=='+' ? zName+1 : zName;
242	j = fieldId(zBaseName);
243	if( j<0 ) continue;
	@@ -244,12 +292,16 @@
244	aUsed[j] = 1;
245	if( aField[j].mUsed & USEDBY_TICKET ){
246	if( zName[0]=='+' ){
247	blob_append_sql(&sql1,", \"%w\"=coalesce(\"%w\",'') \|\| %Q",
248	zBaseName, zBaseName, p->aField[i].zValue);

249	}else{
250	blob_append_sql(&sql1,", \"%w\"=%Q", zBaseName, p->aField[i].zValue);



251	}
252	}
253	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
254	blob_append_sql(&sql2, ",\"%w\"", zBaseName);
255	blob_append_sql(&sql3, ",%Q", p->aField[i].zValue);
	@@ -327,24 +379,37 @@
327	}
328	blob_reset(&sql2);
329	blob_reset(&sql3);
330	fossil_free(aUsed);
331	if( rid>0 ){ /* extract backlinks */
332	int bReplace = 1, mimetype;
333	for(i=0; i<p->nField; i++){
334	const char *zName = p->aField[i].zName;
335	const char *zBaseName = zName[0]=='+' ? zName+1 : zName;
336	j = fieldId(zBaseName);
337	if( j<0 ) continue;
338	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
339	mimetype = mimetype_tktchng;



340	}else{
341	mimetype = mimetype_tkt;














342	}
343	backlink_extract(p->aField[i].zValue, mimetype, rid, BKLNK_TICKET,
344	p->rDate, bReplace);
345	bReplace = 0;
346	}
347	}
348	return tktid;
349	}
350
	@@ -377,12 +442,13 @@
377	void ticket_rebuild_entry(const char *zTktUuid){
378	char *zTag = mprintf("tkt-%s", zTktUuid);
379	int tagid = tag_findid(zTag, 1);
380	Stmt q;
381	Manifest *pTicket;
382	int tktid;
383	int createFlag = 1;

384
385	fossil_free(zTag);
386	getAllTicketFields();
387	if( haveTicket==0 ) return;
388	tktid = db_int(0, "SELECT tkt_id FROM ticket WHERE tkt_uuid=%Q", zTktUuid);
	@@ -390,22 +456,41 @@
390	if( haveTicketChng ){
391	db_multi_exec("DELETE FROM ticketchng WHERE tkt_id=%d;", tktid);
392	}
393	db_multi_exec("DELETE FROM ticket WHERE tkt_id=%d", tktid);
394	tktid = 0;



395	db_prepare(&q, "SELECT rid FROM tagxref WHERE tagid=%d ORDER BY mtime",tagid);
396	while( db_step(&q)==SQLITE_ROW ){
397	int rid = db_column_int(&q, 0);
398	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
399	if( pTicket ){
400	tktid = ticket_insert(pTicket, rid, tktid);
401	manifest_ticket_event(rid, pTicket, createFlag, tagid);
402	manifest_destroy(pTicket);
403	}
404	createFlag = 0;
405	}
406	db_finalize(&q);
















407	}
408
409
410	/*
411	** Create the TH1 interpreter and load the "common" code.
	@@ -738,23 +823,41 @@
738	return TH_OK;
739	}
740
741	/*
742	** Write a ticket into the repository.


743	*/
744	static int ticket_put(
745	Blob pTicket, / The text of the ticket change record */
746	const char zTktId, / The ticket to which this change is applied */

747	int needMod /* True if moderation is needed */
748	){
749	int result;
750	int rid;
751	manifest_crosslink_begin();
752	rid = content_put_ex(pTicket, 0, 0, 0, needMod);
753	if( rid==0 ){
754	fossil_fatal("trouble committing ticket: %s", g.zErrMsg);
755	}















756	if( needMod ){
757	moderation_table_create();
758	db_multi_exec(
759	"INSERT INTO modreq(objid, tktid) VALUES(%d,%Q)",
760	rid, zTktId
	@@ -787,14 +890,14 @@
787	void *pUuid,
788	int argc,
789	const char **argv,
790	int *argl
791	){
792	char *zDate;
793	const char *zUuid;
794	int i;
795	int nJ = 0;
796	Blob tktchng, cksum;
797	int needMod;
798
799	login_verify_csrf_secret();
800	if( !captcha_is_correct(0) ){
	@@ -804,15 +907,17 @@
804	zUuid = (const char *)pUuid;
805	blob_zero(&tktchng);
806	zDate = date_in_standard_format("now");
807	blob_appendf(&tktchng, "D %s\n", zDate);
808	free(zDate);

809	for(i=0; i<nField; i++){
810	if( aField[i].zAppend ){
811	blob_appendf(&tktchng, "J +%s %z\n", aField[i].zName,
812	fossilize(aField[i].zAppend, -1));
813	++nJ;

814	}
815	}
816	for(i=0; i<nField; i++){
817	const char *zValue;
818	int nValue;
	@@ -825,12 +930,14 @@
825	\|\| strlen(aField[i].zValue)!=nValue
826	){
827	if( memcmp(aField[i].zName, "private_", 8)==0 ){
828	zValue = db_conceal(zValue, nValue);
829	blob_appendf(&tktchng, "J %s %s\n", aField[i].zName, zValue);

830	}else{
831	blob_appendf(&tktchng, "J %s %#F\n", aField[i].zName, nValue, zValue);

832	}
833	nJ++;
834	}
835	}
836	}
	@@ -846,11 +953,11 @@
846	blob_appendf(&tktchng, "U %F\n", login_name());
847	md5sum_blob(&tktchng, &cksum);
848	blob_appendf(&tktchng, "Z %b\n", &cksum);
849	if( nJ==0 ){
850	blob_reset(&tktchng);
851	return TH_OK;
852	}
853	needMod = ticket_need_moderation(0);
854	if( g.zPath[0]=='d' ){
855	const char *zNeedMod = needMod ? "required" : "skipped";
856	/* If called from /debug_tktnew or /debug_tktedit... */
	@@ -858,20 +965,22 @@
858	@ <p>Ticket artifact that would have been submitted:</p>
859	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
860	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
861	@ </div>
862	@ <hr />
863	return TH_OK;
864	}else{
865	if( g.thTrace ){
866	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
867	"}<br />\n",
868	blob_str(&tktchng));
869	}
870	ticket_put(&tktchng, zUuid, needMod);

871	}
872	return ticket_change(zUuid);


873	}
874
875
876	/*
877	** WEBPAGE: tktnew
	@@ -1141,17 +1250,21 @@
1141	** By default, the artifacts are decoded and formatted. Text fields
1142	** are formatted as text/plain, since in the general case Fossil does
1143	** not have knowledge of the encoding. If the "raw" query parameter
1144	** is present, then the undecoded and unformatted text of each artifact
1145	** is displayed.



1146	*/
1147	void tkthistory_page(void){
1148	Stmt q;
1149	char *zTitle;
1150	const char *zUuid;
1151	int tagid;
1152	int nChng = 0;

1153
1154	login_check_credentials();
1155	if( !g.perm.Hyperlink \|\| !g.perm.RdTkt ){
1156	login_needed(g.anon.Hyperlink && g.anon.RdTkt);
1157	return;
	@@ -1177,10 +1290,14 @@
1177	}
1178	if( P("raw")!=0 ){
1179	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1180	}else{
1181	@ <h2>Artifacts Associated With Ticket %h(zUuid)</h2>




1182	}
1183	db_prepare(&q,
1184	"SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL"
1185	" FROM event, blob"
1186	" WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)"
	@@ -1198,33 +1315,33 @@
1198	const char *zDate = db_column_text(&q, 0);
1199	int rid = db_column_int(&q, 1);
1200	const char *zChngUuid = db_column_text(&q, 2);
1201	const char *zFile = db_column_text(&q, 4);
1202	if( nChng==0 ){
1203	@ <ol>
1204	}
1205	if( zFile!=0 ){
1206	const char *zSrc = db_column_text(&q, 3);
1207	const char *zUser = db_column_text(&q, 5);


1208	if( zSrc==0 \|\| zSrc[0]==0 ){
1209	@
1210	@ <li><p>Delete attachment "%h(zFile)"
1211	}else{
1212	@
1213	@ <li><p>Add attachment
1214	@ "%z(href("%R/artifact/%!S",zSrc))%s(zFile)</a>"
1215	}
1216	@ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]
1217	@ (rid %d(rid)) by
1218	hyperlink_to_user(zUser,zDate," on");
1219	hyperlink_to_date(zDate, ".</p>");
1220	}else{
1221	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
1222	if( pTicket ){
1223	@
1224	@ <li><p>Ticket change
1225	@ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]
1226	@ (rid %d(rid)) by
1227	hyperlink_to_user(pTicket->zUser,zDate," on");
1228	hyperlink_to_date(zDate, ":");
1229	@ </p>
1230	if( P("raw")!=0 ){
	@@ -1233,21 +1350,23 @@
1233	@ <blockquote><pre>
1234	@ %h(blob_str(&c))
1235	@ </pre></blockquote>
1236	blob_reset(&c);
1237	}else{
1238	ticket_output_change_artifact(pTicket, "a", nChng);
1239	}
1240	}
1241	manifest_destroy(pTicket);
1242	}

1243	}
1244	db_finalize(&q);
1245	if( nChng ){
1246	@ </ol>
1247	}
1248	style_finish_page();

1249	}
1250
1251	/*
1252	** Return TRUE if the given BLOB contains a newline character.
1253	*/
	@@ -1261,48 +1380,95 @@
1261	}
1262
1263	/*
1264	** The pTkt object is a ticket change artifact. Output a detailed
1265	** description of this object.



1266	*/
1267	void ticket_output_change_artifact(
1268	Manifest pTkt, / Parsed artifact for the ticket change */
1269	const char zListType, / Which type of list */
1270	int n /* Which ticket change is this */

1271	){
1272	int i;
1273	if( zListType==0 ) zListType = "1";
1274	getAllTicketFields();
1275	@ <ol type="%s(zListType)">
1276	for(i=0; i<pTkt->nField; i++){
1277	Blob val;
1278	const char z, zX;
1279	int id;
1280	z = pTkt->aField[i].zName;
1281	blob_set(&val, pTkt->aField[i].zValue);
1282	zX = z[0]=='+' ? z+1 : z;
1283	id = fieldId(zX);




1284	@ <li>\
1285	if( id<0 ){
1286	@ Untracked field %h(zX):
1287	}else if( aField[id].mUsed==USEDBY_TICKETCHNG ){
1288	@ %h(zX):
1289	}else if( n==0 ){
1290	@ %h(zX) initialized to:
1291	}else if( z[0]=='+' && (aField[id].mUsed&USEDBY_TICKET)!=0 ){
1292	@ Appended to %h(zX):
1293	}else{
1294	@ %h(zX) changed to:
1295	}
1296	if( blob_size(&val)>50 \|\| contains_newline(&val) ){
1297	@ <blockquote><pre class='verbatim'>
1298	@ %h(blob_str(&val))
1299	@ </pre></blockquote></li>
1300	}else{
1301	@ "%h(blob_str(&val))"</li>
1302	}
1303	blob_reset(&val);







































1304	}
1305	@ </ol>
1306	}
1307
1308	/*
	@@ -1460,10 +1626,11 @@
1460	}else{
1461	/* add a new ticket or update an existing ticket */
1462	enum { set,add,history,err } eCmd = err;
1463	int i = 0;
1464	Blob tktchng, cksum;

1465
1466	/* get command type (set/add) and get uuid, if needed for set */
1467	if( strncmp(g.argv[2],"set",n)==0 \|\| strncmp(g.argv[2],"change",n)==0 \|\|
1468	strncmp(g.argv[2],"history",n)==0 ){
1469	if( strncmp(g.argv[2],"history",n)==0 ){
	@@ -1602,10 +1769,11 @@
1602	}else{
1603	aField[j].zValue = zFValue;
1604	}
1605	}
1606	}

1607
1608	/* now add the needed artifacts to the repository */
1609	blob_zero(&tktchng);
1610	/* add the time to the ticket manifest */
1611	blob_appendf(&tktchng, "D %s\n", zDate);
	@@ -1615,34 +1783,39 @@
1615	char *zPfx;
1616
1617	if( aField[i].zAppend && aField[i].zAppend[0] ){
1618	zPfx = " +";
1619	zValue = aField[i].zAppend;

1620	}else if( aField[i].zValue && aField[i].zValue[0] ){
1621	zPfx = " ";
1622	zValue = aField[i].zValue;

1623	}else{
1624	continue;
1625	}
1626	if( memcmp(aField[i].zName, "private_", 8)==0 ){
1627	zValue = db_conceal(zValue, strlen(zValue));
1628	blob_appendf(&tktchng, "J%s%s %s\n", zPfx, aField[i].zName, zValue);

1629	}else{
1630	blob_appendf(&tktchng, "J%s%s %#F\n", zPfx,
1631	aField[i].zName, strlen(zValue), zValue);
1632	}
1633	}
1634	blob_appendf(&tktchng, "K %s\n", zTktUuid);
1635	blob_appendf(&tktchng, "U %F\n", zUser);
1636	md5sum_blob(&tktchng, &cksum);
1637	blob_appendf(&tktchng, "Z %b\n", &cksum);
1638	if( ticket_put(&tktchng, zTktUuid, ticket_need_moderation(1))==0 ){

1639	fossil_fatal("%s", g.zErrMsg);
1640	}else{
1641	fossil_print("ticket %s succeeded for %s\n",
1642	(eCmd==set?"set":"add"),zTktUuid);
1643	}

1644	}
1645	}
1646	}
1647
1648
1649

	--- src/tkt.c
	+++ src/tkt.c
	@@ -30,22 +30,27 @@
30	static int nField = 0;
31	static struct tktFieldInfo {
32	char zName; / Name of the database field */
33	char zValue; / Value to store */
34	char zAppend; / Value to append */
35	char zBsln; / "baseline for $zName" if that field exists*/
36	unsigned mUsed; /* 01: TICKET 02: TICKETCHNG */
37	} *aField;
38	#define USEDBY_TICKET 01
39	#define USEDBY_TICKETCHNG 02
40	#define USEDBY_BOTH 03
41	#define JCARD_ASSIGN ('=')
42	#define JCARD_APPEND ('+')
43	#define JCARD_PRIVATE ('p')
44	static u8 haveTicket = 0; /* True if the TICKET table exists */
45	static u8 haveTicketCTime = 0; /* True if TICKET.TKT_CTIME exists */
46	static u8 haveTicketChng = 0; /* True if the TICKETCHNG table exists */
47	static u8 haveTicketChngRid = 0; /* True if TICKETCHNG.TKT_RID exists */
48	static u8 haveTicketChngUser = 0;/* True if TICKETCHNG.TKT_USER exists */
49	static u8 useTicketGenMt = 0; /* use generated TICKET.MIMETYPE */
50	static u8 useTicketChngGenMt = 0;/* use generated TICKETCHNG.MIMETYPE */
51	static int nTicketBslns = 0; /* number of valid "baseline for ..." */
52
53
54	/*
55	** Compare two entries in aField[] for sorting purposes
56	*/
	@@ -73,31 +78,56 @@
78	** The haveTicket and haveTicketChng variables are set to 1 if the TICKET and
79	** TICKETCHANGE tables exist, respectively.
80	*/
81	static void getAllTicketFields(void){
82	Stmt q;
83	int i, noRegularMimetype, nBaselines;
84	static int once = 0;
85	if( once ) return;
86	once = 1;
87	nBaselines = 0;
88	db_prepare(&q, "PRAGMA table_info(ticket)");
89	while( db_step(&q)==SQLITE_ROW ){
90	const char *zFieldName = db_column_text(&q, 1);
91	haveTicket = 1;
92	if( memcmp(zFieldName,"tkt_",4)==0 ){
93	if( strcmp(zFieldName, "tkt_ctime")==0 ) haveTicketCTime = 1;
94	continue;
95	}
96	if( memcmp(zFieldName,"baseline for ",13)==0 ){
97	if( strcmp(db_column_text(&q,2),"INTEGER")==0 ){
98	nBaselines++;
99	}
100	continue;
101	}
102	if( strchr(zFieldName,' ')!=0 ) continue;
103	if( nField%10==0 ){
104	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
105	}
106	aField[nField].zBsln = 0;
107	aField[nField].zName = mprintf("%s", zFieldName);
108	aField[nField].mUsed = USEDBY_TICKET;
109	nField++;
110	}
111	db_finalize(&q);
112	if( nBaselines ){
113	db_prepare(&q, "SELECT 1 FROM pragma_table_info('ticket') "
114	"WHERE type = 'INTEGER' AND name = :n");
115	for(i=0; i<nField && nBaselines!=0; i++){
116	char *zBsln = mprintf("baseline for %s",aField[i].zName);
117	db_bind_text(&q, ":n", zBsln);
118	if( db_step(&q)==SQLITE_ROW ){
119	aField[i].zBsln = zBsln;
120	nTicketBslns++;
121	nBaselines--;
122	}else{
123	free(zBsln);
124	}
125	db_reset(&q);
126	}
127	db_finalize(&q);
128	}
129	db_prepare(&q, "PRAGMA table_info(ticketchng)");
130	while( db_step(&q)==SQLITE_ROW ){
131	const char *zFieldName = db_column_text(&q, 1);
132	haveTicketChng = 1;
133	if( memcmp(zFieldName,"tkt_",4)==0 ){
	@@ -114,10 +144,11 @@
144	continue;
145	}
146	if( nField%10==0 ){
147	aField = fossil_realloc(aField, sizeof(aField[0])*(nField+10) );
148	}
149	aField[nField].zBsln = 0;
150	aField[nField].zName = mprintf("%s", zFieldName);
151	aField[nField].mUsed = USEDBY_TICKETCHNG;
152	nField++;
153	}
154	db_finalize(&q);
	@@ -201,21 +232,39 @@
232	for(i=0; (z = cgi_parameter_name(i))!=0; i++){
233	Th_Store(z, P(z));
234	}
235	}
236
237	/*
238	** Information about a single J-card
239	*/
240	struct jCardInfo {
241	char *zValue;
242	int mimetype;
243	int rid;
244	double mtime;
245	};
246
247	/*
248	** Update an entry of the TICKET and TICKETCHNG tables according to the
249	** information in the ticket artifact given in p. Attempt to create
250	** the appropriate TICKET table entry if tktid is zero. If tktid is nonzero
251	** then it will be the ROWID of an existing TICKET entry.
252	**
253	** Parameter rid is the recordID for the ticket artifact in the BLOB table.
254	** Upon assignment of a field this rid is stored into a corresponding
255	** zBsln integer column (provided that it is defined within TICKET table).
256	**
257	** If a field is USEDBY_TICKETCHNG table then back-references within it
258	** are extracted and inserted into the BACKLINK table; otherwise
259	** a corresponding blob in the `fields` array is updated so that the
260	** caller could extract backlinks from the most recent field's values.
261	**
262	** Return the new rowid of the TICKET table entry.
263	*/
264	static int ticket_insert(const Manifest *p, const int rid, int tktid,
265	Blob *fields){
266	Blob sql1; /* update or replace TICKET ... */
267	Blob sql2; /* list of TICKETCHNG's fields that are in the manifest */
268	Blob sql3; /* list of values which correspond to the previous list */
269	Stmt q;
270	int i, j;
	@@ -232,12 +281,11 @@
281	blob_zero(&sql3);
282	blob_append_sql(&sql1, "UPDATE OR REPLACE ticket SET tkt_mtime=:mtime");
283	if( haveTicketCTime ){
284	blob_append_sql(&sql1, ", tkt_ctime=coalesce(tkt_ctime,:mtime)");
285	}
286	aUsed = fossil_malloc_zero( nField );

287	for(i=0; i<p->nField; i++){
288	const char * const zName = p->aField[i].zName;
289	const char * const zBaseName = zName[0]=='+' ? zName+1 : zName;
290	j = fieldId(zBaseName);
291	if( j<0 ) continue;
	@@ -244,12 +292,16 @@
292	aUsed[j] = 1;
293	if( aField[j].mUsed & USEDBY_TICKET ){
294	if( zName[0]=='+' ){
295	blob_append_sql(&sql1,", \"%w\"=coalesce(\"%w\",'') \|\| %Q",
296	zBaseName, zBaseName, p->aField[i].zValue);
297	/* when appending keep "baseline for ..." unchanged */
298	}else{
299	blob_append_sql(&sql1,", \"%w\"=%Q", zBaseName, p->aField[i].zValue);
300	if( aField[j].zBsln ){
301	blob_append_sql(&sql1,", \"%w\"=%d", aField[j].zBsln, rid);
302	}
303	}
304	}
305	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
306	blob_append_sql(&sql2, ",\"%w\"", zBaseName);
307	blob_append_sql(&sql3, ",%Q", p->aField[i].zValue);
	@@ -327,24 +379,37 @@
379	}
380	blob_reset(&sql2);
381	blob_reset(&sql3);
382	fossil_free(aUsed);
383	if( rid>0 ){ /* extract backlinks */

384	for(i=0; i<p->nField; i++){
385	const char *zName = p->aField[i].zName;
386	const char *zBaseName = zName[0]=='+' ? zName+1 : zName;
387	j = fieldId(zBaseName);
388	if( j<0 ) continue;
389	if( aField[j].mUsed & USEDBY_TICKETCHNG ){
390	backlink_extract(p->aField[i].zValue, mimetype_tktchng,
391	rid, BKLNK_TICKET, p->rDate,
392	/* existing backlinks must have been
393	* already deleted by the caller */ 0 );
394	}else{
395	/* update field's data with the most recent values */
396	Blob *cards = fields + j;
397	struct jCardInfo card = {
398	fossil_strdup(p->aField[i].zValue),
399	mimetype_tkt, rid, p->rDate
400	};
401	if( blob_size(cards) && zName[0]!='+' ){
402	struct jCardInfo x = (struct jCardInfo )blob_buffer(cards);
403	struct jCardInfo *end = x + blob_count(cards,struct jCardInfo);
404	for(; x!=end; x++){
405	fossil_free( x->zValue );
406	}
407	blob_truncate(cards,0);
408	}
409	blob_append(cards, (const char*)(&card), sizeof(card));
410	}



411	}
412	}
413	return tktid;
414	}
415
	@@ -377,12 +442,13 @@
442	void ticket_rebuild_entry(const char *zTktUuid){
443	char *zTag = mprintf("tkt-%s", zTktUuid);
444	int tagid = tag_findid(zTag, 1);
445	Stmt q;
446	Manifest *pTicket;
447	int tktid, i;
448	int createFlag = 1;
449	Blob fields; / array of blobs; each blob holds array of jCardInfo */
450
451	fossil_free(zTag);
452	getAllTicketFields();
453	if( haveTicket==0 ) return;
454	tktid = db_int(0, "SELECT tkt_id FROM ticket WHERE tkt_uuid=%Q", zTktUuid);
	@@ -390,22 +456,41 @@
456	if( haveTicketChng ){
457	db_multi_exec("DELETE FROM ticketchng WHERE tkt_id=%d;", tktid);
458	}
459	db_multi_exec("DELETE FROM ticket WHERE tkt_id=%d", tktid);
460	tktid = 0;
461	fields = blobarray_new( nField );
462	db_multi_exec("DELETE FROM backlink WHERE srctype=%d AND srcid IN "
463	"(SELECT rid FROM tagxref WHERE tagid=%d)",BKLNK_TICKET, tagid);
464	db_prepare(&q, "SELECT rid FROM tagxref WHERE tagid=%d ORDER BY mtime",tagid);
465	while( db_step(&q)==SQLITE_ROW ){
466	int rid = db_column_int(&q, 0);
467	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
468	if( pTicket ){
469	tktid = ticket_insert(pTicket, rid, tktid, fields);
470	manifest_ticket_event(rid, pTicket, createFlag, tagid);
471	manifest_destroy(pTicket);
472	}
473	createFlag = 0;
474	}
475	db_finalize(&q);
476	/* Extract backlinks from the most recent values of TICKET fields */
477	for(i=0; i<nField; i++){
478	Blob *cards = fields + i;
479	if( blob_size(cards) ){
480	struct jCardInfo x = (struct jCardInfo )blob_buffer(cards);
481	struct jCardInfo *end = x + blob_count(cards,struct jCardInfo);
482	for(; x!=end; x++){
483	assert( x->zValue );
484	backlink_extract(x->zValue,x->mimetype,
485	x->rid,BKLNK_TICKET,x->mtime,0);
486	fossil_free( x->zValue );
487	}
488	}
489	blob_truncate(cards,0);
490	}
491	blobarray_delete(fields,nField);
492	}
493
494
495	/*
496	** Create the TH1 interpreter and load the "common" code.
	@@ -738,23 +823,41 @@
823	return TH_OK;
824	}
825
826	/*
827	** Write a ticket into the repository.
828	** Upon reassignment of fields try to delta-compress an artifact against
829	** all artifacts that are referenced in the corresponding zBsln fields.
830	*/
831	static int ticket_put(
832	Blob pTicket, / The text of the ticket change record */
833	const char zTktId, / The ticket to which this change is applied */
834	const char aUsed, / Indicators for fields' modifications */
835	int needMod /* True if moderation is needed */
836	){
837	int result;
838	int rid;
839	manifest_crosslink_begin();
840	rid = content_put_ex(pTicket, 0, 0, 0, needMod);
841	if( rid==0 ){
842	fossil_fatal("trouble committing ticket: %s", g.zErrMsg);
843	}
844	if( nTicketBslns ){
845	int i, s, buf[8], nSrc=0, *aSrc=&(buf[0]);
846	if( nTicketBslns > count(buf) ){
847	aSrc = (int)fossil_malloc(sizeof(int)nTicketBslns);
848	}
849	for(i=0; i<nField; i++){
850	if( aField[i].zBsln && aUsed[i]==JCARD_ASSIGN ){
851	s = db_int(0,"SELECT \"%w\" FROM ticket WHERE tkt_uuid = '%q'",
852	aField[i].zBsln, zTktId );
853	if( s > 0 ) aSrc[nSrc++] = s;
854	}
855	}
856	if( nSrc ) content_deltify(rid, aSrc, nSrc, 0);
857	if( aSrc!=&(buf[0]) ) fossil_free( aSrc );
858	}
859	if( needMod ){
860	moderation_table_create();
861	db_multi_exec(
862	"INSERT INTO modreq(objid, tktid) VALUES(%d,%Q)",
863	rid, zTktId
	@@ -787,14 +890,14 @@
890	void *pUuid,
891	int argc,
892	const char **argv,
893	int *argl
894	){
895	char zDate, aUsed;
896	const char *zUuid;
897	int i;
898	int nJ = 0, rc = TH_OK;
899	Blob tktchng, cksum;
900	int needMod;
901
902	login_verify_csrf_secret();
903	if( !captcha_is_correct(0) ){
	@@ -804,15 +907,17 @@
907	zUuid = (const char *)pUuid;
908	blob_zero(&tktchng);
909	zDate = date_in_standard_format("now");
910	blob_appendf(&tktchng, "D %s\n", zDate);
911	free(zDate);
912	aUsed = fossil_malloc_zero( nField );
913	for(i=0; i<nField; i++){
914	if( aField[i].zAppend ){
915	blob_appendf(&tktchng, "J +%s %z\n", aField[i].zName,
916	fossilize(aField[i].zAppend, -1));
917	++nJ;
918	aUsed[i] = JCARD_APPEND;
919	}
920	}
921	for(i=0; i<nField; i++){
922	const char *zValue;
923	int nValue;
	@@ -825,12 +930,14 @@
930	\|\| strlen(aField[i].zValue)!=nValue
931	){
932	if( memcmp(aField[i].zName, "private_", 8)==0 ){
933	zValue = db_conceal(zValue, nValue);
934	blob_appendf(&tktchng, "J %s %s\n", aField[i].zName, zValue);
935	aUsed[i] = JCARD_PRIVATE;
936	}else{
937	blob_appendf(&tktchng, "J %s %#F\n", aField[i].zName, nValue, zValue);
938	aUsed[i] = JCARD_ASSIGN;
939	}
940	nJ++;
941	}
942	}
943	}
	@@ -846,11 +953,11 @@
953	blob_appendf(&tktchng, "U %F\n", login_name());
954	md5sum_blob(&tktchng, &cksum);
955	blob_appendf(&tktchng, "Z %b\n", &cksum);
956	if( nJ==0 ){
957	blob_reset(&tktchng);
958	goto finish;
959	}
960	needMod = ticket_need_moderation(0);
961	if( g.zPath[0]=='d' ){
962	const char *zNeedMod = needMod ? "required" : "skipped";
963	/* If called from /debug_tktnew or /debug_tktedit... */
	@@ -858,20 +965,22 @@
965	@ <p>Ticket artifact that would have been submitted:</p>
966	@ <blockquote><pre>%h(blob_str(&tktchng))</pre></blockquote>
967	@ <blockquote><pre>Moderation would be %h(zNeedMod).</pre></blockquote>
968	@ </div>
969	@ <hr />

970	}else{
971	if( g.thTrace ){
972	Th_Trace("submit_ticket {\n<blockquote><pre>\n%h\n</pre></blockquote>\n"
973	"}<br />\n",
974	blob_str(&tktchng));
975	}
976	ticket_put(&tktchng, zUuid, aUsed, needMod);
977	rc = ticket_change(zUuid);
978	}
979	finish:
980	fossil_free( aUsed );
981	return rc;
982	}
983
984
985	/*
986	** WEBPAGE: tktnew
	@@ -1141,17 +1250,21 @@
1250	** By default, the artifacts are decoded and formatted. Text fields
1251	** are formatted as text/plain, since in the general case Fossil does
1252	** not have knowledge of the encoding. If the "raw" query parameter
1253	** is present, then the undecoded and unformatted text of each artifact
1254	** is displayed.
1255	**
1256	** Reassignments of a field of the TICKET table that has a corresponding
1257	** "baseline for ..." companion are rendered as unified diffs.
1258	*/
1259	void tkthistory_page(void){
1260	Stmt q;
1261	char *zTitle;
1262	const char *zUuid;
1263	int tagid;
1264	int nChng = 0;
1265	Blob aLastVal = 0; / holds the last rendered value for each field */
1266
1267	login_check_credentials();
1268	if( !g.perm.Hyperlink \|\| !g.perm.RdTkt ){
1269	login_needed(g.anon.Hyperlink && g.anon.RdTkt);
1270	return;
	@@ -1177,10 +1290,14 @@
1290	}
1291	if( P("raw")!=0 ){
1292	@ <h2>Raw Artifacts Associated With Ticket %h(zUuid)</h2>
1293	}else{
1294	@ <h2>Artifacts Associated With Ticket %h(zUuid)</h2>
1295	getAllTicketFields();
1296	if( nTicketBslns ){
1297	aLastVal = blobarray_new(nField);
1298	}
1299	}
1300	db_prepare(&q,
1301	"SELECT datetime(mtime,toLocal()), objid, uuid, NULL, NULL, NULL"
1302	" FROM event, blob"
1303	" WHERE objid IN (SELECT rid FROM tagxref WHERE tagid=%d)"
	@@ -1198,33 +1315,33 @@
1315	const char *zDate = db_column_text(&q, 0);
1316	int rid = db_column_int(&q, 1);
1317	const char *zChngUuid = db_column_text(&q, 2);
1318	const char *zFile = db_column_text(&q, 4);
1319	if( nChng==0 ){
1320	@ <ol class="tkt-changes">
1321	}
1322	if( zFile!=0 ){
1323	const char *zSrc = db_column_text(&q, 3);
1324	const char *zUser = db_column_text(&q, 5);
1325	@
1326	@ <li id="%S(zChngUuid)"><p><span>
1327	if( zSrc==0 \|\| zSrc[0]==0 ){
1328	@ Delete attachment "%h(zFile)"

1329	}else{
1330	@ Add attachment

1331	@ "%z(href("%R/artifact/%!S",zSrc))%s(zFile)</a>"
1332	}
1333	@ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]</span>
1334	@ (rid %d(rid)) by
1335	hyperlink_to_user(zUser,zDate," on");
1336	hyperlink_to_date(zDate, ".</p>");
1337	}else{
1338	pTicket = manifest_get(rid, CFTYPE_TICKET, 0);
1339	if( pTicket ){
1340	@
1341	@ <li id="%S(zChngUuid)"><p><span>Ticket change
1342	@ [%z(href("%R/artifact/%!S",zChngUuid))%S(zChngUuid)</a>]</span>
1343	@ (rid %d(rid)) by
1344	hyperlink_to_user(pTicket->zUser,zDate," on");
1345	hyperlink_to_date(zDate, ":");
1346	@ </p>
1347	if( P("raw")!=0 ){
	@@ -1233,21 +1350,23 @@
1350	@ <blockquote><pre>
1351	@ %h(blob_str(&c))
1352	@ </pre></blockquote>
1353	blob_reset(&c);
1354	}else{
1355	ticket_output_change_artifact(pTicket, "a", nChng, aLastVal);
1356	}
1357	}
1358	manifest_destroy(pTicket);
1359	}
1360	@ </li>
1361	}
1362	db_finalize(&q);
1363	if( nChng ){
1364	@ </ol>
1365	}
1366	style_finish_page();
1367	if( aLastVal ) blobarray_delete(aLastVal, nField);
1368	}
1369
1370	/*
1371	** Return TRUE if the given BLOB contains a newline character.
1372	*/
	@@ -1261,48 +1380,95 @@
1380	}
1381
1382	/*
1383	** The pTkt object is a ticket change artifact. Output a detailed
1384	** description of this object.
1385	**
1386	** If `aLastVal` is not NULL then render selected fields as unified diffs
1387	** and update corresponding elements of that array with values from `pTkt`.
1388	*/
1389	void ticket_output_change_artifact(
1390	Manifest pTkt, / Parsed artifact for the ticket change */
1391	const char zListType, / Which type of list */
1392	int n, /* Which ticket change is this */
1393	Blob aLastVal / Array of the latest values for the diffs */
1394	){
1395	int i;
1396	if( zListType==0 ) zListType = "1";
1397	getAllTicketFields();
1398	@ <ol type="%s(zListType)">
1399	for(i=0; i<pTkt->nField; i++){
1400	const char *z = pTkt->aField[i].zName;
1401	const char *zX = z[0]=='+' ? z+1 : z;
1402	const int id = fieldId(zX);
1403	const char *zValue = pTkt->aField[i].zValue;
1404	const size_t nValue = strlen(zValue);
1405	const int bLong = nValue>50 \|\| memchr(zValue,'\n',nValue)!=NULL;
1406	/* zValue is long enough to justify a <blockquote> */
1407	const int bCanDiff = aLastVal && id>=0 && aField[id].zBsln;
1408	/* preliminary flag for rendering via unified diff */
1409	int bAppend = 0; /* zValue is being appended to a TICKET's field */
1410	int bRegular = 0; /* prev value of a TICKET's field is being superseded*/
1411	@ <li>\
1412	if( id<0 ){
1413	@ Untracked field %h(zX):
1414	}else if( aField[id].mUsed==USEDBY_TICKETCHNG ){
1415	@ %h(zX):
1416	}else if( n==0 ){
1417	@ %h(zX) initialized to:
1418	}else if( z[0]=='+' && (aField[id].mUsed&USEDBY_TICKET)!=0 ){
1419	@ Appended to %h(zX):
1420	bAppend = 1;
1421	}else{
1422	if( !bCanDiff ){
1423	@ %h(zX) changed to: \
1424	}
1425	bRegular = 1;
1426	}
1427	if( bCanDiff ){
1428	Blob *prev = aLastVal+id;
1429	Blob val = BLOB_INITIALIZER;
1430	if( nValue ){
1431	blob_init(&val, zValue, nValue+1);
1432	val.nUsed--; /* makes blob_str() faster */
1433	}
1434	if( bRegular && nValue && blob_buffer(prev) && blob_size(prev) ){
1435	Blob d = BLOB_INITIALIZER;
1436	DiffConfig DCfg;
1437	construct_diff_flags(1, &DCfg);
1438	DCfg.diffFlags \|= DIFF_HTML \| DIFF_LINENO;
1439	text_diff(prev, &val, &d, &DCfg);
1440	@ %h(zX) changed as:
1441	@ %s(blob_str(&d))
1442	@ </li>
1443	blob_reset(&d);
1444	}else{
1445	if( bRegular ){
1446	@ %h(zX) changed to:
1447	}
1448	if( bLong ){
1449	@ <blockquote><pre class='verbatim'>
1450	@ %h(zValue)
1451	@ </pre></blockquote></li>
1452	}else{
1453	@ "%h(zValue)"</li>
1454	}
1455	}
1456	if( blob_buffer(prev) && blob_size(prev) && !bAppend ){
1457	blob_truncate(prev,0);
1458	}
1459	if( nValue ) blob_appendb(prev, &val);
1460	blob_reset(&val);
1461	}else{
1462	if( bLong ){
1463	@ <blockquote><pre class='verbatim'>
1464	@ %h(zValue)
1465	@ </pre></blockquote></li>
1466	}else{
1467	@ "%h(zValue)"</li>
1468	}
1469	}
1470	}
1471	@ </ol>
1472	}
1473
1474	/*
	@@ -1460,10 +1626,11 @@
1626	}else{
1627	/* add a new ticket or update an existing ticket */
1628	enum { set,add,history,err } eCmd = err;
1629	int i = 0;
1630	Blob tktchng, cksum;
1631	char *aUsed;
1632
1633	/* get command type (set/add) and get uuid, if needed for set */
1634	if( strncmp(g.argv[2],"set",n)==0 \|\| strncmp(g.argv[2],"change",n)==0 \|\|
1635	strncmp(g.argv[2],"history",n)==0 ){
1636	if( strncmp(g.argv[2],"history",n)==0 ){
	@@ -1602,10 +1769,11 @@
1769	}else{
1770	aField[j].zValue = zFValue;
1771	}
1772	}
1773	}
1774	aUsed = fossil_malloc_zero( nField );
1775
1776	/* now add the needed artifacts to the repository */
1777	blob_zero(&tktchng);
1778	/* add the time to the ticket manifest */
1779	blob_appendf(&tktchng, "D %s\n", zDate);
	@@ -1615,34 +1783,39 @@
1783	char *zPfx;
1784
1785	if( aField[i].zAppend && aField[i].zAppend[0] ){
1786	zPfx = " +";
1787	zValue = aField[i].zAppend;
1788	aUsed[i] = JCARD_APPEND;
1789	}else if( aField[i].zValue && aField[i].zValue[0] ){
1790	zPfx = " ";
1791	zValue = aField[i].zValue;
1792	aUsed[i] = JCARD_ASSIGN;
1793	}else{
1794	continue;
1795	}
1796	if( memcmp(aField[i].zName, "private_", 8)==0 ){
1797	zValue = db_conceal(zValue, strlen(zValue));
1798	blob_appendf(&tktchng, "J%s%s %s\n", zPfx, aField[i].zName, zValue);
1799	aUsed[i] = JCARD_PRIVATE;
1800	}else{
1801	blob_appendf(&tktchng, "J%s%s %#F\n", zPfx,
1802	aField[i].zName, strlen(zValue), zValue);
1803	}
1804	}
1805	blob_appendf(&tktchng, "K %s\n", zTktUuid);
1806	blob_appendf(&tktchng, "U %F\n", zUser);
1807	md5sum_blob(&tktchng, &cksum);
1808	blob_appendf(&tktchng, "Z %b\n", &cksum);
1809	if( ticket_put(&tktchng, zTktUuid, aUsed,
1810	ticket_need_moderation(1) )==0 ){
1811	fossil_fatal("%s", g.zErrMsg);
1812	}else{
1813	fossil_print("ticket %s succeeded for %s\n",
1814	(eCmd==set?"set":"add"),zTktUuid);
1815	}
1816	fossil_free( aUsed );
1817	}
1818	}
1819	}
1820
1821
1822

M src/wiki.c

-2

		--- src/wiki.c
		+++ src/wiki.c
		@@ -1867,13 +1867,11 @@
1867	1867	style_header("Changes To %s", pW1->zWikiTitle);
1868	1868	blob_zero(&d);
1869	1869	construct_diff_flags(1, &DCfg);
1870	1870	DCfg.diffFlags \|= DIFF_HTML \| DIFF_LINENO;
1871	1871	text_diff(&w2, &w1, &d, &DCfg);
1872		- @ <pre class="udiff">
1873	1872	@ %s(blob_str(&d))
1874		- @ <pre>
1875	1873	manifest_destroy(pW1);
1876	1874	manifest_destroy(pW2);
1877	1875	style_finish_page();
1878	1876	}
1879	1877
1880	1878

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1867,13 +1867,11 @@
1867	style_header("Changes To %s", pW1->zWikiTitle);
1868	blob_zero(&d);
1869	construct_diff_flags(1, &DCfg);
1870	DCfg.diffFlags \|= DIFF_HTML \| DIFF_LINENO;
1871	text_diff(&w2, &w1, &d, &DCfg);
1872	@ <pre class="udiff">
1873	@ %s(blob_str(&d))
1874	@ <pre>
1875	manifest_destroy(pW1);
1876	manifest_destroy(pW2);
1877	style_finish_page();
1878	}
1879
1880

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1867,13 +1867,11 @@
1867	style_header("Changes To %s", pW1->zWikiTitle);
1868	blob_zero(&d);
1869	construct_diff_flags(1, &DCfg);
1870	DCfg.diffFlags \|= DIFF_HTML \| DIFF_LINENO;
1871	text_diff(&w2, &w1, &d, &DCfg);

1872	@ %s(blob_str(&d))

1873	manifest_destroy(pW1);
1874	manifest_destroy(pW2);
1875	style_finish_page();
1876	}
1877
1878

M www/changes.wiki

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -14,10 +14,13 @@
14	14	* Rebuilt [/file/Dockerfile \| the stock Dockerfile] to create a "from scratch"
15	15	Busybox based container image via an Alpine Linux intermediary
16	16	* Added [/doc/trunk/www/containers.md \| a new document] describing how to
17	17	customize, use, and run that container.
18	18	* Added "by hour of day" report to [/reports?view=byhour\|the /reports page].
	19	+ * Improved correctness, usability, and efficiency for the case
	20	+ [/timeline?r=deltify-tkt-blobs\|when values in a TICKET's column
	21	+ tend to be long and volatile].
19	22
20	23	<h2 id='v2_19'>Changes for version 2.19 (2022-07-21)</h2>
21	24	* On file listing pages, sort filenames using the "uintnocase" collating
22	25	sequence, so that filenames that contains embedded integers sort in
23	26	numeric order even if they contain a different number of digits.
24	27

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,10 +14,13 @@
14	* Rebuilt [/file/Dockerfile \| the stock Dockerfile] to create a "from scratch"
15	Busybox based container image via an Alpine Linux intermediary
16	* Added [/doc/trunk/www/containers.md \| a new document] describing how to
17	customize, use, and run that container.
18	* Added "by hour of day" report to [/reports?view=byhour\|the /reports page].



19
20	<h2 id='v2_19'>Changes for version 2.19 (2022-07-21)</h2>
21	* On file listing pages, sort filenames using the "uintnocase" collating
22	sequence, so that filenames that contains embedded integers sort in
23	numeric order even if they contain a different number of digits.
24

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,10 +14,13 @@
14	* Rebuilt [/file/Dockerfile \| the stock Dockerfile] to create a "from scratch"
15	Busybox based container image via an Alpine Linux intermediary
16	* Added [/doc/trunk/www/containers.md \| a new document] describing how to
17	customize, use, and run that container.
18	* Added "by hour of day" report to [/reports?view=byhour\|the /reports page].
19	* Improved correctness, usability, and efficiency for the case
20	[/timeline?r=deltify-tkt-blobs\|when values in a TICKET's column
21	tend to be long and volatile].
22
23	<h2 id='v2_19'>Changes for version 2.19 (2022-07-21)</h2>
24	* On file listing pages, sort filenames using the "uintnocase" collating
25	sequence, so that filenames that contains embedded integers sort in
26	numeric order even if they contain a different number of digits.
27

Fossil SCM

Keyboard Shortcuts