fe356e3ef86… — Fossil SCM

M src/graph.c

+10 -6

		--- src/graph.c
		+++ src/graph.c
		@@ -993,16 +993,17 @@
993	993	**
994	994	** 0x01 A rail that merges with the preferred branch
995	995	*/
996	996	u16 aPriority[GR_MAX_RAIL];
997	997	int mxMatch = 0;
998		- memset(aPriority, 0, p->mxRail+1);
	998	+ memset(aPriority, 0, (p->mxRail+1)*sizeof(aPriority[0]));
999	999	if( pLeftBranch ){
1000	1000	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
1001	1001	int iMatch = match_text(pLeftBranch, pRow->zBranch);
1002		- if( iMatch>0 && iMatch<0x3fff ){
1003		- aPriority[pRow->iRail] \|= iMatch*4;
	1002	+ if( iMatch>0 ){
	1003	+ if( iMatch>10 ) iMatch = 10;
	1004	+ aPriority[pRow->iRail] \|= 1<<(iMatch+1);
1004	1005	if( mxMatch<iMatch ) mxMatch = iMatch;
1005	1006	for(i=0; i<=p->mxRail; i++){
1006	1007	if( pRow->mergeIn[i] ) aPriority[i] \|= 1;
1007	1008	}
1008	1009	if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] \|= 1;
		@@ -1027,18 +1028,21 @@
1027	1028	}
1028	1029
1029	1030	#if 0
1030	1031	fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail);
1031	1032	fprintf(stderr,"Priority:");
1032		- for(i=0; i<=p->mxRail; i++) fprintf(stderr," %d", aPriority[i]);
	1033	+ for(i=0; i<=p->mxRail; i++){
	1034	+ fprintf(stderr," %x.%x",
	1035	+ aPriority[i]/4, aPriority[i]&3);
	1036	+ }
1033	1037	fprintf(stderr,"\n");
1034	1038	#endif
1035	1039
1036	1040	j = 0;
1037		- for(kk=4; kk<=mxMatch*4; kk+=4){
	1041	+ for(kk=4; kk<=1<<(mxMatch+1); kk*=2){
1038	1042	for(i=0; i<=p->mxRail; i++){
1039		- if( aPriority[i]>=kk && aPriority[i]<=kk+3 ){
	1043	+ if( aPriority[i]>=kk && aPriority[i]<kk*2 ){
1040	1044	aMap[i] = j++;
1041	1045	}
1042	1046	}
1043	1047	}
1044	1048	for(i=p->mxRail; i>=0; i--){
1045	1049

	--- src/graph.c
	+++ src/graph.c
	@@ -993,16 +993,17 @@
993	**
994	** 0x01 A rail that merges with the preferred branch
995	*/
996	u16 aPriority[GR_MAX_RAIL];
997	int mxMatch = 0;
998	memset(aPriority, 0, p->mxRail+1);
999	if( pLeftBranch ){
1000	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
1001	int iMatch = match_text(pLeftBranch, pRow->zBranch);
1002	if( iMatch>0 && iMatch<0x3fff ){
1003	aPriority[pRow->iRail] \|= iMatch*4;

1004	if( mxMatch<iMatch ) mxMatch = iMatch;
1005	for(i=0; i<=p->mxRail; i++){
1006	if( pRow->mergeIn[i] ) aPriority[i] \|= 1;
1007	}
1008	if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] \|= 1;
	@@ -1027,18 +1028,21 @@
1027	}
1028
1029	#if 0
1030	fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail);
1031	fprintf(stderr,"Priority:");
1032	for(i=0; i<=p->mxRail; i++) fprintf(stderr," %d", aPriority[i]);



1033	fprintf(stderr,"\n");
1034	#endif
1035
1036	j = 0;
1037	for(kk=4; kk<=mxMatch*4; kk+=4){
1038	for(i=0; i<=p->mxRail; i++){
1039	if( aPriority[i]>=kk && aPriority[i]<=kk+3 ){
1040	aMap[i] = j++;
1041	}
1042	}
1043	}
1044	for(i=p->mxRail; i>=0; i--){
1045

	--- src/graph.c
	+++ src/graph.c
	@@ -993,16 +993,17 @@
993	**
994	** 0x01 A rail that merges with the preferred branch
995	*/
996	u16 aPriority[GR_MAX_RAIL];
997	int mxMatch = 0;
998	memset(aPriority, 0, (p->mxRail+1)*sizeof(aPriority[0]));
999	if( pLeftBranch ){
1000	for(pRow=p->pFirst; pRow; pRow=pRow->pNext){
1001	int iMatch = match_text(pLeftBranch, pRow->zBranch);
1002	if( iMatch>0 ){
1003	if( iMatch>10 ) iMatch = 10;
1004	aPriority[pRow->iRail] \|= 1<<(iMatch+1);
1005	if( mxMatch<iMatch ) mxMatch = iMatch;
1006	for(i=0; i<=p->mxRail; i++){
1007	if( pRow->mergeIn[i] ) aPriority[i] \|= 1;
1008	}
1009	if( pRow->mergeOut>=0 ) aPriority[pRow->mergeOut] \|= 1;
	@@ -1027,18 +1028,21 @@
1028	}
1029
1030	#if 0
1031	fprintf(stderr,"mergeRail: 0x%llx\n", p->mergeRail);
1032	fprintf(stderr,"Priority:");
1033	for(i=0; i<=p->mxRail; i++){
1034	fprintf(stderr," %x.%x",
1035	aPriority[i]/4, aPriority[i]&3);
1036	}
1037	fprintf(stderr,"\n");
1038	#endif
1039
1040	j = 0;
1041	for(kk=4; kk<=1<<(mxMatch+1); kk*=2){
1042	for(i=0; i<=p->mxRail; i++){
1043	if( aPriority[i]>=kk && aPriority[i]<kk*2 ){
1044	aMap[i] = j++;
1045	}
1046	}
1047	}
1048	for(i=p->mxRail; i>=0; i--){
1049

M src/match.c

-1

		--- src/match.c
		+++ src/match.c
		@@ -182,11 +182,10 @@
182	182	int nText = (int)strlen(zText);
183	183	for(i=0; i<p->nPattern; i++){
184	184	if( re_match(p->aRe[i], (const u8*)zText, nText) ) return i+1;
185	185	}
186	186	break;
187		-
188	187	}
189	188	}
190	189	return 0;
191	190	}
192	191
193	192

	--- src/match.c
	+++ src/match.c
	@@ -182,11 +182,10 @@
182	int nText = (int)strlen(zText);
183	for(i=0; i<p->nPattern; i++){
184	if( re_match(p->aRe[i], (const u8*)zText, nText) ) return i+1;
185	}
186	break;
187
188	}
189	}
190	return 0;
191	}
192
193

	--- src/match.c
	+++ src/match.c
	@@ -182,11 +182,10 @@
