Fossil SCM
Fix error when displaying timeline of single branch. Reported on ML
Commit
81b76085e52ad86ee4e6770b1bd517c6abae6857
Parent
f7c19ec0cc098d2…
1 file changed
+4
-2
+4
-2
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1756,11 +1756,12 @@ | ||
| 1756 | 1756 | zDate = mprintf("%s", (zAfter ? zAfter : zBefore)); |
| 1757 | 1757 | } |
| 1758 | 1758 | if( zDate ){ |
| 1759 | 1759 | rDate = symbolic_name_to_mtime(zDate); |
| 1760 | 1760 | if( db_int(0, |
| 1761 | - "SELECT EXISTS (SELECT 1 FROM event WHERE mtime<=%.17g%s)", | |
| 1761 | + "SELECT EXISTS (SELECT 1 FROM event CROSS JOIN blob" | |
| 1762 | + " WHERE blob.rid=event.objid AND mtime<=%.17g%s)", | |
| 1762 | 1763 | rDate-ONE_SECOND, blob_sql_text(&cond)) |
| 1763 | 1764 | ){ |
| 1764 | 1765 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 1765 | 1766 | zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0)); |
| 1766 | 1767 | } |
| @@ -1771,11 +1772,12 @@ | ||
| 1771 | 1772 | zDate = mprintf("%s", (zBefore ? zBefore : zAfter)); |
| 1772 | 1773 | } |
| 1773 | 1774 | if( zDate ){ |
| 1774 | 1775 | rDate = symbolic_name_to_mtime(zDate); |
| 1775 | 1776 | if( db_int(0, |
| 1776 | - "SELECT EXISTS (SELECT 1 FROM event WHERE mtime>=%.17g%s)", | |
| 1777 | + "SELECT EXISTS (SELECT 1 FROM event CROSS JOIN blob" | |
| 1778 | + " WHERE blob.rid=event.objid AND mtime>=%.17g%s)", | |
| 1777 | 1779 | rDate+ONE_SECOND, blob_sql_text(&cond)) |
| 1778 | 1780 | ){ |
| 1779 | 1781 | timeline_submenu(&url, "Newer", "a", zDate, "b"); |
| 1780 | 1782 | } |
| 1781 | 1783 | free(zDate); |
| 1782 | 1784 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1756,11 +1756,12 @@ | |
| 1756 | zDate = mprintf("%s", (zAfter ? zAfter : zBefore)); |
| 1757 | } |
| 1758 | if( zDate ){ |
| 1759 | rDate = symbolic_name_to_mtime(zDate); |
| 1760 | if( db_int(0, |
| 1761 | "SELECT EXISTS (SELECT 1 FROM event WHERE mtime<=%.17g%s)", |
| 1762 | rDate-ONE_SECOND, blob_sql_text(&cond)) |
| 1763 | ){ |
| 1764 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 1765 | zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0)); |
| 1766 | } |
| @@ -1771,11 +1772,12 @@ | |
| 1771 | zDate = mprintf("%s", (zBefore ? zBefore : zAfter)); |
| 1772 | } |
| 1773 | if( zDate ){ |
| 1774 | rDate = symbolic_name_to_mtime(zDate); |
| 1775 | if( db_int(0, |
| 1776 | "SELECT EXISTS (SELECT 1 FROM event WHERE mtime>=%.17g%s)", |
| 1777 | rDate+ONE_SECOND, blob_sql_text(&cond)) |
| 1778 | ){ |
| 1779 | timeline_submenu(&url, "Newer", "a", zDate, "b"); |
| 1780 | } |
| 1781 | free(zDate); |
| 1782 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1756,11 +1756,12 @@ | |
| 1756 | zDate = mprintf("%s", (zAfter ? zAfter : zBefore)); |
| 1757 | } |
| 1758 | if( zDate ){ |
| 1759 | rDate = symbolic_name_to_mtime(zDate); |
| 1760 | if( db_int(0, |
| 1761 | "SELECT EXISTS (SELECT 1 FROM event CROSS JOIN blob" |
| 1762 | " WHERE blob.rid=event.objid AND mtime<=%.17g%s)", |
| 1763 | rDate-ONE_SECOND, blob_sql_text(&cond)) |
| 1764 | ){ |
| 1765 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 1766 | zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0)); |
| 1767 | } |
| @@ -1771,11 +1772,12 @@ | |
| 1772 | zDate = mprintf("%s", (zBefore ? zBefore : zAfter)); |
| 1773 | } |
| 1774 | if( zDate ){ |
| 1775 | rDate = symbolic_name_to_mtime(zDate); |
| 1776 | if( db_int(0, |
| 1777 | "SELECT EXISTS (SELECT 1 FROM event CROSS JOIN blob" |
| 1778 | " WHERE blob.rid=event.objid AND mtime>=%.17g%s)", |
| 1779 | rDate+ONE_SECOND, blob_sql_text(&cond)) |
| 1780 | ){ |
| 1781 | timeline_submenu(&url, "Newer", "a", zDate, "b"); |
| 1782 | } |
| 1783 | free(zDate); |
| 1784 |