Fossil SCM
Fixing 'patch' on the fdiff page.
Commit
675b49efa36ce8338101a23c876c969d91c84148
Parent
a50a28bb3f8359b…
1 file changed
+2
-2
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -1103,21 +1103,21 @@ | ||
| 1103 | 1103 | cgi_set_content_type("text/plain"); |
| 1104 | 1104 | diffFlags = 4; |
| 1105 | 1105 | }else{ |
| 1106 | 1106 | blob_zero(&diff); |
| 1107 | 1107 | pOut = &diff; |
| 1108 | - diffFlags = construct_diff_flags(1, sideBySide); | |
| 1108 | + diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML; | |
| 1109 | 1109 | if( sideBySide ){ |
| 1110 | 1110 | zStyle = "sbsdiff"; |
| 1111 | 1111 | }else{ |
| 1112 | 1112 | diffFlags |= DIFF_LINENO; |
| 1113 | 1113 | zStyle = "udiff"; |
| 1114 | 1114 | } |
| 1115 | 1115 | } |
| 1116 | 1116 | content_get(v1, &c1); |
| 1117 | 1117 | content_get(v2, &c2); |
| 1118 | - text_diff(&c1, &c2, pOut, diffFlags | DIFF_HTML ); | |
| 1118 | + text_diff(&c1, &c2, pOut, diffFlags); | |
| 1119 | 1119 | blob_reset(&c1); |
| 1120 | 1120 | blob_reset(&c2); |
| 1121 | 1121 | if( !isPatch ){ |
| 1122 | 1122 | style_header("Diff"); |
| 1123 | 1123 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1124 | 1124 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1103,21 +1103,21 @@ | |
| 1103 | cgi_set_content_type("text/plain"); |
| 1104 | diffFlags = 4; |
| 1105 | }else{ |
| 1106 | blob_zero(&diff); |
| 1107 | pOut = &diff; |
| 1108 | diffFlags = construct_diff_flags(1, sideBySide); |
| 1109 | if( sideBySide ){ |
| 1110 | zStyle = "sbsdiff"; |
| 1111 | }else{ |
| 1112 | diffFlags |= DIFF_LINENO; |
| 1113 | zStyle = "udiff"; |
| 1114 | } |
| 1115 | } |
| 1116 | content_get(v1, &c1); |
| 1117 | content_get(v2, &c2); |
| 1118 | text_diff(&c1, &c2, pOut, diffFlags | DIFF_HTML ); |
| 1119 | blob_reset(&c1); |
| 1120 | blob_reset(&c2); |
| 1121 | if( !isPatch ){ |
| 1122 | style_header("Diff"); |
| 1123 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1124 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -1103,21 +1103,21 @@ | |
| 1103 | cgi_set_content_type("text/plain"); |
| 1104 | diffFlags = 4; |
| 1105 | }else{ |
| 1106 | blob_zero(&diff); |
| 1107 | pOut = &diff; |
| 1108 | diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML; |
| 1109 | if( sideBySide ){ |
| 1110 | zStyle = "sbsdiff"; |
| 1111 | }else{ |
| 1112 | diffFlags |= DIFF_LINENO; |
| 1113 | zStyle = "udiff"; |
| 1114 | } |
| 1115 | } |
| 1116 | content_get(v1, &c1); |
| 1117 | content_get(v2, &c2); |
| 1118 | text_diff(&c1, &c2, pOut, diffFlags); |
| 1119 | blob_reset(&c1); |
| 1120 | blob_reset(&c2); |
| 1121 | if( !isPatch ){ |
| 1122 | style_header("Diff"); |
| 1123 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1124 |