| | @@ -1023,11 +1023,11 @@ |
| 1023 | 1023 | return blob_str(&out); |
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | |
| 1027 | 1027 | /* |
| 1028 | | -** Add the select/option box to the timeline submenu that is used to |
| 1028 | +** Add the select/option box to the timeline submenu that is used to |
| 1029 | 1029 | ** set the y= parameter that determines which elements to display |
| 1030 | 1030 | ** on the timeline. |
| 1031 | 1031 | */ |
| 1032 | 1032 | static void timeline_y_submenu(void){ |
| 1033 | 1033 | static int i = 0; |
| | @@ -1176,11 +1176,11 @@ |
| 1176 | 1176 | tagid = db_int(0, "SELECT tagid FROM tag WHERE tagname='sym-%q'",zBrName); |
| 1177 | 1177 | zThisTag = zBrName; |
| 1178 | 1178 | }else{ |
| 1179 | 1179 | tagid = 0; |
| 1180 | 1180 | } |
| 1181 | | - if( tagid>0 |
| 1181 | + if( tagid>0 |
| 1182 | 1182 | && db_int(0,"SELECT count(*) FROM tagxref WHERE tagid=%d",tagid)<=nEntry |
| 1183 | 1183 | ){ |
| 1184 | 1184 | zCirca = zBefore = zAfter = 0; |
| 1185 | 1185 | nEntry = -1; |
| 1186 | 1186 | } |
| | @@ -1383,11 +1383,11 @@ |
| 1383 | 1383 | " OR EXISTS(SELECT 1 FROM plink CROSS JOIN tagxref ON rid=pid" |
| 1384 | 1384 | " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", |
| 1385 | 1385 | tagid |
| 1386 | 1386 | ); |
| 1387 | 1387 | if( (tmFlags & TIMELINE_UNHIDE)==0 ){ |
| 1388 | | - blob_append_sql(&sql, |
| 1388 | + blob_append_sql(&sql, |
| 1389 | 1389 | " AND NOT EXISTS(SELECT 1 FROM plink JOIN tagxref ON rid=pid" |
| 1390 | 1390 | " WHERE tagid=%d AND tagtype>0 AND cid=blob.rid)", |
| 1391 | 1391 | TAG_HIDDEN |
| 1392 | 1392 | ); |
| 1393 | 1393 | } |
| | @@ -1780,11 +1780,11 @@ |
| 1780 | 1780 | ** for the current version or "now" for the current time. |
| 1781 | 1781 | ** |
| 1782 | 1782 | ** Options: |
| 1783 | 1783 | ** -n|--limit N Output the first N entries (default 20 lines). |
| 1784 | 1784 | ** N=0 means no limit. |
| 1785 | | -** -p|--path PATH Output items affecting PATH only. |
| 1785 | +** -p|--path PATH Output items affecting PATH only. |
| 1786 | 1786 | ** PATH can be a file or a sub directory. |
| 1787 | 1787 | ** --offset P skip P changes |
| 1788 | 1788 | ** -t|--type TYPE Output items from the given types only, such as: |
| 1789 | 1789 | ** ci = file commits only |
| 1790 | 1790 | ** e = events only |
| | @@ -1902,11 +1902,11 @@ |
| 1902 | 1902 | if( mode==0 ){ |
| 1903 | 1903 | if( isIsoDate(zOrigin) ) zShift = ",'+1 day'"; |
| 1904 | 1904 | } |
| 1905 | 1905 | zDate = mprintf("(SELECT julianday(%Q%s, 'utc'))", zOrigin, zShift); |
| 1906 | 1906 | } |
| 1907 | | - |
| 1907 | + |
| 1908 | 1908 | if( zFilePattern ){ |
| 1909 | 1909 | if( zType==0 ){ |
| 1910 | 1910 | /* When zFilePattern is specified and type is not specified, only show |
| 1911 | 1911 | * file checkins */ |
| 1912 | 1912 | zType="ci"; |
| 1913 | 1913 | |