Fossil SCM
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.
Commit
37d107501c25b2f8782a09c5b3691fcff2b6d4d7
Parent
5a428febd486a69…
1 file changed
+1
-1
+1
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -917,11 +917,11 @@ | ||
| 917 | 917 | const char *zThisTag = 0; /* Suppress links to this tag */ |
| 918 | 918 | const char *zThisUser = 0; /* Suppress links to this user */ |
| 919 | 919 | HQuery url; /* URL for various branch links */ |
| 920 | 920 | int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */ |
| 921 | 921 | int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */ |
| 922 | - int noMerge = P("nomerge")!=0; /* Do not follow merge links */ | |
| 922 | + int noMerge = P("shortest")==0; /* Follow merge links if shorter */ | |
| 923 | 923 | int me_rid = name_to_typed_rid(P("me"),"ci"); /* me= for common ancestory */ |
| 924 | 924 | int you_rid = name_to_typed_rid(P("you"),"ci");/* you= for common ancst */ |
| 925 | 925 | int pd_rid; |
| 926 | 926 | double rBefore, rAfter, rCirca; /* Boundary times */ |
| 927 | 927 | |
| 928 | 928 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -917,11 +917,11 @@ | |
| 917 | const char *zThisTag = 0; /* Suppress links to this tag */ |
| 918 | const char *zThisUser = 0; /* Suppress links to this user */ |
| 919 | HQuery url; /* URL for various branch links */ |
| 920 | int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */ |
| 921 | int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */ |
| 922 | int noMerge = P("nomerge")!=0; /* Do not follow merge links */ |
| 923 | int me_rid = name_to_typed_rid(P("me"),"ci"); /* me= for common ancestory */ |
| 924 | int you_rid = name_to_typed_rid(P("you"),"ci");/* you= for common ancst */ |
| 925 | int pd_rid; |
| 926 | double rBefore, rAfter, rCirca; /* Boundary times */ |
| 927 | |
| 928 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -917,11 +917,11 @@ | |
| 917 | const char *zThisTag = 0; /* Suppress links to this tag */ |
| 918 | const char *zThisUser = 0; /* Suppress links to this user */ |
| 919 | HQuery url; /* URL for various branch links */ |
| 920 | int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */ |
| 921 | int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */ |
| 922 | int noMerge = P("shortest")==0; /* Follow merge links if shorter */ |
| 923 | int me_rid = name_to_typed_rid(P("me"),"ci"); /* me= for common ancestory */ |
| 924 | int you_rid = name_to_typed_rid(P("you"),"ci");/* you= for common ancst */ |
| 925 | int pd_rid; |
| 926 | double rBefore, rAfter, rCirca; /* Boundary times */ |
| 927 | |
| 928 |