Fossil

Check-in [37d107501c]
Login

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

Overview
Comment:On the timeline webpage, remove the (undocumented) "nomerge" query parameter and make no-merge behavior the default when using the "from" and "to" query parameters. A new "shortest" query parameter can be used to find the shortest path, if desired.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 37d107501c25b2f8782a09c5b3691fcff2b6d4d7
User & Date: drh 2012-10-05 13:55:24.157
Context
2012-10-05
16:36
Fix a couple of C99-isms in the recent stash changes. ... (check-in: f378800aed user: drh tags: trunk)
13:55
On the timeline webpage, remove the (undocumented) "nomerge" query parameter and make no-merge behavior the default when using the "from" and "to" query parameters. A new "shortest" query parameter can be used to find the shortest path, if desired. ... (check-in: 37d107501c user: drh tags: trunk)
13:48
Update SQLite from upstream so that Fossil will compile on pre-C99 compilers. This SQLite still has issues with ORDER BY optimization, but those issues do not seem to effect Fossil. ... (check-in: 5a428febd4 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/timeline.c.
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
  int tagid;                         /* Tag ID */
  int tmFlags;                       /* Timeline flags */
  const char *zThisTag = 0;          /* Suppress links to this tag */
  const char *zThisUser = 0;         /* Suppress links to this user */
  HQuery url;                        /* URL for various branch links */
  int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
  int to_rid = name_to_typed_rid(P("to"),"ci");    /* to= for path timelines */
  int noMerge = P("nomerge")!=0;          /* Do not follow merge links */
  int me_rid = name_to_typed_rid(P("me"),"ci");  /* me= for common ancestory */
  int you_rid = name_to_typed_rid(P("you"),"ci");/* you= for common ancst */
  int pd_rid;
  double rBefore, rAfter, rCirca;     /* Boundary times */

  /* To view the timeline, must have permission to read project data.
  */







|







915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
  int tagid;                         /* Tag ID */
  int tmFlags;                       /* Timeline flags */
  const char *zThisTag = 0;          /* Suppress links to this tag */
  const char *zThisUser = 0;         /* Suppress links to this user */
  HQuery url;                        /* URL for various branch links */
  int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
  int to_rid = name_to_typed_rid(P("to"),"ci");    /* to= for path timelines */
  int noMerge = P("shortest")==0;           /* Follow merge links if shorter */
  int me_rid = name_to_typed_rid(P("me"),"ci");  /* me= for common ancestory */
  int you_rid = name_to_typed_rid(P("you"),"ci");/* you= for common ancst */
  int pd_rid;
  double rBefore, rAfter, rCirca;     /* Boundary times */

  /* To view the timeline, must have permission to read project data.
  */