Fossil SCM
Cherry-pick from [f1e99a5a408c]: minor annotate/blame url rendering bug.
Commit
904ab4bbb844001a725a80d548f2c2f41db0a680
Parent
6215d0830374a32…
1 file changed
+5
-1
+5
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2172,11 +2172,15 @@ | ||
| 2172 | 2172 | annotate_file(&ann, fnid, mid, iLimit, annFlags); |
| 2173 | 2173 | zCI = ann.aVers[0].zMUuid; |
| 2174 | 2174 | |
| 2175 | 2175 | /* generate the web page */ |
| 2176 | 2176 | style_header("Annotation For %h", zFilename); |
| 2177 | - url_initialize(&url, "annotate"); | |
| 2177 | + if( bBlame ){ | |
| 2178 | + url_initialize(&url, "blame"); | |
| 2179 | + }else{ | |
| 2180 | + url_initialize(&url, "annotate"); | |
| 2181 | + } | |
| 2178 | 2182 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2179 | 2183 | url_add_parameter(&url, "filename", zFilename); |
| 2180 | 2184 | if( iLimit!=20 ){ |
| 2181 | 2185 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2182 | 2186 | } |
| 2183 | 2187 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2172,11 +2172,15 @@ | |
| 2172 | annotate_file(&ann, fnid, mid, iLimit, annFlags); |
| 2173 | zCI = ann.aVers[0].zMUuid; |
| 2174 | |
| 2175 | /* generate the web page */ |
| 2176 | style_header("Annotation For %h", zFilename); |
| 2177 | url_initialize(&url, "annotate"); |
| 2178 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2179 | url_add_parameter(&url, "filename", zFilename); |
| 2180 | if( iLimit!=20 ){ |
| 2181 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2182 | } |
| 2183 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2172,11 +2172,15 @@ | |
| 2172 | annotate_file(&ann, fnid, mid, iLimit, annFlags); |
| 2173 | zCI = ann.aVers[0].zMUuid; |
| 2174 | |
| 2175 | /* generate the web page */ |
| 2176 | style_header("Annotation For %h", zFilename); |
| 2177 | if( bBlame ){ |
| 2178 | url_initialize(&url, "blame"); |
| 2179 | }else{ |
| 2180 | url_initialize(&url, "annotate"); |
| 2181 | } |
| 2182 | url_add_parameter(&url, "checkin", P("checkin")); |
| 2183 | url_add_parameter(&url, "filename", zFilename); |
| 2184 | if( iLimit!=20 ){ |
| 2185 | url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit)); |
| 2186 | } |
| 2187 |