182	int nText = (int)strlen(zText);
183	for(i=0; i<p->nPattern; i++){
184	if( re_match(p->aRe[i], (const u8*)zText, nText) ) return i+1;
185	}
186	break;

187	}
188	}
189	return 0;
190	}
191
192

M src/timeline.c

+7 -1

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1552,10 +1552,11 @@
1552	1552	** from=CX ... shortest path from CX up to CHECKIN
1553	1553	** t=TAG Show only check-ins with the given TAG
1554	1554	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1555	1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'
1556	1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'
	1557	+** bo=TAGLIST Show branches of the graph in the order defined TAGLIST
1557	1558	** rel Show related check-ins as well as those matching t=TAG
1558	1559	** mionly Limit rel to show ancestors but not descendants
1559	1560	** nowiki Do not show wiki associated with branch or tag
1560	1561	** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
1561	1562	** u=USER Only show items associated with USER
		@@ -2915,11 +2916,16 @@
2915	2916	@ %z(chref("button","%s",zNewerButton))%h(zNewerButtonLabel)\
2916	2917	@  ↑</a>
2917	2918	}
2918	2919	cgi_check_for_malice();
2919	2920	{
2920		- Matcher *pLeftBranch = match_create(matchStyle, zBrName);
	2921	+ Matcher *pLeftBranch;
	2922	+ if( P("bo")!=0 ){
	2923	+ pLeftBranch = match_create(MS_BRLIST, P("bo"));
	2924	+ }else{
	2925	+ pLeftBranch = match_create(matchStyle, zBrName);
	2926	+ }
2921	2927	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, pLeftBranch,
2922	2928	selectedRid, secondaryRid, 0);
2923	2929	match_free(pLeftBranch);
2924	2930	}
2925	2931	db_finalize(&q);
2926	2932

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1552,10 +1552,11 @@
1552	** from=CX ... shortest path from CX up to CHECKIN
1553	** t=TAG Show only check-ins with the given TAG
1554	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'
1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'

1557	** rel Show related check-ins as well as those matching t=TAG
1558	** mionly Limit rel to show ancestors but not descendants
1559	** nowiki Do not show wiki associated with branch or tag
1560	** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
1561	** u=USER Only show items associated with USER
	@@ -2915,11 +2916,16 @@
2915	@ %z(chref("button","%s",zNewerButton))%h(zNewerButtonLabel)\
2916	@  ↑</a>
2917	}
2918	cgi_check_for_malice();
2919	{
2920	Matcher *pLeftBranch = match_create(matchStyle, zBrName);





2921	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, pLeftBranch,
2922	selectedRid, secondaryRid, 0);
2923	match_free(pLeftBranch);
2924	}
2925	db_finalize(&q);
2926

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1552,10 +1552,11 @@
1552	** from=CX ... shortest path from CX up to CHECKIN
1553	** t=TAG Show only check-ins with the given TAG
1554	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'
1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'
1557	** bo=TAGLIST Show branches of the graph in the order defined TAGLIST
1558	** rel Show related check-ins as well as those matching t=TAG
1559	** mionly Limit rel to show ancestors but not descendants
1560	** nowiki Do not show wiki associated with branch or tag
1561	** ms=MATCHSTYLE Set tag match style to EXACT, GLOB, LIKE, REGEXP
1562	** u=USER Only show items associated with USER
	@@ -2915,11 +2916,16 @@
2916	@ %z(chref("button","%s",zNewerButton))%h(zNewerButtonLabel)\
2917	@  ↑</a>
2918	}
2919	cgi_check_for_malice();
2920	{
2921	Matcher *pLeftBranch;
2922	if( P("bo")!=0 ){
2923	pLeftBranch = match_create(MS_BRLIST, P("bo"));
2924	}else{
2925	pLeftBranch = match_create(matchStyle, zBrName);
2926	}
2927	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, pLeftBranch,
2928	selectedRid, secondaryRid, 0);
2929	match_free(pLeftBranch);
2930	}
2931	db_finalize(&q);
2932

Fossil SCM

Keyboard Shortcuts