Fossil SCM

On webpages, render help text as HTML.

drh 2020-06-25 00:17 trunk merge

Commit e58c76a1d0d6a3bc992fe1b77349d39030336efe2e03da59d757d23ebc0100af

Parent e1d8cea28ae3952…

22 files changed +10 -10 +3 -3 +13 -12 +54 -55 +6 -5 +8 -8 +52 -52 +17 -13 +7 -7 +10 -10 +243 -44 +3 -3 +26 -26 +15 -21 +60 -60 +4 -4 +13 -12 +9 -9 +8 -5 +16 -15 +6 -6 +19 -19

~ src/add.c ~ src/allrepo.c ~ src/attach.c ~ src/bisect.c ~ src/branch.c ~ src/bundle.c ~ src/checkin.c ~ src/clone.c ~ src/configure.c ~ src/diff.c ~ src/dispatch.c ~ src/export.c ~ src/purge.c ~ src/rss.c ~ src/stash.c ~ src/tag.c ~ src/timeline.c ~ src/tkt.c ~ src/undo.c ~ src/update.c ~ src/user.c ~ src/wiki.c

M src/add.c

+10 -10

		--- src/add.c
		+++ src/add.c
		@@ -360,17 +360,17 @@
360	360	** be treated case sensitive or not. If the option is not given, the default
361	361	** depends on the global setting, or the operating system default, if not set.
362	362	**
363	363	** Options:
364	364	**
365		-** --case-sensitive <BOOL> Override the case-sensitive setting.
	365	+** --case-sensitive BOOL Override the case-sensitive setting.
366	366	** --dotfiles include files beginning with a dot (".")
367	367	** -f\|--force Add files without prompting
368		-** --ignore <CSG> Ignore unmanaged files matching patterns from
369		-** the comma separated list of glob patterns.
370		-** --clean <CSG> Also ignore files matching patterns from
371		-** the comma separated list of glob patterns.
	368	+** --ignore CSG Ignore unmanaged files matching patterns from
	369	+** the Comma Separated Glob (CSG) pattern list
	370	+** --clean CSG Also ignore files matching patterns from
	371	+** the Comma Separated Glob (CSG) list
372	372	** --reset Reset the ADDED state of a checkout, such
373	373	** that all newly-added (but not yet committed)
374	374	** files are no longer added. No flags other
375	375	** than --verbose and --dry-run may be used
376	376	** with --reset.
		@@ -739,16 +739,16 @@
739	739	** anything.
740	740	**
741	741	** This command can be used to track third party software.
742	742	**
743	743	** Options:
744		-** --case-sensitive <BOOL> Override the case-sensitive setting.
	744	+** --case-sensitive BOOL Override the case-sensitive setting.
745	745	** --dotfiles Include files beginning with a dot (".")
746		-** --ignore <CSG> Ignore unmanaged files matching patterns from
747		-** the comma separated list of glob patterns.
748		-** --clean <CSG> Also ignore files matching patterns from
749		-** the comma separated list of glob patterns.
	746	+** --ignore CSG Ignore unmanaged files matching patterns from
	747	+** the Comma Separated Glob (CSG) list
	748	+** --clean CSG Also ignore files matching patterns from
	749	+** the Comma Separated Glob (CSG) list
750	750	** -n\|--dry-run If given, display instead of run actions.
751	751	** --reset Reset the ADDED/DELETED state of a checkout,
752	752	** such that all newly-added (but not yet committed)
753	753	** files are no longer added and all newly-removed
754	754	** (but not yet committed) files are no longer
755	755

	--- src/add.c
	+++ src/add.c
	@@ -360,17 +360,17 @@
360	** be treated case sensitive or not. If the option is not given, the default
361	** depends on the global setting, or the operating system default, if not set.
362	**
363	** Options:
364	**
365	** --case-sensitive <BOOL> Override the case-sensitive setting.
366	** --dotfiles include files beginning with a dot (".")
367	** -f\|--force Add files without prompting
368	** --ignore <CSG> Ignore unmanaged files matching patterns from
369	** the comma separated list of glob patterns.
370	** --clean <CSG> Also ignore files matching patterns from
371	** the comma separated list of glob patterns.
372	** --reset Reset the ADDED state of a checkout, such
373	** that all newly-added (but not yet committed)
374	** files are no longer added. No flags other
375	** than --verbose and --dry-run may be used
376	** with --reset.
	@@ -739,16 +739,16 @@
739	** anything.
740	**
741	** This command can be used to track third party software.
742	**
743	** Options:
744	** --case-sensitive <BOOL> Override the case-sensitive setting.
745	** --dotfiles Include files beginning with a dot (".")
746	** --ignore <CSG> Ignore unmanaged files matching patterns from
747	** the comma separated list of glob patterns.
748	** --clean <CSG> Also ignore files matching patterns from
749	** the comma separated list of glob patterns.
750	** -n\|--dry-run If given, display instead of run actions.
751	** --reset Reset the ADDED/DELETED state of a checkout,
752	** such that all newly-added (but not yet committed)
753	** files are no longer added and all newly-removed
754	** (but not yet committed) files are no longer
755

	--- src/add.c
	+++ src/add.c
	@@ -360,17 +360,17 @@
360	** be treated case sensitive or not. If the option is not given, the default
361	** depends on the global setting, or the operating system default, if not set.
362	**
363	** Options:
364	**
365	** --case-sensitive BOOL Override the case-sensitive setting.
366	** --dotfiles include files beginning with a dot (".")
367	** -f\|--force Add files without prompting
368	** --ignore CSG Ignore unmanaged files matching patterns from
369	** the Comma Separated Glob (CSG) pattern list
370	** --clean CSG Also ignore files matching patterns from
371	** the Comma Separated Glob (CSG) list
372	** --reset Reset the ADDED state of a checkout, such
373	** that all newly-added (but not yet committed)
374	** files are no longer added. No flags other
375	** than --verbose and --dry-run may be used
376	** with --reset.
	@@ -739,16 +739,16 @@
739	** anything.
740	**
741	** This command can be used to track third party software.
742	**
743	** Options:
744	** --case-sensitive BOOL Override the case-sensitive setting.
745	** --dotfiles Include files beginning with a dot (".")
746	** --ignore CSG Ignore unmanaged files matching patterns from
747	** the Comma Separated Glob (CSG) list
748	** --clean CSG Also ignore files matching patterns from
749	** the Comma Separated Glob (CSG) list
750	** -n\|--dry-run If given, display instead of run actions.
751	** --reset Reset the ADDED/DELETED state of a checkout,
752	** such that all newly-added (but not yet committed)
753	** files are no longer added and all newly-removed
754	** (but not yet committed) files are no longer
755

M src/allrepo.c

+3 -3

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -104,13 +104,13 @@
104	104	** --randomize options are not supported.
105	105	**
106	106	** sync Run a "sync" on all repositories. Only the --verbose
107	107	** and --unversioned options are supported.
108	108	**
109		-** setting Run the "setting", "set", or "unset" commands on all
110		-** set repositories. These command are particularly useful in
111		-** unset conjunction with the "max-loadavg" setting which cannot
	109	+** set\|unset Run the "setting", "set", or "unset" commands on all
	110	+** repositories. These command are particularly useful in
	111	+** conjunction with the "max-loadavg" setting which cannot
112	112	** otherwise be set globally.
113	113	**
114	114	** server Run the "ui" or "server" commands on all repositories.
115	115	** ui The root URI gives a listing of all repos.
116	116	**
117	117

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -104,13 +104,13 @@
104	** --randomize options are not supported.
105	**
106	** sync Run a "sync" on all repositories. Only the --verbose
107	** and --unversioned options are supported.
108	**
109	** setting Run the "setting", "set", or "unset" commands on all
110	** set repositories. These command are particularly useful in
111	** unset conjunction with the "max-loadavg" setting which cannot
112	** otherwise be set globally.
113	**
114	** server Run the "ui" or "server" commands on all repositories.
115	** ui The root URI gives a listing of all repos.
116	**
117

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -104,13 +104,13 @@
104	** --randomize options are not supported.
105	**
106	** sync Run a "sync" on all repositories. Only the --verbose
107	** and --unversioned options are supported.
108	**
109	** set\|unset Run the "setting", "set", or "unset" commands on all
110	** repositories. These command are particularly useful in
111	** conjunction with the "max-loadavg" setting which cannot
112	** otherwise be set globally.
113	**
114	** server Run the "ui" or "server" commands on all repositories.
115	** ui The root URI gives a listing of all repos.
116	**
117

M src/attach.c

+13 -12

		--- src/attach.c
		+++ src/attach.c
		@@ -685,22 +685,23 @@
