Fossil

Check-in [758029a8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not show cherrypick merge links in the context for the /ci_tags page.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 758029a81226d4682f8f26539899f66225ca5041a716ecd2e8da09cfc8da0783
User & Date: drh 2018-12-29 18:21:51
Context
2018-12-30
20:30
Begin adding the ability to use specially-named wiki pages to supplemental information about branches, tags, and/or checkins. check-in: dcf93d03 user: drh tags: describe-objects-using-wiki
00:29
NetBSD wants a header for isspace() check-in: ae62c08c user: bch tags: trunk
2018-12-29
18:21
Do not show cherrypick merge links in the context for the /ci_tags page. check-in: 758029a8 user: drh tags: trunk
13:04
Improved default CSS for drawing dashed lines for cherrypick merges. check-in: 3d922b52 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/info.c.

610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
    "       (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
    "       value, datetime(tagxref.mtime,toLocal()), tagtype,"
    "       (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
    "  FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
    " WHERE tagxref.rid=%d"
    " ORDER BY tagname /*sort*/", rid, rid, rid
  );
  if( db_table_exists("repository","cherrypick") ){
    db_multi_exec(
      "INSERT OR IGNORE INTO ok "
      "  SELECT parentid FROM cherrypick WHERE childid=%d;"
      "INSERT OR IGNORE INTO ok "
      "  SELECT childid FROM cherrypick WHERE parentid=%d;",
      rid, rid
    );
  }
  blob_zero(&sql);
  blob_append(&sql, timeline_query_for_www(), -1);
  blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
  db_prepare(&q, "%s", blob_sql_text(&sql));
  www_print_timeline(&q, TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_NOSCROLL,
                     0, 0, rid, 0);
  db_finalize(&q);







<
<
<
<
<
<
<
<
<







610
611
612
613
614
615
616









617
618
619
620
621
622
623
    "       (SELECT uuid FROM blob WHERE rid=tagxref.srcid AND rid!=%d),"
    "       value, datetime(tagxref.mtime,toLocal()), tagtype,"
    "       (SELECT uuid FROM blob WHERE rid=tagxref.origid AND rid!=%d)"
    "  FROM tagxref JOIN tag ON tagxref.tagid=tag.tagid"
    " WHERE tagxref.rid=%d"
    " ORDER BY tagname /*sort*/", rid, rid, rid
  );









  blob_zero(&sql);
  blob_append(&sql, timeline_query_for_www(), -1);
  blob_append_sql(&sql, " AND event.objid IN ok ORDER BY mtime DESC");
  db_prepare(&q, "%s", blob_sql_text(&sql));
  www_print_timeline(&q, TIMELINE_DISJOINT|TIMELINE_GRAPH|TIMELINE_NOSCROLL,
                     0, 0, rid, 0);
  db_finalize(&q);