Fossil SCM

Improved title on ancestor displays in /timeline.

drh 2020-06-18 14:48 trunk

Commit f505d8d518de33385f68e1d9ee01b6c52ef92c3fd9679020c52d84ba8e078d8b

Parent badbcba970b84c1…

1 file changed +6 -3

M src/timeline.c

+6 -3

		--- src/timeline.c
		+++ src/timeline.c
		@@ -2017,11 +2017,11 @@
2017	2017	" WHERE mlink.mid=x"
2018	2018	" AND mlink.fnid=filename.fnid AND %s)",
2019	2019	glob_expr("filename.name", zChng)
2020	2020	);
2021	2021	}
2022		- tmFlags \|= TIMELINE_DISJOINT;
	2022	+// tmFlags \|= TIMELINE_DISJOINT;
2023	2023	db_multi_exec("%s", blob_sql_text(&sql));
2024	2024	if( advancedMenu ){
2025	2025	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2026	2026	}
2027	2027	nNodeOnPath = db_int(0, "SELECT count(*) FROM temp.pathnode");
		@@ -2038,10 +2038,11 @@
2038	2038	}
2039	2039	addFileGlobDescription(zChng, &desc);
2040	2040	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2041	2041	/* If p= or d= is present, ignore all other parameters other than n= */
2042	2042	char *zUuid;
	2043	+ const char *zCiName;
2043	2044	int np, nd;
2044	2045
2045	2046	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2046	2047	if( p_rid && d_rid ){
2047	2048	if( p_rid!=d_rid ) p_rid = d_rid;
		@@ -2050,10 +2051,12 @@
2050	2051	db_multi_exec(
2051	2052	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2052	2053	);
2053	2054	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d",
2054	2055	p_rid ? p_rid : d_rid);
	2056	+ zCiName = pd_rid ? P("pd") : p_rid ? P("p") : P("d");
	2057	+ if( zCiName==0 ) zCiName = zUuid;
2055	2058	blob_append_sql(&sql, " AND event.objid IN ok");
2056	2059	nd = 0;
2057	2060	if( d_rid ){
2058	2061	compute_descendants(d_rid, nEntry==0 ? 0 : nEntry+1);
2059	2062	nd = db_int(0, "SELECT count(*)-1 FROM ok");
		@@ -2070,12 +2073,12 @@
2070	2073	blob_appendf(&desc, "%d ancestors", np);
2071	2074	db_multi_exec("%s", blob_sql_text(&sql));
2072	2075	}
2073	2076	if( useDividers ) selectedRid = p_rid;
2074	2077	}
2075		- blob_appendf(&desc, " of %z[%S]</a>",
2076		- href("%R/info/%!S", zUuid), zUuid);
	2078	+ blob_appendf(&desc, " of %z%h</a>",
	2079	+ href("%R/info?name=%h", zCiName), zCiName);
2077	2080	if( d_rid ){
2078	2081	if( p_rid ){
2079	2082	/* If both p= and d= are set, we don't have the uuid of d yet. */
2080	2083	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
2081	2084	}
2082	2085

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2017,11 +2017,11 @@
2017	" WHERE mlink.mid=x"
2018	" AND mlink.fnid=filename.fnid AND %s)",
2019	glob_expr("filename.name", zChng)
2020	);
2021	}
2022	tmFlags \|= TIMELINE_DISJOINT;
2023	db_multi_exec("%s", blob_sql_text(&sql));
2024	if( advancedMenu ){
2025	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2026	}
2027	nNodeOnPath = db_int(0, "SELECT count(*) FROM temp.pathnode");
	@@ -2038,10 +2038,11 @@
2038	}
2039	addFileGlobDescription(zChng, &desc);
2040	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2041	/* If p= or d= is present, ignore all other parameters other than n= */
2042	char *zUuid;

2043	int np, nd;
2044
2045	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2046	if( p_rid && d_rid ){
2047	if( p_rid!=d_rid ) p_rid = d_rid;
	@@ -2050,10 +2051,12 @@
2050	db_multi_exec(
2051	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2052	);
2053	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d",
2054	p_rid ? p_rid : d_rid);


2055	blob_append_sql(&sql, " AND event.objid IN ok");
2056	nd = 0;
2057	if( d_rid ){
2058	compute_descendants(d_rid, nEntry==0 ? 0 : nEntry+1);
2059	nd = db_int(0, "SELECT count(*)-1 FROM ok");
	@@ -2070,12 +2073,12 @@
2070	blob_appendf(&desc, "%d ancestors", np);
2071	db_multi_exec("%s", blob_sql_text(&sql));
2072	}
2073	if( useDividers ) selectedRid = p_rid;
2074	}
2075	blob_appendf(&desc, " of %z[%S]</a>",
2076	href("%R/info/%!S", zUuid), zUuid);
2077	if( d_rid ){
2078	if( p_rid ){
2079	/* If both p= and d= are set, we don't have the uuid of d yet. */
2080	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
2081	}
2082

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2017,11 +2017,11 @@
2017	" WHERE mlink.mid=x"
2018	" AND mlink.fnid=filename.fnid AND %s)",
2019	glob_expr("filename.name", zChng)
2020	);
2021	}
2022	// tmFlags \|= TIMELINE_DISJOINT;
2023	db_multi_exec("%s", blob_sql_text(&sql));
2024	if( advancedMenu ){
2025	style_submenu_checkbox("v", "Files", (zType[0]!='a' && zType[0]!='c'),0);
2026	}
2027	nNodeOnPath = db_int(0, "SELECT count(*) FROM temp.pathnode");
	@@ -2038,10 +2038,11 @@
2038	}
2039	addFileGlobDescription(zChng, &desc);
2040	}else if( (p_rid \|\| d_rid) && g.perm.Read && zTagSql==0 ){
2041	/* If p= or d= is present, ignore all other parameters other than n= */
2042	char *zUuid;
2043	const char *zCiName;
2044	int np, nd;
2045
2046	tmFlags \|= TIMELINE_XMERGE \| TIMELINE_FILLGAPS;
2047	if( p_rid && d_rid ){
2048	if( p_rid!=d_rid ) p_rid = d_rid;
	@@ -2050,10 +2051,12 @@
2051	db_multi_exec(
2052	"CREATE TEMP TABLE IF NOT EXISTS ok(rid INTEGER PRIMARY KEY)"
2053	);
2054	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d",
2055	p_rid ? p_rid : d_rid);
2056	zCiName = pd_rid ? P("pd") : p_rid ? P("p") : P("d");
2057	if( zCiName==0 ) zCiName = zUuid;
2058	blob_append_sql(&sql, " AND event.objid IN ok");
2059	nd = 0;
2060	if( d_rid ){
2061	compute_descendants(d_rid, nEntry==0 ? 0 : nEntry+1);
2062	nd = db_int(0, "SELECT count(*)-1 FROM ok");
	@@ -2070,12 +2073,12 @@
2073	blob_appendf(&desc, "%d ancestors", np);
2074	db_multi_exec("%s", blob_sql_text(&sql));
2075	}
2076	if( useDividers ) selectedRid = p_rid;
2077	}
2078	blob_appendf(&desc, " of %z%h</a>",
2079	href("%R/info?name=%h", zCiName), zCiName);
2080	if( d_rid ){
2081	if( p_rid ){
2082	/* If both p= and d= are set, we don't have the uuid of d yet. */
2083	zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
2084	}
2085

Fossil SCM

Keyboard Shortcuts