Fossil SCM

Don't display anything marked "hidden" in the timeline.

jan.nijtmans 2013-09-11 15:16 UTC trunk
Commit ba7056b242859d28e4fb575e0f258d31087c2a5f
Parent c2fa007451c77bb…
3 files changed +8 -4 +1 -1 +9 -3
~ src/json_timeline.c ~ src/schema.c ~ src/timeline.c
M src/json_timeline.c
+8 -4
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -172,18 +172,22 @@
172172
 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)",
173173
 tagid);
174174
 if(zBranch){
175175
 /* from "r" flag code in page_timeline().*/
176176
 blob_appendf(pSql,
177
- " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid"
177
+ " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
178
+ " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)"
179
+ " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
178180
 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
179
- tagid);
181
+ tagid, TAG_HIDDEN);
180182
 #if 0 /* from the undocumented "mionly" flag in page_timeline() */
181183
 blob_appendf(pSql,
182
- " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid"
184
+ " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
185
+ " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)"
186
+ " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
183187
 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
184
- tagid);
188
+ tagid, TAG_HIDDEN);
185189
 #endif
186190
 }
187191
 blob_append(pSql," ) ",3);
188192
 return 1;
189193
 }
190194
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -172,18 +172,22 @@
172 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)",
173 tagid);
174 if(zBranch){
175 /* from "r" flag code in page_timeline().*/
176 blob_appendf(pSql,
177 " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=cid"
 
 
178 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
179 tagid);
180 #if 0 /* from the undocumented "mionly" flag in page_timeline() */
181 blob_appendf(pSql,
182 " OR EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid"
 
 
183 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
184 tagid);
185 #endif
186 }
187 blob_append(pSql," ) ",3);
188 return 1;
189 }
190
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -172,18 +172,22 @@
172 " WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)",
173 tagid);
174 if(zBranch){
175 /* from "r" flag code in page_timeline().*/
176 blob_appendf(pSql,
177 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
178 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)"
179 " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
180 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
181 tagid, TAG_HIDDEN);
182 #if 0 /* from the undocumented "mionly" flag in page_timeline() */
183 blob_appendf(pSql,
184 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
185 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)"
186 " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
187 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
188 tagid, TAG_HIDDEN);
189 #endif
190 }
191 blob_append(pSql," ) ",3);
192 return 1;
193 }
194
M src/schema.c
+1 -1
--- src/schema.c
+++ src/schema.c
@@ -435,11 +435,11 @@
435435
 #if INTERFACE
436436
 # define TAG_BGCOLOR 1 /* Set the background color for display */
437437
 # define TAG_COMMENT 2 /* The check-in comment */
438438
 # define TAG_USER 3 /* User who made a checking */
439439
 # define TAG_DATE 4 /* The date of a check-in */
440
-# define TAG_HIDDEN 5 /* Do not display or sync */
440
+# define TAG_HIDDEN 5 /* Do not display in timeline */
441441
 # define TAG_PRIVATE 6 /* Display but do not sync */
442442
 # define TAG_CLUSTER 7 /* A cluster */
443443
 # define TAG_BRANCH 8 /* Value is name of the current branch */
444444
 # define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
445445
 # define TAG_PARENT 10 /* Change to parentage on a checkin */
446446
--- src/schema.c
+++ src/schema.c
@@ -435,11 +435,11 @@
435 #if INTERFACE
436 # define TAG_BGCOLOR 1 /* Set the background color for display */
437 # define TAG_COMMENT 2 /* The check-in comment */
438 # define TAG_USER 3 /* User who made a checking */
439 # define TAG_DATE 4 /* The date of a check-in */
440 # define TAG_HIDDEN 5 /* Do not display or sync */
441 # define TAG_PRIVATE 6 /* Display but do not sync */
442 # define TAG_CLUSTER 7 /* A cluster */
443 # define TAG_BRANCH 8 /* Value is name of the current branch */
444 # define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
445 # define TAG_PARENT 10 /* Change to parentage on a checkin */
446
--- src/schema.c
+++ src/schema.c
@@ -435,11 +435,11 @@
435 #if INTERFACE
436 # define TAG_BGCOLOR 1 /* Set the background color for display */
437 # define TAG_COMMENT 2 /* The check-in comment */
438 # define TAG_USER 3 /* User who made a checking */
439 # define TAG_DATE 4 /* The date of a check-in */
440 # define TAG_HIDDEN 5 /* Do not display in timeline */
441 # define TAG_PRIVATE 6 /* Display but do not sync */
442 # define TAG_CLUSTER 7 /* A cluster */
443 # define TAG_BRANCH 8 /* Value is name of the current branch */
444 # define TAG_CLOSED 9 /* Do not display this check-in as a leaf */
445 # define TAG_PARENT 10 /* Change to parentage on a checkin */
446
M src/timeline.c
+9 -3
--- src/timeline.c
+++ src/timeline.c
@@ -897,13 +897,15 @@
897897
 @ tagid AS tagid,
