Differences From:

File src/timeline.c part of check-in [e631d8af6d] - Improvements to the timeline when displaying check-ins with a given tag. by drh on 2009-01-21 18:42:19. [view]

To:

File src/timeline.c part of check-in [2fa4df1e47] - Add timeline links on the leaves page. Also on the leaves page, do not show Merge labels on check-ins. The second part is the fix for ticket d6bb26f436d8299f95d63f45fa51c92acdc91c5a. by drh on 2009-01-21 18:59:11. [view]

@@ -99,9 +99,10 @@
 /*
 ** Allowed flags for the tmFlags argument to www_print_timeline
 */
 #if INTERFACE
-#define TIMELINE_ARTID  0x0001   /* Show artifact IDs on non-check-in lines */
+#define TIMELINE_ARTID    0x0001  /* Show artifact IDs on non-check-in lines */
+#define TIMELINE_LEAFONLY 0x0002  /* Show "Leaf", but not "Merge", "Fork" etc */
 #endif
 
 /*
 ** Output a timeline in the web format given a query.  The query
@@ -171,16 +172,18 @@
       @ <td valign="top" align="left">
     }
     if( zType[0]=='c' ){
       hyperlink_to_uuid_with_mouseover(zUuid, "xin", "xout", rid);
-      if( nParent>1 ){
-        @ <b>Merge</b>
-      }
-      if( nPChild>1 ){
-        if( count_nonbranch_children(rid)>1 ){
-          @ <b>Fork</b>
-        }else{
-          @ <b>Branch</b>
+      if( (tmFlags & TIMELINE_LEAFONLY)==0 ){
+        if( nParent>1 ){
+          @ <b>Merge</b>
+        }
+        if( nPChild>1 ){
+          if( count_nonbranch_children(rid)>1 ){
+            @ <b>Fork</b>
+          }else{
+            @ <b>Branch</b>
+          }
         }
       }
       if( isLeaf ){
         @ <b>Leaf</b>