Fossil

Check-in [2078c746a5]
Login

Check-in [2078c746a5]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove an unused subroutine. Fix a minor CSS problem.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | vdiff-improvements
Files: files | file ages | folders
SHA3-256: 2078c746a5abb9eaf30ca1cc801c41f1ac779f02962ea8728381bf0b8e6c75c7
User & Date: drh 2019-08-27 00:29:06.331
Context
2019-08-27
00:29
Merge in documentation enhancements from trunk. ... (check-in: c1b62c3260 user: drh tags: vdiff-improvements)
00:29
Remove an unused subroutine. Fix a minor CSS problem. ... (check-in: 2078c746a5 user: drh tags: vdiff-improvements)
00:11
On the /vdiff page, show a timeline with both check-ins using different highlights on each check-in. ... (check-in: 6e40f866ab user: drh tags: vdiff-improvements)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/default_css.txt.
︙︙
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

.timelineSelected {
  padding: .1em .2em;
  border: 2px solid lightgray;
  background-color: #ffc;
  box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
}
.timelineSecondary {
  background-color: #ffc;
}
tr.timelineSelected td {
  border-radius: 0;
  border-width: 0;
}
tr.timelineCurrent td {
  border-radius: 0;








|








43
44
45
46
47
48
49
50
51
52
53
54
55
56
57

.timelineSelected {
  padding: .1em .2em;
  border: 2px solid lightgray;
  background-color: #ffc;
  box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.5);
}
.timelineSecondary {
  background-color: #cff;
}
tr.timelineSelected td {
  border-radius: 0;
  border-width: 0;
}
tr.timelineCurrent td {
  border-radius: 0;
︙︙
Changes to src/info.c.
︙︙
1109
1110
1111
1112
1113
1114
1115

1116
1117
1118
1119
1120
1121
1122

  if( !is_a_version(rid) ){
    webpage_error("Artifact %s is not a check-in.", P(zParam));
    return 0;
  }
  return manifest_get(rid, CFTYPE_MANIFEST, 0);
}


/*
** Output a description of a check-in
*/
static void checkin_description(int rid){
  Stmt q;
  db_prepare(&q,
    "SELECT datetime(mtime), coalesce(euser,user),"








>








1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123

  if( !is_a_version(rid) ){
    webpage_error("Artifact %s is not a check-in.", P(zParam));
    return 0;
  }
  return manifest_get(rid, CFTYPE_MANIFEST, 0);
}

#if 0 /* not used */
/*
** Output a description of a check-in
*/
static void checkin_description(int rid){
  Stmt q;
  db_prepare(&q,
    "SELECT datetime(mtime), coalesce(euser,user),"
︙︙
1167
1168
1169
1170
1171
1172
1173

1174
1175
1176
1177
1178
1179
1180

    }
    @ date:
    hyperlink_to_date(zDate, ")");
    tag_private_status(rid);
  }
  db_finalize(&q);
}



/*
** WEBPAGE: vdiff
** URL: /vdiff?from=TAG&to=TAG
**
** Show the difference between two check-ins identified by the from= and








>








1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182

    }
    @ date:
    hyperlink_to_date(zDate, ")");
    tag_private_status(rid);
  }
  db_finalize(&q);
}
#endif /* not used */


/*
** WEBPAGE: vdiff
** URL: /vdiff?from=TAG&to=TAG
**
** Show the difference between two check-ins identified by the from= and
︙︙
1265
1266
1267
1268
1269
1270
1271

1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286

  }
  style_header("Check-in Differences");
  if( P("nohdr")==0 ){
    @ <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>

    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>
    }
    render_checkin_context(ridFrom, ridTo, 0);
    @<hr /><p>
  }

  manifest_file_rewind(pFrom);
  pFileFrom = manifest_file_next(pFrom, 0);
  manifest_file_rewind(pTo);
  pFileTo = manifest_file_next(pTo, 0);








>







<








1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281

1282
1283
1284
1285
1286
1287
1288

  }
  style_header("Check-in Differences");
  if( P("nohdr")==0 ){
    @ <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);
    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>
  }

  manifest_file_rewind(pFrom);
  pFileFrom = manifest_file_next(pFrom, 0);
  manifest_file_rewind(pTo);
  pFileTo = manifest_file_next(pTo, 0);
︙︙