Fossil SCM

Improved graph display when a single checkin is the parent of both a normal and a cherrypick merge.

drh 2018-12-28 16:21 trunk

Commit 30aec47aa0cf8d2c6dcc1da8534eb8022c67ef66fb41df14083323886e5b6129

Parent 35e892b4f3b5694…

4 files changed +10 -4 +48 -16 +13 -8 +4

~ src/graph.c ~ src/graph.js ~ src/timeline.c ~ test/graph-test-1.wiki

M src/graph.c

+10 -4

		--- src/graph.c
		+++ src/graph.c
		@@ -57,10 +57,11 @@
57	57	i8 iRail; /* Which rail this check-in appears on. 0-based.*/
58	58	i8 mergeOut; /* Merge out to this rail. -1 if no merge-out */
59	59	u8 mergeIn[GR_MAX_RAIL]; /* Merge in from non-zero rails */
60	60	int aiRiser[GR_MAX_RAIL]; /* Risers from this node to a higher row. */
61	61	int mergeUpto; /* Draw the mergeOut rail up to this level */
	62	+ int cherrypickUpto; /* Continue the mergeOut rail up to here */
62	63	u64 mergeDown; /* Draw merge lines up from bottom of graph */
63	64	u64 cherrypickDown; /* Draw cherrypick lines up from bottom */
64	65
65	66	u64 railInUse; /* Mask of occupied rails at this row */
66	67	};
		@@ -308,26 +309,31 @@
308	309	if( u>=0 && u<pChild->idx ){
309	310	/* The thick arrow up to the next primary child of pDesc goes
310	311	** further up than the thin merge arrow riser, so draw them both
311	312	** on the same rail. */
312	313	pParent->mergeOut = pParent->iRail;
313		- pParent->mergeUpto = pChild->idx;
314		- }else{
	314	+ }else{
315	315	/* The thin merge arrow riser is taller than the thick primary
316	316	** child riser, so use separate rails. */
317	317	int iTarget = pParent->iRail;
318	318	pParent->mergeOut = findFreeRail(p, pChild->idx, pParent->idx-1, iTarget);
319		- pParent->mergeUpto = pChild->idx;
320	319	mask = BIT(pParent->mergeOut);
321	320	for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
322	321	pLoop=pLoop->pNext){
323	322	pLoop->railInUse \|= mask;
324	323	}
325	324	}
326	325	}
327		- if( !isCherrypick ){
	326	+ if( isCherrypick ){
	327	+ if( pParent->cherrypickUpto==0 \|\| pParent->cherrypickUpto > pChild->idx ){
	328	+ pParent->cherrypickUpto = pChild->idx;
	329	+ }
	330	+ }else{
328	331	pParent->hasNormalOutMerge = 1;
	332	+ if( pParent->mergeUpto==0 \|\| pParent->mergeUpto > pChild->idx ){
	333	+ pParent->mergeUpto = pChild->idx;
	334	+ }
329	335	}
330	336	pChild->mergeIn[pParent->mergeOut] = isCherrypick ? 2 : 1;
331	337	}
332	338
333	339	/*
334	340

	--- src/graph.c
	+++ src/graph.c
	@@ -57,10 +57,11 @@
57	i8 iRail; /* Which rail this check-in appears on. 0-based.*/
58	i8 mergeOut; /* Merge out to this rail. -1 if no merge-out */
59	u8 mergeIn[GR_MAX_RAIL]; /* Merge in from non-zero rails */
60	int aiRiser[GR_MAX_RAIL]; /* Risers from this node to a higher row. */
61	int mergeUpto; /* Draw the mergeOut rail up to this level */

62	u64 mergeDown; /* Draw merge lines up from bottom of graph */
63	u64 cherrypickDown; /* Draw cherrypick lines up from bottom */
64
65	u64 railInUse; /* Mask of occupied rails at this row */
66	};
	@@ -308,26 +309,31 @@
308	if( u>=0 && u<pChild->idx ){
309	/* The thick arrow up to the next primary child of pDesc goes
310	** further up than the thin merge arrow riser, so draw them both
311	** on the same rail. */
312	pParent->mergeOut = pParent->iRail;
313	pParent->mergeUpto = pChild->idx;
314	}else{
315	/* The thin merge arrow riser is taller than the thick primary
316	** child riser, so use separate rails. */
317	int iTarget = pParent->iRail;
318	pParent->mergeOut = findFreeRail(p, pChild->idx, pParent->idx-1, iTarget);
319	pParent->mergeUpto = pChild->idx;
320	mask = BIT(pParent->mergeOut);
321	for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
322	pLoop=pLoop->pNext){
323	pLoop->railInUse \|= mask;
324	}
325	}
326	}
327	if( !isCherrypick ){




328	pParent->hasNormalOutMerge = 1;



329	}
330	pChild->mergeIn[pParent->mergeOut] = isCherrypick ? 2 : 1;
331	}
332
333	/*
334

	--- src/graph.c
	+++ src/graph.c
	@@ -57,10 +57,11 @@
57	i8 iRail; /* Which rail this check-in appears on. 0-based.*/
58	i8 mergeOut; /* Merge out to this rail. -1 if no merge-out */
59	u8 mergeIn[GR_MAX_RAIL]; /* Merge in from non-zero rails */
60	int aiRiser[GR_MAX_RAIL]; /* Risers from this node to a higher row. */
61	int mergeUpto; /* Draw the mergeOut rail up to this level */
62	int cherrypickUpto; /* Continue the mergeOut rail up to here */
63	u64 mergeDown; /* Draw merge lines up from bottom of graph */
64	u64 cherrypickDown; /* Draw cherrypick lines up from bottom */
65
66	u64 railInUse; /* Mask of occupied rails at this row */
67	};
	@@ -308,26 +309,31 @@
