Fossil SCM

In /timeline, the cherrypicks query parameter puts the graph into "disjoint" mode, which displays much better for the data it is presenting.

drh 2018-12-28 02:01 trunk
Commit 35e892b4f3b56947c240277814ad5672b0a0761edca88214be30e92e7f26f183
1 file changed +1 -1
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -2106,11 +2106,11 @@
21062106
blob_appendf(&desc, " in the most recent bisect");
21072107
tmFlags |= TIMELINE_DISJOINT;
21082108
}
21092109
if( cpOnly && showCherrypicks ){
21102110
blob_appendf(&desc, " that participate in a cherrypick merge");
2111
- tmFlags |= TIMELINE_CHPICK;
2111
+ tmFlags |= TIMELINE_CHPICK|TIMELINE_DISJOINT;
21122112
}
21132113
if( zUser ){
21142114
blob_appendf(&desc, " by user %h", zUser);
21152115
tmFlags |= TIMELINE_DISJOINT;
21162116
}
21172117
--- src/timeline.c
+++ src/timeline.c
@@ -2106,11 +2106,11 @@
2106 blob_appendf(&desc, " in the most recent bisect");
2107 tmFlags |= TIMELINE_DISJOINT;
2108 }
2109 if( cpOnly && showCherrypicks ){
2110 blob_appendf(&desc, " that participate in a cherrypick merge");
2111 tmFlags |= TIMELINE_CHPICK;
2112 }
2113 if( zUser ){
2114 blob_appendf(&desc, " by user %h", zUser);
2115 tmFlags |= TIMELINE_DISJOINT;
2116 }
2117
--- src/timeline.c
+++ src/timeline.c
@@ -2106,11 +2106,11 @@
2106 blob_appendf(&desc, " in the most recent bisect");
2107 tmFlags |= TIMELINE_DISJOINT;
2108 }
2109 if( cpOnly && showCherrypicks ){
2110 blob_appendf(&desc, " that participate in a cherrypick merge");
2111 tmFlags |= TIMELINE_CHPICK|TIMELINE_DISJOINT;
2112 }
2113 if( zUser ){
2114 blob_appendf(&desc, " by user %h", zUser);
2115 tmFlags |= TIMELINE_DISJOINT;
2116 }
2117

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button