898898
 @ brief AS brief,
899899
 @ event.mtime AS mtime
900900
 @ FROM event CROSS JOIN blob
901901
 @ WHERE blob.rid=event.objid
902
+ @ AND NOT EXISTS(SELECT 1 FROM tagxref
903
+ @ WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)
902904
 ;
903905
 if( zBase==0 ){
904
- zBase = mprintf(zBaseSql, TAG_BRANCH, TAG_BRANCH);
906
+ zBase = mprintf(zBaseSql, TAG_HIDDEN);
905907
 }
906908
 return zBase;
907909
 }
908910
909911
 /*
@@ -1253,18 +1255,22 @@
12531255
 ** useful in helping to visualize what has happened on a quiescent
12541256
 ** branch that is infrequently merged with a much more activate branch.
12551257
 */
12561258
 blob_appendf(&sql,
12571259
 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
1260
+ " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)"
1261
+ " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
12581262
 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
1259
- tagid
1263
+ tagid, TAG_HIDDEN
12601264
 );
12611265
 if( P("mionly")==0 ){
12621266
 blob_appendf(&sql,
12631267
 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
1268
+ " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)"
1269
+ " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
12641270
 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
1265
- tagid
1271
+ tagid, TAG_HIDDEN
12661272
 );
12671273
 }else{
12681274
 url_add_parameter(&url, "mionly", "1");
12691275
 }
12701276
 }else{
12711277
--- src/timeline.c
+++ src/timeline.c
@@ -897,13 +897,15 @@
897 @ tagid AS tagid,
898 @ brief AS brief,
899 @ event.mtime AS mtime
900 @ FROM event CROSS JOIN blob
901 @ WHERE blob.rid=event.objid
 
 
902 ;
903 if( zBase==0 ){
904 zBase = mprintf(zBaseSql, TAG_BRANCH, TAG_BRANCH);
905 }
906 return zBase;
907 }
908
909 /*
@@ -1253,18 +1255,22 @@
1253 ** useful in helping to visualize what has happened on a quiescent
1254 ** branch that is infrequently merged with a much more activate branch.
1255 */
1256 blob_appendf(&sql,
1257 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
 
 
1258 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
1259 tagid
1260 );
1261 if( P("mionly")==0 ){
1262 blob_appendf(&sql,
1263 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
 
 
1264 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
1265 tagid
1266 );
1267 }else{
1268 url_add_parameter(&url, "mionly", "1");
1269 }
1270 }else{
1271
--- src/timeline.c
+++ src/timeline.c
@@ -897,13 +897,15 @@
897 @ tagid AS tagid,
898 @ brief AS brief,
899 @ event.mtime AS mtime
900 @ FROM event CROSS JOIN blob
901 @ WHERE blob.rid=event.objid
902 @ AND NOT EXISTS(SELECT 1 FROM tagxref
903 @ WHERE tagid=%d AND tagtype>0 AND rid=blob.rid)
904 ;
905 if( zBase==0 ){
906 zBase = mprintf(zBaseSql, TAG_HIDDEN);
907 }
908 return zBase;
909 }
910
911 /*
@@ -1253,18 +1255,22 @@
1255 ** useful in helping to visualize what has happened on a quiescent
1256 ** branch that is infrequently merged with a much more activate branch.
1257 */
1258 blob_appendf(&sql,
1259 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
1260 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)"
1261 " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=cid"
1262 " WHERE tagid=%d AND tagtype>0 AND pid=blob.rid)",
1263 tagid, TAG_HIDDEN
1264 );
1265 if( P("mionly")==0 ){
1266 blob_appendf(&sql,
1267 " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
1268 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)"
1269 " AND NOT EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid"
1270 " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)",
1271 tagid, TAG_HIDDEN
1272 );
1273 }else{
1274 url_add_parameter(&url, "mionly", "1");
1275 }
1276 }else{
1277

Keyboard Shortcuts

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