Fossil SCM
Fix a bug in branch ordering
Commit
fc62ce69e909fdcde6e52890cc5633ea48b6bd61e0cf8ef9951875f0020078d3
Parent
fe356e3ef8658fe…
2 files changed
+1
+3
-1
+1
| --- src/graph.c | ||
| +++ src/graph.c | ||
| @@ -1015,10 +1015,11 @@ | ||
| 1015 | 1015 | } |
| 1016 | 1016 | } |
| 1017 | 1017 | }else{ |
| 1018 | 1018 | j = 1; |
| 1019 | 1019 | aPriority[0] = 4; |
| 1020 | + mxMatch = 1; | |
| 1020 | 1021 | for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ |
| 1021 | 1022 | if( pRow->iRail==0 ){ |
| 1022 | 1023 | for(i=0; i<=p->mxRail; i++){ |
| 1023 | 1024 | if( pRow->mergeIn[i] ) aPriority[i] |= 1; |
| 1024 | 1025 | } |
| 1025 | 1026 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -1015,10 +1015,11 @@ | |
| 1015 | } |
| 1016 | } |
| 1017 | }else{ |
| 1018 | j = 1; |
| 1019 | aPriority[0] = 4; |
| 1020 | for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ |
| 1021 | if( pRow->iRail==0 ){ |
| 1022 | for(i=0; i<=p->mxRail; i++){ |
| 1023 | if( pRow->mergeIn[i] ) aPriority[i] |= 1; |
| 1024 | } |
| 1025 |
| --- src/graph.c | |
| +++ src/graph.c | |
| @@ -1015,10 +1015,11 @@ | |
| 1015 | } |
| 1016 | } |
| 1017 | }else{ |
| 1018 | j = 1; |
| 1019 | aPriority[0] = 4; |
| 1020 | mxMatch = 1; |
| 1021 | for(pRow=p->pFirst; pRow; pRow=pRow->pNext){ |
| 1022 | if( pRow->iRail==0 ){ |
| 1023 | for(i=0; i<=p->mxRail; i++){ |
| 1024 | if( pRow->mergeIn[i] ) aPriority[i] |= 1; |
| 1025 | } |
| 1026 |
+3
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -2919,12 +2919,14 @@ | ||
| 2919 | 2919 | cgi_check_for_malice(); |
| 2920 | 2920 | { |
| 2921 | 2921 | Matcher *pLeftBranch; |
| 2922 | 2922 | if( P("bo")!=0 ){ |
| 2923 | 2923 | pLeftBranch = match_create(MS_BRLIST, P("bo")); |
| 2924 | - }else{ | |
| 2924 | + }else if( zBrName ){ | |
| 2925 | 2925 | pLeftBranch = match_create(matchStyle, zBrName); |
| 2926 | + }else if( zTagName ){ | |
| 2927 | + pLeftBranch = match_create(matchStyle, zTagName); | |
| 2926 | 2928 | } |
| 2927 | 2929 | www_print_timeline(&q, tmFlags, zThisUser, zThisTag, pLeftBranch, |
| 2928 | 2930 | selectedRid, secondaryRid, 0); |
| 2929 | 2931 | match_free(pLeftBranch); |
| 2930 | 2932 | } |
| 2931 | 2933 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2919,12 +2919,14 @@ | |
| 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 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -2919,12 +2919,14 @@ | |
| 2919 | cgi_check_for_malice(); |
| 2920 | { |
| 2921 | Matcher *pLeftBranch; |
| 2922 | if( P("bo")!=0 ){ |
| 2923 | pLeftBranch = match_create(MS_BRLIST, P("bo")); |
| 2924 | }else if( zBrName ){ |
| 2925 | pLeftBranch = match_create(matchStyle, zBrName); |
| 2926 | }else if( zTagName ){ |
| 2927 | pLeftBranch = match_create(matchStyle, zTagName); |
| 2928 | } |
| 2929 | www_print_timeline(&q, tmFlags, zThisUser, zThisTag, pLeftBranch, |
| 2930 | selectedRid, secondaryRid, 0); |
| 2931 | match_free(pLeftBranch); |
| 2932 | } |
| 2933 |