Fossil SCM

Rename the new "so=" query parameter on /timeline to "sl=" ("Sort List"). Improve the help page for /timeline.

drh 2024-12-24 13:10 trunk

Commit b46d2c46912bd8f972662bff03884cf6d653809c3c5d9996dca6119ccf3de985

Parent 055cef4b41897b2…

2 files changed +3 -3 +17

M src/timeline.c

+3 -3

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1553,11 +1553,11 @@
1553	1553	** t=TAG Show only check-ins with the given TAG
1554	1554	** r=TAG Same as 't=TAG&rel'. Mnemonic: "Related"
1555	1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'. Mnemonic: "Tag List"
1556	1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'. Mnemonic: "Related List"
1557	1557	** ml=TAGLIST Same as 'tl=TAGLIST&mionly'. Mnemonic: "Merge-in List"
1558		-** so=TAGLIST "Sort Order". Show TAGLIST branches ordered left to right.
	1558	+** sl=TAGLIST "Sort List". Draw TAGLIST branches ordered left to right.
1559	1559	** rel Show related check-ins as well as those matching t=TAG
1560	1560	** mionly Show related parents but not related children.
1561	1561	** nowiki Do not show wiki associated with branch or tag
1562	1562	** ms=MATCHSTYLE Set tag name match algorithm. One of "exact", "glob",
1563	1563	** "like", or "regexp".
		@@ -2927,12 +2927,12 @@