685	685	/*
686	686	** COMMAND: attachment*
687	687	**
688	688	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
689	689	**
690		-** Add an attachment to an existing wiki page or tech note.
691		-**
692		-** Options:
693		-** -t\|--technote DATETIME Specifies the timestamp of
694		-** the technote to which the attachment
695		-** is to be made. The attachment will be
696		-** to the most recently modified tech note
697		-** with the specified timestamp.
698		-** -t\|--technote TECHNOTE-ID Specifies the technote to be
699		-** updated by its technote id.
700		-**
701		-** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
	690	+** Add an attachment to an existing wiki page or tech note.
	691	+** Options:
	692	+**
	693	+** -t\|--technote DATETIME Specifies the timestamp of
	694	+** the technote to which the attachment
	695	+** is to be made. The attachment will be
	696	+** to the most recently modified tech note
	697	+** with the specified timestamp.
	698	+**
	699	+** -t\|--technote TECHNOTE-ID Specifies the technote to be
	700	+** updated by its technote id.
	701	+**
	702	+** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
702	703	**
703	704	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
704	705	** year-month-day form, it may be truncated, the "T" may be replaced by
705	706	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
706	707	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
707	708

	--- src/attach.c
	+++ src/attach.c
	@@ -685,22 +685,23 @@
685	/*
686	** COMMAND: attachment*
687	**
688	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
689	**
690	** Add an attachment to an existing wiki page or tech note.
691	**
692	** Options:
693	** -t\|--technote DATETIME Specifies the timestamp of
694	** the technote to which the attachment
695	** is to be made. The attachment will be
696	** to the most recently modified tech note
697	** with the specified timestamp.
698	** -t\|--technote TECHNOTE-ID Specifies the technote to be
699	** updated by its technote id.
700	**
701	** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.

702	**
703	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
704	** year-month-day form, it may be truncated, the "T" may be replaced by
705	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
706	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
707

	--- src/attach.c
	+++ src/attach.c
	@@ -685,22 +685,23 @@
685	/*
686	** COMMAND: attachment*
687	**
688	** Usage: %fossil attachment add ?PAGENAME? FILENAME ?OPTIONS?
689	**
690	** Add an attachment to an existing wiki page or tech note.
691	** Options:
692	**
693	** -t\|--technote DATETIME Specifies the timestamp of
694	** the technote to which the attachment
695	** is to be made. The attachment will be
696	** to the most recently modified tech note
697	** with the specified timestamp.
698	**
699	** -t\|--technote TECHNOTE-ID Specifies the technote to be
700	** updated by its technote id.
701	**
702	** One of PAGENAME, DATETIME or TECHNOTE-ID must be specified.
703	**
704	** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
705	** year-month-day form, it may be truncated, the "T" may be replaced by
706	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
707	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
708

M src/bisect.c

+54 -55

		--- src/bisect.c
		+++ src/bisect.c
		@@ -304,67 +304,66 @@
304	304	**
305	305	** Usage: %fossil bisect SUBCOMMAND ...
306	306	**
307	307	** Run various subcommands useful for searching for bugs.
308	308	**
309		-** fossil bisect bad ?VERSION?
310		-**
311		-** Identify version VERSION as non-working. If VERSION is omitted,
312		-** the current checkout is marked as non-working.
313		-**
314		-** fossil bisect good ?VERSION?
315		-**
316		-** Identify version VERSION as working. If VERSION is omitted,
317		-** the current checkout is marked as working.
318		-**
319		-** fossil bisect log
320		-** fossil bisect chart
321		-**
322		-** Show a log of "good" and "bad" versions. "bisect log" shows the
323		-** events in the order that they were tested. "bisect chart" shows
324		-** them in order of check-in.
325		-**
326		-** fossil bisect next
327		-**
328		-** Update to the next version that is halfway between the working and
329		-** non-working versions.
330		-**
331		-** fossil bisect options ?NAME? ?VALUE?
332		-**
333		-** List all bisect options, or the value of a single option, or set the
334		-** value of a bisect option.
335		-**
336		-** fossil bisect reset
337		-**
338		-** Reinitialize a bisect session. This cancels prior bisect history
339		-** and allows a bisect session to start over from the beginning.
340		-**
341		-** fossil bisect vlist\|ls\|status ?-a\|--all?
342		-**
343		-** List the versions in between "bad" and "good".
344		-**
345		-** fossil bisect ui
346		-**
347		-** Like "fossil ui" except start on a timeline that shows only the
348		-** check-ins that are part of the current bisect.
349		-**
350		-** fossil bisect undo
351		-**
352		-** Undo the most recent "good" or "bad" command.
	309	+** > fossil bisect bad ?VERSION?
	310	+**
	311	+** Identify version VERSION as non-working. If VERSION is omitted,
	312	+** the current checkout is marked as non-working.
	313	+**
	314	+** > fossil bisect good ?VERSION?
	315	+**
	316	+** Identify version VERSION as working. If VERSION is omitted,
	317	+** the current checkout is marked as working.
	318	+**
	319	+** > fossil bisect log
	320	+** > fossil bisect chart
	321	+**
	322	+** Show a log of "good" and "bad" versions. "bisect log" shows the
	323	+** events in the order that they were tested. "bisect chart" shows
	324	+** them in order of check-in.
	325	+**
	326	+** > fossil bisect next
	327	+**
	328	+** Update to the next version that is halfway between the working and
	329	+** non-working versions.
	330	+**
	331	+** > fossil bisect options ?NAME? ?VALUE?
	332	+**
	333	+** List all bisect options, or the value of a single option, or set the
	334	+** value of a bisect option.
	335	+**
	336	+** > fossil bisect reset
	337	+**
	338	+** Reinitialize a bisect session. This cancels prior bisect history
	339	+** and allows a bisect session to start over from the beginning.
	340	+**
	341	+** > fossil bisect vlist\|ls\|status ?-a\|--all?
	342	+**
	343	+** List the versions in between "bad" and "good".
	344	+**
	345	+** > fossil bisect ui
	346	+**
	347	+** Like "fossil ui" except start on a timeline that shows only the
	348	+** check-ins that are part of the current bisect.
	349	+**
	350	+** > fossil bisect undo
	351	+**
	352	+** Undo the most recent "good" or "bad" command.
353	353	**
354	354	** Summary:
355		-**
356		-** fossil bisect bad ?VERSION?
357		-** fossil bisect good ?VERSION?
358		-** fossil bisect log
359		-** fossil bisect chart
360		-** fossil bisect next
361		-** fossil bisect options
362		-** fossil bisect reset
363		-** fossil bisect status
364		-** fossil bisect ui
365		-** fossil bisect undo
	355	+** * fossil bisect bad ?VERSION?
	356	+** * fossil bisect good ?VERSION?
	357	+** * fossil bisect log
	358	+** * fossil bisect chart
	359	+** * fossil bisect next
	360	+** * fossil bisect options
	361	+** * fossil bisect reset
	362	+** * fossil bisect status
	363	+** * fossil bisect ui
	364	+** * fossil bisect undo
366	365	*/
367	366	void bisect_cmd(void){
368	367	int n;
369	368	const char *zCmd;
370	369	int foundCmd = 0;
371	370

	--- src/bisect.c
	+++ src/bisect.c
	@@ -304,67 +304,66 @@
304	**
305	** Usage: %fossil bisect SUBCOMMAND ...
306	**
307	** Run various subcommands useful for searching for bugs.
308	**
309	** fossil bisect bad ?VERSION?
310	**
311	** Identify version VERSION as non-working. If VERSION is omitted,
312	** the current checkout is marked as non-working.
313	**
314	** fossil bisect good ?VERSION?
315	**
316	** Identify version VERSION as working. If VERSION is omitted,
317	** the current checkout is marked as working.
318	**
319	** fossil bisect log
320	** fossil bisect chart
321	**
322	** Show a log of "good" and "bad" versions. "bisect log" shows the
323	** events in the order that they were tested. "bisect chart" shows
324	** them in order of check-in.
325	**
326	** fossil bisect next
327	**
328	** Update to the next version that is halfway between the working and
329	** non-working versions.
330	**
331	** fossil bisect options ?NAME? ?VALUE?
332	**
333	** List all bisect options, or the value of a single option, or set the
334	** value of a bisect option.
335	**
336	** fossil bisect reset
337	**
338	** Reinitialize a bisect session. This cancels prior bisect history
339	** and allows a bisect session to start over from the beginning.
340	**
341	** fossil bisect vlist\|ls\|status ?-a\|--all?
342	**
343	** List the versions in between "bad" and "good".
344	**
345	** fossil bisect ui
346	**
347	** Like "fossil ui" except start on a timeline that shows only the
348	** check-ins that are part of the current bisect.
349	**
350	** fossil bisect undo
351	**
352	** Undo the most recent "good" or "bad" command.
353	**
354	** Summary:
355	**
356	** fossil bisect bad ?VERSION?
357	** fossil bisect good ?VERSION?
358	** fossil bisect log
359	** fossil bisect chart
360	** fossil bisect next
361	** fossil bisect options
362	** fossil bisect reset
363	** fossil bisect status
364	** fossil bisect ui
365	** fossil bisect undo
366	*/
367	void bisect_cmd(void){
368	int n;
369	const char *zCmd;
370	int foundCmd = 0;
371

	--- src/bisect.c
	+++ src/bisect.c
	@@ -304,67 +304,66 @@
304	**
305	** Usage: %fossil bisect SUBCOMMAND ...
306	**
307	** Run various subcommands useful for searching for bugs.
308	**
309	** > fossil bisect bad ?VERSION?
310	**
311	** Identify version VERSION as non-working. If VERSION is omitted,
312	** the current checkout is marked as non-working.
313	**
314	** > fossil bisect good ?VERSION?
315	**
316	** Identify version VERSION as working. If VERSION is omitted,
317	** the current checkout is marked as working.
318	**
319	** > fossil bisect log
320	** > fossil bisect chart
321	**
322	** Show a log of "good" and "bad" versions. "bisect log" shows the
323	** events in the order that they were tested. "bisect chart" shows
324	** them in order of check-in.
325	**
326	** > fossil bisect next
327	**
328	** Update to the next version that is halfway between the working and
329	** non-working versions.
330	**
331	** > fossil bisect options ?NAME? ?VALUE?
332	**
333	** List all bisect options, or the value of a single option, or set the
334	** value of a bisect option.
335	**
336	** > fossil bisect reset
337	**
338	** Reinitialize a bisect session. This cancels prior bisect history
339	** and allows a bisect session to start over from the beginning.
340	**
341	** > fossil bisect vlist\|ls\|status ?-a\|--all?
342	**
343	** List the versions in between "bad" and "good".
344	**
345	** > fossil bisect ui
346	**
347	** Like "fossil ui" except start on a timeline that shows only the
348	** check-ins that are part of the current bisect.
349	**
350	** > fossil bisect undo
351	**
352	** Undo the most recent "good" or "bad" command.
353	**
354	** Summary:
355	** * fossil bisect bad ?VERSION?
356	** * fossil bisect good ?VERSION?
357	** * fossil bisect log
358	** * fossil bisect chart
359	** * fossil bisect next
360	** * fossil bisect options
361	** * fossil bisect reset
362	** * fossil bisect status
363	** * fossil bisect ui
364	** * fossil bisect undo

365	*/
366	void bisect_cmd(void){
367	int n;
368	const char *zCmd;
369	int foundCmd = 0;
370

M src/branch.c

+6 -5

		--- src/branch.c
		+++ src/branch.c
		@@ -347,27 +347,27 @@
347	347	** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
348	348	**
349	349	** Run various subcommands to manage branches of the open repository or
350	350	** of the repository identified by the -R or --repository option.
351	351	**
352		-** fossil branch current
	352	+** > fossil branch current
353	353	**
354	354	** Print the name of the branch for the current check-out
355	355	**
356		-** fossil branch info BRANCH-NAME
	356	+** > fossil branch info BRANCH-NAME
357	357	**
358	358	** Print information about a branch
359	359	**
360		-** fossil branch list\|ls ?OPTIONS?
	360	+** > fossil branch list\|ls ?OPTIONS?
361	361	**
362	362	** List all branches. Options:
363	363	** -a\|--all List all branches. Default show only open branches
364	364	** -c\|--closed List closed branches.
365	365	** -r Reverse the sort order
366	366	** -t Show recently changed branches first
367	367	**
368		-** fossil branch new BRANCH-NAME BASIS ?OPTIONS?
	368	+** > fossil branch new BRANCH-NAME BASIS ?OPTIONS?
369	369	**
370	370	** Create a new branch BRANCH-NAME off of check-in BASIS.
371	371	** Supported options for this subcommand include:
372	372	** --private branch is private (i.e., remains local)
373	373	** --bgcolor COLOR use COLOR instead of automatic background
		@@ -379,11 +379,12 @@
379	379	** year-month-day form, it may be truncated, the "T" may be
380	380	** replaced by a space, and it may also name a timezone offset
381	381	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
382	382	** Either no timezone suffix or "Z" means UTC.
383	383	**
384		-** Options:
	384	+** Options valid for all subcommands:
	385	+**
385	386	** -R\|--repository FILE Run commands on repository FILE
386	387	**
387	388	** Summary:
388	389	** fossil branch current
389	390	** fossil branch info BRANCH-NAME
390	391

	--- src/branch.c
	+++ src/branch.c
	@@ -347,27 +347,27 @@
347	** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
348	**
349	** Run various subcommands to manage branches of the open repository or
350	** of the repository identified by the -R or --repository option.
351	**
352	** fossil branch current
353	**
354	** Print the name of the branch for the current check-out
355	**
356	** fossil branch info BRANCH-NAME
357	**
358	** Print information about a branch
359	**
360	** fossil branch list\|ls ?OPTIONS?
361	**
362	** List all branches. Options:
363	** -a\|--all List all branches. Default show only open branches
364	** -c\|--closed List closed branches.
365	** -r Reverse the sort order
366	** -t Show recently changed branches first
367	**
368	** fossil branch new BRANCH-NAME BASIS ?OPTIONS?
369	**
370	** Create a new branch BRANCH-NAME off of check-in BASIS.
371	** Supported options for this subcommand include:
372	** --private branch is private (i.e., remains local)
373	** --bgcolor COLOR use COLOR instead of automatic background
	@@ -379,11 +379,12 @@
379	** year-month-day form, it may be truncated, the "T" may be
380	** replaced by a space, and it may also name a timezone offset
381	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
382	** Either no timezone suffix or "Z" means UTC.
383	**
384	** Options:

385	** -R\|--repository FILE Run commands on repository FILE
386	**
387	** Summary:
388	** fossil branch current
389	** fossil branch info BRANCH-NAME
390

	--- src/branch.c
	+++ src/branch.c
	@@ -347,27 +347,27 @@
347	** Usage: %fossil branch SUBCOMMAND ... ?OPTIONS?
348	**
349	** Run various subcommands to manage branches of the open repository or
350	** of the repository identified by the -R or --repository option.
351	**
352	** > fossil branch current
353	**
354	** Print the name of the branch for the current check-out
355	**
356	** > fossil branch info BRANCH-NAME
357	**
358	** Print information about a branch
359	**
360	** > fossil branch list\|ls ?OPTIONS?
361	**
362	** List all branches. Options:
363	** -a\|--all List all branches. Default show only open branches
364	** -c\|--closed List closed branches.
365	** -r Reverse the sort order
366	** -t Show recently changed branches first
367	**
368	** > fossil branch new BRANCH-NAME BASIS ?OPTIONS?
369	**
370	** Create a new branch BRANCH-NAME off of check-in BASIS.
371	** Supported options for this subcommand include:
372	** --private branch is private (i.e., remains local)
373	** --bgcolor COLOR use COLOR instead of automatic background
	@@ -379,11 +379,12 @@
379	** year-month-day form, it may be truncated, the "T" may be
380	** replaced by a space, and it may also name a timezone offset
381	** from UTC as "-HH:MM" (westward) or "+HH:MM" (eastward).
382	** Either no timezone suffix or "Z" means UTC.
383	**
384	** Options valid for all subcommands:
385	**
386	** -R\|--repository FILE Run commands on repository FILE
387	**
388	** Summary:
389	** fossil branch current
390	** fossil branch info BRANCH-NAME
391

M src/bundle.c

+8 -8

		--- src/bundle.c
		+++ src/bundle.c
		@@ -720,23 +720,23 @@
720	720	/*
721	721	** COMMAND: bundle
722	722	**
723	723	** Usage: %fossil bundle SUBCOMMAND ARGS...
724	724	**
725		-** fossil bundle append BUNDLE FILE...
	725	+** > fossil bundle append BUNDLE FILE...
726	726	**
727	727	** Add files named on the command line to BUNDLE. This subcommand has
728	728	** little practical use and is mostly intended for testing.
729	729	**
730		-** fossil bundle cat BUNDLE HASH...
	730	+** > fossil bundle cat BUNDLE HASH...
731	731	**
732	732	** Extract one or more artifacts from the bundle and write them
733	733	** consecutively on standard output. This subcommand was designed
734	734	** for testing and introspection of bundles and is not something
735	735	** commonly used.
736	736	**
737		-** fossil bundle export BUNDLE ?OPTIONS?
	737	+** > fossil bundle export BUNDLE ?OPTIONS?
738	738	**
739	739	** Generate a new bundle, in the file named BUNDLE, that contains a
740	740	** subset of the check-ins in the repository (usually a single branch)
741	741	** described by the --branch, --from, --to, and/or --checkin options,
742	742	** at least one of which is required. If BUNDLE already exists, the
		@@ -744,29 +744,29 @@
744	744	**
745	745	** --branch BRANCH Package all check-ins on BRANCH.
746	746	** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2.
747	747	** --checkin TAG Package the single check-in TAG
748	748	** --standalone Do no use delta-encoding against
749		-** artifacts not in the bundle
	749	+** artifacts not in the bundle
750	750	**
751		-** fossil bundle extend BUNDLE
	751	+** > fossil bundle extend BUNDLE
752	752	**
753	753	** The BUNDLE must already exist. This subcommand adds to the bundle
754	754	** any check-ins that are descendants of check-ins already in the bundle,
755	755	** and any tags that apply to artifacts in the bundle.
756	756	**
757		-** fossil bundle import BUNDLE ?--publish?
	757	+** > fossil bundle import BUNDLE ?--publish?
758	758	**
759	759	** Import all content from BUNDLE into the repository. By default, the
760	760	** imported files are private and will not sync. Use the --publish
761	761	** option to make the import public.
762	762	**
763		-** fossil bundle ls BUNDLE
	763	+** > fossil bundle ls BUNDLE
764	764	**
765	765	** List the contents of BUNDLE on standard output
766	766	**
767		-** fossil bundle purge BUNDLE
	767	+** > fossil bundle purge BUNDLE
768	768	**
769	769	** Remove from the repository all files that are used exclusively
770	770	** by check-ins in BUNDLE. This has the effect of undoing a
771	771	** "fossil bundle import".
772	772	**
773	773

	--- src/bundle.c
	+++ src/bundle.c
	@@ -720,23 +720,23 @@
720	/*
721	** COMMAND: bundle
722	**
723	** Usage: %fossil bundle SUBCOMMAND ARGS...
724	**
725	** fossil bundle append BUNDLE FILE...
726	**
727	** Add files named on the command line to BUNDLE. This subcommand has
728	** little practical use and is mostly intended for testing.
729	**
730	** fossil bundle cat BUNDLE HASH...
731	**
732	** Extract one or more artifacts from the bundle and write them
733	** consecutively on standard output. This subcommand was designed
734	** for testing and introspection of bundles and is not something
735	** commonly used.
736	**
737	** fossil bundle export BUNDLE ?OPTIONS?
738	**
739	** Generate a new bundle, in the file named BUNDLE, that contains a
740	** subset of the check-ins in the repository (usually a single branch)
741	** described by the --branch, --from, --to, and/or --checkin options,
742	** at least one of which is required. If BUNDLE already exists, the
	@@ -744,29 +744,29 @@
744	**
745	** --branch BRANCH Package all check-ins on BRANCH.
746	** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2.
747	** --checkin TAG Package the single check-in TAG
748	** --standalone Do no use delta-encoding against
749	** artifacts not in the bundle
750	**
751	** fossil bundle extend BUNDLE
752	**
753	** The BUNDLE must already exist. This subcommand adds to the bundle
754	** any check-ins that are descendants of check-ins already in the bundle,
755	** and any tags that apply to artifacts in the bundle.
756	**
757	** fossil bundle import BUNDLE ?--publish?
758	**
759	** Import all content from BUNDLE into the repository. By default, the
760	** imported files are private and will not sync. Use the --publish
761	** option to make the import public.
762	**
763	** fossil bundle ls BUNDLE
764	**
765	** List the contents of BUNDLE on standard output
766	**
767	** fossil bundle purge BUNDLE
768	**
769	** Remove from the repository all files that are used exclusively
770	** by check-ins in BUNDLE. This has the effect of undoing a
771	** "fossil bundle import".
772	**
773

	--- src/bundle.c
	+++ src/bundle.c
	@@ -720,23 +720,23 @@
720	/*
721	** COMMAND: bundle
722	**
723	** Usage: %fossil bundle SUBCOMMAND ARGS...
724	**
725	** > fossil bundle append BUNDLE FILE...
726	**
727	** Add files named on the command line to BUNDLE. This subcommand has
728	** little practical use and is mostly intended for testing.
729	**
730	** > fossil bundle cat BUNDLE HASH...
731	**
732	** Extract one or more artifacts from the bundle and write them
733	** consecutively on standard output. This subcommand was designed
734	** for testing and introspection of bundles and is not something
735	** commonly used.
736	**
737	** > fossil bundle export BUNDLE ?OPTIONS?
738	**
739	** Generate a new bundle, in the file named BUNDLE, that contains a
740	** subset of the check-ins in the repository (usually a single branch)
741	** described by the --branch, --from, --to, and/or --checkin options,
742	** at least one of which is required. If BUNDLE already exists, the
	@@ -744,29 +744,29 @@
744	**
745	** --branch BRANCH Package all check-ins on BRANCH.
746	** --from TAG1 --to TAG2 Package check-ins between TAG1 and TAG2.
747	** --checkin TAG Package the single check-in TAG
748	** --standalone Do no use delta-encoding against
749	** artifacts not in the bundle
750	**
751	** > fossil bundle extend BUNDLE
752	**
753	** The BUNDLE must already exist. This subcommand adds to the bundle
754	** any check-ins that are descendants of check-ins already in the bundle,
755	** and any tags that apply to artifacts in the bundle.
756	**
757	** > fossil bundle import BUNDLE ?--publish?
758	**
759	** Import all content from BUNDLE into the repository. By default, the
760	** imported files are private and will not sync. Use the --publish
761	** option to make the import public.
762	**
763	** > fossil bundle ls BUNDLE
764	**
765	** List the contents of BUNDLE on standard output
766	**
767	** > fossil bundle purge BUNDLE
768	**
769	** Remove from the repository all files that are used exclusively
770	** by check-ins in BUNDLE. This has the effect of undoing a
771	** "fossil bundle import".
772	**
773

M src/checkin.c

+52 -52

		--- src/checkin.c
		+++ src/checkin.c
		@@ -822,17 +822,17 @@
822	822	**
823	823	** Pathnames are displayed according to the "relative-paths" setting,
824	824	** unless overridden by the --abs-paths or --rel-paths options.
825	825	**
826	826	** Options:
827		-** --abs-paths Display absolute pathnames.
828		-** --case-sensitive <BOOL> override case-sensitive setting
829		-** --dotfiles include files beginning with a dot (".")
830		-** --header Identify the repository if there are extras
831		-** --ignore <CSG> ignore files matching patterns from the argument
832		-** --rel-paths Display pathnames relative to the current working
833		-** directory.
	827	+** --abs-paths Display absolute pathnames.
	828	+** --case-sensitive BOOL Override case-sensitive setting
	829	+** --dotfiles Include files beginning with a dot (".")
	830	+** --header Identify the repository if there are extras
	831	+** --ignore CSG Ignore files matching patterns from the argument
	832	+** --rel-paths Display pathnames relative to the current working
	833	+** directory.
834	834	**
835	835	** See also: changes, clean, status
836	836	*/
837	837	void extras_cmd(void){
838	838	Blob report = BLOB_INITIALIZER;
		@@ -908,55 +908,55 @@
908	908	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
909	909	** --verily option when you really want to clean up everything. Extreme
910	910	** care should be exercised when using the --verily option.
911	911	**
912	912	** Options:
913		-** --allckouts Check for empty directories within any checkouts
914		-** that may be nested within the current one. This
915		-** option should be used with great care because the
916		-** empty-dirs setting (and other applicable settings)
917		-** belonging to the other repositories, if any, will
918		-** not be checked.
919		-** --case-sensitive <BOOL> override case-sensitive setting
920		-** --dirsonly Only remove empty directories. No files will
921		-** be removed. Using this option will automatically
922		-** enable the --emptydirs option as well.
923		-** --disable-undo WARNING: This option disables use of the undo
924		-** mechanism for this clean operation and should be
925		-** used with extreme caution.
926		-** --dotfiles Include files beginning with a dot (".").
927		-** --emptydirs Remove any empty directories that are not
928		-** explicitly exempted via the empty-dirs setting
929		-** or another applicable setting or command line
930		-** argument. Matching files, if any, are removed
931		-** prior to checking for any empty directories;
932		-** therefore, directories that contain only files
933		-** that were removed will be removed as well.
934		-** -f\|--force Remove files without prompting.
935		-** -i\|--prompt Prompt before removing each file. This option
936		-** implies the --disable-undo option.
937		-** -x\|--verily WARNING: Removes everything that is not a managed
938		-** file or the repository itself. This option
939		-** implies the --force, --emptydirs, --dotfiles, and
940		-** --disable-undo options.
941		-** Furthermore, it completely disregards the keep-glob
942		-** and ignore-glob settings. However, it does honor
943		-** the --ignore and --keep options.
944		-** --clean <CSG> WARNING: Never prompt to delete any files matching
945		-** this comma separated list of glob patterns. Also,
946		-** deletions of any files matching this pattern list
947		-** cannot be undone.
948		-** --ignore <CSG> Ignore files matching patterns from the
949		-** comma separated list of glob patterns.
950		-** --keep <CSG> Keep files matching this comma separated
951		-** list of glob patterns.
952		-** -n\|--dry-run Delete nothing, but display what would have been
953		-** deleted.
954		-** --no-prompt This option disables prompting the user for input
955		-** and assumes an answer of 'No' for every question.
956		-** --temp Remove only Fossil-generated temporary files.
957		-** -v\|--verbose Show all files as they are removed.
	913	+** --allckouts Check for empty directories within any checkouts
	914	+** that may be nested within the current one. This
	915	+** option should be used with great care because the
	916	+** empty-dirs setting (and other applicable settings)
	917	+** belonging to the other repositories, if any, will
	918	+** not be checked.
	919	+** --case-sensitive BOOL Override case-sensitive setting
	920	+** --dirsonly Only remove empty directories. No files will
	921	+** be removed. Using this option will automatically
	922	+** enable the --emptydirs option as well.
	923	+** --disable-undo WARNING: This option disables use of the undo
	924	+** mechanism for this clean operation and should be
	925	+** used with extreme caution.
	926	+** --dotfiles Include files beginning with a dot (".").
	927	+** --emptydirs Remove any empty directories that are not
	928	+** explicitly exempted via the empty-dirs setting
	929	+** or another applicable setting or command line
	930	+** argument. Matching files, if any, are removed
	931	+** prior to checking for any empty directories;
	932	+** therefore, directories that contain only files
	933	+** that were removed will be removed as well.
	934	+** -f\|--force Remove files without prompting.
	935	+** -i\|--prompt Prompt before removing each file. This option
	936	+** implies the --disable-undo option.
	937	+** -x\|--verily WARNING: Removes everything that is not a managed
	938	+** file or the repository itself. This option
	939	+** implies the --force, --emptydirs, --dotfiles, and
	940	+** --disable-undo options. Furthermore, it
	941	+** completely disregards the keep-glob
	942	+** and ignore-glob settings. However, it does honor
	943	+** the --ignore and --keep options.
	944	+** --clean CSG WARNING: Never prompt to delete any files matching
	945	+** this comma separated list of glob patterns. Also,
	946	+** deletions of any files matching this pattern list
	947	+** cannot be undone.
	948	+** --ignore CSG Ignore files matching patterns from the
	949	+** comma separated list of glob patterns.
	950	+** --keep <CSG> Keep files matching this comma separated
	951	+** list of glob patterns.
	952	+** -n\|--dry-run Delete nothing, but display what would have been
	953	+** deleted.
	954	+** --no-prompt This option disables prompting the user for input
	955	+** and assumes an answer of 'No' for every question.
	956	+** --temp Remove only Fossil-generated temporary files.
	957	+** -v\|--verbose Show all files as they are removed.
958	958	**
959	959	** See also: addremove, extras, status
960	960	*/
961	961	void clean_cmd(void){
962	962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963	963

	--- src/checkin.c
	+++ src/checkin.c
	@@ -822,17 +822,17 @@
822	**
823	** Pathnames are displayed according to the "relative-paths" setting,
824	** unless overridden by the --abs-paths or --rel-paths options.
825	**
826	** Options:
827	** --abs-paths Display absolute pathnames.
828	** --case-sensitive <BOOL> override case-sensitive setting
829	** --dotfiles include files beginning with a dot (".")
830	** --header Identify the repository if there are extras
831	** --ignore <CSG> ignore files matching patterns from the argument
832	** --rel-paths Display pathnames relative to the current working
833	** directory.
834	**
835	** See also: changes, clean, status
836	*/
837	void extras_cmd(void){
838	Blob report = BLOB_INITIALIZER;
	@@ -908,55 +908,55 @@
908	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
909	** --verily option when you really want to clean up everything. Extreme
910	** care should be exercised when using the --verily option.
911	**
912	** Options:
913	** --allckouts Check for empty directories within any checkouts
914	** that may be nested within the current one. This
915	** option should be used with great care because the
916	** empty-dirs setting (and other applicable settings)
917	** belonging to the other repositories, if any, will
918	** not be checked.
919	** --case-sensitive <BOOL> override case-sensitive setting
920	** --dirsonly Only remove empty directories. No files will
921	** be removed. Using this option will automatically
922	** enable the --emptydirs option as well.
923	** --disable-undo WARNING: This option disables use of the undo
924	** mechanism for this clean operation and should be
925	** used with extreme caution.
926	** --dotfiles Include files beginning with a dot (".").
927	** --emptydirs Remove any empty directories that are not
928	** explicitly exempted via the empty-dirs setting
929	** or another applicable setting or command line
930	** argument. Matching files, if any, are removed
931	** prior to checking for any empty directories;
932	** therefore, directories that contain only files
933	** that were removed will be removed as well.
934	** -f\|--force Remove files without prompting.
935	** -i\|--prompt Prompt before removing each file. This option
936	** implies the --disable-undo option.
937	** -x\|--verily WARNING: Removes everything that is not a managed
938	** file or the repository itself. This option
939	** implies the --force, --emptydirs, --dotfiles, and
940	** --disable-undo options.
941	** Furthermore, it completely disregards the keep-glob
942	** and ignore-glob settings. However, it does honor
943	** the --ignore and --keep options.
944	** --clean <CSG> WARNING: Never prompt to delete any files matching
945	** this comma separated list of glob patterns. Also,
946	** deletions of any files matching this pattern list
947	** cannot be undone.
948	** --ignore <CSG> Ignore files matching patterns from the
949	** comma separated list of glob patterns.
950	** --keep <CSG> Keep files matching this comma separated
951	** list of glob patterns.
952	** -n\|--dry-run Delete nothing, but display what would have been
953	** deleted.
954	** --no-prompt This option disables prompting the user for input
955	** and assumes an answer of 'No' for every question.
956	** --temp Remove only Fossil-generated temporary files.
957	** -v\|--verbose Show all files as they are removed.
958	**
959	** See also: addremove, extras, status
960	*/
961	void clean_cmd(void){
962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963

	--- src/checkin.c
	+++ src/checkin.c
	@@ -822,17 +822,17 @@
822	**
823	** Pathnames are displayed according to the "relative-paths" setting,
824	** unless overridden by the --abs-paths or --rel-paths options.
825	**
826	** Options:
827	** --abs-paths Display absolute pathnames.
828	** --case-sensitive BOOL Override case-sensitive setting
829	** --dotfiles Include files beginning with a dot (".")
830	** --header Identify the repository if there are extras
831	** --ignore CSG Ignore files matching patterns from the argument
832	** --rel-paths Display pathnames relative to the current working
833	** directory.
834	**
835	** See also: changes, clean, status
836	*/
837	void extras_cmd(void){
838	Blob report = BLOB_INITIALIZER;
	@@ -908,55 +908,55 @@
908	** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the
909	** --verily option when you really want to clean up everything. Extreme
910	** care should be exercised when using the --verily option.
911	**
912	** Options:
913	** --allckouts Check for empty directories within any checkouts
914	** that may be nested within the current one. This
915	** option should be used with great care because the
916	** empty-dirs setting (and other applicable settings)
917	** belonging to the other repositories, if any, will
918	** not be checked.
919	** --case-sensitive BOOL Override case-sensitive setting
920	** --dirsonly Only remove empty directories. No files will
921	** be removed. Using this option will automatically
922	** enable the --emptydirs option as well.
923	** --disable-undo WARNING: This option disables use of the undo
924	** mechanism for this clean operation and should be
925	** used with extreme caution.
926	** --dotfiles Include files beginning with a dot (".").
927	** --emptydirs Remove any empty directories that are not
928	** explicitly exempted via the empty-dirs setting
929	** or another applicable setting or command line
930	** argument. Matching files, if any, are removed
931	** prior to checking for any empty directories;
932	** therefore, directories that contain only files
933	** that were removed will be removed as well.
934	** -f\|--force Remove files without prompting.
935	** -i\|--prompt Prompt before removing each file. This option
936	** implies the --disable-undo option.
937	** -x\|--verily WARNING: Removes everything that is not a managed
938	** file or the repository itself. This option
939	** implies the --force, --emptydirs, --dotfiles, and
940	** --disable-undo options. Furthermore, it
941	** completely disregards the keep-glob
942	** and ignore-glob settings. However, it does honor
943	** the --ignore and --keep options.
944	** --clean CSG WARNING: Never prompt to delete any files matching
945	** this comma separated list of glob patterns. Also,
946	** deletions of any files matching this pattern list
947	** cannot be undone.
948	** --ignore CSG Ignore files matching patterns from the
949	** comma separated list of glob patterns.
950	** --keep <CSG> Keep files matching this comma separated
951	** list of glob patterns.
952	** -n\|--dry-run Delete nothing, but display what would have been
953	** deleted.
954	** --no-prompt This option disables prompting the user for input
955	** and assumes an answer of 'No' for every question.
956	** --temp Remove only Fossil-generated temporary files.
957	** -v\|--verbose Show all files as they are removed.
958	**
959	** See also: addremove, extras, status
960	*/
961	void clean_cmd(void){
962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963

M src/clone.c

+17 -13

		--- src/clone.c
		+++ src/clone.c
		@@ -85,27 +85,31 @@
85	85	** Usage: %fossil clone ?OPTIONS? URI FILENAME
86	86	**
87	87	** Make a clone of a repository specified by URI in the local
88	88	** file named FILENAME.
89	89	**
90		-** URI may be one of the following form: ([...] mean optional)
91		-** HTTP/HTTPS protocol:
92		-** http[s]://[userid[:password]@]host[:port][/path]
93		-**
94		-** SSH protocol:
95		-** ssh://[userid@]host[:port]/path/to/repo.fossil\\
96		-** [?fossil=path/to/fossil.exe]
97		-**
98		-** Filesystem:
99		-** [file://]path/to/repo.fossil
	90	+** URI may be one of the following forms:
	91	+** ([...] denotes optional elements):
	92	+**
	93	+** * HTTP/HTTPS protocol:
	94	+**
	95	+** http[s]://[userid[:password]@]host[:port][/path]
	96	+**
	97	+** * SSH protocol:
	98	+**
	99	+** ssh://[userid@]host[:port]/path/to/repo.fossil[?fossil=path/fossil.exe]
	100	+**
	101	+** * Filesystem:
	102	+**
	103	+** [file://]path/to/repo.fossil
100	104	**
101	105	** Note 1: For ssh and filesystem, path must have an extra leading
102		-** '/' to use an absolute path.
	106	+** '/' to use an absolute path.
103	107	**
104	108	** Note 2: Use %HH escapes for special characters in the userid and
105		-** password. For example "%40" in place of "@", "%2f" in place
106		-** of "/", and "%3a" in place of ":".
	109	+** password. For example "%40" in place of "@", "%2f" in place
	110	+** of "/", and "%3a" in place of ":".
107	111	**
108	112	** By default, your current login name is used to create the default
109	113	** admin user. This can be overridden using the -A\|--admin-user
110	114	** parameter.
111	115	**
112	116

	--- src/clone.c
	+++ src/clone.c
	@@ -85,27 +85,31 @@
85	** Usage: %fossil clone ?OPTIONS? URI FILENAME
86	**
87	** Make a clone of a repository specified by URI in the local
88	** file named FILENAME.
89	**
90	** URI may be one of the following form: ([...] mean optional)
91	** HTTP/HTTPS protocol:
92	** http[s]://[userid[:password]@]host[:port][/path]
93	**
94	** SSH protocol:
95	** ssh://[userid@]host[:port]/path/to/repo.fossil\\
96	** [?fossil=path/to/fossil.exe]
97	**
98	** Filesystem:
99	** [file://]path/to/repo.fossil




100	**
101	** Note 1: For ssh and filesystem, path must have an extra leading
102	** '/' to use an absolute path.
103	**
104	** Note 2: Use %HH escapes for special characters in the userid and
105	** password. For example "%40" in place of "@", "%2f" in place
106	** of "/", and "%3a" in place of ":".
107	**
108	** By default, your current login name is used to create the default
109	** admin user. This can be overridden using the -A\|--admin-user
110	** parameter.
111	**
112

	--- src/clone.c
	+++ src/clone.c
	@@ -85,27 +85,31 @@
85	** Usage: %fossil clone ?OPTIONS? URI FILENAME
86	**
87	** Make a clone of a repository specified by URI in the local
88	** file named FILENAME.
89	**
90	** URI may be one of the following forms:
91	** ([...] denotes optional elements):
92	**
93	** * HTTP/HTTPS protocol:
94	**
95	** http[s]://[userid[:password]@]host[:port][/path]
96	**
97	** * SSH protocol:
98	**
99	** ssh://[userid@]host[:port]/path/to/repo.fossil[?fossil=path/fossil.exe]
100	**
101	** * Filesystem:
102	**
103	** [file://]path/to/repo.fossil
104	**
105	** Note 1: For ssh and filesystem, path must have an extra leading
106	** '/' to use an absolute path.
107	**
108	** Note 2: Use %HH escapes for special characters in the userid and
109	** password. For example "%40" in place of "@", "%2f" in place
110	** of "/", and "%3a" in place of ":".
111	**
112	** By default, your current login name is used to create the default
113	** admin user. This can be overridden using the -A\|--admin-user
114	** parameter.
115	**
116

M src/configure.c

+7 -7

		--- src/configure.c
		+++ src/configure.c
		@@ -704,47 +704,47 @@
704	704	** Usage: %fossil configuration METHOD ... ?OPTIONS?
705	705	**
706	706	** Where METHOD is one of: export import merge pull push reset. All methods
707	707	** accept the -R or --repository option to specify a repository.
708	708	**
709		-** %fossil configuration export AREA FILENAME
	709	+** > fossil configuration export AREA FILENAME
710	710	**
711	711	** Write to FILENAME exported configuration information for AREA.
712	712	** AREA can be one of:
713	713	**
714	714	** all email project shun skin ticket user alias subscriber
715	715	**
716		-** %fossil configuration import FILENAME
	716	+** > fossil configuration import FILENAME
717	717	**
718	718	** Read a configuration from FILENAME, overwriting the current
719	719	** configuration.
720	720	**
721		-** %fossil configuration merge FILENAME
	721	+** > fossil configuration merge FILENAME
722	722	**
723	723	** Read a configuration from FILENAME and merge its values into
724	724	** the current configuration. Existing values take priority over
725	725	** values read from FILENAME.
726	726	**
727		-** %fossil configuration pull AREA ?URL?
	727	+** > fossil configuration pull AREA ?URL?
728	728	**
729	729	** Pull and install the configuration from a different server
730	730	** identified by URL. If no URL is specified, then the default
731	731	** server is used. Use the --overwrite flag to completely
732	732	** replace local settings with content received from URL.
733	733	**
734		-** %fossil configuration push AREA ?URL?
	734	+** > fossil configuration push AREA ?URL?
735	735	**
736	736	** Push the local configuration into the remote server identified
737	737	** by URL. Admin privilege is required on the remote server for
738	738	** this to work. When the same record exists both locally and on
739	739	** the remote end, the one that was most recently changed wins.
740	740	**
741		-** %fossil configuration reset AREA
	741	+** > fossil configuration reset AREA
742	742	**
743	743	** Restore the configuration to the default. AREA as above.
744	744	**
745		-** %fossil configuration sync AREA ?URL?
	745	+** > fossil configuration sync AREA ?URL?
746	746	**
747	747	** Synchronize configuration changes in the local repository with
748	748	** the remote repository at URL.
749	749	**
750	750	** Options:
751	751

	--- src/configure.c
	+++ src/configure.c
	@@ -704,47 +704,47 @@
704	** Usage: %fossil configuration METHOD ... ?OPTIONS?
705	**
706	** Where METHOD is one of: export import merge pull push reset. All methods
707	** accept the -R or --repository option to specify a repository.
708	**
709	** %fossil configuration export AREA FILENAME
710	**
711	** Write to FILENAME exported configuration information for AREA.
712	** AREA can be one of:
713	**
714	** all email project shun skin ticket user alias subscriber
715	**
716	** %fossil configuration import FILENAME
717	**
718	** Read a configuration from FILENAME, overwriting the current
719	** configuration.
720	**
721	** %fossil configuration merge FILENAME
722	**
723	** Read a configuration from FILENAME and merge its values into
724	** the current configuration. Existing values take priority over
725	** values read from FILENAME.
726	**
727	** %fossil configuration pull AREA ?URL?
728	**
729	** Pull and install the configuration from a different server
730	** identified by URL. If no URL is specified, then the default
731	** server is used. Use the --overwrite flag to completely
732	** replace local settings with content received from URL.
733	**
734	** %fossil configuration push AREA ?URL?
735	**
736	** Push the local configuration into the remote server identified
737	** by URL. Admin privilege is required on the remote server for
738	** this to work. When the same record exists both locally and on
739	** the remote end, the one that was most recently changed wins.
740	**
741	** %fossil configuration reset AREA
742	**
743	** Restore the configuration to the default. AREA as above.
744	**
745	** %fossil configuration sync AREA ?URL?
746	**
747	** Synchronize configuration changes in the local repository with
748	** the remote repository at URL.
749	**
750	** Options:
751

	--- src/configure.c
	+++ src/configure.c
	@@ -704,47 +704,47 @@
704	** Usage: %fossil configuration METHOD ... ?OPTIONS?
705	**
706	** Where METHOD is one of: export import merge pull push reset. All methods
707	** accept the -R or --repository option to specify a repository.
708	**
709	** > fossil configuration export AREA FILENAME
710	**
711	** Write to FILENAME exported configuration information for AREA.
712	** AREA can be one of:
713	**
714	** all email project shun skin ticket user alias subscriber
715	**
716	** > fossil configuration import FILENAME
717	**
718	** Read a configuration from FILENAME, overwriting the current
719	** configuration.
720	**
721	** > fossil configuration merge FILENAME
722	**
723	** Read a configuration from FILENAME and merge its values into
724	** the current configuration. Existing values take priority over
725	** values read from FILENAME.
726	**
727	** > fossil configuration pull AREA ?URL?
728	**
729	** Pull and install the configuration from a different server
730	** identified by URL. If no URL is specified, then the default
731	** server is used. Use the --overwrite flag to completely
732	** replace local settings with content received from URL.
733	**
734	** > fossil configuration push AREA ?URL?
735	**
736	** Push the local configuration into the remote server identified
737	** by URL. Admin privilege is required on the remote server for
738	** this to work. When the same record exists both locally and on
739	** the remote end, the one that was most recently changed wins.
740	**
741	** > fossil configuration reset AREA
742	**
743	** Restore the configuration to the default. AREA as above.
744	**
745	** > fossil configuration sync AREA ?URL?
746	**
747	** Synchronize configuration changes in the local repository with
748	** the remote repository at URL.
749	**
750	** Options:
751

M src/diff.c

+10 -10

		--- src/diff.c
		+++ src/diff.c
		@@ -2399,19 +2399,19 @@
2399	2399	** Query parameters:
2400	2400	**
2401	2401	** checkin=ID The check-in at which to start the annotation
2402	2402	** filename=FILENAME The filename.
2403	2403	** filevers=BOOLEAN Show file versions rather than check-in versions
2404		-** limit=LIMIT Limit the amount of analysis:
2405		-** "none" No limit
2406		-** "Xs" As much as can be computed in X seconds
2407		-** "N" N versions
	2404	+** limit=LIMIT Limit the amount of analysis. LIMIT can be one of:
	2405	+** none No limit
	2406	+** Xs As much as can be computed in X seconds
	2407	+** N N versions
2408	2408	** log=BOOLEAN Show a log of versions analyzed
2409	2409	** origin=ID The origin checkin. If unspecified, the root
2410		-** check-in over the entire repository is used.
2411		-** Specify "origin=trunk" or similar for a reverse
2412		-** annotation
	2410	+** check-in over the entire repository is used.
	2411	+** Specify "origin=trunk" or similar for a reverse
	2412	+** annotation
2413	2413	** w=BOOLEAN Ignore whitespace
2414	2414	*/
2415	2415	void annotation_page(void){
2416	2416	int i;
2417	2417	const char zLimit; / Depth limit */
		@@ -2586,17 +2586,17 @@
2586	2586	** Options:
2587	2587	** --filevers Show file version numbers rather than
2588	2588	** check-in versions
2589	2589	** -r\|--revision VERSION The specific check-in containing the file
2590	2590	** -l\|--log List all versions analyzed
2591		-** -n\|--limit LIMIT Limit the amount of analysis:
	2591	+** -n\|--limit LIMIT LIMIT can be one of:
2592	2592	** N Up to N versions
2593	2593	** Xs As much as possible in X seconds
2594	2594	** none No limit
2595	2595	** -o\|--origin VERSION The origin check-in. By default this is the
2596		-** root of the repository. Set to "trunk" or
2597		-** similar for a reverse annotation.
	2596	+** root of the repository. Set to "trunk" or
	2597	+** similar for a reverse annotation.
2598	2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	2600	**
2601	2601	** See also: info, finfo, timeline
2602	2602	*/
2603	2603

	--- src/diff.c
	+++ src/diff.c
	@@ -2399,19 +2399,19 @@
2399	** Query parameters:
2400	**
2401	** checkin=ID The check-in at which to start the annotation
2402	** filename=FILENAME The filename.
2403	** filevers=BOOLEAN Show file versions rather than check-in versions
2404	** limit=LIMIT Limit the amount of analysis:
2405	** "none" No limit
2406	** "Xs" As much as can be computed in X seconds
2407	** "N" N versions
2408	** log=BOOLEAN Show a log of versions analyzed
2409	** origin=ID The origin checkin. If unspecified, the root
2410	** check-in over the entire repository is used.
2411	** Specify "origin=trunk" or similar for a reverse
2412	** annotation
2413	** w=BOOLEAN Ignore whitespace
2414	*/
2415	void annotation_page(void){
2416	int i;
2417	const char zLimit; / Depth limit */
	@@ -2586,17 +2586,17 @@
2586	** Options:
2587	** --filevers Show file version numbers rather than
2588	** check-in versions
2589	** -r\|--revision VERSION The specific check-in containing the file
2590	** -l\|--log List all versions analyzed
2591	** -n\|--limit LIMIT Limit the amount of analysis:
2592	** N Up to N versions
2593	** Xs As much as possible in X seconds
2594	** none No limit
2595	** -o\|--origin VERSION The origin check-in. By default this is the
2596	** root of the repository. Set to "trunk" or
2597	** similar for a reverse annotation.
2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	**
2601	** See also: info, finfo, timeline
2602	*/
2603

	--- src/diff.c
	+++ src/diff.c
	@@ -2399,19 +2399,19 @@
2399	** Query parameters:
2400	**
2401	** checkin=ID The check-in at which to start the annotation
2402	** filename=FILENAME The filename.
2403	** filevers=BOOLEAN Show file versions rather than check-in versions
2404	** limit=LIMIT Limit the amount of analysis. LIMIT can be one of:
2405	** none No limit
2406	** Xs As much as can be computed in X seconds
2407	** N N versions
2408	** log=BOOLEAN Show a log of versions analyzed
2409	** origin=ID The origin checkin. If unspecified, the root
2410	** check-in over the entire repository is used.
2411	** Specify "origin=trunk" or similar for a reverse
2412	** annotation
2413	** w=BOOLEAN Ignore whitespace
2414	*/
2415	void annotation_page(void){
2416	int i;
2417	const char zLimit; / Depth limit */
	@@ -2586,17 +2586,17 @@
2586	** Options:
2587	** --filevers Show file version numbers rather than
2588	** check-in versions
2589	** -r\|--revision VERSION The specific check-in containing the file
2590	** -l\|--log List all versions analyzed
2591	** -n\|--limit LIMIT LIMIT can be one of:
2592	** N Up to N versions
2593	** Xs As much as possible in X seconds
2594	** none No limit
2595	** -o\|--origin VERSION The origin check-in. By default this is the
2596	** root of the repository. Set to "trunk" or
2597	** similar for a reverse annotation.
2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	**
2601	** See also: info, finfo, timeline
2602	*/
2603

M src/dispatch.c

+243 -44

		--- src/dispatch.c
		+++ src/dispatch.c
		@@ -216,35 +216,224 @@
216	216	if( strncmp(zPrefix, aCommand[i].zName, nPrefix)==0 ){
217	217	blob_appendf(pList, " %s", aCommand[i].zName);
218	218	}
219	219	}
220	220	}
	221	+
	222	+/*
	223	+** Return the index of the first non-space character that follows
	224	+** a span of two or more spaces. Return 0 if there is not gap.
	225	+*/
	226	+static int hasGap(const char *z, int n){
	227	+ int i;
	228	+ for(i=3; i<n-1; i++){
	229	+ if( z[i]==' ' && z[i+1]!=' ' && z[i-1]==' ' && z[i-2]!='.' ) return i+1;
	230	+ }
	231	+ return 0 ;
	232	+}
	233	+
	234	+/*
	235	+** Append text to pOut, adding formatting markup. Terms that
	236	+** have all lower-case letters are within <tt>..</tt>. Terms
	237	+** that have all upper-case letters are within <i>..</i>.
	238	+*/
	239	+static void appendMixedFont(Blob pOut, const char z, int n){
	240	+ const char *zEnd = "";
	241	+ int i = 0;
	242	+ int j;
	243	+ while( i<n ){
	244	+ if( z[i]==' ' \|\| z[j]=='=' ){
	245	+ for(j=i+1; j<n && (z[j]==' ' \|\| z[j]=='='); j++){}
	246	+ blob_append(pOut, z+i, j-i);
	247	+ i = j;
	248	+ }else{
	249	+ for(j=i; j<n && z[j]!=' ' && z[j]!='=' && !fossil_isalpha(z[j]); j++){}
	250	+ if( j>=n \|\| z[j]==' ' \|\| z[j]=='=' ){
	251	+ zEnd = "";
	252	+ }else{
	253	+ if( fossil_isupper(z[j]) ){
	254	+ blob_append(pOut, "<i>",3);
	255	+ zEnd = "</i>";
	256	+ }else{
	257	+ blob_append(pOut, "<tt>", 4);
	258	+ zEnd = "</tt>";
	259	+ }
	260	+ }
	261	+ while( j<n && z[j]!=' ' && z[j]!='=' ){ j++; }
	262	+ blob_appendf(pOut, "%#h", j-i, z+i);
	263	+ if( zEnd[0] ) blob_append(pOut, zEnd, -1);
	264	+ i = j;
	265	+ }
	266	+ }
	267	+}
221	268
222	269	/*
223	270	** Attempt to reformat plain-text help into HTML for display on a webpage.
224	271	**
225	272	** The HTML output is appended to Blob pHtml, which should already be
226	273	** initialized.
	274	+**
	275	+** Formatting rules:
	276	+**
	277	+** * Bullet lists are indented from the surrounding text by
	278	+** at least one space. Each bullet begins with " * ".
	279	+**
	280	+** * Display lists are indented from the surrounding text.
	281	+** Each tag begins with "-" or occur on a line that is
	282	+** followed by two spaces and a non-space. <dd> elements can begin
	283	+** on the same line as long as they are separated by at least
	284	+** two spaces.
	285	+**
	286	+** * Indented text is show verbatim (<pre>...</pre>)
227	287	*/
228	288	static void help_to_html(const char zHelp, Blob pHtml){
229		- char *s;
230		- char *d;
231		- char *z;
232		-
233		- /* Transform "%fossil" into just "fossil" */
234		- z = s = d = mprintf("%s", zHelp);
235		- while( *s ){
236		- if( *s=='%' && strncmp(s, "%fossil", 7)==0 ){
237		- s++;
238		- }else{
239		- d++ = s++;
240		- }
241		- }
242		- *d = 0;
243		-
244		- blob_appendf(pHtml, "<pre>\n%h\n</pre>\n", z);
245		- fossil_free(z);
	289	+ int i;
	290	+ char c;
	291	+ int nIndent = 0;
	292	+ int wantP = 0;
	293	+ int wantBR = 0;
	294	+ int aIndent[10];
	295	+ const char *azEnd[10];
	296	+ int iLevel = 0;
	297	+ int isLI = 0;
	298	+ int isDT = 0;
	299	+ static const char *zEndDL = "</dl></blockquote>";
	300	+ static const char *zEndPRE = "</pre></blockquote>";
	301	+ static const char *zEndUL = "</ul>";
	302	+ static const char *zEndDD = "</dd>";
	303	+
	304	+ aIndent[0] = 0;
	305	+ azEnd[0] = "";
	306	+ while( zHelp[0] ){
	307	+ i = 0;
	308	+ while( (c = zHelp[i])!=0
	309	+ && c!='\n'
	310	+ && (c!='%' \|\| strncmp(zHelp+i,"%fossil",7)!=0)
	311	+ ){ i++; }
	312	+ if( c=='%' ){
	313	+ if( i ) blob_appendf(pHtml, "%#h", i, zHelp);
	314	+ zHelp += i + 1;
	315	+ i = 0;
	316	+ wantBR = 1;
	317	+ continue;
	318	+ }
	319	+ if( i>2 && zHelp[0]=='>' && zHelp[1]==' ' ){
	320	+ isDT = 1;
	321	+ for(nIndent=1; nIndent<i && zHelp[nIndent]==' '; nIndent++){}
	322	+ }else{
	323	+ isDT = 0;
	324	+ for(nIndent=0; nIndent<i && zHelp[nIndent]==' '; nIndent++){}
	325	+ }
	326	+ if( nIndent==i ){
	327	+ if( c==0 ) break;
	328	+ blob_append(pHtml, "\n", 1);
	329	+ wantP = 1;
	330	+ wantBR = 0;
	331	+ zHelp += i+1;
	332	+ continue;
	333	+ }
	334	+ if( nIndent+2<i && zHelp[nIndent]=='*' && zHelp[nIndent+1]==' ' ){
	335	+ nIndent += 2;
	336	+ while( nIndent<i && zHelp[nIndent]==' '){ nIndent++; }
	337	+ isLI = 1;
	338	+ }else{
	339	+ isLI = 0;
	340	+ }
	341	+ while( iLevel>0 && aIndent[iLevel]>nIndent ){
	342	+ blob_append(pHtml, azEnd[iLevel--], -1);
	343	+ }
	344	+ if( nIndent>aIndent[iLevel] ){
	345	+ assert( iLevel<ArraySize(aIndent)-2 );
	346	+ if( isLI ){
	347	+ iLevel++;
	348	+ aIndent[iLevel] = nIndent;
	349	+ azEnd[iLevel] = zEndUL;
	350	+ blob_append(pHtml, "<ul>\n", 5);
	351	+ }else if( isDT
	352	+ \|\| zHelp[nIndent]=='-'
	353	+ \|\| hasGap(zHelp+nIndent,i-nIndent) ){
	354	+ iLevel++;
	355	+ aIndent[iLevel] = nIndent;
	356	+ azEnd[iLevel] = zEndDL;
	357	+ blob_append(pHtml, "<blockquote><dl>\n", -1);
	358	+ }else if( azEnd[iLevel]==zEndDL ){
	359	+ iLevel++;
	360	+ aIndent[iLevel] = nIndent;
	361	+ azEnd[iLevel] = zEndDD;
	362	+ blob_append(pHtml, "<dd>", 4);
	363	+ }else if( wantP ){
	364	+ iLevel++;
	365	+ aIndent[iLevel] = nIndent;
	366	+ azEnd[iLevel] = zEndPRE;
	367	+ blob_append(pHtml, "<blockquote><pre>", -1);
	368	+ wantP = 0;
	369	+ }
	370	+ }
	371	+ if( isLI ){
	372	+ blob_append(pHtml, "<li> ", 5);
	373	+ }
	374	+ if( wantP ){
	375	+ blob_append(pHtml, "<p> ", 4);
	376	+ wantP = 0;
	377	+ }
	378	+ if( azEnd[iLevel]==zEndDL ){
	379	+ int iDD;
	380	+ blob_append(pHtml, "<dt> ", 5);
	381	+ iDD = hasGap(zHelp+nIndent, i-nIndent);
	382	+ if( iDD ){
	383	+ int x;
	384	+ assert( iLevel<ArraySize(aIndent)-1 );
	385	+ iLevel++;
	386	+ aIndent[iLevel] = x = nIndent+iDD;
	387	+ azEnd[iLevel] = zEndDD;
	388	+ appendMixedFont(pHtml, zHelp+nIndent, iDD-2);
	389	+ blob_appendf(pHtml, "</dt><dd>%#h\n", i-x, zHelp+x);
	390	+ }else{
	391	+ appendMixedFont(pHtml, zHelp+nIndent, i-nIndent);
	392	+ blob_append(pHtml, "</dt>\n", 6);
	393	+ }
	394	+ }else if( wantBR ){
	395	+ appendMixedFont(pHtml, zHelp+nIndent, i-nIndent);
	396	+ blob_append(pHtml, "<br>\n", 5);
	397	+ wantBR = 0;
	398	+ }else{
	399	+ blob_appendf(pHtml, "%#h\n", i-nIndent, zHelp+nIndent);
	400	+ }
	401	+ zHelp += i+1;
	402	+ i = 0;
	403	+ if( c==0 ) break;
	404	+ }
	405	+ while( iLevel>0 ){
	406	+ blob_appendf(pHtml, "%s\n", azEnd[iLevel--]);
	407	+ }
	408	+}
	409	+
	410	+/*
	411	+** Format help text for TTY display.
	412	+*/
	413	+static void help_to_text(const char zHelp, Blob pText){
	414	+ int i;
	415	+ char c;
	416	+ for(i=0; (c = zHelp[i])!=0; i++){
	417	+ if( c=='%' && strncmp(zHelp+i,"%fossil",7)==0 ){
	418	+ if( i>0 ) blob_append(pText, zHelp, i);
	419	+ blob_append(pText, "fossil", 6);
	420	+ zHelp += i+7;
	421	+ i = -1;
	422	+ continue;
	423	+ }
	424	+ if( c=='\n' && strncmp(zHelp+i+1,"> ",2)==0 ){
	425	+ blob_append(pText, zHelp, i+1);
	426	+ blob_append(pText, " ", 1);
	427	+ zHelp += i+2;
	428	+ i = -1;
	429	+ continue;
	430	+ }
	431	+ }
	432	+ if( i>0 ){
	433	+ blob_append(pText, zHelp, i);
	434	+ }
246	435	}
247	436
248	437	/*
249	438	** COMMAND: test-all-help
250	439	**
		@@ -292,19 +481,24 @@
292	481	}else{
293	482	fossil_print("---\n");
294	483	}
295	484	for(i=0; i<MX_COMMAND; i++){
296	485	if( (aCommand[i].eCmdFlags & mask)==0 ) continue;
297		- fossil_print("# %s\n", aCommand[i].zName);
298	486	if( useHtml ){
299	487	Blob html;
300		- blob_zero(&html);
	488	+ blob_init(&html, 0, 0);
301	489	help_to_html(aCommand[i].zHelp, &html);
302		- fossil_print("%s\n\n", blob_str(&html));
	490	+ fossil_print("<h1>%h</h1>\n", aCommand[i].zName);
	491	+ fossil_print("%s\n<hr>\n", blob_str(&html));
303	492	blob_reset(&html);
304	493	}else{
305		- fossil_print("%s\n\n", aCommand[i].zHelp);
	494	+ Blob txt;
	495	+ blob_init(&txt, 0, 0);
	496	+ help_to_text(aCommand[i].zHelp, &txt);
	497	+ fossil_print("# %s\n", aCommand[i].zName);
	498	+ fossil_print("%s\n\n", blob_str(&txt));
	499	+ blob_reset(&txt);
306	500	}
307	501	}
308	502	if( useHtml ){
309	503	fossil_print("<!-- end_all_help -->\n");
310	504	}else{
		@@ -479,13 +673,13 @@
479	673	@ ambiguous command prefix: %h(zCmd)
480	674	}else{
481	675	if( pCmd->zHelp[0]==0 ){
482	676	@ No help available for "%h(pCmd->zName)"
483	677	}else{
484		- @ <blockquote>
	678	+ @ <div class="helpPage">
485	679	help_to_html(pCmd->zHelp, cgi_output_blob());
486		- @ </blockquote>
	680	+ @ </div>
487	681	}
488	682	}
489	683	}else{
490	684	int i;
491	685
		@@ -689,31 +883,37 @@
689	883	;
690	884
691	885	/*
692	886	** COMMAND: help
693	887	**
694		-** Usage: %fossil help TOPIC
695		-** or: %fossil TOPIC --help
	888	+** Usage: %fossil help [OPTIONS] [TOPIC]
696	889	**
697	890	** Display information on how to use TOPIC, which may be a command, webpage, or
698		-** setting. Webpage names begin with "/". To display a list of available
699		-** topics, use one of:
	891	+** setting. Webpage names begin with "/". If TOPIC is omitted, a list of
	892	+** topics is returned.
	893	+**
	894	+** The following options can be used when TOPIC is omitted:
	895	+**
	896	+** -a\|--all List both command and auxiliary commands
	897	+** -o\|--options List command-line options common to all commands
	898	+** -s\|--setting List setting names
	899	+** -t\|--test List unsupported "test" commands
	900	+** -x\|--aux List only auxiliary commands
	901	+** -w\|--www List all web pages
	902	+**
	903	+** These options can be used when TOPIC is present:
700	904	**
701		-** %fossil help Show common commands
702		-** %fossil help -a\|--all Show both common and auxiliary commands
703		-** %fossil help -o\|--options Show command-line options common to all cmds
704		-** %fossil help -s\|--setting Show setting names
705		-** %fossil help -t\|--test Show test commands only
706		-** %fossil help -x\|--aux Show auxiliary commands only
707		-** %fossil help -w\|--www Show list of webpages
	905	+** -h\|--html Format output as HTML rather than plain text
708	906	*/
709	907	void help_cmd(void){
710	908	int rc;
711	909	int isPage = 0;
712	910	const char *z;
713	911	const char *zCmdOrPage;
714	912	const CmdOrPage *pCmd = 0;
	913	+ int useHtml = 0;
	914	+ Blob txt;
715	915	if( g.argc<3 ){
716	916	z = g.argv[0];
717	917	fossil_print(
718	918	"Usage: %s help TOPIC\n"
719	919	"Common commands: (use \"%s help help\" for more options)\n",
		@@ -744,10 +944,11 @@
744	944	}
745	945	else if( find_option("setting","s",0) ){
746	946	command_list(0, CMDFLAG_SETTING);
747	947	return;
748	948	}
	949	+ useHtml = find_option("html","h",0)!=0;
749	950	isPage = ('/' == *g.argv[2]) ? 1 : 0;
750	951	if(isPage){
751	952	zCmdOrPage = "page";
752	953	}else{
753	954	zCmdOrPage = "command or setting";
		@@ -782,20 +983,18 @@
782	983	fossil_print("Setting: \"%s\"%s\n\n",
783	984	pCmd->zName,
784	985	(pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : ""
785	986	);
786	987	}
787		- while( *z ){
788		- if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){
789		- fossil_print("%s", g.argv[0]);
790		- z += 7;
791		- }else{
792		- putchar(*z);
793		- z++;
794		- }
795		- }
796		- putchar('\n');
	988	+ blob_init(&txt, 0, 0);
	989	+ if( useHtml ){
	990	+ help_to_html(z, &txt);
	991	+ }else{
	992	+ help_to_text(z, &txt);
	993	+ }
	994	+ fossil_print("%s\n", blob_str(&txt));
	995	+ blob_reset(&txt);
797	996	}
798	997
799	998	/*
800	999	** Return a pointer to the setting information array.
801	1000	**
802	1001

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -216,35 +216,224 @@
216	if( strncmp(zPrefix, aCommand[i].zName, nPrefix)==0 ){
217	blob_appendf(pList, " %s", aCommand[i].zName);
218	}
219	}
220	}















































221
222	/*
223	** Attempt to reformat plain-text help into HTML for display on a webpage.
224	**
225	** The HTML output is appended to Blob pHtml, which should already be
226	** initialized.













227	*/
228	static void help_to_html(const char zHelp, Blob pHtml){
229	char *s;
230	char *d;
231	char *z;
232
233	/* Transform "%fossil" into just "fossil" */
234	z = s = d = mprintf("%s", zHelp);
235	while( *s ){
236	if( *s=='%' && strncmp(s, "%fossil", 7)==0 ){
237	s++;
238	}else{
239	d++ = s++;
240	}
241	}
242	*d = 0;
243
244	blob_appendf(pHtml, "<pre>\n%h\n</pre>\n", z);
245	fossil_free(z);

































































































































246	}
247
248	/*
249	** COMMAND: test-all-help
250	**
	@@ -292,19 +481,24 @@
292	}else{
293	fossil_print("---\n");
294	}
295	for(i=0; i<MX_COMMAND; i++){
296	if( (aCommand[i].eCmdFlags & mask)==0 ) continue;
297	fossil_print("# %s\n", aCommand[i].zName);
298	if( useHtml ){
299	Blob html;
300	blob_zero(&html);
301	help_to_html(aCommand[i].zHelp, &html);
302	fossil_print("%s\n\n", blob_str(&html));

303	blob_reset(&html);
304	}else{
305	fossil_print("%s\n\n", aCommand[i].zHelp);





306	}
307	}
308	if( useHtml ){
309	fossil_print("<!-- end_all_help -->\n");
310	}else{
	@@ -479,13 +673,13 @@
479	@ ambiguous command prefix: %h(zCmd)
480	}else{
481	if( pCmd->zHelp[0]==0 ){
482	@ No help available for "%h(pCmd->zName)"
483	}else{
484	@ <blockquote>
485	help_to_html(pCmd->zHelp, cgi_output_blob());
486	@ </blockquote>
487	}
488	}
489	}else{
490	int i;
491
	@@ -689,31 +883,37 @@
689	;
690
691	/*
692	** COMMAND: help
693	**
694	** Usage: %fossil help TOPIC
695	** or: %fossil TOPIC --help
696	**
697	** Display information on how to use TOPIC, which may be a command, webpage, or
698	** setting. Webpage names begin with "/". To display a list of available
699	** topics, use one of:











700	**
701	** %fossil help Show common commands
702	** %fossil help -a\|--all Show both common and auxiliary commands
703	** %fossil help -o\|--options Show command-line options common to all cmds
704	** %fossil help -s\|--setting Show setting names
705	** %fossil help -t\|--test Show test commands only
706	** %fossil help -x\|--aux Show auxiliary commands only
707	** %fossil help -w\|--www Show list of webpages
708	*/
709	void help_cmd(void){
710	int rc;
711	int isPage = 0;
712	const char *z;
713	const char *zCmdOrPage;
714	const CmdOrPage *pCmd = 0;


715	if( g.argc<3 ){
716	z = g.argv[0];
717	fossil_print(
718	"Usage: %s help TOPIC\n"
719	"Common commands: (use \"%s help help\" for more options)\n",
	@@ -744,10 +944,11 @@
744	}
745	else if( find_option("setting","s",0) ){
746	command_list(0, CMDFLAG_SETTING);
747	return;
748	}

749	isPage = ('/' == *g.argv[2]) ? 1 : 0;
750	if(isPage){
751	zCmdOrPage = "page";
752	}else{
753	zCmdOrPage = "command or setting";
	@@ -782,20 +983,18 @@
782	fossil_print("Setting: \"%s\"%s\n\n",
783	pCmd->zName,
784	(pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : ""
785	);
786	}
787	while( *z ){
788	if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){
789	fossil_print("%s", g.argv[0]);
790	z += 7;
791	}else{
792	putchar(*z);
793	z++;
794	}
795	}
796	putchar('\n');
797	}
798
799	/*
800	** Return a pointer to the setting information array.
801	**
802

	--- src/dispatch.c
	+++ src/dispatch.c
	@@ -216,35 +216,224 @@
216	if( strncmp(zPrefix, aCommand[i].zName, nPrefix)==0 ){
217	blob_appendf(pList, " %s", aCommand[i].zName);
218	}
219	}
220	}
221
222	/*
223	** Return the index of the first non-space character that follows
224	** a span of two or more spaces. Return 0 if there is not gap.
225	*/
226	static int hasGap(const char *z, int n){
227	int i;
228	for(i=3; i<n-1; i++){
229	if( z[i]==' ' && z[i+1]!=' ' && z[i-1]==' ' && z[i-2]!='.' ) return i+1;
230	}
231	return 0 ;
232	}
233
234	/*
235	** Append text to pOut, adding formatting markup. Terms that
236	** have all lower-case letters are within <tt>..</tt>. Terms
237	** that have all upper-case letters are within <i>..</i>.
238	*/
239	static void appendMixedFont(Blob pOut, const char z, int n){
240	const char *zEnd = "";
241	int i = 0;
242	int j;
243	while( i<n ){
244	if( z[i]==' ' \|\| z[j]=='=' ){
245	for(j=i+1; j<n && (z[j]==' ' \|\| z[j]=='='); j++){}
246	blob_append(pOut, z+i, j-i);
247	i = j;
248	}else{
249	for(j=i; j<n && z[j]!=' ' && z[j]!='=' && !fossil_isalpha(z[j]); j++){}
250	if( j>=n \|\| z[j]==' ' \|\| z[j]=='=' ){
251	zEnd = "";
252	}else{
253	if( fossil_isupper(z[j]) ){
254	blob_append(pOut, "<i>",3);
255	zEnd = "</i>";
256	}else{
257	blob_append(pOut, "<tt>", 4);
258	zEnd = "</tt>";
259	}
260	}
261	while( j<n && z[j]!=' ' && z[j]!='=' ){ j++; }
262	blob_appendf(pOut, "%#h", j-i, z+i);
263	if( zEnd[0] ) blob_append(pOut, zEnd, -1);
264	i = j;
265	}
266	}
267	}
268
269	/*
270	** Attempt to reformat plain-text help into HTML for display on a webpage.
271	**
272	** The HTML output is appended to Blob pHtml, which should already be
273	** initialized.
274	**
275	** Formatting rules:
276	**
277	** * Bullet lists are indented from the surrounding text by
278	** at least one space. Each bullet begins with " * ".
279	**
280	** * Display lists are indented from the surrounding text.
281	** Each tag begins with "-" or occur on a line that is
282	** followed by two spaces and a non-space. <dd> elements can begin
283	** on the same line as long as they are separated by at least
284	** two spaces.
285	**
286	** * Indented text is show verbatim (<pre>...</pre>)
287	*/
288	static void help_to_html(const char zHelp, Blob pHtml){
289	int i;
290	char c;
291	int nIndent = 0;
292	int wantP = 0;
293	int wantBR = 0;
294	int aIndent[10];
295	const char *azEnd[10];
296	int iLevel = 0;
297	int isLI = 0;
298	int isDT = 0;
299	static const char *zEndDL = "</dl></blockquote>";
300	static const char *zEndPRE = "</pre></blockquote>";
301	static const char *zEndUL = "</ul>";
302	static const char *zEndDD = "</dd>";
303
304	aIndent[0] = 0;
305	azEnd[0] = "";
306	while( zHelp[0] ){
307	i = 0;
308	while( (c = zHelp[i])!=0
309	&& c!='\n'
310	&& (c!='%' \|\| strncmp(zHelp+i,"%fossil",7)!=0)
311	){ i++; }
312	if( c=='%' ){
313	if( i ) blob_appendf(pHtml, "%#h", i, zHelp);
314	zHelp += i + 1;
315	i = 0;
316	wantBR = 1;
317	continue;
318	}
319	if( i>2 && zHelp[0]=='>' && zHelp[1]==' ' ){
320	isDT = 1;
321	for(nIndent=1; nIndent<i && zHelp[nIndent]==' '; nIndent++){}
322	}else{
323	isDT = 0;
324	for(nIndent=0; nIndent<i && zHelp[nIndent]==' '; nIndent++){}
325	}
326	if( nIndent==i ){
327	if( c==0 ) break;
328	blob_append(pHtml, "\n", 1);
329	wantP = 1;
330	wantBR = 0;
331	zHelp += i+1;
332	continue;
333	}
334	if( nIndent+2<i && zHelp[nIndent]=='*' && zHelp[nIndent+1]==' ' ){
335	nIndent += 2;
336	while( nIndent<i && zHelp[nIndent]==' '){ nIndent++; }
337	isLI = 1;
338	}else{
339	isLI = 0;
340	}
341	while( iLevel>0 && aIndent[iLevel]>nIndent ){
342	blob_append(pHtml, azEnd[iLevel--], -1);
343	}
344	if( nIndent>aIndent[iLevel] ){
345	assert( iLevel<ArraySize(aIndent)-2 );
346	if( isLI ){
347	iLevel++;
348	aIndent[iLevel] = nIndent;
349	azEnd[iLevel] = zEndUL;
350	blob_append(pHtml, "<ul>\n", 5);
351	}else if( isDT
352	\|\| zHelp[nIndent]=='-'
353	\|\| hasGap(zHelp+nIndent,i-nIndent) ){
354	iLevel++;
355	aIndent[iLevel] = nIndent;
356	azEnd[iLevel] = zEndDL;
357	blob_append(pHtml, "<blockquote><dl>\n", -1);
358	}else if( azEnd[iLevel]==zEndDL ){
359	iLevel++;
360	aIndent[iLevel] = nIndent;
361	azEnd[iLevel] = zEndDD;
362	blob_append(pHtml, "<dd>", 4);
363	}else if( wantP ){
364	iLevel++;
365	aIndent[iLevel] = nIndent;
366	azEnd[iLevel] = zEndPRE;
367	blob_append(pHtml, "<blockquote><pre>", -1);
368	wantP = 0;
369	}
370	}
371	if( isLI ){
372	blob_append(pHtml, "<li> ", 5);
373	}
374	if( wantP ){
375	blob_append(pHtml, "<p> ", 4);
376	wantP = 0;
377	}
378	if( azEnd[iLevel]==zEndDL ){
379	int iDD;
380	blob_append(pHtml, "<dt> ", 5);
381	iDD = hasGap(zHelp+nIndent, i-nIndent);
382	if( iDD ){
383	int x;
384	assert( iLevel<ArraySize(aIndent)-1 );
385	iLevel++;
386	aIndent[iLevel] = x = nIndent+iDD;
387	azEnd[iLevel] = zEndDD;
388	appendMixedFont(pHtml, zHelp+nIndent, iDD-2);
389	blob_appendf(pHtml, "</dt><dd>%#h\n", i-x, zHelp+x);
390	}else{
391	appendMixedFont(pHtml, zHelp+nIndent, i-nIndent);
392	blob_append(pHtml, "</dt>\n", 6);
393	}
394	}else if( wantBR ){
395	appendMixedFont(pHtml, zHelp+nIndent, i-nIndent);
396	blob_append(pHtml, "<br>\n", 5);
397	wantBR = 0;
398	}else{
399	blob_appendf(pHtml, "%#h\n", i-nIndent, zHelp+nIndent);
400	}
401	zHelp += i+1;
402	i = 0;
403	if( c==0 ) break;
404	}
405	while( iLevel>0 ){
406	blob_appendf(pHtml, "%s\n", azEnd[iLevel--]);
407	}
408	}
409
410	/*
411	** Format help text for TTY display.
412	*/
413	static void help_to_text(const char zHelp, Blob pText){
414	int i;
415	char c;
416	for(i=0; (c = zHelp[i])!=0; i++){
417	if( c=='%' && strncmp(zHelp+i,"%fossil",7)==0 ){
418	if( i>0 ) blob_append(pText, zHelp, i);
419	blob_append(pText, "fossil", 6);
420	zHelp += i+7;
421	i = -1;
422	continue;
423	}
424	if( c=='\n' && strncmp(zHelp+i+1,"> ",2)==0 ){
425	blob_append(pText, zHelp, i+1);
426	blob_append(pText, " ", 1);
427	zHelp += i+2;
428	i = -1;
429	continue;
430	}
431	}
432	if( i>0 ){
433	blob_append(pText, zHelp, i);
434	}
435	}
436
437	/*
438	** COMMAND: test-all-help
439	**
	@@ -292,19 +481,24 @@
481	}else{
482	fossil_print("---\n");
483	}
484	for(i=0; i<MX_COMMAND; i++){
485	if( (aCommand[i].eCmdFlags & mask)==0 ) continue;

486	if( useHtml ){
487	Blob html;
488	blob_init(&html, 0, 0);
489	help_to_html(aCommand[i].zHelp, &html);
490	fossil_print("<h1>%h</h1>\n", aCommand[i].zName);
491	fossil_print("%s\n<hr>\n", blob_str(&html));
492	blob_reset(&html);
493	}else{
494	Blob txt;
495	blob_init(&txt, 0, 0);
496	help_to_text(aCommand[i].zHelp, &txt);
497	fossil_print("# %s\n", aCommand[i].zName);
498	fossil_print("%s\n\n", blob_str(&txt));
499	blob_reset(&txt);
500	}
501	}
502	if( useHtml ){
503	fossil_print("<!-- end_all_help -->\n");
504	}else{
	@@ -479,13 +673,13 @@
673	@ ambiguous command prefix: %h(zCmd)
674	}else{
675	if( pCmd->zHelp[0]==0 ){
676	@ No help available for "%h(pCmd->zName)"
677	}else{
678	@ <div class="helpPage">
679	help_to_html(pCmd->zHelp, cgi_output_blob());
680	@ </div>
681	}
682	}
683	}else{
684	int i;
685
	@@ -689,31 +883,37 @@
883	;
884
885	/*
886	** COMMAND: help
887	**
888	** Usage: %fossil help [OPTIONS] [TOPIC]

889	**
890	** Display information on how to use TOPIC, which may be a command, webpage, or
891	** setting. Webpage names begin with "/". If TOPIC is omitted, a list of
892	** topics is returned.
893	**
894	** The following options can be used when TOPIC is omitted:
895	**
896	** -a\|--all List both command and auxiliary commands
897	** -o\|--options List command-line options common to all commands
898	** -s\|--setting List setting names
899	** -t\|--test List unsupported "test" commands
900	** -x\|--aux List only auxiliary commands
901	** -w\|--www List all web pages
902	**
903	** These options can be used when TOPIC is present:
904	**
905	** -h\|--html Format output as HTML rather than plain text






906	*/
907	void help_cmd(void){
908	int rc;
909	int isPage = 0;
910	const char *z;
911	const char *zCmdOrPage;
912	const CmdOrPage *pCmd = 0;
913	int useHtml = 0;
914	Blob txt;
915	if( g.argc<3 ){
916	z = g.argv[0];
917	fossil_print(
918	"Usage: %s help TOPIC\n"
919	"Common commands: (use \"%s help help\" for more options)\n",
	@@ -744,10 +944,11 @@
944	}
945	else if( find_option("setting","s",0) ){
946	command_list(0, CMDFLAG_SETTING);
947	return;
948	}
949	useHtml = find_option("html","h",0)!=0;
950	isPage = ('/' == *g.argv[2]) ? 1 : 0;
951	if(isPage){
952	zCmdOrPage = "page";
953	}else{
954	zCmdOrPage = "command or setting";
	@@ -782,20 +983,18 @@
983	fossil_print("Setting: \"%s\"%s\n\n",
984	pCmd->zName,
985	(pCmd->eCmdFlags & CMDFLAG_VERSIONABLE)!=0 ? " (versionable)" : ""
986	);
987	}
988	blob_init(&txt, 0, 0);
989	if( useHtml ){
990	help_to_html(z, &txt);
991	}else{
992	help_to_text(z, &txt);
993	}
994	fossil_print("%s\n", blob_str(&txt));
995	blob_reset(&txt);


996	}
997
998	/*
999	** Return a pointer to the setting information array.
1000	**
1001

M src/export.c

+3 -3

		--- src/export.c
		+++ src/export.c
		@@ -1649,11 +1649,11 @@
1649	1649	** Usage: %fossil git SUBCOMMAND
1650	1650	**
1651	1651	** Do incremental import or export operations between Fossil and Git.
1652	1652	** Subcommands:
1653	1653	**
1654		-** fossil git export [MIRROR] [OPTIONS]
	1654	+** > fossil git export [MIRROR] [OPTIONS]
1655	1655	**
1656	1656	** Write content from the Fossil repository into the Git repository
1657	1657	** in directory MIRROR. The Git repository is created if it does not
1658	1658	** already exist. If the Git repository does already exist, then
1659	1659	** new content added to fossil since the previous export is appended.
		@@ -1680,15 +1680,15 @@
1680	1680	** --limit N Add no more than N new check-ins to MIRROR.
1681	1681	** Useful for debugging
1682	1682	** --quiet\|-q Reduce output. Repeat for even less output.
1683	1683	** --verbose\|-v More output.
1684	1684	**
1685		-** fossil git import MIRROR
	1685	+** > fossil git import MIRROR
1686	1686	**
1687	1687	** TBD...
1688	1688	**
1689		-** fossil git status
	1689	+** > fossil git status
1690	1690	**
1691	1691	** Show the status of the current Git mirror, if there is one.
1692	1692	*/
1693	1693	void gitmirror_command(void){
1694	1694	char *zCmd;
1695	1695

	--- src/export.c
	+++ src/export.c
	@@ -1649,11 +1649,11 @@
1649	** Usage: %fossil git SUBCOMMAND
1650	**
1651	** Do incremental import or export operations between Fossil and Git.
1652	** Subcommands:
1653	**
1654	** fossil git export [MIRROR] [OPTIONS]
1655	**
1656	** Write content from the Fossil repository into the Git repository
1657	** in directory MIRROR. The Git repository is created if it does not
1658	** already exist. If the Git repository does already exist, then
1659	** new content added to fossil since the previous export is appended.
	@@ -1680,15 +1680,15 @@
1680	** --limit N Add no more than N new check-ins to MIRROR.
1681	** Useful for debugging
1682	** --quiet\|-q Reduce output. Repeat for even less output.
1683	** --verbose\|-v More output.
1684	**
1685	** fossil git import MIRROR
1686	**
1687	** TBD...
1688	**
1689	** fossil git status
1690	**
1691	** Show the status of the current Git mirror, if there is one.
1692	*/
1693	void gitmirror_command(void){
1694	char *zCmd;
1695

	--- src/export.c
	+++ src/export.c
	@@ -1649,11 +1649,11 @@
1649	** Usage: %fossil git SUBCOMMAND
1650	**
1651	** Do incremental import or export operations between Fossil and Git.
1652	** Subcommands:
1653	**
1654	** > fossil git export [MIRROR] [OPTIONS]
1655	**
1656	** Write content from the Fossil repository into the Git repository
1657	** in directory MIRROR. The Git repository is created if it does not
1658	** already exist. If the Git repository does already exist, then
1659	** new content added to fossil since the previous export is appended.
	@@ -1680,15 +1680,15 @@
1680	** --limit N Add no more than N new check-ins to MIRROR.
1681	** Useful for debugging
1682	** --quiet\|-q Reduce output. Repeat for even less output.
1683	** --verbose\|-v More output.
1684	**
1685	** > fossil git import MIRROR
1686	**
1687	** TBD...
1688	**
1689	** > fossil git status
1690	**
1691	** Show the status of the current Git mirror, if there is one.
1692	*/
1693	void gitmirror_command(void){
1694	char *zCmd;
1695

M src/purge.c

+26 -26

		--- src/purge.c
		+++ src/purge.c
		@@ -2,11 +2,11 @@
2	2	** Copyright (c) 2014 D. Richard Hipp
3	3	**
4	4	** This program is free software; you can redistribute it and/or
5	5	** modify it under the terms of the Simplified BSD License (also
6	6	** known as the "2-Clause License" or "FreeBSD License".)
7		-
	7	+**
8	8	** This program is distributed in the hope that it will be useful,
9	9	** but without any warranty; without even the implied warranty of
10	10	** merchantability or fitness for a particular purpose.
11	11	**
12	12	** Author contact information:
		@@ -449,79 +449,79 @@
449	449	** The purge command removes content from a repository and stores that content
450	450	** in a "graveyard". The graveyard exists so that content can be recovered
451	451	** using the "fossil purge undo" command. The "fossil purge obliterate"
452	452	** command empties the graveyard, making the content unrecoverable.
453	453	**
454		-** ==== WARNING: This command can potentially destroy historical data and ====
455		-** ==== leave your repository in a goofy state. Know what you are doing! ====
456		-** ==== Make a backup of your repository before using this command! ====
457		-**
458		-** ==== FURTHER WARNING: This command is a work-in-progress and may yet ====
459		-** ==== contain bugs. ====
460		-**
461		-** fossil purge artifacts HASH... ?OPTIONS?
	454	+** WARNING: This command can potentially destroy historical data and
	455	+** leave your repository in a goofy state. Know what you are doing!
	456	+** Make a backup of your repository before using this command!
	457	+**
	458	+** FURTHER WARNING: This command is a work-in-progress and may yet
	459	+** contain bugs.
	460	+**
	461	+** > fossil purge artifacts HASH... ?OPTIONS?
462	462	**
463	463	** Move arbitrary artifacts identified by the HASH list into the
464	464	** graveyard.
465	465	**
466		-** fossil purge cat HASH...
	466	+** > fossil purge cat HASH...
467	467	**
468	468	** Write the content of one or more artifacts in the graveyard onto
469	469	** standard output.
470	470	**
471		-** fossil purge checkins TAGS... ?OPTIONS?
	471	+** > fossil purge checkins TAGS... ?OPTIONS?
472	472	**
473	473	** Move the check-ins or branches identified by TAGS and all of
474	474	** their descendants out of the repository and into the graveyard.
475	475	** If TAGS includes a branch name then it means all the check-ins
476	476	** on the most recent occurrence of that branch.
477	477	**
478		-** fossil purge files NAME ... ?OPTIONS?
	478	+** > fossil purge files NAME ... ?OPTIONS?
479	479	**
480	480	** Move all instances of files called NAME into the graveyard.
481	481	** NAME should be the name of the file relative to the root of the
482	482	** repository. If NAME is a directory, then all files within that
483	483	** directory are moved.
484	484	**
485		-** fossil purge list\|ls ?-l?
	485	+** > fossil purge list\|ls ?-l?
486	486	**
487	487	** Show the graveyard of prior purges. The -l option gives more
488	488	** detail in the output.
489	489	**
490		-** fossil purge obliterate ID... ?--force?
	490	+** > fossil purge obliterate ID... ?--force?
491	491	**
492	492	** Remove one or more purge events from the graveyard. Once a purge
493	493	** event is obliterated, it can no longer be undone. The --force
494	494	** option suppresses the confirmation prompt.
495	495	**
496		-** fossil purge tickets NAME ... ?OPTIONS?
	496	+** > fossil purge tickets NAME ... ?OPTIONS?
497	497	**
498	498	** TBD...
499	499	**
500		-** fossil purge undo ID
	500	+** > fossil purge undo ID
501	501	**
502	502	** Restore the content previously removed by purge ID.
503	503	**
504		-** fossil purge wiki NAME ... ?OPTIONS?
	504	+** > fossil purge wiki NAME ... ?OPTIONS?
505	505	**
506	506	** TBD...
507	507	**
508	508	** COMMON OPTIONS:
509	509	**
510	510	** --explain Make no changes, but show what would happen.
511	511	** --dry-run An alias for --explain
512	512	**
513	513	** SUMMARY:
514		-** fossil purge artifacts HASH.. [OPTIONS]
515		-** fossil purge cat HASH...
516		-** fossil purge checkins TAGS... [OPTIONS]
517		-** fossil purge files FILENAME... [OPTIONS]
518		-** fossil purge list
519		-** fossil purge obliterate ID...
520		-** fossil purge tickets NAME... [OPTIONS]
521		-** fossil purge undo ID
522		-** fossil purge wiki NAME... [OPTIONS]
	514	+** * fossil purge artifacts HASH.. [OPTIONS]
	515	+** * fossil purge cat HASH...
	516	+** * fossil purge checkins TAGS... [OPTIONS]
	517	+** * fossil purge files FILENAME... [OPTIONS]
	518	+** * fossil purge list
	519	+** * fossil purge obliterate ID...
	520	+** * fossil purge tickets NAME... [OPTIONS]
	521	+** * fossil purge undo ID
	522	+** * fossil purge wiki NAME... [OPTIONS]
523	523	*/
524	524	void purge_cmd(void){
525	525	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
526	526	const char *zSubcmd;
527	527	int n;
528	528

	--- src/purge.c
	+++ src/purge.c
	@@ -2,11 +2,11 @@
2	** Copyright (c) 2014 D. Richard Hipp
3	**
4	** This program is free software; you can redistribute it and/or
5	** modify it under the terms of the Simplified BSD License (also
6	** known as the "2-Clause License" or "FreeBSD License".)
7
8	** This program is distributed in the hope that it will be useful,
9	** but without any warranty; without even the implied warranty of
10	** merchantability or fitness for a particular purpose.
11	**
12	** Author contact information:
	@@ -449,79 +449,79 @@
449	** The purge command removes content from a repository and stores that content
450	** in a "graveyard". The graveyard exists so that content can be recovered
451	** using the "fossil purge undo" command. The "fossil purge obliterate"
452	** command empties the graveyard, making the content unrecoverable.
453	**
454	** ==== WARNING: This command can potentially destroy historical data and ====
455	** ==== leave your repository in a goofy state. Know what you are doing! ====
456	** ==== Make a backup of your repository before using this command! ====
457	**
458	** ==== FURTHER WARNING: This command is a work-in-progress and may yet ====
459	** ==== contain bugs. ====
460	**
461	** fossil purge artifacts HASH... ?OPTIONS?
462	**
463	** Move arbitrary artifacts identified by the HASH list into the
464	** graveyard.
465	**
466	** fossil purge cat HASH...
467	**
468	** Write the content of one or more artifacts in the graveyard onto
469	** standard output.
470	**
471	** fossil purge checkins TAGS... ?OPTIONS?
472	**
473	** Move the check-ins or branches identified by TAGS and all of
474	** their descendants out of the repository and into the graveyard.
475	** If TAGS includes a branch name then it means all the check-ins
476	** on the most recent occurrence of that branch.
477	**
478	** fossil purge files NAME ... ?OPTIONS?
479	**
480	** Move all instances of files called NAME into the graveyard.
481	** NAME should be the name of the file relative to the root of the
482	** repository. If NAME is a directory, then all files within that
483	** directory are moved.
484	**
485	** fossil purge list\|ls ?-l?
486	**
487	** Show the graveyard of prior purges. The -l option gives more
488	** detail in the output.
489	**
490	** fossil purge obliterate ID... ?--force?
491	**
492	** Remove one or more purge events from the graveyard. Once a purge
493	** event is obliterated, it can no longer be undone. The --force
494	** option suppresses the confirmation prompt.
495	**
496	** fossil purge tickets NAME ... ?OPTIONS?
497	**
498	** TBD...
499	**
500	** fossil purge undo ID
501	**
502	** Restore the content previously removed by purge ID.
503	**
504	** fossil purge wiki NAME ... ?OPTIONS?
505	**
506	** TBD...
507	**
508	** COMMON OPTIONS:
509	**
510	** --explain Make no changes, but show what would happen.
511	** --dry-run An alias for --explain
512	**
513	** SUMMARY:
514	** fossil purge artifacts HASH.. [OPTIONS]
515	** fossil purge cat HASH...
516	** fossil purge checkins TAGS... [OPTIONS]
517	** fossil purge files FILENAME... [OPTIONS]
518	** fossil purge list
519	** fossil purge obliterate ID...
520	** fossil purge tickets NAME... [OPTIONS]
521	** fossil purge undo ID
522	** fossil purge wiki NAME... [OPTIONS]
523	*/
524	void purge_cmd(void){
525	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
526	const char *zSubcmd;
527	int n;
528

	--- src/purge.c
	+++ src/purge.c
	@@ -2,11 +2,11 @@
2	** Copyright (c) 2014 D. Richard Hipp
3	**
4	** This program is free software; you can redistribute it and/or
5	** modify it under the terms of the Simplified BSD License (also
6	** known as the "2-Clause License" or "FreeBSD License".)
7	**
8	** This program is distributed in the hope that it will be useful,
9	** but without any warranty; without even the implied warranty of
10	** merchantability or fitness for a particular purpose.
11	**
12	** Author contact information:
	@@ -449,79 +449,79 @@
449	** The purge command removes content from a repository and stores that content
450	** in a "graveyard". The graveyard exists so that content can be recovered
451	** using the "fossil purge undo" command. The "fossil purge obliterate"
452	** command empties the graveyard, making the content unrecoverable.
453	**
454	** WARNING: This command can potentially destroy historical data and
455	** leave your repository in a goofy state. Know what you are doing!
456	** Make a backup of your repository before using this command!
457	**
458	** FURTHER WARNING: This command is a work-in-progress and may yet
459	** contain bugs.
460	**
461	** > fossil purge artifacts HASH... ?OPTIONS?
462	**
463	** Move arbitrary artifacts identified by the HASH list into the
464	** graveyard.
465	**
466	** > fossil purge cat HASH...
467	**
468	** Write the content of one or more artifacts in the graveyard onto
469	** standard output.
470	**
471	** > fossil purge checkins TAGS... ?OPTIONS?
472	**
473	** Move the check-ins or branches identified by TAGS and all of
474	** their descendants out of the repository and into the graveyard.
475	** If TAGS includes a branch name then it means all the check-ins
476	** on the most recent occurrence of that branch.
477	**
478	** > fossil purge files NAME ... ?OPTIONS?
479	**
480	** Move all instances of files called NAME into the graveyard.
481	** NAME should be the name of the file relative to the root of the
482	** repository. If NAME is a directory, then all files within that
483	** directory are moved.
484	**
485	** > fossil purge list\|ls ?-l?
486	**
487	** Show the graveyard of prior purges. The -l option gives more
488	** detail in the output.
489	**
490	** > fossil purge obliterate ID... ?--force?
491	**
492	** Remove one or more purge events from the graveyard. Once a purge
493	** event is obliterated, it can no longer be undone. The --force
494	** option suppresses the confirmation prompt.
495	**
496	** > fossil purge tickets NAME ... ?OPTIONS?
497	**
498	** TBD...
499	**
500	** > fossil purge undo ID
501	**
502	** Restore the content previously removed by purge ID.
503	**
504	** > fossil purge wiki NAME ... ?OPTIONS?
505	**
506	** TBD...
507	**
508	** COMMON OPTIONS:
509	**
510	** --explain Make no changes, but show what would happen.
511	** --dry-run An alias for --explain
512	**
513	** SUMMARY:
514	** * fossil purge artifacts HASH.. [OPTIONS]
515	** * fossil purge cat HASH...
516	** * fossil purge checkins TAGS... [OPTIONS]
517	** * fossil purge files FILENAME... [OPTIONS]
518	** * fossil purge list
519	** * fossil purge obliterate ID...
520	** * fossil purge tickets NAME... [OPTIONS]
521	** * fossil purge undo ID
522	** * fossil purge wiki NAME... [OPTIONS]
523	*/
524	void purge_cmd(void){
525	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
526	const char *zSubcmd;
527	int n;
528

M src/rss.c

+15 -21

		--- src/rss.c
		+++ src/rss.c
		@@ -224,35 +224,29 @@
224	224	** Usage: %fossil rss ?OPTIONS?
225	225	**
226	226	** The CLI variant of the /timeline.rss page, this produces an RSS
227	227	** feed of the timeline to stdout. Options:
228	228	**
229		-** -type\|y FLAG
230		-** may be: all (default), ci (show check-ins only), t (show tickets only),
231		-** w (show wiki only).
232		-**
233		-** -limit\|n LIMIT
234		-** The maximum number of items to show.
235		-**
236		-** -tkt HASH
237		-** Filters for only those events for the specified ticket.
238		-**
239		-** -tag TAG
240		-** filters for a tag
241		-**
242		-** -wiki NAME
243		-** Filters on a specific wiki page.
	229	+** -type\|y FLAG may be: all (default), ci (show check-ins only),
	230	+** t (show tickets only), w (show wiki only).
	231	+**
	232	+** -limit\|n LIMIT The maximum number of items to show.
	233	+**
	234	+** -tkt HASH Filters for only those events for the specified ticket.
	235	+**
	236	+** -tag TAG filters for a tag
	237	+**
	238	+** -wiki NAME Filters on a specific wiki page.
244	239	**
245	240	** Only one of -tkt, -tag, or -wiki may be used.
246	241	**
247		-** -name FILENAME
248		-** filters for a specific file. This may be combined with one of the other
249		-** filters (useful for looking at a specific branch).
	242	+** -name FILENAME filters for a specific file. This may be combined
	243	+** with one of the other filters (useful for looking
	244	+** at a specific branch).
250	245	**
251		-** -url STRING
252		-** Sets the RSS feed's root URL to the given string. The default is
253		-** "URL-PLACEHOLDER" (without quotes).
	246	+** -url STRING Sets the RSS feed's root URL to the given string.
	247	+** The default is "URL-PLACEHOLDER" (without quotes).
254	248	*/
255	249	void cmd_timeline_rss(void){
256	250	Stmt q;
257	251	int nLine=0;
258	252	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
259	253

	--- src/rss.c
	+++ src/rss.c
	@@ -224,35 +224,29 @@
224	** Usage: %fossil rss ?OPTIONS?
225	**
226	** The CLI variant of the /timeline.rss page, this produces an RSS
227	** feed of the timeline to stdout. Options:
228	**
229	** -type\|y FLAG
230	** may be: all (default), ci (show check-ins only), t (show tickets only),
231	** w (show wiki only).
232	**
233	** -limit\|n LIMIT
234	** The maximum number of items to show.
235	**
236	** -tkt HASH
237	** Filters for only those events for the specified ticket.
238	**
239	** -tag TAG
240	** filters for a tag
241	**
242	** -wiki NAME
243	** Filters on a specific wiki page.
244	**
245	** Only one of -tkt, -tag, or -wiki may be used.
246	**
247	** -name FILENAME
248	** filters for a specific file. This may be combined with one of the other
249	** filters (useful for looking at a specific branch).
250	**
251	** -url STRING
252	** Sets the RSS feed's root URL to the given string. The default is
253	** "URL-PLACEHOLDER" (without quotes).
254	*/
255	void cmd_timeline_rss(void){
256	Stmt q;
257	int nLine=0;
258	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
259

	--- src/rss.c
	+++ src/rss.c
	@@ -224,35 +224,29 @@
224	** Usage: %fossil rss ?OPTIONS?
225	**
226	** The CLI variant of the /timeline.rss page, this produces an RSS
227	** feed of the timeline to stdout. Options:
228	**
229	** -type\|y FLAG may be: all (default), ci (show check-ins only),
230	** t (show tickets only), w (show wiki only).
231	**
232	** -limit\|n LIMIT The maximum number of items to show.
233	**
234	** -tkt HASH Filters for only those events for the specified ticket.
235	**
236	** -tag TAG filters for a tag
237	**
238	** -wiki NAME Filters on a specific wiki page.





239	**
240	** Only one of -tkt, -tag, or -wiki may be used.
241	**
242	** -name FILENAME filters for a specific file. This may be combined
243	** with one of the other filters (useful for looking
244	** at a specific branch).
245	**
246	** -url STRING Sets the RSS feed's root URL to the given string.
247	** The default is "URL-PLACEHOLDER" (without quotes).

248	*/
249	void cmd_timeline_rss(void){
250	Stmt q;
251	int nLine=0;
252	char zPubDate, zProjectName, zProjectDescr, zFreeProjectName=0;
253

M src/stash.c

+60 -60

		--- src/stash.c
		+++ src/stash.c
		@@ -510,72 +510,72 @@
510	510	/*
511	511	** COMMAND: stash
512	512	**
513	513	** Usage: %fossil stash SUBCOMMAND ARGS...
514	514	**
515		-** fossil stash
516		-** fossil stash save ?-m\|--comment COMMENT? ?FILES...?
517		-** fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
518		-**
519		-** Save the current changes in the working tree as a new stash.
520		-** Then revert the changes back to the last check-in. If FILES
521		-** are listed, then only stash and revert the named files. The
522		-** "save" verb can be omitted if and only if there are no other
523		-** arguments. The "snapshot" verb works the same as "save" but
524		-** omits the revert, keeping the checkout unchanged.
525		-**
526		-** fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
527		-**
528		-** List all changes sets currently stashed. Show information about
529		-** individual files in each changeset if -v or --verbose is used.
530		-**
531		-** fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
532		-** fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
533		-**
534		-** Show the contents of a stash as a diff against its baseline.
535		-** With gshow and gcat, gdiff-command is used instead of internal
536		-** diff logic.
537		-**
538		-** fossil stash pop
539		-** fossil stash apply ?STASHID?
540		-**
541		-** Apply STASHID or the most recently created stash to the current
542		-** working checkout. The "pop" command deletes that changeset from
543		-** the stash after applying it but the "apply" command retains the
544		-** changeset.
545		-**
546		-** fossil stash goto ?STASHID?
547		-**
548		-** Update to the baseline checkout for STASHID then apply the
549		-** changes of STASHID. Keep STASHID so that it can be reused
550		-** This command is undoable.
551		-**
552		-** fossil stash drop\|rm ?STASHID? ?-a\|--all?
553		-**
554		-** Forget everything about STASHID. Forget the whole stash if the
555		-** -a\|--all flag is used. Individual drops are undoable but -a\|--all
556		-** is not.
557		-**
558		-** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
559		-** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560		-**
561		-** Show diffs of the current working directory and what that
562		-** directory would be if STASHID were applied. With gdiff,
563		-** gdiff-command is used instead of internal diff logic.
	515	+** > fossil stash
	516	+** > fossil stash save ?-m\|--comment COMMENT? ?FILES...?
	517	+** > fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
	518	+**
	519	+** Save the current changes in the working tree as a new stash.
	520	+** Then revert the changes back to the last check-in. If FILES
	521	+** are listed, then only stash and revert the named files. The
	522	+** "save" verb can be omitted if and only if there are no other
	523	+** arguments. The "snapshot" verb works the same as "save" but
	524	+** omits the revert, keeping the checkout unchanged.
	525	+**
	526	+** > fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
	527	+**
	528	+** List all changes sets currently stashed. Show information about
	529	+** individual files in each changeset if -v or --verbose is used.
	530	+**
	531	+** > fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
	532	+** > fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
	533	+**
	534	+** Show the contents of a stash as a diff against its baseline.
	535	+** With gshow and gcat, gdiff-command is used instead of internal
	536	+** diff logic.
	537	+**
	538	+** > fossil stash pop
	539	+** > fossil stash apply ?STASHID?
	540	+**
	541	+** Apply STASHID or the most recently created stash to the current
	542	+** working checkout. The "pop" command deletes that changeset from
	543	+** the stash after applying it but the "apply" command retains the
	544	+** changeset.
	545	+**
	546	+** > fossil stash goto ?STASHID?
	547	+**
	548	+** Update to the baseline checkout for STASHID then apply the
	549	+** changes of STASHID. Keep STASHID so that it can be reused
	550	+** This command is undoable.
	551	+**
	552	+** > fossil stash drop\|rm ?STASHID? ?-a\|--all?
	553	+**
	554	+** Forget everything about STASHID. Forget the whole stash if the
	555	+** -a\|--all flag is used. Individual drops are undoable but -a\|--all
	556	+** is not.
	557	+**
	558	+** > fossil stash diff ?STASHID? ?DIFF-OPTIONS?
	559	+** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
	560	+**
	561	+** Show diffs of the current working directory and what that
	562	+** directory would be if STASHID were applied. With gdiff,
	563	+** gdiff-command is used instead of internal diff logic.
564	564	**
565	565	** SUMMARY:
566		-** fossil stash
567		-** fossil stash save ?-m\|--comment COMMENT? ?FILES...?
568		-** fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
569		-** fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
570		-** fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
571		-** fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
572		-** fossil stash pop
573		-** fossil stash apply\|goto ?STASHID?
574		-** fossil stash drop\|rm ?STASHID? ?-a\|--all?
575		-** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
576		-** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
	566	+** * fossil stash
	567	+** * fossil stash save ?-m\|--comment COMMENT? ?FILES...?
	568	+** * fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
	569	+** * fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
	570	+** * fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
	571	+** * fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
	572	+** * fossil stash pop
	573	+** * fossil stash apply\|goto ?STASHID?
	574	+** * fossil stash drop\|rm ?STASHID? ?-a\|--all?
	575	+** * fossil stash diff ?STASHID? ?DIFF-OPTIONS?
	576	+** * fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
577	577	*/
578	578	void stash_cmd(void){
579	579	const char *zCmd;
580	580	int nCmd;
581	581	int stashid = 0;
582	582

	--- src/stash.c
	+++ src/stash.c
	@@ -510,72 +510,72 @@
510	/*
511	** COMMAND: stash
512	**
513	** Usage: %fossil stash SUBCOMMAND ARGS...
514	**
515	** fossil stash
516	** fossil stash save ?-m\|--comment COMMENT? ?FILES...?
517	** fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
518	**
519	** Save the current changes in the working tree as a new stash.
520	** Then revert the changes back to the last check-in. If FILES
521	** are listed, then only stash and revert the named files. The
522	** "save" verb can be omitted if and only if there are no other
523	** arguments. The "snapshot" verb works the same as "save" but
524	** omits the revert, keeping the checkout unchanged.
525	**
526	** fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
527	**
528	** List all changes sets currently stashed. Show information about
529	** individual files in each changeset if -v or --verbose is used.
530	**
531	** fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
532	** fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
533	**
534	** Show the contents of a stash as a diff against its baseline.
535	** With gshow and gcat, gdiff-command is used instead of internal
536	** diff logic.
537	**
538	** fossil stash pop
539	** fossil stash apply ?STASHID?
540	**
541	** Apply STASHID or the most recently created stash to the current
542	** working checkout. The "pop" command deletes that changeset from
543	** the stash after applying it but the "apply" command retains the
544	** changeset.
545	**
546	** fossil stash goto ?STASHID?
547	**
548	** Update to the baseline checkout for STASHID then apply the
549	** changes of STASHID. Keep STASHID so that it can be reused
550	** This command is undoable.
551	**
552	** fossil stash drop\|rm ?STASHID? ?-a\|--all?
553	**
554	** Forget everything about STASHID. Forget the whole stash if the
555	** -a\|--all flag is used. Individual drops are undoable but -a\|--all
556	** is not.
557	**
558	** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
559	** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560	**
561	** Show diffs of the current working directory and what that
562	** directory would be if STASHID were applied. With gdiff,
563	** gdiff-command is used instead of internal diff logic.
564	**
565	** SUMMARY:
566	** fossil stash
567	** fossil stash save ?-m\|--comment COMMENT? ?FILES...?
568	** fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
569	** fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
570	** fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
571	** fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
572	** fossil stash pop
573	** fossil stash apply\|goto ?STASHID?
574	** fossil stash drop\|rm ?STASHID? ?-a\|--all?
575	** fossil stash diff ?STASHID? ?DIFF-OPTIONS?
576	** fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
577	*/
578	void stash_cmd(void){
579	const char *zCmd;
580	int nCmd;
581	int stashid = 0;
582

	--- src/stash.c
	+++ src/stash.c
	@@ -510,72 +510,72 @@
510	/*
511	** COMMAND: stash
512	**
513	** Usage: %fossil stash SUBCOMMAND ARGS...
514	**
515	** > fossil stash
516	** > fossil stash save ?-m\|--comment COMMENT? ?FILES...?
517	** > fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
518	**
519	** Save the current changes in the working tree as a new stash.
520	** Then revert the changes back to the last check-in. If FILES
521	** are listed, then only stash and revert the named files. The
522	** "save" verb can be omitted if and only if there are no other
523	** arguments. The "snapshot" verb works the same as "save" but
524	** omits the revert, keeping the checkout unchanged.
525	**
526	** > fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
527	**
528	** List all changes sets currently stashed. Show information about
529	** individual files in each changeset if -v or --verbose is used.
530	**
531	** > fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
532	** > fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
533	**
534	** Show the contents of a stash as a diff against its baseline.
535	** With gshow and gcat, gdiff-command is used instead of internal
536	** diff logic.
537	**
538	** > fossil stash pop
539	** > fossil stash apply ?STASHID?
540	**
541	** Apply STASHID or the most recently created stash to the current
542	** working checkout. The "pop" command deletes that changeset from
543	** the stash after applying it but the "apply" command retains the
544	** changeset.
545	**
546	** > fossil stash goto ?STASHID?
547	**
548	** Update to the baseline checkout for STASHID then apply the
549	** changes of STASHID. Keep STASHID so that it can be reused
550	** This command is undoable.
551	**
552	** > fossil stash drop\|rm ?STASHID? ?-a\|--all?
553	**
554	** Forget everything about STASHID. Forget the whole stash if the
555	** -a\|--all flag is used. Individual drops are undoable but -a\|--all
556	** is not.
557	**
558	** > fossil stash diff ?STASHID? ?DIFF-OPTIONS?
559	** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560	**
561	** Show diffs of the current working directory and what that
562	** directory would be if STASHID were applied. With gdiff,
563	** gdiff-command is used instead of internal diff logic.
564	**
565	** SUMMARY:
566	** * fossil stash
567	** * fossil stash save ?-m\|--comment COMMENT? ?FILES...?
568	** * fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
569	** * fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
570	** * fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
571	** * fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
572	** * fossil stash pop
573	** * fossil stash apply\|goto ?STASHID?
574	** * fossil stash drop\|rm ?STASHID? ?-a\|--all?
575	** * fossil stash diff ?STASHID? ?DIFF-OPTIONS?
576	** * fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
577	*/
578	void stash_cmd(void){
579	const char *zCmd;
580	int nCmd;
581	int stashid = 0;
582

M src/tag.c

+4 -4

		--- src/tag.c
		+++ src/tag.c
		@@ -371,11 +371,11 @@
371	371	**
372	372	** Usage: %fossil tag SUBCOMMAND ...
373	373	**
374	374	** Run various subcommands to control tags and properties.
375	375	**
376		-** %fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
	376	+** > fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
377	377	**
378	378	** Add a new tag or property to CHECK-IN. The tag will
379	379	** be usable instead of a CHECK-IN in commands such as
380	380	** update and merge. If the --propagate flag is present,
381	381	** the tag value propagates to all descendants of CHECK-IN
		@@ -390,11 +390,11 @@
390	390	**
391	391	** The --date-override and --user-override options support
392	392	** importing history from other SCM systems. DATETIME has
393	393	** the form 'YYYY-MMM-DD HH:MM:SS'.
394	394	**
395		-** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
	395	+** > fossil tag cancel ?--raw? TAGNAME CHECK-IN
396	396	**
397	397	** Remove the tag TAGNAME from CHECK-IN, and also remove
398	398	** the propagation of the tag to any descendants. Use the
399	399	** the --dryrun or -n options to see what would have happened.
400	400	**
		@@ -403,11 +403,11 @@
403	403	** --date-override DATETIME Set date and time deleted.
404	404	** --user-override USER Name USER when deleting the tag.
405	405	** --dryrun\|-n Display the control artifact, but do
406	406	** not insert it into the database.
407	407	**
408		-** %fossil tag find ?OPTIONS? TAGNAME
	408	+** > fossil tag find ?OPTIONS? TAGNAME
409	409	**
410	410	** List all objects that use TAGNAME. TYPE can be "ci" for
411	411	** check-ins or "e" for events. The limit option limits the number
412	412	** of results to the given value.
413	413	**
		@@ -414,11 +414,11 @@
414	414	** Options:
415	415	** --raw Raw tag name.
416	416	** -t\|--type TYPE One of "ci", or "e".
417	417	** -n\|--limit N Limit to N results.
418	418	**
419		-** %fossil tag list\|ls ?OPTIONS? ?CHECK-IN?
	419	+** > fossil tag list\|ls ?OPTIONS? ?CHECK-IN?
420	420	**
421	421	** List all tags, or if CHECK-IN is supplied, list
422	422	** all tags and their values for CHECK-IN. The tagtype option
423	423	** takes one of: propagated, singleton, cancel.
424	424	**
425	425

	--- src/tag.c
	+++ src/tag.c
	@@ -371,11 +371,11 @@
371	**
372	** Usage: %fossil tag SUBCOMMAND ...
373	**
374	** Run various subcommands to control tags and properties.
375	**
376	** %fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
377	**
378	** Add a new tag or property to CHECK-IN. The tag will
379	** be usable instead of a CHECK-IN in commands such as
380	** update and merge. If the --propagate flag is present,
381	** the tag value propagates to all descendants of CHECK-IN
	@@ -390,11 +390,11 @@
390	**
391	** The --date-override and --user-override options support
392	** importing history from other SCM systems. DATETIME has
393	** the form 'YYYY-MMM-DD HH:MM:SS'.
394	**
395	** %fossil tag cancel ?--raw? TAGNAME CHECK-IN
396	**
397	** Remove the tag TAGNAME from CHECK-IN, and also remove
398	** the propagation of the tag to any descendants. Use the
399	** the --dryrun or -n options to see what would have happened.
400	**
	@@ -403,11 +403,11 @@
403	** --date-override DATETIME Set date and time deleted.
404	** --user-override USER Name USER when deleting the tag.
405	** --dryrun\|-n Display the control artifact, but do
406	** not insert it into the database.
407	**
408	** %fossil tag find ?OPTIONS? TAGNAME
409	**
410	** List all objects that use TAGNAME. TYPE can be "ci" for
411	** check-ins or "e" for events. The limit option limits the number
412	** of results to the given value.
413	**
	@@ -414,11 +414,11 @@
414	** Options:
415	** --raw Raw tag name.
416	** -t\|--type TYPE One of "ci", or "e".
417	** -n\|--limit N Limit to N results.
418	**
419	** %fossil tag list\|ls ?OPTIONS? ?CHECK-IN?
420	**
421	** List all tags, or if CHECK-IN is supplied, list
422	** all tags and their values for CHECK-IN. The tagtype option
423	** takes one of: propagated, singleton, cancel.
424	**
425

	--- src/tag.c
	+++ src/tag.c
	@@ -371,11 +371,11 @@
371	**
372	** Usage: %fossil tag SUBCOMMAND ...
373	**
374	** Run various subcommands to control tags and properties.
375	**
376	** > fossil tag add ?OPTIONS? TAGNAME CHECK-IN ?VALUE?
377	**
378	** Add a new tag or property to CHECK-IN. The tag will
379	** be usable instead of a CHECK-IN in commands such as
380	** update and merge. If the --propagate flag is present,
381	** the tag value propagates to all descendants of CHECK-IN
	@@ -390,11 +390,11 @@
390	**
391	** The --date-override and --user-override options support
392	** importing history from other SCM systems. DATETIME has
393	** the form 'YYYY-MMM-DD HH:MM:SS'.
394	**
395	** > fossil tag cancel ?--raw? TAGNAME CHECK-IN
396	**
397	** Remove the tag TAGNAME from CHECK-IN, and also remove
398	** the propagation of the tag to any descendants. Use the
399	** the --dryrun or -n options to see what would have happened.
400	**
	@@ -403,11 +403,11 @@
403	** --date-override DATETIME Set date and time deleted.
404	** --user-override USER Name USER when deleting the tag.
405	** --dryrun\|-n Display the control artifact, but do
406	** not insert it into the database.
407	**
408	** > fossil tag find ?OPTIONS? TAGNAME
409	**
410	** List all objects that use TAGNAME. TYPE can be "ci" for
411	** check-ins or "e" for events. The limit option limits the number
412	** of results to the given value.
413	**
	@@ -414,11 +414,11 @@
414	** Options:
415	** --raw Raw tag name.
416	** -t\|--type TYPE One of "ci", or "e".
417	** -n\|--limit N Limit to N results.
418	**
419	** > fossil tag list\|ls ?OPTIONS? ?CHECK-IN?
420	**
421	** List all tags, or if CHECK-IN is supplied, list
422	** all tags and their values for CHECK-IN. The tagtype option
423	** takes one of: propagated, singleton, cancel.
424	**
425

M src/timeline.c

+13 -12

		--- src/timeline.c
		+++ src/timeline.c
		@@ -1583,20 +1583,21 @@
1583	1583	/*
1584	1584	** WEBPAGE: timeline
1585	1585	**
1586	1586	** Query parameters:
1587	1587	**
1588		-** a=TIMEORTAG After this event
1589		-** b=TIMEORTAG Before this event
1590		-** c=TIMEORTAG "Circa" this event
1591		-** cf=FILEHASH "Circa" the first use of the file with FILEHASH
1592		-** m=TIMEORTAG Mark this event
1593		-** n=COUNT Maximum number of events. "all" for no limit
	1588	+** a=TIMEORTAG Show events after TIMEORTAG
	1589	+** b=TIMEORTAG Show events before TIMEORTAG
	1590	+** c=TIMEORTAG Show events that happen "circa" TIMEORTAG
	1591	+** cf=FILEHASH Show events around the time of the first use of
	1592	+** the file with FILEHASH
	1593	+** m=TIMEORTAG Highlight the event at TIMEORTAG
	1594	+** n=COUNT Maximum number of events. "all" for no limit
1594	1595	** p=CHECKIN Parents and ancestors of CHECKIN
1595		-** bt=PRIOR ... going back to PRIOR
	1596	+** bt=PRIOR ... going back to PRIOR
1596	1597	** d=CHECKIN Children and descendants of CHECKIN
1597		-** dp=CHECKIN The same as d=CHECKIN&p=CHECKIN
	1598	+** dp=CHECKIN The same as 'd=CHECKIN&p=CHECKIN'
1598	1599	** t=TAG Show only check-ins with the given TAG
1599	1600	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1600	1601	** rel Show related check-ins as well as those matching t=TAG
1601	1602	** mionly Limit rel to show ancestors but not descendants
1602	1603	** nowiki Do not show wiki associated with branch or tag
		@@ -1611,16 +1612,16 @@
1611	1612	** nsm Omit the submenu
1612	1613	** v Show details of files changed
1613	1614	** vfx Show complete text of forum messages
1614	1615	** f=CHECKIN Show family (immediate parents and children) of CHECKIN
1615	1616	** from=CHECKIN Path from...
1616		-** to=CHECKIN ... to this
1617		-** shortest ... show only the shortest path
1618		-** rel ... also show related checkins
	1617	+** to=CHECKIN ... to this
	1618	+** shortest ... show only the shortest path
	1619	+** rel ... also show related checkins
1619	1620	** uf=FILE_HASH Show only check-ins that contain the given file version
1620	1621	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1621		-** name matches one of the comma-separate GLOBLIST
	1622	+** name matches one of the comma-separate GLOBLIST
1622	1623	** brbg Background color from branch name
1623	1624	** ubg Background color from user
1624	1625	** namechng Show only check-ins that have filename changes
1625	1626	** forks Show only forks and their children
1626	1627	** cherrypicks Show all cherrypicks
1627	1628

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1583,20 +1583,21 @@
1583	/*
1584	** WEBPAGE: timeline
1585	**
1586	** Query parameters:
1587	**
1588	** a=TIMEORTAG After this event
1589	** b=TIMEORTAG Before this event
1590	** c=TIMEORTAG "Circa" this event
1591	** cf=FILEHASH "Circa" the first use of the file with FILEHASH
1592	** m=TIMEORTAG Mark this event
1593	** n=COUNT Maximum number of events. "all" for no limit

1594	** p=CHECKIN Parents and ancestors of CHECKIN
1595	** bt=PRIOR ... going back to PRIOR
1596	** d=CHECKIN Children and descendants of CHECKIN
1597	** dp=CHECKIN The same as d=CHECKIN&p=CHECKIN
1598	** t=TAG Show only check-ins with the given TAG
1599	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1600	** rel Show related check-ins as well as those matching t=TAG
1601	** mionly Limit rel to show ancestors but not descendants
1602	** nowiki Do not show wiki associated with branch or tag
	@@ -1611,16 +1612,16 @@
1611	** nsm Omit the submenu
1612	** v Show details of files changed
1613	** vfx Show complete text of forum messages
1614	** f=CHECKIN Show family (immediate parents and children) of CHECKIN
1615	** from=CHECKIN Path from...
1616	** to=CHECKIN ... to this
1617	** shortest ... show only the shortest path
1618	** rel ... also show related checkins
1619	** uf=FILE_HASH Show only check-ins that contain the given file version
1620	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1621	** name matches one of the comma-separate GLOBLIST
1622	** brbg Background color from branch name
1623	** ubg Background color from user
1624	** namechng Show only check-ins that have filename changes
1625	** forks Show only forks and their children
1626	** cherrypicks Show all cherrypicks
1627

	--- src/timeline.c
	+++ src/timeline.c
	@@ -1583,20 +1583,21 @@
1583	/*
1584	** WEBPAGE: timeline
1585	**
1586	** Query parameters:
1587	**
1588	** a=TIMEORTAG Show events after TIMEORTAG
1589	** b=TIMEORTAG Show events before TIMEORTAG
1590	** c=TIMEORTAG Show events that happen "circa" TIMEORTAG
1591	** cf=FILEHASH Show events around the time of the first use of
1592	** the file with FILEHASH
1593	** m=TIMEORTAG Highlight the event at TIMEORTAG
1594	** n=COUNT Maximum number of events. "all" for no limit
1595	** p=CHECKIN Parents and ancestors of CHECKIN
1596	** bt=PRIOR ... going back to PRIOR
1597	** d=CHECKIN Children and descendants of CHECKIN
1598	** dp=CHECKIN The same as 'd=CHECKIN&p=CHECKIN'
1599	** t=TAG Show only check-ins with the given TAG
1600	** r=TAG Show check-ins related to TAG, equivalent to t=TAG&rel
1601	** rel Show related check-ins as well as those matching t=TAG
1602	** mionly Limit rel to show ancestors but not descendants
1603	** nowiki Do not show wiki associated with branch or tag
	@@ -1611,16 +1612,16 @@
1612	** nsm Omit the submenu
1613	** v Show details of files changed
1614	** vfx Show complete text of forum messages
1615	** f=CHECKIN Show family (immediate parents and children) of CHECKIN
1616	** from=CHECKIN Path from...
1617	** to=CHECKIN ... to this
1618	** shortest ... show only the shortest path
1619	** rel ... also show related checkins
1620	** uf=FILE_HASH Show only check-ins that contain the given file version
1621	** chng=GLOBLIST Show only check-ins that involve changes to a file whose
1622	** name matches one of the comma-separate GLOBLIST
1623	** brbg Background color from branch name
1624	** ubg Background color from user
1625	** namechng Show only check-ins that have filename changes
1626	** forks Show only forks and their children
1627	** cherrypicks Show all cherrypicks
1628

M src/tkt.c

+9 -9

		--- src/tkt.c
		+++ src/tkt.c
		@@ -1136,11 +1136,11 @@
1136	1136	**
1137	1137	** Usage: %fossil ticket SUBCOMMAND ...
1138	1138	**
1139	1139	** Run various subcommands to control tickets
1140	1140	**
1141		-** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
	1141	+** > fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
1142	1142	**
1143	1143	** Options:
1144	1144	** -l\|--limit LIMITCHAR
1145	1145	** -q\|--quote
1146	1146	** -R\|--repository FILE
		@@ -1165,22 +1165,22 @@
1165	1165	**
1166	1166	** Instead of the report title it's possible to use the report
1167	1167	** number; the special report number 0 lists all columns defined in
1168	1168	** the ticket table.
1169	1169	**
1170		-** %fossil ticket list fields
1171		-** %fossil ticket ls fields
	1170	+** > fossil ticket list fields
	1171	+** > fossil ticket ls fields
1172	1172	**
1173	1173	** List all fields defined for ticket in the fossil repository.
1174	1174	**
1175		-** %fossil ticket list reports
1176		-** %fossil ticket ls reports
	1175	+** > fossil ticket list reports
	1176	+** > fossil ticket ls reports
1177	1177	**
1178	1178	** List all ticket reports defined in the fossil repository.
1179	1179	**
1180		-** %fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1181		-** %fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
	1180	+** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
	1181	+** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1182	1182	**
1183	1183	** Change ticket identified by TICKETUUID to set the values of
1184	1184	** each field FIELD to VALUE.
1185	1185	**
1186	1186	** Field names as defined in the TICKET table. By default, these
		@@ -1192,15 +1192,15 @@
1192	1192	** can use more than one field/value pair on the commandline. Using
1193	1193	** --quote enables the special character decoding as in "ticket
1194	1194	** show", which allows setting multiline text or text with special
1195	1195	** characters.
1196	1196	**
1197		-** %fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
	1197	+** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1198	1198	**
1199	1199	** Like set, but create a new ticket with the given values.
1200	1200	**
1201		-** %fossil ticket history TICKETUUID
	1201	+** > fossil ticket history TICKETUUID
1202	1202	**
1203	1203	** Show the complete change history for the ticket
1204	1204	**
1205	1205	** Note that the values in set\|add are not validated against the
1206	1206	** definitions given in "Ticket Common Script".
1207	1207

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1136,11 +1136,11 @@
1136	**
1137	** Usage: %fossil ticket SUBCOMMAND ...
1138	**
1139	** Run various subcommands to control tickets
1140	**
1141	** %fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
1142	**
1143	** Options:
1144	** -l\|--limit LIMITCHAR
1145	** -q\|--quote
1146	** -R\|--repository FILE
	@@ -1165,22 +1165,22 @@
1165	**
1166	** Instead of the report title it's possible to use the report
1167	** number; the special report number 0 lists all columns defined in
1168	** the ticket table.
1169	**
1170	** %fossil ticket list fields
1171	** %fossil ticket ls fields
1172	**
1173	** List all fields defined for ticket in the fossil repository.
1174	**
1175	** %fossil ticket list reports
1176	** %fossil ticket ls reports
1177	**
1178	** List all ticket reports defined in the fossil repository.
1179	**
1180	** %fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1181	** %fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1182	**
1183	** Change ticket identified by TICKETUUID to set the values of
1184	** each field FIELD to VALUE.
1185	**
1186	** Field names as defined in the TICKET table. By default, these
	@@ -1192,15 +1192,15 @@
1192	** can use more than one field/value pair on the commandline. Using
1193	** --quote enables the special character decoding as in "ticket
1194	** show", which allows setting multiline text or text with special
1195	** characters.
1196	**
1197	** %fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1198	**
1199	** Like set, but create a new ticket with the given values.
1200	**
1201	** %fossil ticket history TICKETUUID
1202	**
1203	** Show the complete change history for the ticket
1204	**
1205	** Note that the values in set\|add are not validated against the
1206	** definitions given in "Ticket Common Script".
1207

	--- src/tkt.c
	+++ src/tkt.c
	@@ -1136,11 +1136,11 @@
1136	**
1137	** Usage: %fossil ticket SUBCOMMAND ...
1138	**
1139	** Run various subcommands to control tickets
1140	**
1141	** > fossil ticket show (REPORTTITLE\|REPORTNR) ?TICKETFILTER? ?OPTIONS?
1142	**
1143	** Options:
1144	** -l\|--limit LIMITCHAR
1145	** -q\|--quote
1146	** -R\|--repository FILE
	@@ -1165,22 +1165,22 @@
1165	**
1166	** Instead of the report title it's possible to use the report
1167	** number; the special report number 0 lists all columns defined in
1168	** the ticket table.
1169	**
1170	** > fossil ticket list fields
1171	** > fossil ticket ls fields
1172	**
1173	** List all fields defined for ticket in the fossil repository.
1174	**
1175	** > fossil ticket list reports
1176	** > fossil ticket ls reports
1177	**
1178	** List all ticket reports defined in the fossil repository.
1179	**
1180	** > fossil ticket set TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1181	** > fossil ticket change TICKETUUID (FIELD VALUE)+ ?-q\|--quote?
1182	**
1183	** Change ticket identified by TICKETUUID to set the values of
1184	** each field FIELD to VALUE.
1185	**
1186	** Field names as defined in the TICKET table. By default, these
	@@ -1192,15 +1192,15 @@
1192	** can use more than one field/value pair on the commandline. Using
1193	** --quote enables the special character decoding as in "ticket
1194	** show", which allows setting multiline text or text with special
1195	** characters.
1196	**
1197	** > fossil ticket add FIELD VALUE ?FIELD VALUE .. ? ?-q\|--quote?
1198	**
1199	** Like set, but create a new ticket with the given values.
1200	**
1201	** > fossil ticket history TICKETUUID
1202	**
1203	** Show the complete change history for the ticket
1204	**
1205	** Note that the values in set\|add are not validated against the
1206	** definitions given in "Ticket Common Script".
1207

M src/undo.c

+8 -5

		--- src/undo.c
		+++ src/undo.c
		@@ -425,15 +425,18 @@
425	425	** Usage: %fossil undo ?OPTIONS? ?FILENAME...?
426	426	** or: %fossil redo ?OPTIONS? ?FILENAME...?
427	427	**
428	428	** The undo command reverts the changes caused by the previous command
429	429	** if the previous command is one of the following:
430		-**
431		-** (1) fossil update (5) fossil stash apply
432		-** (2) fossil merge (6) fossil stash drop
433		-** (3) fossil revert (7) fossil stash goto
434		-** (4) fossil stash pop (8) fossil clean (see note)
	430	+** * fossil update
	431	+** * fossil merge
	432	+** * fossil revert
	433	+** * fossil stash pop
	434	+** * fossil stash apply
	435	+** * fossil stash drop
	436	+** * fossil stash goto
	437	+** * fossil clean (see note below)
435	438	**
436	439	** Note: The "fossil clean" command only saves state for files less than
437	440	** 10MiB in size and so if fossil clean deleted files larger than that,
438	441	** then "fossil undo" will not recover the larger files.
439	442	**
440	443

	--- src/undo.c
	+++ src/undo.c
	@@ -425,15 +425,18 @@
425	** Usage: %fossil undo ?OPTIONS? ?FILENAME...?
426	** or: %fossil redo ?OPTIONS? ?FILENAME...?
427	**
428	** The undo command reverts the changes caused by the previous command
429	** if the previous command is one of the following:
430	**
431	** (1) fossil update (5) fossil stash apply
432	** (2) fossil merge (6) fossil stash drop
433	** (3) fossil revert (7) fossil stash goto
434	** (4) fossil stash pop (8) fossil clean (see note)



435	**
436	** Note: The "fossil clean" command only saves state for files less than
437	** 10MiB in size and so if fossil clean deleted files larger than that,
438	** then "fossil undo" will not recover the larger files.
439	**
440

	--- src/undo.c
	+++ src/undo.c
	@@ -425,15 +425,18 @@
425	** Usage: %fossil undo ?OPTIONS? ?FILENAME...?
426	** or: %fossil redo ?OPTIONS? ?FILENAME...?
427	**
428	** The undo command reverts the changes caused by the previous command
429	** if the previous command is one of the following:
430	** * fossil update
431	** * fossil merge
432	** * fossil revert
433	** * fossil stash pop
434	** * fossil stash apply
435	** * fossil stash drop
436	** * fossil stash goto
437	** * fossil clean (see note below)
438	**
439	** Note: The "fossil clean" command only saves state for files less than
440	** 10MiB in size and so if fossil clean deleted files larger than that,
441	** then "fossil undo" will not recover the larger files.
442	**
443

M src/update.c

+16 -15

		--- src/update.c
		+++ src/update.c
		@@ -91,25 +91,26 @@
91	91	**
92	92	** The -v or --verbose option prints status information about
93	93	** unchanged files in addition to those file that actually do change.
94	94	**
95	95	** Options:
96		-** --case-sensitive <BOOL> override case-sensitive setting
97		-** --debug print debug information on stdout
98		-** --latest acceptable in place of VERSION, update to latest version
99		-** --force-missing force update if missing content after sync
100		-** -n\|--dry-run If given, display instead of run actions
101		-** -v\|--verbose print status information about all files
102		-** -W\|--width <num> Width of lines (default is to auto-detect). Must be >20
103		-** or 0 (= no limit, resulting in a single line per entry).
104		-** --setmtime Set timestamps of all files to match their SCM-side
105		-** times (the timestamp of the last checkin which modified
106		-** them).
107		-**
108		-** -K\|--keep-merge-files On merge conflict, retain the temporary files
109		-** used for merging, named -baseline, -original,
110		-** and *-merge.
	96	+** --case-sensitive BOOL Override case-sensitive setting
	97	+** --debug Print debug information on stdout
	98	+** --latest Acceptable in place of VERSION, update to
	99	+** latest version
	100	+** --force-missing Force update if missing content after sync
	101	+** -n\|--dry-run If given, display instead of run actions
	102	+** -v\|--verbose Print status information about all files
	103	+** -W\|--width WIDTH Width of lines (default is to auto-detect).
	104	+** Must be more than 20 or 0 (= no limit,
	105	+** resulting in a single line per entry).
	106	+** --setmtime Set timestamps of all files to match their
	107	+** SCM-side times (the timestamp of the last
	108	+** checkin which modified them).
	109	+** -K\|--keep-merge-files On merge conflict, retain the temporary files
	110	+** used for merging, named -baseline, -original,
	111	+** and *-merge.
111	112	**
112	113	** See also: revert
113	114	*/
114	115	void update_cmd(void){
115	116	int vid; /* Current version */
116	117

	--- src/update.c
	+++ src/update.c
	@@ -91,25 +91,26 @@
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those file that actually do change.
94	**
95	** Options:
96	** --case-sensitive <BOOL> override case-sensitive setting
97	** --debug print debug information on stdout
98	** --latest acceptable in place of VERSION, update to latest version
99	** --force-missing force update if missing content after sync
100	** -n\|--dry-run If given, display instead of run actions
101	** -v\|--verbose print status information about all files
102	** -W\|--width <num> Width of lines (default is to auto-detect). Must be >20
103	** or 0 (= no limit, resulting in a single line per entry).
104	** --setmtime Set timestamps of all files to match their SCM-side
105	** times (the timestamp of the last checkin which modified
106	** them).
107	**
108	** -K\|--keep-merge-files On merge conflict, retain the temporary files
109	** used for merging, named -baseline, -original,
110	** and *-merge.

111	**
112	** See also: revert
113	*/
114	void update_cmd(void){
115	int vid; /* Current version */
116

	--- src/update.c
	+++ src/update.c
	@@ -91,25 +91,26 @@
91	**
92	** The -v or --verbose option prints status information about
93	** unchanged files in addition to those file that actually do change.
94	**
95	** Options:
96	** --case-sensitive BOOL Override case-sensitive setting
97	** --debug Print debug information on stdout
98	** --latest Acceptable in place of VERSION, update to
99	** latest version
100	** --force-missing Force update if missing content after sync
101	** -n\|--dry-run If given, display instead of run actions
102	** -v\|--verbose Print status information about all files
103	** -W\|--width WIDTH Width of lines (default is to auto-detect).
104	** Must be more than 20 or 0 (= no limit,
105	** resulting in a single line per entry).
106	** --setmtime Set timestamps of all files to match their
107	** SCM-side times (the timestamp of the last
108	** checkin which modified them).
109	** -K\|--keep-merge-files On merge conflict, retain the temporary files
110	** used for merging, named -baseline, -original,
111	** and *-merge.
112	**
113	** See also: revert
114	*/
115	void update_cmd(void){
116	int vid; /* Current version */
117

M src/user.c

+6 -6

		--- src/user.c
		+++ src/user.c
		@@ -331,31 +331,31 @@
331	331	** Usage: %fossil user SUBCOMMAND ... ?-R\|--repository FILE?
332	332	**
333	333	** Run various subcommands on users of the open repository or of
334	334	** the repository identified by the -R or --repository option.
335	335	**
336		-** %fossil user capabilities USERNAME ?STRING?
	336	+** > fossil user capabilities USERNAME ?STRING?
337	337	**
338	338	** Query or set the capabilities for user USERNAME
339	339	**
340		-** %fossil user default ?USERNAME?
	340	+** > fossil user default ?USERNAME?
341	341	**
342	342	** Query or set the default user. The default user is the
343	343	** user for command-line interaction.
344	344	**
345		-** %fossil user list
346		-** %fossil user ls
	345	+** > fossil user list
	346	+** > fossil user ls
347	347	**
348	348	** List all users known to the repository
349	349	**
350		-** %fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD?
	350	+** > fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD?
351	351	**
352	352	** Create a new user in the repository. Users can never be
353	353	** deleted. They can be denied all access but they must continue
354	354	** to exist in the database.
355	355	**
356		-** %fossil user password USERNAME ?PASSWORD?
	356	+** > fossil user password USERNAME ?PASSWORD?
357	357	**
358	358	** Change the web access password for a user.
359	359	*/
360	360	void user_cmd(void){
361	361	int n;
362	362

	--- src/user.c
	+++ src/user.c
	@@ -331,31 +331,31 @@
331	** Usage: %fossil user SUBCOMMAND ... ?-R\|--repository FILE?
332	**
333	** Run various subcommands on users of the open repository or of
334	** the repository identified by the -R or --repository option.
335	**
336	** %fossil user capabilities USERNAME ?STRING?
337	**
338	** Query or set the capabilities for user USERNAME
339	**
340	** %fossil user default ?USERNAME?
341	**
342	** Query or set the default user. The default user is the
343	** user for command-line interaction.
344	**
345	** %fossil user list
346	** %fossil user ls
347	**
348	** List all users known to the repository
349	**
350	** %fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD?
351	**
352	** Create a new user in the repository. Users can never be
353	** deleted. They can be denied all access but they must continue
354	** to exist in the database.
355	**
356	** %fossil user password USERNAME ?PASSWORD?
357	**
358	** Change the web access password for a user.
359	*/
360	void user_cmd(void){
361	int n;
362

	--- src/user.c
	+++ src/user.c
	@@ -331,31 +331,31 @@
331	** Usage: %fossil user SUBCOMMAND ... ?-R\|--repository FILE?
332	**
333	** Run various subcommands on users of the open repository or of
334	** the repository identified by the -R or --repository option.
335	**
336	** > fossil user capabilities USERNAME ?STRING?
337	**
338	** Query or set the capabilities for user USERNAME
339	**
340	** > fossil user default ?USERNAME?
341	**
342	** Query or set the default user. The default user is the
343	** user for command-line interaction.
344	**
345	** > fossil user list
346	** > fossil user ls
347	**
348	** List all users known to the repository
349	**
350	** > fossil user new ?USERNAME? ?CONTACT-INFO? ?PASSWORD?
351	**
352	** Create a new user in the repository. Users can never be
353	** deleted. They can be denied all access but they must continue
354	** to exist in the database.
355	**
356	** > fossil user password USERNAME ?PASSWORD?
357	**
358	** Change the web access password for a user.
359	*/
360	void user_cmd(void){
361	int n;
362

M src/wiki.c

+19 -19

		--- src/wiki.c
		+++ src/wiki.c
		@@ -1405,34 +1405,34 @@
1405	1405	**
1406	1406	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1407	1407	**
1408	1408	** Run various subcommands to work with wiki entries or tech notes.
1409	1409	**
1410		-** %fossil wiki export ?OPTIONS? PAGENAME ?FILE?
1411		-** %fossil wiki export ?OPTIONS? -t\|--technote DATETIME\|TECHNOTE-ID ?FILE?
	1410	+** > fossil wiki export ?OPTIONS? PAGENAME ?FILE?
	1411	+** > fossil wiki export ?OPTIONS? -t\|--technote DATETIME\|TECHNOTE-ID ?FILE?
1412	1412	**
1413	1413	** Sends the latest version of either a wiki page or of a tech
1414	1414	** note to the given file or standard output. A filename of "-"
1415	1415	** writes the output to standard output. The directory parts of
1416	1416	** the output filename are created if needed.
1417		-**
1418		-** Options:
1419	1417	** If PAGENAME is provided, the named wiki page will be output.
1420		-** --technote\|-t DATETIME\|TECHNOTE-ID
1421		-** Specifies that a technote, rather than a wiki page,
1422		-** will be exported. If DATETIME is used, the most
1423		-** recently modified tech note with that DATETIME will
1424		-** output.
1425		-** -h\|--html The body (only) is rendered in HTML form, without
1426		-** any page header/foot or HTML/BODY tag wrappers.
1427		-** -H\|--HTML Works like -h\|-html but wraps the output in
1428		-** <html><body>...</body></html>.
1429		-** -p\|--pre If -h\|-H is used and the page or technote has
1430		-** the text/plain mimetype, its HTML-escaped output
1431		-** will be wrapped in <pre>...</pre>.
	1418	+**
	1419	+** Options:
	1420	+** --technote\|-t DATETIME\|TECHNOTE-ID
	1421	+** Specifies that a technote, rather than a wiki page,
	1422	+** will be exported. If DATETIME is used, the most
	1423	+** recently modified tech note with that DATETIME will
	1424	+** output.
	1425	+** -h\|--html The body (only) is rendered in HTML form, without
	1426	+** any page header/foot or HTML/BODY tag wrappers.
	1427	+** -H\|--HTML Works like -h\|-html but wraps the output in
	1428	+** <html><body>...</body></html>.
	1429	+** -p\|--pre If -h\|-H is used and the page or technote has
	1430	+** the text/plain mimetype, its HTML-escaped output
	1431	+** will be wrapped in <pre>...</pre>.
1432	1432	**
1433		-** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
	1433	+** > fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1434	1434	**
1435	1435	** Create a new or commit changes to an existing wiki page or
1436	1436	** technote from FILE or from standard input. PAGENAME is the
1437	1437	** name of the wiki entry or the timeline comment of the
1438	1438	** technote.
		@@ -1456,12 +1456,12 @@
1456	1456	** updated by its technote id.
1457	1457	** --technote-tags TAGS The set of tags for a technote.
1458	1458	** --technote-bgcolor COLOR The color used for the technote
1459	1459	** on the timeline.
1460	1460	**
1461		-** %fossil wiki list ?OPTIONS?
1462		-** %fossil wiki ls ?OPTIONS?
	1461	+** > fossil wiki list ?OPTIONS?
	1462	+** > fossil wiki ls ?OPTIONS?
1463	1463	**
1464	1464	** Lists all wiki entries, one per line, ordered
1465	1465	** case-insensitively by name.
1466	1466	**
1467	1467	** Options:
1468	1468

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1405,34 +1405,34 @@
1405	**
1406	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1407	**
1408	** Run various subcommands to work with wiki entries or tech notes.
1409	**
1410	** %fossil wiki export ?OPTIONS? PAGENAME ?FILE?
1411	** %fossil wiki export ?OPTIONS? -t\|--technote DATETIME\|TECHNOTE-ID ?FILE?
1412	**
1413	** Sends the latest version of either a wiki page or of a tech
1414	** note to the given file or standard output. A filename of "-"
1415	** writes the output to standard output. The directory parts of
1416	** the output filename are created if needed.
1417	**
1418	** Options:
1419	** If PAGENAME is provided, the named wiki page will be output.
1420	** --technote\|-t DATETIME\|TECHNOTE-ID
1421	** Specifies that a technote, rather than a wiki page,
1422	** will be exported. If DATETIME is used, the most
1423	** recently modified tech note with that DATETIME will
1424	** output.
1425	** -h\|--html The body (only) is rendered in HTML form, without
1426	** any page header/foot or HTML/BODY tag wrappers.
1427	** -H\|--HTML Works like -h\|-html but wraps the output in
1428	** <html><body>...</body></html>.
1429	** -p\|--pre If -h\|-H is used and the page or technote has
1430	** the text/plain mimetype, its HTML-escaped output
1431	** will be wrapped in <pre>...</pre>.


1432	**
1433	** %fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1434	**
1435	** Create a new or commit changes to an existing wiki page or
1436	** technote from FILE or from standard input. PAGENAME is the
1437	** name of the wiki entry or the timeline comment of the
1438	** technote.
	@@ -1456,12 +1456,12 @@
1456	** updated by its technote id.
1457	** --technote-tags TAGS The set of tags for a technote.
1458	** --technote-bgcolor COLOR The color used for the technote
1459	** on the timeline.
1460	**
1461	** %fossil wiki list ?OPTIONS?
1462	** %fossil wiki ls ?OPTIONS?
1463	**
1464	** Lists all wiki entries, one per line, ordered
1465	** case-insensitively by name.
1466	**
1467	** Options:
1468

	--- src/wiki.c
	+++ src/wiki.c
	@@ -1405,34 +1405,34 @@
1405	**
1406	** Usage: %fossil wiki (export\|create\|commit\|list) WikiName
1407	**
1408	** Run various subcommands to work with wiki entries or tech notes.
1409	**
1410	** > fossil wiki export ?OPTIONS? PAGENAME ?FILE?
1411	** > fossil wiki export ?OPTIONS? -t\|--technote DATETIME\|TECHNOTE-ID ?FILE?
1412	**
1413	** Sends the latest version of either a wiki page or of a tech
1414	** note to the given file or standard output. A filename of "-"
1415	** writes the output to standard output. The directory parts of
1416	** the output filename are created if needed.


1417	** If PAGENAME is provided, the named wiki page will be output.
1418	**
1419	** Options:
1420	** --technote\|-t DATETIME\|TECHNOTE-ID
1421	** Specifies that a technote, rather than a wiki page,
1422	** will be exported. If DATETIME is used, the most
1423	** recently modified tech note with that DATETIME will
1424	** output.
1425	** -h\|--html The body (only) is rendered in HTML form, without
1426	** any page header/foot or HTML/BODY tag wrappers.
1427	** -H\|--HTML Works like -h\|-html but wraps the output in
1428	** <html><body>...</body></html>.
1429	** -p\|--pre If -h\|-H is used and the page or technote has
1430	** the text/plain mimetype, its HTML-escaped output
1431	** will be wrapped in <pre>...</pre>.
1432	**
1433	** > fossil wiki (create\|commit) PAGENAME ?FILE? ?OPTIONS?
1434	**
1435	** Create a new or commit changes to an existing wiki page or
1436	** technote from FILE or from standard input. PAGENAME is the
1437	** name of the wiki entry or the timeline comment of the
1438	** technote.
	@@ -1456,12 +1456,12 @@
1456	** updated by its technote id.
1457	** --technote-tags TAGS The set of tags for a technote.
1458	** --technote-bgcolor COLOR The color used for the technote
1459	** on the timeline.
1460	**
1461	** > fossil wiki list ?OPTIONS?
1462	** > fossil wiki ls ?OPTIONS?
1463	**
1464	** Lists all wiki entries, one per line, ordered
1465	** case-insensitively by name.
1466	**
1467	** Options:
1468

Fossil SCM

Keyboard Shortcuts