Fossil SCM
Add the nohdr boolean query parameter to the /vdiff page.
Commit
2532f1bccc960f110086ef48046861ef1a1e7e7b
Parent
230fdcf692dc3e6…
1 file changed
+16
-13
+16
-13
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -979,10 +979,11 @@ | ||
| 979 | 979 | ** v=BOOLEAN Default true. If false, only list files that have changed |
| 980 | 980 | ** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false |
| 981 | 981 | ** glob=STRING only diff files matching this glob |
| 982 | 982 | ** dc=N show N lines of context around each diff |
| 983 | 983 | ** w ignore whitespace when computing diffs |
| 984 | +** nohdr omit the description at the top of the page | |
| 984 | 985 | ** |
| 985 | 986 | ** |
| 986 | 987 | ** Show all differences between two check-ins. |
| 987 | 988 | */ |
| 988 | 989 | void vdiff_page(void){ |
| @@ -1076,23 +1077,25 @@ | ||
| 1076 | 1077 | sideBySide, (verboseFlag && !sideBySide)?"&v":"", |
| 1077 | 1078 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1078 | 1079 | } |
| 1079 | 1080 | } |
| 1080 | 1081 | style_header("Check-in Differences"); |
| 1081 | - @ <h2>Difference From:</h2><blockquote> | |
| 1082 | - checkin_description(ridFrom); | |
| 1083 | - @ </blockquote><h2>To:</h2><blockquote> | |
| 1084 | - checkin_description(ridTo); | |
| 1085 | - @ </blockquote> | |
| 1086 | - if( pRe ){ | |
| 1087 | - @ <p><b>Only differences that match regular expression "%h(zRe)" | |
| 1088 | - @ are shown.</b></p> | |
| 1089 | - } | |
| 1090 | - if( zGlob ){ | |
| 1091 | - @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> | |
| 1092 | - } | |
| 1093 | - @<hr /><p> | |
| 1082 | + if( P("nohdr")==0 ){ | |
| 1083 | + @ <h2>Difference From:</h2><blockquote> | |
| 1084 | + checkin_description(ridFrom); | |
| 1085 | + @ </blockquote><h2>To:</h2><blockquote> | |
| 1086 | + checkin_description(ridTo); | |
| 1087 | + @ </blockquote> | |
| 1088 | + if( pRe ){ | |
| 1089 | + @ <p><b>Only differences that match regular expression "%h(zRe)" | |
| 1090 | + @ are shown.</b></p> | |
| 1091 | + } | |
| 1092 | + if( zGlob ){ | |
| 1093 | + @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> | |
| 1094 | + } | |
| 1095 | + @<hr /><p> | |
| 1096 | + } | |
| 1094 | 1097 | |
| 1095 | 1098 | manifest_file_rewind(pFrom); |
| 1096 | 1099 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1097 | 1100 | manifest_file_rewind(pTo); |
| 1098 | 1101 | pFileTo = manifest_file_next(pTo, 0); |
| 1099 | 1102 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -979,10 +979,11 @@ | |
| 979 | ** v=BOOLEAN Default true. If false, only list files that have changed |
| 980 | ** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false |
| 981 | ** glob=STRING only diff files matching this glob |
| 982 | ** dc=N show N lines of context around each diff |
| 983 | ** w ignore whitespace when computing diffs |
| 984 | ** |
| 985 | ** |
| 986 | ** Show all differences between two check-ins. |
| 987 | */ |
| 988 | void vdiff_page(void){ |
| @@ -1076,23 +1077,25 @@ | |
| 1076 | sideBySide, (verboseFlag && !sideBySide)?"&v":"", |
| 1077 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1078 | } |
| 1079 | } |
| 1080 | style_header("Check-in Differences"); |
| 1081 | @ <h2>Difference From:</h2><blockquote> |
| 1082 | checkin_description(ridFrom); |
| 1083 | @ </blockquote><h2>To:</h2><blockquote> |
| 1084 | checkin_description(ridTo); |
| 1085 | @ </blockquote> |
| 1086 | if( pRe ){ |
| 1087 | @ <p><b>Only differences that match regular expression "%h(zRe)" |
| 1088 | @ are shown.</b></p> |
| 1089 | } |
| 1090 | if( zGlob ){ |
| 1091 | @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> |
| 1092 | } |
| 1093 | @<hr /><p> |
| 1094 | |
| 1095 | manifest_file_rewind(pFrom); |
| 1096 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1097 | manifest_file_rewind(pTo); |
| 1098 | pFileTo = manifest_file_next(pTo, 0); |
| 1099 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -979,10 +979,11 @@ | |
| 979 | ** v=BOOLEAN Default true. If false, only list files that have changed |
| 980 | ** sbs=BOOLEAN Side-by-side diff if true. Unified diff if false |
| 981 | ** glob=STRING only diff files matching this glob |
| 982 | ** dc=N show N lines of context around each diff |
| 983 | ** w ignore whitespace when computing diffs |
| 984 | ** nohdr omit the description at the top of the page |
| 985 | ** |
| 986 | ** |
| 987 | ** Show all differences between two check-ins. |
| 988 | */ |
| 989 | void vdiff_page(void){ |
| @@ -1076,23 +1077,25 @@ | |
| 1077 | sideBySide, (verboseFlag && !sideBySide)?"&v":"", |
| 1078 | zGlob ? "&glob=" : "", zGlob ? zGlob : ""); |
| 1079 | } |
| 1080 | } |
| 1081 | style_header("Check-in Differences"); |
| 1082 | if( P("nohdr")==0 ){ |
| 1083 | @ <h2>Difference From:</h2><blockquote> |
| 1084 | checkin_description(ridFrom); |
| 1085 | @ </blockquote><h2>To:</h2><blockquote> |
| 1086 | checkin_description(ridTo); |
| 1087 | @ </blockquote> |
| 1088 | if( pRe ){ |
| 1089 | @ <p><b>Only differences that match regular expression "%h(zRe)" |
| 1090 | @ are shown.</b></p> |
| 1091 | } |
| 1092 | if( zGlob ){ |
| 1093 | @ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p> |
| 1094 | } |
| 1095 | @<hr /><p> |
| 1096 | } |
| 1097 | |
| 1098 | manifest_file_rewind(pFrom); |
| 1099 | pFileFrom = manifest_file_next(pFrom, 0); |
| 1100 | manifest_file_rewind(pTo); |
| 1101 | pFileTo = manifest_file_next(pTo, 0); |
| 1102 |