2927	2927	@  ↑</a>
2928	2928	}
2929	2929	cgi_check_for_malice();
2930	2930	{
2931	2931	Matcher *pLeftBranch;
2932		- if( P("so")!=0 ){
2933		- pLeftBranch = match_create(MS_BRLIST, P("so"));
	2932	+ if( P("sl")!=0 ){
	2933	+ pLeftBranch = match_create(MS_BRLIST, P("sl"));
2934	2934	}else if( zBrName ){
2935	2935	pLeftBranch = match_create(matchStyle, zBrName);
2936	2936	}else{
2937	2937	pLeftBranch = match_create(matchStyle, zTagName);
2938	2938	}
2939	2939

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1553,11 +1553,11 @@
1553	** t=TAG Show only check-ins with the given TAG
1554	** r=TAG Same as 't=TAG&rel'. Mnemonic: "Related"
1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'. Mnemonic: "Tag List"
1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'. Mnemonic: "Related List"
1557	** ml=TAGLIST Same as 'tl=TAGLIST&mionly'. Mnemonic: "Merge-in List"
1558	** so=TAGLIST "Sort Order". Show TAGLIST branches ordered left to right.
1559	** rel Show related check-ins as well as those matching t=TAG
1560	** mionly Show related parents but not related children.
1561	** nowiki Do not show wiki associated with branch or tag
1562	** ms=MATCHSTYLE Set tag name match algorithm. One of "exact", "glob",
1563	** "like", or "regexp".
	@@ -2927,12 +2927,12 @@
2927	@  ↑</a>
2928	}
2929	cgi_check_for_malice();
2930	{
2931	Matcher *pLeftBranch;
2932	if( P("so")!=0 ){
2933	pLeftBranch = match_create(MS_BRLIST, P("so"));
2934	}else if( zBrName ){
2935	pLeftBranch = match_create(matchStyle, zBrName);
2936	}else{
2937	pLeftBranch = match_create(matchStyle, zTagName);
2938	}
2939

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1553,11 +1553,11 @@
1553	** t=TAG Show only check-ins with the given TAG
1554	** r=TAG Same as 't=TAG&rel'. Mnemonic: "Related"
1555	** tl=TAGLIST Same as 't=TAGLIST&ms=brlist'. Mnemonic: "Tag List"
1556	** rl=TAGLIST Same as 'r=TAGLIST&ms=brlist'. Mnemonic: "Related List"
1557	** ml=TAGLIST Same as 'tl=TAGLIST&mionly'. Mnemonic: "Merge-in List"
1558	** sl=TAGLIST "Sort List". Draw TAGLIST branches ordered left to right.
1559	** rel Show related check-ins as well as those matching t=TAG
1560	** mionly Show related parents but not related children.
1561	** nowiki Do not show wiki associated with branch or tag
1562	** ms=MATCHSTYLE Set tag name match algorithm. One of "exact", "glob",
1563	** "like", or "regexp".
	@@ -2927,12 +2927,12 @@
2927	@  ↑</a>
2928	}
2929	cgi_check_for_malice();
2930	{
2931	Matcher *pLeftBranch;
2932	if( P("sl")!=0 ){
2933	pLeftBranch = match_create(MS_BRLIST, P("sl"));
2934	}else if( zBrName ){
2935	pLeftBranch = match_create(matchStyle, zBrName);
2936	}else{
2937	pLeftBranch = match_create(matchStyle, zTagName);
2938	}
2939

M www/changes.wiki

+17

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -18,10 +18,27 @@
18	18	branch has been changed.
19	19	* When a merge conflict occurs, a new section is added to the conflict
20	20	text that shows Fossil's suggested resolution to the conflict.
21	21	* Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show
22	22	diffs of multiple files.
	23	+ * Enhancements to the [/help?cmd=/timeline\|/timeline page]:
	24	+ <ol type="a">
	25	+ <li> Added the "ml=" ("Merge-in List") query parameter that works
	26	+ like "rl=" ("Related List") but adds "mionly" style related
	27	+ check-ins instead of the full "rel" style.
	28	+ <li> For "tl=", "rl=", and "ml=", the order of the branches in the
	29	+ graph now tries to match the order of the branches named in
	30	+ the list.
	31	+ <li> The "ms=" ("Match Style") query parameter is honored for
	32	+ "tl=", "rl=", and "ml=".
	33	+ <li> New query parameter "sl=BRANCHLIST" ("Sort List") strives to
	34	+ put branches in the specified order in the graph. This
	35	+ overrides any "tl=" or similar ordering.
	36	+ <li> In the various "from=","to=" query formats, if the one of the
	37	+ end points is an ancestor of the other, then the "rel" modifier
	38	+ omits check-ins that are not ancestors of the newer endpoint.
	39	+ </ol>
23	40	* Added the [/help?cmd=/clusterlist\|/clusterlist page] for analysis
24	41	and debugging
25	42	* Fix a bug in [/help?cmd=patch\|fossil patch create] that causes
26	43	[/help?cmd=revert\|fossil revert] operations that happened on individual
27	44	files after a [/help?cmd=merge\|fossil merge] to be omitted from the
28	45

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -18,10 +18,27 @@
18	branch has been changed.
19	* When a merge conflict occurs, a new section is added to the conflict
20	text that shows Fossil's suggested resolution to the conflict.
21	* Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show
22	diffs of multiple files.

















23	* Added the [/help?cmd=/clusterlist\|/clusterlist page] for analysis
24	and debugging
25	* Fix a bug in [/help?cmd=patch\|fossil patch create] that causes
26	[/help?cmd=revert\|fossil revert] operations that happened on individual
27	files after a [/help?cmd=merge\|fossil merge] to be omitted from the
28

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -18,10 +18,27 @@
18	branch has been changed.
19	* When a merge conflict occurs, a new section is added to the conflict
20	text that shows Fossil's suggested resolution to the conflict.
21	* Add the "Hide diffs/Show diffs" toggle to web-UI diff pages that show
22	diffs of multiple files.
23	* Enhancements to the [/help?cmd=/timeline\|/timeline page]:
24	<ol type="a">
25	<li> Added the "ml=" ("Merge-in List") query parameter that works
26	like "rl=" ("Related List") but adds "mionly" style related
27	check-ins instead of the full "rel" style.
28	<li> For "tl=", "rl=", and "ml=", the order of the branches in the
29	graph now tries to match the order of the branches named in
30	the list.
31	<li> The "ms=" ("Match Style") query parameter is honored for
32	"tl=", "rl=", and "ml=".
33	<li> New query parameter "sl=BRANCHLIST" ("Sort List") strives to
34	put branches in the specified order in the graph. This
35	overrides any "tl=" or similar ordering.
36	<li> In the various "from=","to=" query formats, if the one of the
37	end points is an ancestor of the other, then the "rel" modifier
38	omits check-ins that are not ancestors of the newer endpoint.
39	</ol>
40	* Added the [/help?cmd=/clusterlist\|/clusterlist page] for analysis
41	and debugging
42	* Fix a bug in [/help?cmd=patch\|fossil patch create] that causes
43	[/help?cmd=revert\|fossil revert] operations that happened on individual
44	files after a [/help?cmd=merge\|fossil merge] to be omitted from the
45

Fossil SCM

Keyboard Shortcuts