Fossil SCM

Merge in hide-diff-on-vdiff_page... Which now give possibility to hide or show full detailed diff on vdiff page. (when clicking on 2 nodes on timeline) Just like the /info page.

mgagnon 2013-11-22 01:14 trunk merge

Commit 74a4db258a5de6666023e27a7dd768ef3db4d278

Parent 8dc9d0093581f5a…

3 files changed +5 +1 -1 +6 -1

~ src/info.c ~ src/setup.c ~ src/timeline.c

M src/info.c

		--- src/info.c
		+++ src/info.c
		@@ -965,10 +965,15 @@
965	965	}
966	966	verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
967	967	if( !verboseFlag && sideBySide ) verboseFlag = 1;
968	968	zFrom = P("from");
969	969	zTo = P("to");
	970	+ if( sideBySide \|\| verboseFlag ){
	971	+ style_submenu_element("Hide Diff", "hidediff",
	972	+ "%R/vdiff?from=%T&to=%T&sbs=0",
	973	+ zFrom, zTo);
	974	+ }
970	975	if( !sideBySide ){
971	976	style_submenu_element("Side-by-side Diff", "sbsdiff",
972	977	"%R/vdiff?from=%T&to=%T&sbs=1",
973	978	zFrom, zTo);
974	979	}
975	980

	--- src/info.c
	+++ src/info.c
	@@ -965,10 +965,15 @@
965	}
966	verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
967	if( !verboseFlag && sideBySide ) verboseFlag = 1;
968	zFrom = P("from");
969	zTo = P("to");





970	if( !sideBySide ){
971	style_submenu_element("Side-by-side Diff", "sbsdiff",
972	"%R/vdiff?from=%T&to=%T&sbs=1",
973	zFrom, zTo);
974	}
975

	--- src/info.c
	+++ src/info.c
	@@ -965,10 +965,15 @@
965	}
966	verboseFlag = (zVerbose!=0) && !is_false(zVerbose);
967	if( !verboseFlag && sideBySide ) verboseFlag = 1;
968	zFrom = P("from");
969	zTo = P("to");
970	if( sideBySide \|\| verboseFlag ){
971	style_submenu_element("Hide Diff", "hidediff",
972	"%R/vdiff?from=%T&to=%T&sbs=0",
973	zFrom, zTo);
974	}
975	if( !sideBySide ){
976	style_submenu_element("Side-by-side Diff", "sbsdiff",
977	"%R/vdiff?from=%T&to=%T&sbs=1",
978	zFrom, zTo);
979	}
980

M src/setup.c

+1 -1

		--- src/setup.c
		+++ src/setup.c
		@@ -1211,11 +1211,11 @@
1211	1211	@ and time is shown on every timeline entry (using the CSS class "timelineTime").</p>
1212	1212
1213	1213	@ <hr />
1214	1214	onoff_attribute("Show version differences by default",
1215	1215	"show-version-diffs", "vdiff", 0, 0);
1216		- @ <p>On the version-information pages linked from the timeline can either
	1216	+ @ <p>The version-information pages linked from the timeline can either
1217	1217	@ show complete diffs of all file changes, or can just list the names of
1218	1218	@ the files that have changed. Users can get to either page by
1219	1219	@ clicking. This setting selects the default.</p>
1220	1220
1221	1221	@ <hr />
1222	1222

	--- src/setup.c
	+++ src/setup.c
	@@ -1211,11 +1211,11 @@
1211	@ and time is shown on every timeline entry (using the CSS class "timelineTime").</p>
1212
1213	@ <hr />
1214	onoff_attribute("Show version differences by default",
1215	"show-version-diffs", "vdiff", 0, 0);
1216	@ <p>On the version-information pages linked from the timeline can either
1217	@ show complete diffs of all file changes, or can just list the names of
1218	@ the files that have changed. Users can get to either page by
1219	@ clicking. This setting selects the default.</p>
1220
1221	@ <hr />
1222

	--- src/setup.c
	+++ src/setup.c
	@@ -1211,11 +1211,11 @@
1211	@ and time is shown on every timeline entry (using the CSS class "timelineTime").</p>
1212
1213	@ <hr />
1214	onoff_attribute("Show version differences by default",
1215	"show-version-diffs", "vdiff", 0, 0);
1216	@ <p>The version-information pages linked from the timeline can either
1217	@ show complete diffs of all file changes, or can just list the names of
1218	@ the files that have changed. Users can get to either page by
1219	@ clicking. This setting selects the default.</p>
1220
1221	@ <hr />
1222

M src/timeline.c

+6 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -589,10 +589,11 @@
589	589	){
590	590	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
591	591	GraphRow *pRow;
592	592	int i;
593	593	char cSep;
	594	+
594	595	@ <script type="text/JavaScript">
595	596	@ /* <![CDATA[ */
596	597	@ var railPitch=%d(pGraph->iRailPitch);
597	598
598	599	/* the rowinfo[] array contains all the information needed to generate
		@@ -850,11 +851,15 @@
850	851	@ selRow = null;
851	852	@ }else{
852	853	if( fileDiff ){
853	854	@ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
854	855	}else{
855		- @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
	856	+ if( db_get_boolean("show-version-diffs", 0)==0 ){
	857	+ @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=0";
	858	+ }else{
	859	+ @ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
	860	+ }
856	861	}
857	862	@ }
858	863	@ }
859	864	@ var lastId = "m"+rowinfo[rowinfo.length-1].id;
860	865	@ var lastY = 0;
861	866

	--- src/timeline.c
	+++ src/timeline.c
	@@ -589,10 +589,11 @@
589	){
590	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
591	GraphRow *pRow;
592	int i;
593	char cSep;

594	@ <script type="text/JavaScript">
595	@ /* <![CDATA[ */
596	@ var railPitch=%d(pGraph->iRailPitch);
597
598	/* the rowinfo[] array contains all the information needed to generate
	@@ -850,11 +851,15 @@
850	@ selRow = null;
851	@ }else{
852	if( fileDiff ){
853	@ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
854	}else{
855	@ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";




856	}
857	@ }
858	@ }
859	@ var lastId = "m"+rowinfo[rowinfo.length-1].id;
860	@ var lastY = 0;
861

	--- src/timeline.c
	+++ src/timeline.c
	@@ -589,10 +589,11 @@
589	){
590	if( pGraph && pGraph->nErr==0 && pGraph->nRow>0 ){
591	GraphRow *pRow;
592	int i;
593	char cSep;
594
595	@ <script type="text/JavaScript">
596	@ /* <![CDATA[ */
597	@ var railPitch=%d(pGraph->iRailPitch);
598
599	/* the rowinfo[] array contains all the information needed to generate
	@@ -850,11 +851,15 @@
851	@ selRow = null;
852	@ }else{
853	if( fileDiff ){
854	@ location.href="%R/fdiff?v1="+selRow.h+"&v2="+p.h+"&sbs=1";
855	}else{
856	if( db_get_boolean("show-version-diffs", 0)==0 ){
857	@ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=0";
858	}else{
859	@ location.href="%R/vdiff?from="+selRow.h+"&to="+p.h+"&sbs=1";
860	}
861	}
862	@ }
863	@ }
864	@ var lastId = "m"+rowinfo[rowinfo.length-1].id;
865	@ var lastY = 0;
866

Fossil SCM

Keyboard Shortcuts