Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance the /vdiff page to understand the nc (no-color) query parameter and to do a better job of preserving query parameter choices when clicking on other display options. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
2e51bb9b03d6be85db8a49c2e8baf2ac |
| User & Date: | drh 2021-07-22 23:08:38.885 |
Context
|
2021-07-23
| ||
| 19:35 | The default user capability string for the test-http command — used by ssh:// URLs despite the "test-" prefix! — is now "sxy" to grant all permissions as claimed [/doc/trunk/www/caps/#webonly | in the docs]. While this is objectively correct, it doesn't solve the actual problem I was chasing, being UV sync failure over SSH per [forum:/forumpost/b121db582ee1ed2c | a recent forum post]. check-in: 129e395878 user: wyoung tags: trunk | |
|
2021-07-22
| ||
| 23:08 | Enhance the /vdiff page to understand the nc (no-color) query parameter and to do a better job of preserving query parameter choices when clicking on other display options. check-in: 2e51bb9b03 user: drh tags: trunk | |
|
2021-07-21
| ||
| 18:48 | Cleanup for the "fossil help" command implementation. check-in: 8a231a7990 user: drh tags: trunk | |
Changes
Changes to src/finfo.c.
| ︙ | ︙ | |||
899 900 901 902 903 904 905 |
/* 5 */ " (SELECT uuid FROM blob WHERE rid=mlink.pmid),"
/* 6 */ " mperm,"
/* 7 */ " isaux"
" FROM mlink WHERE mid=%d ORDER BY 1",
mid
);
@ <h1>MLINK table for check-in %h(zCI)</h1>
| | | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 |
/* 5 */ " (SELECT uuid FROM blob WHERE rid=mlink.pmid),"
/* 6 */ " mperm,"
/* 7 */ " isaux"
" FROM mlink WHERE mid=%d ORDER BY 1",
mid
);
@ <h1>MLINK table for check-in %h(zCI)</h1>
render_checkin_context(mid, 0, 1, 0);
style_table_sorter();
@ <hr />
@ <div class='brlist'>
@ <table class='sortable' data-column-types='ttxtttt' data-init-sort='1'>
@ <thead><tr>
@ <th>File</th>
@ <th>Parent<br>Check-in</th>
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
268 269 270 271 272 273 274 |
}
show_common_info(rid, "hash:", 1, 1);
}
}
/*
** Show the context graph (immediate parents and children) for
| | | | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 |
}
show_common_info(rid, "hash:", 1, 1);
}
}
/*
** Show the context graph (immediate parents and children) for
** check-in rid and rid2
*/
void render_checkin_context(int rid, int rid2, int parentsOnly, int mFlags){
Blob sql;
Stmt q;
int rx[2];
int i, n;
rx[0] = rid;
rx[1] = rid2;
n = rid2 ? 2 : 1;
|
| ︙ | ︙ | |||
311 312 313 314 315 316 317 |
);
}
}
}
blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
db_prepare(&q, "%s", blob_sql_text(&sql));
www_print_timeline(&q,
| > | | 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 |
);
}
}
}
blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
db_prepare(&q, "%s", blob_sql_text(&sql));
www_print_timeline(&q,
mFlags
|TIMELINE_GRAPH
|TIMELINE_FILLGAPS
|TIMELINE_NOSCROLL
|TIMELINE_XMERGE
|TIMELINE_CHPICK,
0, 0, 0, rid, rid2, 0);
db_finalize(&q);
}
|
| ︙ | ︙ | |||
878 879 880 881 882 883 884 |
}
db_finalize(&q1);
if( !PB("nowiki") ){
wiki_render_associated("checkin", zUuid, 0);
}
render_backlink_graph(zUuid, "<div class=\"section\">References</div>\n");
@ <div class="section">Context</div>
| | | 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 |
}
db_finalize(&q1);
if( !PB("nowiki") ){
wiki_render_associated("checkin", zUuid, 0);
}
render_backlink_graph(zUuid, "<div class=\"section\">References</div>\n");
@ <div class="section">Context</div>
render_checkin_context(rid, 0, 0, 0);
@ <div class="section">Changes</div>
@ <div class="sectionmenu">
diffFlags = construct_diff_flags(diffType);
zW = (diffFlags&DIFF_IGNORE_ALLWS)?"&w":"";
if( diffType!=0 ){
@ %z(chref("button","%R/%s/%T?diff=0",zPageHide,zName))\
@ Hide Diffs</a>
|
| ︙ | ︙ | |||
1162 1163 1164 1165 1166 1167 1168 | ** to=TAG Right side of the comparison ** branch=TAG Show all changes on a particular branch ** diff=INTEGER 0: none, 1: unified, 2: side-by-side ** glob=STRING only diff files matching this glob ** dc=N show N lines of context around each diff ** w=BOOLEAN ignore whitespace when computing diffs ** nohdr omit the description at the top of the page | | > < < > > > > > | > > > | > > > > > > > > > > | | > > | > > > > > | > > | < < | < < < | < < < | < < | < | > | 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 |
** to=TAG Right side of the comparison
** branch=TAG Show all changes on a particular branch
** diff=INTEGER 0: none, 1: unified, 2: side-by-side
** glob=STRING only diff files matching this glob
** dc=N show N lines of context around each diff
** w=BOOLEAN ignore whitespace when computing diffs
** nohdr omit the description at the top of the page
** nc omit branch coloration from the header graph
** inv "Invert". Exchange the roles of from= and to=
**
** Show all differences between two check-ins.
*/
void vdiff_page(void){
int ridFrom, ridTo;
int diffType = 0; /* 0: none, 1: unified, 2: side-by-side */
u64 diffFlags = 0;
Manifest *pFrom, *pTo;
ManifestFile *pFileFrom, *pFileTo;
const char *zBranch;
const char *zFrom;
const char *zTo;
const char *zRe;
const char *zGlob;
char *zMergeOrigin = 0;
ReCompiled *pRe = 0;
int graphFlags = 0;
Blob qp;
int bInvert = PB("inv");
login_check_credentials();
if( !g.perm.Read ){ login_needed(g.anon.Read); return; }
login_anonymous_available();
load_control();
blob_init(&qp, 0, 0);
diffType = preferred_diff_type();
zRe = P("regex");
if( zRe ) re_compile(&pRe, zRe, 0);
zBranch = P("branch");
if( zBranch && zBranch[0]==0 ) zBranch = 0;
if( zBranch ){
blob_appendf(&qp, "branch=%T", zBranch);
zMergeOrigin = mprintf("merge-in:%s", zBranch);
cgi_replace_parameter("from", zMergeOrigin);
cgi_replace_parameter("to", zBranch);
}else{
if( bInvert ){
blob_appendf(&qp, "to=%T&from=%T",PD("from",""),PD("to",""));
}else{
blob_appendf(&qp, "from=%T&to=%T",PD("from",""),PD("to",""));
}
}
pTo = vdiff_parse_manifest("to", &ridTo);
if( pTo==0 ) return;
pFrom = vdiff_parse_manifest("from", &ridFrom);
if( pFrom==0 ) return;
zGlob = P("glob");
zFrom = P("from");
zTo = P("to");
if( bInvert ){
Manifest *pTemp = pTo;
const char *zTemp = zTo;
pTo = pFrom;
pFrom = pTemp;
zTo = zFrom;
zFrom = zTemp;
}
if( zGlob ){
if( !*zGlob ){
zGlob = NULL;
}else{
blob_appendf(&qp, "&glob=%T", zGlob);
}
}
if( PB("nc") ){
graphFlags |= TIMELINE_NOCOLOR;
blob_appendf(&qp, "&nc");
}
diffFlags = construct_diff_flags(diffType);
if( diffFlags & DIFF_IGNORE_ALLWS ){
blob_appendf(&qp, "&w");
}
style_set_current_feature("vdiff");
if( zBranch==0 ){
style_submenu_element("Path", "%R/timeline?me=%T&you=%T", zFrom, zTo);
}
if( diffType!=0 ){
style_submenu_element("Hide Diff", "%R/vdiff?diff=0&%b", &qp);
}
if( diffType!=2 ){
style_submenu_element("Side-by-Side Diff", "%R/vdiff?diff=2&%b", &qp);
}
if( diffType!=1 ) {
style_submenu_element("Unified Diff", "%R/vdiff?diff=1&%b", &qp);
}
if( zBranch==0 ){
style_submenu_element("Invert","%R/vdiff?diff=%d&inv&%b", diffType, &qp);
}
if( zGlob ){
style_submenu_element("Clear glob", "%R/vdiff?diff=%d&%b", diffType, &qp);
}else{
style_submenu_element("Patch", "%R/vpatch?from=%T&to=%T%s", zFrom, zTo,
(diffFlags & DIFF_IGNORE_ALLWS)?"&w":"");
}
if( diffType!=0 ){
style_submenu_checkbox("w", "Ignore Whitespace", 0, 0);
}
if( zBranch ){
style_header("Changes On Branch %h", zBranch);
}else{
|
| ︙ | ︙ | |||
1272 1273 1274 1275 1276 1277 1278 |
@ %z(href("%R/info/%!S",zToUuid))%S(zToUuid)</a></span></p>
}else{
@ <h2>Difference From <span class='timelineSelected'>\
@ %z(href("%R/info/%h",zFrom))%h(zFrom)</a></span>
@ To <span class='timelineSelected timelineSecondary'>\
@ %z(href("%R/info/%h",zTo))%h(zTo)</a></span></h2>
}
| | | | 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 |
@ %z(href("%R/info/%!S",zToUuid))%S(zToUuid)</a></span></p>
}else{
@ <h2>Difference From <span class='timelineSelected'>\
@ %z(href("%R/info/%h",zFrom))%h(zFrom)</a></span>
@ To <span class='timelineSelected timelineSecondary'>\
@ %z(href("%R/info/%h",zTo))%h(zTo)</a></span></h2>
}
render_checkin_context(ridFrom, ridTo, 0, graphFlags);
if( pRe ){
@ <p><b>Only differences that match regular expression "%h(zRe)"
@ are shown.</b></p>
}
if( zGlob ){
@ <p><b>Only files matching the glob "%h(zGlob)" are shown.</b></p>
}
@<hr /><p>
}
blob_reset(&qp);
manifest_file_rewind(pFrom);
pFileFrom = manifest_file_next(pFrom, 0);
manifest_file_rewind(pTo);
pFileTo = manifest_file_next(pTo, 0);
while( pFileFrom || pFileTo ){
int cmp;
|
| ︙ | ︙ |