Fossil

Check-in [904ab4bb]
Login

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

Overview
Comment:Cherry-pick from [f1e99a5a408c]: minor annotate/blame url rendering bug.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:904ab4bbb844001a725a80d548f2c2f41db0a680
User & Date: andybradford 2014-03-05 06:24:17
Context
2014-03-05
19:07
Update the built-in SQLite to 3.8.4 beta. check-in: f0773f63 user: drh tags: trunk
08:43
Merge trunk. Fix indentation in annotation/blame commands/pages, which was broken since [28b39cc516]. Changelog entry. check-in: bcb22ce1 user: jan.nijtmans tags: diff-eolws
06:24
Cherry-pick from [f1e99a5a408c]: minor annotate/blame url rendering bug. check-in: 904ab4bb user: andybradford tags: trunk
2014-03-04
14:36
Bring in the SQLite with the TRIGGER name resolution bug fix. This fix is not important to Fossil - we just want to include the latest SQLite code for testing. check-in: 6215d083 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

2170
2171
2172
2173
2174
2175
2176



2177

2178
2179
2180
2181
2182
2183
2184
  /* compute the annotation */
  compute_direct_ancestors(mid, 10000000);
  annotate_file(&ann, fnid, mid, iLimit, annFlags);
  zCI = ann.aVers[0].zMUuid;

  /* generate the web page */
  style_header("Annotation For %h", zFilename);



  url_initialize(&url, "annotate");

  url_add_parameter(&url, "checkin", P("checkin"));
  url_add_parameter(&url, "filename", zFilename);
  if( iLimit!=20 ){
    url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit));
  }
  url_add_parameter(&url, "log", showLog ? "1" : "0");
  if( showLog ){







>
>
>
|
>







2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
  /* compute the annotation */
  compute_direct_ancestors(mid, 10000000);
  annotate_file(&ann, fnid, mid, iLimit, annFlags);
  zCI = ann.aVers[0].zMUuid;

  /* generate the web page */
  style_header("Annotation For %h", zFilename);
  if( bBlame ){
    url_initialize(&url, "blame");
  }else{
    url_initialize(&url, "annotate");
  }
  url_add_parameter(&url, "checkin", P("checkin"));
  url_add_parameter(&url, "filename", zFilename);
  if( iLimit!=20 ){
    url_add_parameter(&url, "limit", sqlite3_mprintf("%d", iLimit));
  }
  url_add_parameter(&url, "log", showLog ? "1" : "0");
  if( showLog ){