309	if( u>=0 && u<pChild->idx ){
310	/* The thick arrow up to the next primary child of pDesc goes
311	** further up than the thin merge arrow riser, so draw them both
312	** on the same rail. */
313	pParent->mergeOut = pParent->iRail;
314	}else{

315	/* The thin merge arrow riser is taller than the thick primary
316	** child riser, so use separate rails. */
317	int iTarget = pParent->iRail;
318	pParent->mergeOut = findFreeRail(p, pChild->idx, pParent->idx-1, iTarget);

319	mask = BIT(pParent->mergeOut);
320	for(pLoop=pChild->pNext; pLoop && pLoop->rid!=pParent->rid;
321	pLoop=pLoop->pNext){
322	pLoop->railInUse \|= mask;
323	}
324	}
325	}
326	if( isCherrypick ){
327	if( pParent->cherrypickUpto==0 \|\| pParent->cherrypickUpto > pChild->idx ){
328	pParent->cherrypickUpto = pChild->idx;
329	}
330	}else{
331	pParent->hasNormalOutMerge = 1;
332	if( pParent->mergeUpto==0 \|\| pParent->mergeUpto > pChild->idx ){
333	pParent->mergeUpto = pChild->idx;
334	}
335	}
336	pChild->mergeIn[pParent->mergeOut] = isCherrypick ? 2 : 1;
337	}
338
339	/*
340

M src/graph.js

+48 -16

		--- src/graph.js
		+++ src/graph.js
		@@ -21,34 +21,44 @@
21	21	** The rowinfo field is an array of structures, one per entry in the timeline,
22	22	** where each structure has the following fields:
23	23	**
24	24	** id: The id of the <div> element for the row. This is an integer.
25	25	** to get an actual id, prepend "m" to the integer. The top node
26		-** is iTopRow and numbers increase moving down the graph.
	26	+** is iTopRow and numbers increase moving down the timeline.
27	27	** bg: The background color for this row
28	28	** r: The "rail" that the node for this row sits on. The left-most
29	29	** rail is 0 and the number increases to the right.
30		-** d: True if there is a "descender" - an arrow coming from the bottom
31		-** of the page straight up to this node.
32		-** mo: "merge-out". If non-negative, this is the rail position
	30	+** d: If exists and true then there is a "descender" - an arrow
	31	+** coming from the bottom of the page straight up to this node.
	32	+** mo: "merge-out". If it exists, this is the rail position
33	33	** for the upward portion of a merge arrow. The merge arrow goes up
34		-** to the row identified by mu:. If this value is negative then
	34	+** to the row identified by mu:. If this value is omitted then
35	35	** node has no merge children and no merge-out line is drawn.
36	36	** mu: The id of the row which is the top of the merge-out arrow.
	37	+** Only exists if "mo" exists.
	38	+** cu: The id of the top row of the merge-out arrow for a cherrypick
	39	+** merge arrow that extends beyond the main merge arrow. Only
	40	+** exists if "mo" exists and if there is a cherrpick merge that is
	41	+** higher than "mu".
37	42	** u: Draw a thick child-line out of the top of this node and up to
38	43	** the node with an id equal to this value. 0 if it is straight to
39	44	** the top of the page, -1 if there is no thick-line riser.
40	45	** f: 0x01: a leaf node.
	46	+** 0x02: all output merges are cherrypicks
41	47	** au: An array of integers that define thick-line risers for branches.
42	48	** The integers are in pairs. For each pair, the first integer is
43	49	** is the rail on which the riser should run and the second integer
44		-** is the id of the node upto which the riser should run.
	50	+** is the id of the node upto which the riser should run. If there
	51	+** are no risers, this array does not exist.
45	52	** mi: "merge-in". An array of integer rail positions from which
46	53	** merge arrows should be drawn into this node. If the value is
47	54	** negative, then the rail position is the absolute value of mi[]
48	55	** and a thin merge-arrow descender is drawn to the bottom of
49		-** the screen.
	56	+** the screen. This array is omitted if there are no inbound
	57	+** merges.
	58	+** ci: "cherrypick-in". Like "mi" except for cherrypick merges.
	59	+** omitted if there are no cherrypick merges.
50	60	** h: The artifact hash of the object being graphed
51	61	*/
52	62	var amendCssOnce = 1; // Only change the CSS one time
53	63	function amendCss(circleNodes,showArrowheads){
54	64	if( !amendCssOnce ) return;
		@@ -244,20 +254,36 @@
244	254	if( p.hasOwnProperty('mo') ){
245	255	var x0 = p.x + node.w/2;
246	256	var x1 = p.mo*railPitch + node.w/2;
247	257	var u = tx.rowinfo[p.mu-tx.iTopRow];
248	258	var y1 = miLineY(u);
249		- var drawMethod = (p.f&2) ? drawCherrypickLine : drawMergeLine;
250	259	if( p.u<0 \|\| p.mo!=p.r ){
251	260	x1 += mergeLines[p.mo] = -mLine.w/2;
252	261	var y0 = p.y+2;
253		- if( p.r!=p.mo ) drawMethod(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
254		- drawMethod(x1,y0+mLine.w,null,y1);
	262	+ if( p.mu==p.id ){
	263	+ drawCherrypickLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
	264	+ y1 = y0;
	265	+ }else{
	266	+ drawMergeLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
	267	+ drawMergeLine(x1,y0+mLine.w,null,y1);
	268	+ }
	269	+ if( p.hasOwnProperty('cu') ){
	270	+ var u2 = tx.rowinfo[p.cu-tx.iTopRow];
	271	+ var y2 = miLineY(u2);
	272	+ drawCherrypickLine(x1,y1,null,y2);
	273	+ }
255	274	}else if( mergeOffset ){
256	275	mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset;
257	276	x1 += mergeLines[p.mo];
258		- drawMethod(x1,p.y+node.h/2,null,y1);
	277	+ if( p.mo<p.id ){
	278	+ drawMergeLine(x1,p.y+node.h/2,null,y1);
	279	+ }
	280	+ if( p.hasOwnProperty('cu') ){
	281	+ var u2 = tx.rowinfo[p.cu-tx.iTopRow];
	282	+ var y2 = miLineY(u2);
	283	+ drawCherrypickLine(x1,y1,null,y2);
	284	+ }
259	285	}else{
260	286	delete mergeLines[p.mo];
261	287	}
262	288	}
263	289	if( p.hasOwnProperty('au') ){
		@@ -291,29 +317,34 @@
291	317	var rail = p.mi[i];
292	318	if( rail<0 ){
293	319	rail = -rail;
294	320	mergeLines[rail] = -mLine.w/2;
295	321	var x = rail*railPitch + (node.w-mLine.w)/2;
296		- drawMergeLine(x,miLineY(p),null,btm);
	322	+ var y = miLineY(p);
	323	+ drawMergeLine(x,y,null,mergeBtm[rail]);
	324	+ mergeBtm[rail] = y;
297	325	}
298	326	drawMergeArrow(p,rail,0);
299	327	}
300	328	}
301		- if( p.hasOwnProperty('cpi') ){
302		- for( var i=0; i<p.cpi.length; i++ ){
303		- var rail = p.cpi[i];
	329	+ if( p.hasOwnProperty('ci') ){
	330	+ for( var i=0; i<p.ci.length; i++ ){
	331	+ var rail = p.ci[i];
304	332	if( rail<0 ){
305	333	rail = -rail;
306	334	mergeLines[rail] = -mLine.w/2;
307	335	var x = rail*railPitch + (node.w-mLine.w)/2;
308		- drawCherrypickLine(x,miLineY(p),null,btm);
	336	+ var y = miLineY(p);
	337	+ drawCherrypickLine(x,y,null,mergeBtm[rail]);
	338	+ mergeBtm[rail] = y;
309	339	}
310	340	drawMergeArrow(p,rail,1);
311	341	}
312	342	}
313	343	}
314	344	var mergeLines;
	345	+ var mergeBtm = new Array;
315	346	function renderGraph(){
316	347	mergeLines = {};
317	348	canvasDiv.innerHTML = "";
318	349	var canvasY = absoluteY(canvasDiv);
319	350	for(var i=0; i<tx.rowinfo.length; i++ ){
		@@ -324,10 +355,11 @@
324	355	var tlBtm = document.querySelector(".timelineBottom");
325	356	if( tlBtm.offsetHeight<node.h ){
326	357	tlBtm.style.height = node.h + "px";
327	358	}
328	359	var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;
	360	+ for( var i=0; i<tx.nrail; i++) mergeBtm[i] = btm;
329	361	for( var i=tx.rowinfo.length-1; i>=0; i-- ){
330	362	drawNode(tx.rowinfo[i], btm);
331	363	}
332	364	}
333	365	var selRow;
334	366

	--- src/graph.js
	+++ src/graph.js
	@@ -21,34 +21,44 @@
21	** The rowinfo field is an array of structures, one per entry in the timeline,
22	** where each structure has the following fields:
23	**
24	** id: The id of the <div> element for the row. This is an integer.
25	** to get an actual id, prepend "m" to the integer. The top node
26	** is iTopRow and numbers increase moving down the graph.
27	** bg: The background color for this row
28	** r: The "rail" that the node for this row sits on. The left-most
29	** rail is 0 and the number increases to the right.
30	** d: True if there is a "descender" - an arrow coming from the bottom
31	** of the page straight up to this node.
32	** mo: "merge-out". If non-negative, this is the rail position
33	** for the upward portion of a merge arrow. The merge arrow goes up
34	** to the row identified by mu:. If this value is negative then
35	** node has no merge children and no merge-out line is drawn.
36	** mu: The id of the row which is the top of the merge-out arrow.





37	** u: Draw a thick child-line out of the top of this node and up to
38	** the node with an id equal to this value. 0 if it is straight to
39	** the top of the page, -1 if there is no thick-line riser.
40	** f: 0x01: a leaf node.

41	** au: An array of integers that define thick-line risers for branches.
42	** The integers are in pairs. For each pair, the first integer is
43	** is the rail on which the riser should run and the second integer
44	** is the id of the node upto which the riser should run.

45	** mi: "merge-in". An array of integer rail positions from which
46	** merge arrows should be drawn into this node. If the value is
47	** negative, then the rail position is the absolute value of mi[]
48	** and a thin merge-arrow descender is drawn to the bottom of
49	** the screen.



50	** h: The artifact hash of the object being graphed
51	*/
52	var amendCssOnce = 1; // Only change the CSS one time
53	function amendCss(circleNodes,showArrowheads){
54	if( !amendCssOnce ) return;
	@@ -244,20 +254,36 @@
244	if( p.hasOwnProperty('mo') ){
245	var x0 = p.x + node.w/2;
246	var x1 = p.mo*railPitch + node.w/2;
247	var u = tx.rowinfo[p.mu-tx.iTopRow];
248	var y1 = miLineY(u);
249	var drawMethod = (p.f&2) ? drawCherrypickLine : drawMergeLine;
250	if( p.u<0 \|\| p.mo!=p.r ){
251	x1 += mergeLines[p.mo] = -mLine.w/2;
252	var y0 = p.y+2;
253	if( p.r!=p.mo ) drawMethod(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
254	drawMethod(x1,y0+mLine.w,null,y1);










255	}else if( mergeOffset ){
256	mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset;
257	x1 += mergeLines[p.mo];
258	drawMethod(x1,p.y+node.h/2,null,y1);







259	}else{
260	delete mergeLines[p.mo];
261	}
262	}
263	if( p.hasOwnProperty('au') ){
	@@ -291,29 +317,34 @@
291	var rail = p.mi[i];
292	if( rail<0 ){
293	rail = -rail;
294	mergeLines[rail] = -mLine.w/2;
295	var x = rail*railPitch + (node.w-mLine.w)/2;
296	drawMergeLine(x,miLineY(p),null,btm);


297	}
298	drawMergeArrow(p,rail,0);
299	}
300	}
301	if( p.hasOwnProperty('cpi') ){
302	for( var i=0; i<p.cpi.length; i++ ){
303	var rail = p.cpi[i];
304	if( rail<0 ){
305	rail = -rail;
306	mergeLines[rail] = -mLine.w/2;
307	var x = rail*railPitch + (node.w-mLine.w)/2;
308	drawCherrypickLine(x,miLineY(p),null,btm);


309	}
310	drawMergeArrow(p,rail,1);
311	}
312	}
313	}
314	var mergeLines;

315	function renderGraph(){
316	mergeLines = {};
317	canvasDiv.innerHTML = "";
318	var canvasY = absoluteY(canvasDiv);
319	for(var i=0; i<tx.rowinfo.length; i++ ){
	@@ -324,10 +355,11 @@
324	var tlBtm = document.querySelector(".timelineBottom");
325	if( tlBtm.offsetHeight<node.h ){
326	tlBtm.style.height = node.h + "px";
327	}
328	var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;

329	for( var i=tx.rowinfo.length-1; i>=0; i-- ){
330	drawNode(tx.rowinfo[i], btm);
331	}
332	}
333	var selRow;
334

	--- src/graph.js
	+++ src/graph.js
	@@ -21,34 +21,44 @@
21	** The rowinfo field is an array of structures, one per entry in the timeline,
22	** where each structure has the following fields:
23	**
24	** id: The id of the <div> element for the row. This is an integer.
25	** to get an actual id, prepend "m" to the integer. The top node
26	** is iTopRow and numbers increase moving down the timeline.
27	** bg: The background color for this row
28	** r: The "rail" that the node for this row sits on. The left-most
29	** rail is 0 and the number increases to the right.
30	** d: If exists and true then there is a "descender" - an arrow
31	** coming from the bottom of the page straight up to this node.
32	** mo: "merge-out". If it exists, this is the rail position
33	** for the upward portion of a merge arrow. The merge arrow goes up
34	** to the row identified by mu:. If this value is omitted then
35	** node has no merge children and no merge-out line is drawn.
36	** mu: The id of the row which is the top of the merge-out arrow.
37	** Only exists if "mo" exists.
38	** cu: The id of the top row of the merge-out arrow for a cherrypick
39	** merge arrow that extends beyond the main merge arrow. Only
40	** exists if "mo" exists and if there is a cherrpick merge that is
41	** higher than "mu".
42	** u: Draw a thick child-line out of the top of this node and up to
43	** the node with an id equal to this value. 0 if it is straight to
44	** the top of the page, -1 if there is no thick-line riser.
45	** f: 0x01: a leaf node.
46	** 0x02: all output merges are cherrypicks
47	** au: An array of integers that define thick-line risers for branches.
48	** The integers are in pairs. For each pair, the first integer is
49	** is the rail on which the riser should run and the second integer
50	** is the id of the node upto which the riser should run. If there
51	** are no risers, this array does not exist.
52	** mi: "merge-in". An array of integer rail positions from which
53	** merge arrows should be drawn into this node. If the value is
54	** negative, then the rail position is the absolute value of mi[]
55	** and a thin merge-arrow descender is drawn to the bottom of
56	** the screen. This array is omitted if there are no inbound
57	** merges.
58	** ci: "cherrypick-in". Like "mi" except for cherrypick merges.
59	** omitted if there are no cherrypick merges.
60	** h: The artifact hash of the object being graphed
61	*/
62	var amendCssOnce = 1; // Only change the CSS one time
63	function amendCss(circleNodes,showArrowheads){
64	if( !amendCssOnce ) return;
	@@ -244,20 +254,36 @@
254	if( p.hasOwnProperty('mo') ){
255	var x0 = p.x + node.w/2;
256	var x1 = p.mo*railPitch + node.w/2;
257	var u = tx.rowinfo[p.mu-tx.iTopRow];
258	var y1 = miLineY(u);

259	if( p.u<0 \|\| p.mo!=p.r ){
260	x1 += mergeLines[p.mo] = -mLine.w/2;
261	var y0 = p.y+2;
262	if( p.mu==p.id ){
263	drawCherrypickLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
264	y1 = y0;
265	}else{
266	drawMergeLine(x0,y0,x1+(x0<x1 ? mLine.w : 0),null);
267	drawMergeLine(x1,y0+mLine.w,null,y1);
268	}
269	if( p.hasOwnProperty('cu') ){
270	var u2 = tx.rowinfo[p.cu-tx.iTopRow];
271	var y2 = miLineY(u2);
272	drawCherrypickLine(x1,y1,null,y2);
273	}
274	}else if( mergeOffset ){
275	mergeLines[p.mo] = u.r<p.r ? -mergeOffset-mLine.w : mergeOffset;
276	x1 += mergeLines[p.mo];
277	if( p.mo<p.id ){
278	drawMergeLine(x1,p.y+node.h/2,null,y1);
279	}
280	if( p.hasOwnProperty('cu') ){
281	var u2 = tx.rowinfo[p.cu-tx.iTopRow];
282	var y2 = miLineY(u2);
283	drawCherrypickLine(x1,y1,null,y2);
284	}
285	}else{
286	delete mergeLines[p.mo];
287	}
288	}
289	if( p.hasOwnProperty('au') ){
	@@ -291,29 +317,34 @@
317	var rail = p.mi[i];
318	if( rail<0 ){
319	rail = -rail;
320	mergeLines[rail] = -mLine.w/2;
321	var x = rail*railPitch + (node.w-mLine.w)/2;
322	var y = miLineY(p);
323	drawMergeLine(x,y,null,mergeBtm[rail]);
324	mergeBtm[rail] = y;
325	}
326	drawMergeArrow(p,rail,0);
327	}
328	}
329	if( p.hasOwnProperty('ci') ){
330	for( var i=0; i<p.ci.length; i++ ){
331	var rail = p.ci[i];
332	if( rail<0 ){
333	rail = -rail;
334	mergeLines[rail] = -mLine.w/2;
335	var x = rail*railPitch + (node.w-mLine.w)/2;
336	var y = miLineY(p);
337	drawCherrypickLine(x,y,null,mergeBtm[rail]);
338	mergeBtm[rail] = y;
339	}
340	drawMergeArrow(p,rail,1);
341	}
342	}
343	}
344	var mergeLines;
345	var mergeBtm = new Array;
346	function renderGraph(){
347	mergeLines = {};
348	canvasDiv.innerHTML = "";
349	var canvasY = absoluteY(canvasDiv);
350	for(var i=0; i<tx.rowinfo.length; i++ ){
	@@ -324,10 +355,11 @@
355	var tlBtm = document.querySelector(".timelineBottom");
356	if( tlBtm.offsetHeight<node.h ){
357	tlBtm.style.height = node.h + "px";
358	}
359	var btm = absoluteY(tlBtm) - canvasY + tlBtm.offsetHeight;
360	for( var i=0; i<tx.nrail; i++) mergeBtm[i] = btm;
361	for( var i=tx.rowinfo.length-1; i>=0; i-- ){
362	drawNode(tx.rowinfo[i], btm);
363	}
364	}
365	var selRow;
366

M src/timeline.c

+13 -8

		--- src/timeline.c
		+++ src/timeline.c
		@@ -866,20 +866,22 @@
866	866	** r: The "rail" that the node for this row sits on. The left-most
867	867	** rail is 0 and the number increases to the right.
868	868	** d: If exists and true then there is a "descender" - an arrow
869	869	** coming from the bottom of the page straight up to this node.
870	870	** mo: "merge-out". If it exists, this is the rail position
871		- ** for the upward portion of a merge arrow. The merge arrow goes up
872		- ** to the row identified by mu:. If this value is omitted then
873		- ** node has no merge children and no merge-out line is drawn.
	871	+ ** for the upward portion of a merge arrow. The merge arrow goes as
	872	+ ** a solid normal merge line up to the row identified by "mu" and
	873	+ ** then as a dashed cherrypick merge line up further to "cu".
	874	+ ** If this value is omitted if there are no merge children.
874	875	** mu: The id of the row which is the top of the merge-out arrow.
875	876	** Only exists if "mo" exists.
	877	+ ** cu: Extend the mu merge error on up to this row as a cherrypick
	878	+ ** merge line, if this value exists.
876	879	** u: Draw a thick child-line out of the top of this node and up to
877	880	** the node with an id equal to this value. 0 if it is straight to
878	881	** the top of the page, -1 if there is no thick-line riser.
879	882	** f: 0x01: a leaf node.
880		- ** 0x02: all output merges are cherrypicks
881	883	** au: An array of integers that define thick-line risers for branches.
882	884	** The integers are in pairs. For each pair, the first integer is
883	885	** is the rail on which the riser should run and the second integer
884	886	** is the id of the node upto which the riser should run. If there
885	887	** are no risers, this array does not exist.
		@@ -887,11 +889,11 @@
887	889	** merge arrows should be drawn into this node. If the value is
888	890	** negative, then the rail position is the absolute value of mi[]
889	891	** and a thin merge-arrow descender is drawn to the bottom of
890	892	** the screen. This array is omitted if there are no inbound
891	893	** merges.
892		- ** cpi: "cherrypick-in". Like "mi" except for cherrypick merges.
	894	+ ** ci: "cherrypick-in". Like "mi" except for cherrypick merges.
893	895	** omitted if there are no cherrypick merges.
894	896	** h: The artifact hash of the object being graphed
895	897	*/
896	898	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
897	899	int k = 0;
		@@ -901,16 +903,19 @@
901	903	if( pRow->bDescender ){
902	904	cgi_printf("\"d\":%d,", pRow->bDescender);
903	905	}
904	906	if( pRow->mergeOut>=0 ){
905	907	cgi_printf("\"mo\":%d,", pRow->mergeOut);
	908	+ if( pRow->mergeUpto==0 ) pRow->mergeUpto = pRow->idx;
906	909	cgi_printf("\"mu\":%d,", pRow->mergeUpto);
	910	+ if( pRow->cherrypickUpto>0 && pRow->cherrypickUpto<pRow->mergeUpto ){
	911	+ cgi_printf("\"cu\":%d,", pRow->cherrypickUpto);
	912	+ }
907	913	}
908	914	cgi_printf("\"u\":%d,", pRow->aiRiser[pRow->iRail]);
909	915	k = 0;
910	916	if( pRow->isLeaf ) k \|= 1;
911		- if( !pRow->hasNormalOutMerge ) k \|= 2;
912	917	cgi_printf("\"f\":%d,",k);
913	918	for(i=k=0; i<GR_MAX_RAIL; i++){
914	919	if( i==pRow->iRail ) continue;
915	920	if( pRow->aiRiser[i]>0 ){
916	921	if( k==0 ){
		@@ -941,17 +946,17 @@
941	946	cgi_printf("%c%d", cSep, mi);
942	947	cSep = ',';
943	948	}
944	949	}
945	950	if( k ) cgi_printf("],");
946		- /* cpi */
	951	+ /* ci */
947	952	for(i=k=0; i<GR_MAX_RAIL; i++){
948	953	if( pRow->mergeIn[i]==2 ){
949	954	int mi = i;
950	955	if( (pRow->cherrypickDown >> i) & 1 ) mi = -mi;
951	956	if( k==0 ){
952		- cgi_printf("\"cpi\":");
	957	+ cgi_printf("\"ci\":");
953	958	cSep = '[';
954	959	}
955	960	k++;
956	961	cgi_printf("%c%d", cSep, mi);
957	962	cSep = ',';
958	963

	--- src/timeline.c
	+++ src/timeline.c
	@@ -866,20 +866,22 @@
866	** r: The "rail" that the node for this row sits on. The left-most
867	** rail is 0 and the number increases to the right.
868	** d: If exists and true then there is a "descender" - an arrow
869	** coming from the bottom of the page straight up to this node.
870	** mo: "merge-out". If it exists, this is the rail position
871	** for the upward portion of a merge arrow. The merge arrow goes up
872	** to the row identified by mu:. If this value is omitted then
873	** node has no merge children and no merge-out line is drawn.

874	** mu: The id of the row which is the top of the merge-out arrow.
875	** Only exists if "mo" exists.


876	** u: Draw a thick child-line out of the top of this node and up to
877	** the node with an id equal to this value. 0 if it is straight to
878	** the top of the page, -1 if there is no thick-line riser.
879	** f: 0x01: a leaf node.
880	** 0x02: all output merges are cherrypicks
881	** au: An array of integers that define thick-line risers for branches.
882	** The integers are in pairs. For each pair, the first integer is
883	** is the rail on which the riser should run and the second integer
884	** is the id of the node upto which the riser should run. If there
885	** are no risers, this array does not exist.
	@@ -887,11 +889,11 @@
887	** merge arrows should be drawn into this node. If the value is
888	** negative, then the rail position is the absolute value of mi[]
889	** and a thin merge-arrow descender is drawn to the bottom of
890	** the screen. This array is omitted if there are no inbound
891	** merges.
892	** cpi: "cherrypick-in". Like "mi" except for cherrypick merges.
893	** omitted if there are no cherrypick merges.
894	** h: The artifact hash of the object being graphed
895	*/
896	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
897	int k = 0;
	@@ -901,16 +903,19 @@
901	if( pRow->bDescender ){
902	cgi_printf("\"d\":%d,", pRow->bDescender);
903	}
904	if( pRow->mergeOut>=0 ){
905	cgi_printf("\"mo\":%d,", pRow->mergeOut);

906	cgi_printf("\"mu\":%d,", pRow->mergeUpto);



907	}
908	cgi_printf("\"u\":%d,", pRow->aiRiser[pRow->iRail]);
909	k = 0;
910	if( pRow->isLeaf ) k \|= 1;
911	if( !pRow->hasNormalOutMerge ) k \|= 2;
912	cgi_printf("\"f\":%d,",k);
913	for(i=k=0; i<GR_MAX_RAIL; i++){
914	if( i==pRow->iRail ) continue;
915	if( pRow->aiRiser[i]>0 ){
916	if( k==0 ){
	@@ -941,17 +946,17 @@
941	cgi_printf("%c%d", cSep, mi);
942	cSep = ',';
943	}
944	}
945	if( k ) cgi_printf("],");
946	/* cpi */
947	for(i=k=0; i<GR_MAX_RAIL; i++){
948	if( pRow->mergeIn[i]==2 ){
949	int mi = i;
950	if( (pRow->cherrypickDown >> i) & 1 ) mi = -mi;
951	if( k==0 ){
952	cgi_printf("\"cpi\":");
953	cSep = '[';
954	}
955	k++;
956	cgi_printf("%c%d", cSep, mi);
957	cSep = ',';
958

	--- src/timeline.c
	+++ src/timeline.c
	@@ -866,20 +866,22 @@
866	** r: The "rail" that the node for this row sits on. The left-most
867	** rail is 0 and the number increases to the right.
868	** d: If exists and true then there is a "descender" - an arrow
869	** coming from the bottom of the page straight up to this node.
870	** mo: "merge-out". If it exists, this is the rail position
871	** for the upward portion of a merge arrow. The merge arrow goes as
872	** a solid normal merge line up to the row identified by "mu" and
873	** then as a dashed cherrypick merge line up further to "cu".
874	** If this value is omitted if there are no merge children.
875	** mu: The id of the row which is the top of the merge-out arrow.
876	** Only exists if "mo" exists.
877	** cu: Extend the mu merge error on up to this row as a cherrypick
878	** merge line, if this value exists.
879	** u: Draw a thick child-line out of the top of this node and up to
880	** the node with an id equal to this value. 0 if it is straight to
881	** the top of the page, -1 if there is no thick-line riser.
882	** f: 0x01: a leaf node.

883	** au: An array of integers that define thick-line risers for branches.
884	** The integers are in pairs. For each pair, the first integer is
885	** is the rail on which the riser should run and the second integer
886	** is the id of the node upto which the riser should run. If there
887	** are no risers, this array does not exist.
	@@ -887,11 +889,11 @@
889	** merge arrows should be drawn into this node. If the value is
890	** negative, then the rail position is the absolute value of mi[]
891	** and a thin merge-arrow descender is drawn to the bottom of
892	** the screen. This array is omitted if there are no inbound
893	** merges.
894	** ci: "cherrypick-in". Like "mi" except for cherrypick merges.
895	** omitted if there are no cherrypick merges.
896	** h: The artifact hash of the object being graphed
897	*/
898	for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){
899	int k = 0;
	@@ -901,16 +903,19 @@
903	if( pRow->bDescender ){
904	cgi_printf("\"d\":%d,", pRow->bDescender);
905	}
906	if( pRow->mergeOut>=0 ){
907	cgi_printf("\"mo\":%d,", pRow->mergeOut);
908	if( pRow->mergeUpto==0 ) pRow->mergeUpto = pRow->idx;
909	cgi_printf("\"mu\":%d,", pRow->mergeUpto);
910	if( pRow->cherrypickUpto>0 && pRow->cherrypickUpto<pRow->mergeUpto ){
911	cgi_printf("\"cu\":%d,", pRow->cherrypickUpto);
912	}
913	}
914	cgi_printf("\"u\":%d,", pRow->aiRiser[pRow->iRail]);
915	k = 0;
916	if( pRow->isLeaf ) k \|= 1;

917	cgi_printf("\"f\":%d,",k);
918	for(i=k=0; i<GR_MAX_RAIL; i++){
919	if( i==pRow->iRail ) continue;
920	if( pRow->aiRiser[i]>0 ){
921	if( k==0 ){
	@@ -941,17 +946,17 @@
946	cgi_printf("%c%d", cSep, mi);
947	cSep = ',';
948	}
949	}
950	if( k ) cgi_printf("],");
951	/* ci */
952	for(i=k=0; i<GR_MAX_RAIL; i++){
953	if( pRow->mergeIn[i]==2 ){
954	int mi = i;
955	if( (pRow->cherrypickDown >> i) & 1 ) mi = -mi;
956	if( k==0 ){
957	cgi_printf("\"ci\":");
958	cSep = '[';
959	}
960	k++;
961	cgi_printf("%c%d", cSep, mi);
962	cSep = ',';
963

M test/graph-test-1.wiki

		--- test/graph-test-1.wiki
		+++ test/graph-test-1.wiki
		@@ -84,10 +84,14 @@
84	84	Cherrypick merge arrows</a>
85	85	* <a href="../../../timeline?r=branch-1.37" target="testwindow">Branch
86	86	1.37 with cherry-pick merges from trunk.</a>
87	87	* <a href="../../../timeline?f=68bd2e7bedb8d05a" target="testwindow">
88	88	Single check-in takes both a full merge and a cherrypick merge</a>
	89	+ * <a href="../../../timeline?b=?b=dc81ac70&n=14" target="testwindow">
	90	+ Mixed merge arrow, partly fully and partly cherrypick</a>
	91	+ * <a href="../../../timeline?b=?b=dc81ac70&n=13" target="testwindow">
	92	+ Mixed merge arrow to bottom of screen.</a>
89	93
90	94	External:
91	95
92	96	* <a href="http://www.sqlite.org/src/timeline?c=2010-09-29&nd"
93	97	target="testwindow">Timewarp due to a mis-configured system clock.</a>
94	98

	--- test/graph-test-1.wiki
	+++ test/graph-test-1.wiki
	@@ -84,10 +84,14 @@
84	Cherrypick merge arrows</a>
85	* <a href="../../../timeline?r=branch-1.37" target="testwindow">Branch
86	1.37 with cherry-pick merges from trunk.</a>
87	* <a href="../../../timeline?f=68bd2e7bedb8d05a" target="testwindow">
88	Single check-in takes both a full merge and a cherrypick merge</a>




89
90	External:
91
92	* <a href="http://www.sqlite.org/src/timeline?c=2010-09-29&nd"
93	target="testwindow">Timewarp due to a mis-configured system clock.</a>
94

	--- test/graph-test-1.wiki
	+++ test/graph-test-1.wiki
	@@ -84,10 +84,14 @@
84	Cherrypick merge arrows</a>
85	* <a href="../../../timeline?r=branch-1.37" target="testwindow">Branch
86	1.37 with cherry-pick merges from trunk.</a>
87	* <a href="../../../timeline?f=68bd2e7bedb8d05a" target="testwindow">
88	Single check-in takes both a full merge and a cherrypick merge</a>
89	* <a href="../../../timeline?b=?b=dc81ac70&n=14" target="testwindow">
90	Mixed merge arrow, partly fully and partly cherrypick</a>
91	* <a href="../../../timeline?b=?b=dc81ac70&n=13" target="testwindow">
92	Mixed merge arrow to bottom of screen.</a>
93
94	External:
95
96	* <a href="http://www.sqlite.org/src/timeline?c=2010-09-29&nd"
97	target="testwindow">Timewarp due to a mis-configured system clock.</a>
98

Fossil SCM

Keyboard Shortcuts