b76a547f1aa… — Fossil SCM

M src/add.c

+1 -1

		--- src/add.c
		+++ src/add.c
		@@ -296,11 +296,11 @@
296	296	**
297	297	** Move or rename one or more files within the tree
298	298	**
299	299	** This command does not rename the files on disk. This command merely
300	300	** records the fact that filenames have changed so that appropriate notations
301		-** can be made at the next commit/checkin.
	301	+** can be made at the next <a>commit</a>/checkin.
302	302	*/
303	303	void mv_cmd(void){
304	304	int i;
305	305	int vid;
306	306	char *zDest;
307	307

	--- src/add.c
	+++ src/add.c
	@@ -296,11 +296,11 @@
296	**
297	** Move or rename one or more files within the tree
298	**
299	** This command does not rename the files on disk. This command merely
300	** records the fact that filenames have changed so that appropriate notations
301	** can be made at the next commit/checkin.
302	*/
303	void mv_cmd(void){
304	int i;
305	int vid;
306	char *zDest;
307

	--- src/add.c
	+++ src/add.c
	@@ -296,11 +296,11 @@
296	**
297	** Move or rename one or more files within the tree
298	**
299	** This command does not rename the files on disk. This command merely
300	** records the fact that filenames have changed so that appropriate notations
301	** can be made at the next <a>commit</a>/checkin.
302	*/
303	void mv_cmd(void){
304	int i;
305	int vid;
306	char *zDest;
307

M src/allrepo.c

+2 -2

		--- src/allrepo.c
		+++ src/allrepo.c
		@@ -71,12 +71,12 @@
71	71	** rebuild Rebuild on all repositories
72	72	**
73	73	** sync Run a "sync" on all repositories
74	74	**
75	75	** Respositories are automatically added to the set of known repositories
76		-** when one of the following commands against the repository: clone, info,
77		-** pull, push, or sync
	76	+** when one of the following commands against the repository:
	77	+** <a>clone</a>, <a>info</a>, <a>pull</a>, <a>push</a>, or <a>sync</a>
78	78	*/
79	79	void all_cmd(void){
80	80	int n;
81	81	Stmt q;
82	82	const char *zCmd;
83	83

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -71,12 +71,12 @@
71	** rebuild Rebuild on all repositories
72	**
73	** sync Run a "sync" on all repositories
74	**
75	** Respositories are automatically added to the set of known repositories
76	** when one of the following commands against the repository: clone, info,
77	** pull, push, or sync
78	*/
79	void all_cmd(void){
80	int n;
81	Stmt q;
82	const char *zCmd;
83

	--- src/allrepo.c
	+++ src/allrepo.c
	@@ -71,12 +71,12 @@
71	** rebuild Rebuild on all repositories
72	**
73	** sync Run a "sync" on all repositories
74	**
75	** Respositories are automatically added to the set of known repositories
76	** when one of the following commands against the repository:
77	** <a>clone</a>, <a>info</a>, <a>pull</a>, <a>push</a>, or <a>sync</a>
78	*/
79	void all_cmd(void){
80	int n;
81	Stmt q;
82	const char *zCmd;
83

M src/checkin.c

+3 -3

		--- src/checkin.c
		+++ src/checkin.c
		@@ -101,11 +101,11 @@
101	101	** COMMAND: changes
102	102	**
103	103	** Usage: %fossil changes
104	104	**
105	105	** Report on the edit status of all files in the current checkout.
106		-** See also the "status" and "extra" commands.
	106	+** See also the "<a>status</a>" and "<a>extra</a>" commands.
107	107	*/
108	108	void changes_cmd(void){
109	109	Blob report;
110	110	int vid;
111	111	db_must_be_within_tree();
		@@ -247,11 +247,11 @@
247	247	/*
248	248	** COMMAND: extras
249	249	** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN?
250	250	**
251	251	** Print a list of all files in the source tree that are not part of
252		-** the current checkout. See also the "clean" command.
	252	+** the current checkout. See also the "<a>clean</a>" command.
253	253	**
254	254	** Files and subdirectories whose names begin with "." are normally
255	255	** ignored but can be included by adding the --dotfiles option.
256	256	*/
257	257	void extra_cmd(void){
		@@ -293,11 +293,11 @@
293	293	** COMMAND: clean
294	294	** Usage: %fossil clean ?--force? ?--dotfiles?
295	295	**
296	296	** Delete all "extra" files in the source tree. "Extra" files are
297	297	** files that are not officially part of the checkout. See also
298		-** the "extra" command. This operation cannot be undone.
	298	+** the "<a>extras</a>" command. This operation cannot be undone.
299	299	**
300	300	** You will be prompted before removing each file. If you are
301	301	** sure you wish to remove all "extra" files you can specify the
302	302	** optional --force flag and no prompts will be issued.
303	303	**
304	304

	--- src/checkin.c
	+++ src/checkin.c
	@@ -101,11 +101,11 @@
101	** COMMAND: changes
102	**
103	** Usage: %fossil changes
104	**
105	** Report on the edit status of all files in the current checkout.
106	** See also the "status" and "extra" commands.
107	*/
108	void changes_cmd(void){
109	Blob report;
110	int vid;
111	db_must_be_within_tree();
	@@ -247,11 +247,11 @@
247	/*
248	** COMMAND: extras
249	** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN?
250	**
251	** Print a list of all files in the source tree that are not part of
252	** the current checkout. See also the "clean" command.
253	**
254	** Files and subdirectories whose names begin with "." are normally
255	** ignored but can be included by adding the --dotfiles option.
256	*/
257	void extra_cmd(void){
	@@ -293,11 +293,11 @@
293	** COMMAND: clean
294	** Usage: %fossil clean ?--force? ?--dotfiles?
295	**
296	** Delete all "extra" files in the source tree. "Extra" files are
297	** files that are not officially part of the checkout. See also
298	** the "extra" command. This operation cannot be undone.
299	**
300	** You will be prompted before removing each file. If you are
301	** sure you wish to remove all "extra" files you can specify the
302	** optional --force flag and no prompts will be issued.
303	**
304

	--- src/checkin.c
	+++ src/checkin.c
	@@ -101,11 +101,11 @@
101	** COMMAND: changes
102	**
103	** Usage: %fossil changes
104	**
105	** Report on the edit status of all files in the current checkout.
106	** See also the "<a>status</a>" and "<a>extra</a>" commands.
107	*/
108	void changes_cmd(void){
109	Blob report;
110	int vid;
111	db_must_be_within_tree();
	@@ -247,11 +247,11 @@
247	/*
248	** COMMAND: extras
249	** Usage: %fossil extras ?--dotfiles? ?--ignore GLOBPATTERN?
250	**
251	** Print a list of all files in the source tree that are not part of
252	** the current checkout. See also the "<a>clean</a>" command.
253	**
254	** Files and subdirectories whose names begin with "." are normally
255	** ignored but can be included by adding the --dotfiles option.
256	*/
257	void extra_cmd(void){
	@@ -293,11 +293,11 @@
293	** COMMAND: clean
294	** Usage: %fossil clean ?--force? ?--dotfiles?
295	**
296	** Delete all "extra" files in the source tree. "Extra" files are
297	** files that are not officially part of the checkout. See also
298	** the "<a>extras</a>" command. This operation cannot be undone.
299	**
300	** You will be prompted before removing each file. If you are
301	** sure you wish to remove all "extra" files you can specify the
302	** optional --force flag and no prompts will be issued.
303	**
304

M src/checkout.c

+2 -2

		--- src/checkout.c
		+++ src/checkout.c
		@@ -172,11 +172,11 @@
172	172	** files.
173	173	**
174	174	** The --latest flag can be used in place of VERSION to checkout the
175	175	** latest version in the repository.
176	176	**
177		-** See also the "update" command.
	177	+** See also the "<a>update</a>" command.
178	178	*/
179	179	void checkout_cmd(void){
180	180	int forceFlag; /* Force checkout even if edits exist */
181	181	int keepFlag; /* Do not change any files on disk */
182	182	int latestFlag; /* Checkout the latest version */
		@@ -272,11 +272,11 @@
272	272	/*
273	273	** COMMAND: close
274	274	**
275	275	** Usage: %fossil close ?-f\|--force?
276	276	**
277		-** The opposite of "open". Close the current database connection.
	277	+** The opposite of "<a>open</a>". Close the current database connection.
278	278	** Require a -f or --force flag if there are unsaved changed in the
279	279	** current check-out.
280	280	*/
281	281	void close_cmd(void){
282	282	int forceFlag = find_option("force","f",0)!=0;
283	283

	--- src/checkout.c
	+++ src/checkout.c
	@@ -172,11 +172,11 @@
172	** files.
173	**
174	** The --latest flag can be used in place of VERSION to checkout the
175	** latest version in the repository.
176	**
177	** See also the "update" command.
178	*/
179	void checkout_cmd(void){
180	int forceFlag; /* Force checkout even if edits exist */
181	int keepFlag; /* Do not change any files on disk */
182	int latestFlag; /* Checkout the latest version */
	@@ -272,11 +272,11 @@
272	/*
273	** COMMAND: close
274	**
275	** Usage: %fossil close ?-f\|--force?
276	**
277	** The opposite of "open". Close the current database connection.
278	** Require a -f or --force flag if there are unsaved changed in the
279	** current check-out.
280	*/
281	void close_cmd(void){
282	int forceFlag = find_option("force","f",0)!=0;
283

	--- src/checkout.c
	+++ src/checkout.c
	@@ -172,11 +172,11 @@
172	** files.
173	**
174	** The --latest flag can be used in place of VERSION to checkout the
175	** latest version in the repository.
176	**
177	** See also the "<a>update</a>" command.
178	*/
179	void checkout_cmd(void){
180	int forceFlag; /* Force checkout even if edits exist */
181	int keepFlag; /* Do not change any files on disk */
182	int latestFlag; /* Checkout the latest version */
	@@ -272,11 +272,11 @@
272	/*
273	** COMMAND: close
274	**
275	** Usage: %fossil close ?-f\|--force?
276	**
277	** The opposite of "<a>open</a>". Close the current database connection.
278	** Require a -f or --force flag if there are unsaved changed in the
279	** current check-out.
280	*/
281	void close_cmd(void){
282	int forceFlag = find_option("force","f",0)!=0;
283

M src/db.c

+2 -2

		--- src/db.c
		+++ src/db.c
		@@ -1035,11 +1035,11 @@
1035	1035	** COMMAND: new
1036	1036	**
1037	1037	** Usage: %fossil new ?OPTIONS? FILENAME
1038	1038	**
1039	1039	** Create a repository for a new project in the file named FILENAME.
1040		-** This command is distinct from "clone". The "clone" command makes
	1040	+** This command is distinct from "clone". The "<a>clone</a>" command makes
1041	1041	** a copy of an existing project. This command starts a new project.
1042	1042	**
1043	1043	** By default, your current login name is used to create the default
1044	1044	** admin user. This can be overridden using the -A\|--admin-user
1045	1045	** parameter.
		@@ -1420,11 +1420,11 @@
1420	1420	** for the repository is created with its root at the working directory.
1421	1421	** If VERSION is specified then that version is checked out. Otherwise
1422	1422	** the latest version is checked out. No files other than "manifest"
1423	1423	** and "manifest.uuid" are modified if the --keep option is present.
1424	1424	**
1425		-** See also the "close" command.
	1425	+** See also the "<a>close</a>" command.
1426	1426	*/
1427	1427	void cmd_open(void){
1428	1428	Blob path;
1429	1429	int vid;
1430	1430	int keepFlag;
1431	1431

	--- src/db.c
	+++ src/db.c
	@@ -1035,11 +1035,11 @@
1035	** COMMAND: new
1036	**
1037	** Usage: %fossil new ?OPTIONS? FILENAME
1038	**
1039	** Create a repository for a new project in the file named FILENAME.
1040	** This command is distinct from "clone". The "clone" command makes
1041	** a copy of an existing project. This command starts a new project.
1042	**
1043	** By default, your current login name is used to create the default
1044	** admin user. This can be overridden using the -A\|--admin-user
1045	** parameter.
	@@ -1420,11 +1420,11 @@
1420	** for the repository is created with its root at the working directory.
1421	** If VERSION is specified then that version is checked out. Otherwise
1422	** the latest version is checked out. No files other than "manifest"
1423	** and "manifest.uuid" are modified if the --keep option is present.
1424	**
1425	** See also the "close" command.
1426	*/
1427	void cmd_open(void){
1428	Blob path;
1429	int vid;
1430	int keepFlag;
1431

	--- src/db.c
	+++ src/db.c
	@@ -1035,11 +1035,11 @@
1035	** COMMAND: new
1036	**
1037	** Usage: %fossil new ?OPTIONS? FILENAME
1038	**
1039	** Create a repository for a new project in the file named FILENAME.
1040	** This command is distinct from "clone". The "<a>clone</a>" command makes
1041	** a copy of an existing project. This command starts a new project.
1042	**
1043	** By default, your current login name is used to create the default
1044	** admin user. This can be overridden using the -A\|--admin-user
1045	** parameter.
	@@ -1420,11 +1420,11 @@
1420	** for the repository is created with its root at the working directory.
1421	** If VERSION is specified then that version is checked out. Otherwise
1422	** the latest version is checked out. No files other than "manifest"
1423	** and "manifest.uuid" are modified if the --keep option is present.
1424	**
1425	** See also the "<a>close</a>" command.
1426	*/
1427	void cmd_open(void){
1428	Blob path;
1429	int vid;
1430	int keepFlag;
1431

M src/diffcmd.c

+1 -1

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -364,11 +364,11 @@
364	364	** no "--to" option then the (possibly edited) files in the current check-out
365	365	** are used.
366	366	**
367	367	** The "-i" command-line option forces the use of the internal diff logic
368	368	** rather than any external diff program that might be configured using
369		-** the "setting" command. If no external diff program is configured, then
	369	+** the "<a>setting</a>" command. If no external diff program is configured, then
370	370	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
371	371	*/
372	372	void diff_cmd(void){
373	373	int isGDiff; /* True for gdiff. False for normal diff */
374	374	int isInternDiff; /* True for internal diff */
375	375

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -364,11 +364,11 @@
364	** no "--to" option then the (possibly edited) files in the current check-out
365	** are used.
366	**
367	** The "-i" command-line option forces the use of the internal diff logic
368	** rather than any external diff program that might be configured using
369	** the "setting" command. If no external diff program is configured, then
370	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
371	*/
372	void diff_cmd(void){
373	int isGDiff; /* True for gdiff. False for normal diff */
374	int isInternDiff; /* True for internal diff */
375

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -364,11 +364,11 @@
364	** no "--to" option then the (possibly edited) files in the current check-out
365	** are used.
366	**
367	** The "-i" command-line option forces the use of the internal diff logic
368	** rather than any external diff program that might be configured using
369	** the "<a>setting</a>" command. If no external diff program is configured, then
370	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
371	*/
372	void diff_cmd(void){
373	int isGDiff; /* True for gdiff. False for normal diff */
374	int isInternDiff; /* True for internal diff */
375

M src/main.c

+57 -12

		--- src/main.c
		+++ src/main.c
		@@ -584,10 +584,14 @@
584	584	}
585	585	while( *z ){
586	586	if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){
587	587	printf("%s", g.argv[0]);
588	588	z += 7;
	589	+ }else if( *z=='<' && strncmp(z,"<a>",3)==0 ){
	590	+ z += 3;
	591	+ }else if( *z=='<' && strncmp(z,"</a>",4)==0 ){
	592	+ z += 4;
589	593	}else{
590	594	putchar(*z);
591	595	z++;
592	596	}
593	597	}
		@@ -602,37 +606,78 @@
602	606	const char * zCmd = P("cmd");
603	607
604	608	style_header("Command line help %s%s",zCmd?" - ":"",zCmd?zCmd:"");
605	609	if( zCmd ){
606	610	int rc, idx;
607		- char z, s, *d;
608	611
609	612	@ <h1>%s(zCmd)</h1>
610	613	rc = name_search(zCmd, aCommand, count(aCommand), &idx);
611	614	if( rc==1 ){
612	615	@ unknown command: %s(zCmd)
613	616	}else if( rc==2 ){
614	617	@ ambiguous command prefix: %s(zCmd)
615	618	}else{
616		- z = (char*)aCmdHelp[idx];
617		- if( z==0 ){
	619	+ char zSrc, zDest;
	620	+ int src,dest,len;
	621	+
	622	+ zSrc = (char*)aCmdHelp[idx];
	623	+ if( zSrc==0 \|\| *zSrc==0 ){
618	624	@ no help available for the %s(aCommand[idx].zName) command
619	625	}else{
620		- z=s=d=mprintf("%s",z);
621		- while( *s ){
622		- if( *s=='%' && strncmp(s, "%fossil", 7)==0 ){
623		- s++;
	626	+ len = strlen(zSrc);
	627	+ zDest = malloc(len+1);
	628	+ for(src=dest=0;zSrc[src];){
	629	+ if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){
	630	+ src++; /* skip % for fossil argv[0] expansion */
	631	+ }else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){
	632	+ /* found an internal command cross reference,
	633	+ ** create an additional link
	634	+ */
	635	+ int start;
	636	+
	637	+ len+=80;
	638	+ zDest=realloc(zDest,len);
	639	+ zDest[dest++]=zSrc[src++]; /* < */
	640	+ zDest[dest++]=zSrc[src++]; /* a */
	641	+ zDest[dest++]=' ';
	642	+ zDest[dest++]='h';
	643	+ zDest[dest++]='r';
	644	+ zDest[dest++]='e';
	645	+ zDest[dest++]='f';
	646	+ zDest[dest++]='=';
	647	+ zDest[dest++]='"';
	648	+ zDest[dest++]='h';
	649	+ zDest[dest++]='e';
	650	+ zDest[dest++]='l';
	651	+ zDest[dest++]='p';
	652	+ zDest[dest++]='?';
	653	+ zDest[dest++]='c';
	654	+ zDest[dest++]='m';
	655	+ zDest[dest++]='d';
	656	+ zDest[dest++]='=';
	657	+ start = src+1;
	658	+ for( src=start; zSrc[src] && zSrc[src]!='<'; ){
	659	+ zDest[dest++]=zSrc[src++]; /* command name */
	660	+ }
	661	+ zDest[dest++]='"';
	662	+ zDest[dest++]='>';
	663	+ for( src=start; zSrc[src] && zSrc[src]!='<'; ){
	664	+ zDest[dest++]=zSrc[src++]; /* command name */
	665	+ }
624	666	}else{
625		- d++ = s++;
	667	+ zDest[dest++] = zSrc[src++];
626	668	}
627	669	}
628		- *d = 0;
629		- @ <pre>%s(z)</pre>
630		- free(z);
	670	+ zDest[dest] = 0;
	671	+ @ <pre>%s(zDest)</pre>
	672	+ free(zDest);
631	673	}
632	674	}
633		- @ <hr/><a href="help">available commands</a> in fossil
	675	+ @ <hr>additional information may be found in the web documentation:
	676	+ @ <a href="doc/tip/www/cmd_%s(aCommand[idx].zName).wiki">
	677	+ @ cmd_%s(aCommand[idx].zName)</a>, see also the list of
	678	+ @ <a href="help">available commands</a> in fossil
634	679	@ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC
635	680	}else{
636	681	int i;
637	682
638	683	@ <h1>Available commands</h1>
639	684

	--- src/main.c
	+++ src/main.c
	@@ -584,10 +584,14 @@
584	}
585	while( *z ){
586	if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){
587	printf("%s", g.argv[0]);
588	z += 7;




589	}else{
590	putchar(*z);
591	z++;
592	}
593	}
	@@ -602,37 +606,78 @@
602	const char * zCmd = P("cmd");
603
604	style_header("Command line help %s%s",zCmd?" - ":"",zCmd?zCmd:"");
605	if( zCmd ){
606	int rc, idx;
607	char z, s, *d;
608
609	@ <h1>%s(zCmd)</h1>
610	rc = name_search(zCmd, aCommand, count(aCommand), &idx);
611	if( rc==1 ){
612	@ unknown command: %s(zCmd)
613	}else if( rc==2 ){
614	@ ambiguous command prefix: %s(zCmd)
615	}else{
616	z = (char*)aCmdHelp[idx];
617	if( z==0 ){



618	@ no help available for the %s(aCommand[idx].zName) command
619	}else{
620	z=s=d=mprintf("%s",z);
621	while( *s ){
622	if( *s=='%' && strncmp(s, "%fossil", 7)==0 ){
623	s++;




































624	}else{
625	d++ = s++;
626	}
627	}
628	*d = 0;
629	@ <pre>%s(z)</pre>
630	free(z);
631	}
632	}
633	@ <hr/><a href="help">available commands</a> in fossil



634	@ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC
635	}else{
636	int i;
637
638	@ <h1>Available commands</h1>
639

	--- src/main.c
	+++ src/main.c
	@@ -584,10 +584,14 @@
584	}
585	while( *z ){
586	if( *z=='%' && strncmp(z, "%fossil", 7)==0 ){
587	printf("%s", g.argv[0]);
588	z += 7;
589	}else if( *z=='<' && strncmp(z,"<a>",3)==0 ){
590	z += 3;
591	}else if( *z=='<' && strncmp(z,"</a>",4)==0 ){
592	z += 4;
593	}else{
594	putchar(*z);
595	z++;
596	}
597	}
	@@ -602,37 +606,78 @@
606	const char * zCmd = P("cmd");
607
608	style_header("Command line help %s%s",zCmd?" - ":"",zCmd?zCmd:"");
609	if( zCmd ){
610	int rc, idx;

611
612	@ <h1>%s(zCmd)</h1>
613	rc = name_search(zCmd, aCommand, count(aCommand), &idx);
614	if( rc==1 ){
615	@ unknown command: %s(zCmd)
616	}else if( rc==2 ){
617	@ ambiguous command prefix: %s(zCmd)
618	}else{
619	char zSrc, zDest;
620	int src,dest,len;
621
622	zSrc = (char*)aCmdHelp[idx];
623	if( zSrc==0 \|\| *zSrc==0 ){
624	@ no help available for the %s(aCommand[idx].zName) command
625	}else{
626	len = strlen(zSrc);
627	zDest = malloc(len+1);
628	for(src=dest=0;zSrc[src];){
629	if( zSrc[src]=='%' && strncmp(zSrc+src, "%fossil", 7)==0 ){
630	src++; /* skip % for fossil argv[0] expansion */
631	}else if( zSrc[src]=='<' && strncmp(zSrc+src, "<a>", 3)==0 ){
632	/* found an internal command cross reference,
633	** create an additional link
634	*/
635	int start;
636
637	len+=80;
638	zDest=realloc(zDest,len);
639	zDest[dest++]=zSrc[src++]; /* < */
640	zDest[dest++]=zSrc[src++]; /* a */
641	zDest[dest++]=' ';
642	zDest[dest++]='h';
643	zDest[dest++]='r';
644	zDest[dest++]='e';
645	zDest[dest++]='f';
646	zDest[dest++]='=';
647	zDest[dest++]='"';
648	zDest[dest++]='h';
649	zDest[dest++]='e';
650	zDest[dest++]='l';
651	zDest[dest++]='p';
652	zDest[dest++]='?';
653	zDest[dest++]='c';
654	zDest[dest++]='m';
655	zDest[dest++]='d';
656	zDest[dest++]='=';
657	start = src+1;
658	for( src=start; zSrc[src] && zSrc[src]!='<'; ){
659	zDest[dest++]=zSrc[src++]; /* command name */
660	}
661	zDest[dest++]='"';
662	zDest[dest++]='>';
663	for( src=start; zSrc[src] && zSrc[src]!='<'; ){
664	zDest[dest++]=zSrc[src++]; /* command name */
665	}
666	}else{
667	zDest[dest++] = zSrc[src++];
668	}
669	}
670	zDest[dest] = 0;
671	@ <pre>%s(zDest)</pre>
672	free(zDest);
673	}
674	}
675	@ <hr>additional information may be found in the web documentation:
676	@ <a href="doc/tip/www/cmd_%s(aCommand[idx].zName).wiki">
677	@ cmd_%s(aCommand[idx].zName)</a>, see also the list of
678	@ <a href="help">available commands</a> in fossil
679	@ version %s(MANIFEST_VERSION" "MANIFEST_DATE) UTC
680	}else{
681	int i;
682
683	@ <h1>Available commands</h1>
684

M src/sync.c

+18 -18

		--- src/sync.c
		+++ src/sync.c
		@@ -132,18 +132,18 @@
132	132	** Pull changes from a remote repository into the local repository.
133	133	** Use the "-R REPO" or "--repository REPO" command-line options
134	134	** to specify an alternative repository file.
135	135	**
136	136	** If the URL is not specified, then the URL from the most recent
137		-** clone, push, pull, remote-url, or sync command is used.
	137	+** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command is used.
138	138	**
139	139	** The URL specified normally becomes the new "remote-url" used for
140	140	** subsequent push, pull, and sync operations. However, the "--once"
141	141	** command-line option makes the URL a one-time-use URL that is not
142	142	** saved.
143	143	**
144		-** See also: clone, push, sync, remote-url
	144	+** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
145	145	*/
146	146	void pull_cmd(void){
147	147	int syncFlags = process_sync_args();
148	148	client_sync(0,1,0,syncFlags,0);
149	149	}
		@@ -156,18 +156,18 @@
156	156	** Push changes in the local repository over into a remote repository.
157	157	** Use the "-R REPO" or "--repository REPO" command-line options
158	158	** to specify an alternative repository file.
159	159	**
160	160	** If the URL is not specified, then the URL from the most recent
161		-** clone, push, pull, remote-url, or sync command is used.
	161	+** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command is used.
162	162	**
163	163	** The URL specified normally becomes the new "remote-url" used for
164		-** subsequent push, pull, and sync operations. However, the "--once"
	164	+** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once"
165	165	** command-line option makes the URL a one-time-use URL that is not
166	166	** saved.
167	167	**
168		-** See also: clone, pull, sync, remote-url
	168	+** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
169	169	*/
170	170	void push_cmd(void){
171	171	process_sync_args();
172	172	client_sync(1,0,0,0,0);
173	173	}
		@@ -177,27 +177,27 @@
177	177	** COMMAND: sync
178	178	**
179	179	** Usage: %fossil sync ?URL? ?options?
180	180	**
181	181	** Synchronize the local repository with a remote repository. This is
182		-** the equivalent of running both "push" and "pull" at the same time.
	182	+** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same time.
183	183	** Use the "-R REPO" or "--repository REPO" command-line options
184	184	** to specify an alternative repository file.
185	185	**
186	186	** If a user-id and password are required, specify them as follows:
187	187	**
188	188	** http://userid:[email protected]:1234/path
189	189	**
190	190	** If the URL is not specified, then the URL from the most recent successful
191		-** clone, push, pull, remote-url, or sync command is used.
	191	+** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command is used.
192	192	**
193	193	** The URL specified normally becomes the new "remote-url" used for
194		-** subsequent push, pull, and sync operations. However, the "--once"
	194	+** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once"
195	195	** command-line option makes the URL a one-time-use URL that is not
196	196	** saved.
197	197	**
198		-** See also: clone, push, pull, remote-url
	198	+** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
199	199	*/
200	200	void sync_cmd(void){
201	201	int syncFlags = process_sync_args();
202	202	client_sync(1,1,0,syncFlags,0);
203	203	}
		@@ -205,19 +205,19 @@
205	205	/*
206	206	** COMMAND: remote-url
207	207	**
208	208	** Usage: %fossil remote-url ?URL\|off?
209	209	**
210		-** Query and/or change the default server URL used by the "pull", "push",
211		-** and "sync" commands.
212		-**
213		-** The remote-url is set automatically by a "clone" command or by any
214		-** "sync", "push", or "pull" command that specifies an explicit URL.
215		-** The default remote-url is used by auto-syncing and by "sync", "push",
216		-** "pull" that omit the server URL.
217		-**
218		-** See also: clone, push, pull, sync
	210	+** Query and/or change the default server URL used by the "<a>pull</a>", "<a>push</a>",
	211	+** and "<a>sync</a>" commands.
	212	+**
	213	+** The remote-url is set automatically by a "<a>clone</a>" command or by any
	214	+** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an explicit URL.
	215	+** The default remote-url is used by auto-syncing and by "<a>sync</a>", "<a>push</a>",
	216	+** "<a>pull</a>" that omit the server URL.
	217	+**
	218	+** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
219	219	*/
220	220	void remote_url_cmd(void){
221	221	char *zUrl;
222	222	db_find_and_open_repository(1);
223	223	if( g.argc!=2 && g.argc!=3 ){
224	224

	--- src/sync.c
	+++ src/sync.c
	@@ -132,18 +132,18 @@
132	** Pull changes from a remote repository into the local repository.
133	** Use the "-R REPO" or "--repository REPO" command-line options
134	** to specify an alternative repository file.
135	**
136	** If the URL is not specified, then the URL from the most recent
137	** clone, push, pull, remote-url, or sync command is used.
138	**
139	** The URL specified normally becomes the new "remote-url" used for
140	** subsequent push, pull, and sync operations. However, the "--once"
141	** command-line option makes the URL a one-time-use URL that is not
142	** saved.
143	**
144	** See also: clone, push, sync, remote-url
145	*/
146	void pull_cmd(void){
147	int syncFlags = process_sync_args();
148	client_sync(0,1,0,syncFlags,0);
149	}
	@@ -156,18 +156,18 @@
156	** Push changes in the local repository over into a remote repository.
157	** Use the "-R REPO" or "--repository REPO" command-line options
158	** to specify an alternative repository file.
159	**
160	** If the URL is not specified, then the URL from the most recent
161	** clone, push, pull, remote-url, or sync command is used.
162	**
163	** The URL specified normally becomes the new "remote-url" used for
164	** subsequent push, pull, and sync operations. However, the "--once"
165	** command-line option makes the URL a one-time-use URL that is not
166	** saved.
167	**
168	** See also: clone, pull, sync, remote-url
169	*/
170	void push_cmd(void){
171	process_sync_args();
172	client_sync(1,0,0,0,0);
173	}
	@@ -177,27 +177,27 @@
177	** COMMAND: sync
178	**
179	** Usage: %fossil sync ?URL? ?options?
180	**
181	** Synchronize the local repository with a remote repository. This is
182	** the equivalent of running both "push" and "pull" at the same time.
183	** Use the "-R REPO" or "--repository REPO" command-line options
184	** to specify an alternative repository file.
185	**
186	** If a user-id and password are required, specify them as follows:
187	**
188	** http://userid:[email protected]:1234/path
189	**
190	** If the URL is not specified, then the URL from the most recent successful
191	** clone, push, pull, remote-url, or sync command is used.
192	**
193	** The URL specified normally becomes the new "remote-url" used for
194	** subsequent push, pull, and sync operations. However, the "--once"
195	** command-line option makes the URL a one-time-use URL that is not
196	** saved.
197	**
198	** See also: clone, push, pull, remote-url
199	*/
200	void sync_cmd(void){
201	int syncFlags = process_sync_args();
202	client_sync(1,1,0,syncFlags,0);
203	}
	@@ -205,19 +205,19 @@
205	/*
206	** COMMAND: remote-url
207	**
208	** Usage: %fossil remote-url ?URL\|off?
209	**
210	** Query and/or change the default server URL used by the "pull", "push",
211	** and "sync" commands.
212	**
213	** The remote-url is set automatically by a "clone" command or by any
214	** "sync", "push", or "pull" command that specifies an explicit URL.
215	** The default remote-url is used by auto-syncing and by "sync", "push",
216	** "pull" that omit the server URL.
217	**
218	** See also: clone, push, pull, sync
219	*/
220	void remote_url_cmd(void){
221	char *zUrl;
222	db_find_and_open_repository(1);
223	if( g.argc!=2 && g.argc!=3 ){
224

	--- src/sync.c
	+++ src/sync.c
	@@ -132,18 +132,18 @@
132	** Pull changes from a remote repository into the local repository.
133	** Use the "-R REPO" or "--repository REPO" command-line options
134	** to specify an alternative repository file.
135	**
136	** If the URL is not specified, then the URL from the most recent
137	** <a>clone</a>, <a>push</a>, pull, <a>remote-url</a>, or <a>sync</a> command is used.
138	**
139	** The URL specified normally becomes the new "remote-url" used for
140	** subsequent push, pull, and sync operations. However, the "--once"
141	** command-line option makes the URL a one-time-use URL that is not
142	** saved.
143	**
144	** See also: <a>clone</a>, <a>push</a>, <A>sync</a>, <a>remote-url</a>
145	*/
146	void pull_cmd(void){
147	int syncFlags = process_sync_args();
148	client_sync(0,1,0,syncFlags,0);
149	}
	@@ -156,18 +156,18 @@
156	** Push changes in the local repository over into a remote repository.
157	** Use the "-R REPO" or "--repository REPO" command-line options
158	** to specify an alternative repository file.
159	**
160	** If the URL is not specified, then the URL from the most recent
161	** <a>clone</a>, push, <a>pull</a>, <a>remote-url</a>, or <a>sync</a> command is used.
162	**
163	** The URL specified normally becomes the new "remote-url" used for
164	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once"
165	** command-line option makes the URL a one-time-use URL that is not
166	** saved.
167	**
168	** See also: <a>clone</a>, <a>pull</a>, <a>sync</a>, <a>remote-url</a>
169	*/
170	void push_cmd(void){
171	process_sync_args();
172	client_sync(1,0,0,0,0);
173	}
	@@ -177,27 +177,27 @@
177	** COMMAND: sync
178	**
179	** Usage: %fossil sync ?URL? ?options?
180	**
181	** Synchronize the local repository with a remote repository. This is
182	** the equivalent of running both "<a>push</a>" and "<a>pull</a>" at the same time.
183	** Use the "-R REPO" or "--repository REPO" command-line options
184	** to specify an alternative repository file.
185	**
186	** If a user-id and password are required, specify them as follows:
187	**
188	** http://userid:[email protected]:1234/path
189	**
190	** If the URL is not specified, then the URL from the most recent successful
191	** <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>, or sync command is used.
192	**
193	** The URL specified normally becomes the new "remote-url" used for
194	** subsequent <a>push</a>, <a>pull</a>, and <a>sync</a> operations. However, the "--once"
195	** command-line option makes the URL a one-time-use URL that is not
196	** saved.
197	**
198	** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>remote-url</a>
199	*/
200	void sync_cmd(void){
201	int syncFlags = process_sync_args();
202	client_sync(1,1,0,syncFlags,0);
203	}
	@@ -205,19 +205,19 @@
205	/*
206	** COMMAND: remote-url
207	**
208	** Usage: %fossil remote-url ?URL\|off?
209	**
210	** Query and/or change the default server URL used by the "<a>pull</a>", "<a>push</a>",
211	** and "<a>sync</a>" commands.
212	**
213	** The remote-url is set automatically by a "<a>clone</a>" command or by any
214	** "<a>sync</a>", "<a>push</a>", or "<a>pull</a>" command that specifies an explicit URL.
215	** The default remote-url is used by auto-syncing and by "<a>sync</a>", "<a>push</a>",
216	** "<a>pull</a>" that omit the server URL.
217	**
218	** See also: <a>clone</a>, <a>push</a>, <a>pull</a>, <a>sync</a>
219	*/
220	void remote_url_cmd(void){
221	char *zUrl;
222	db_find_and_open_repository(1);
223	if( g.argc!=2 && g.argc!=3 ){
224

M src/tag.c

+2 -2

		--- src/tag.c
		+++ src/tag.c
		@@ -345,16 +345,16 @@
345	345	**
346	346	** If you need to use a tagname that might be confused with
347	347	** a hexadecimal baseline or artifact ID, you can explicitly
348	348	** disambiguate it by prefixing it with "tag:". For instance:
349	349	**
350		-** fossil update decaf
	350	+** fossil <a>update</a> decaf
351	351	**
352	352	** will be taken as an artifact or baseline ID and fossil will
353	353	** probably complain that no such revision was found. However
354	354	**
355		-** fossil update tag:decaf
	355	+** fossil <a>update</a> tag:decaf
356	356	**
357	357	** will assume that "decaf" is a tag/branch name.
358	358	**
359	359	** only allow --date-override and --user-override in
360	360	** %fossil tag add --date-override 'YYYY-MMM-DD HH:MM:SS' \\
361	361

	--- src/tag.c
	+++ src/tag.c
	@@ -345,16 +345,16 @@
345	**
346	** If you need to use a tagname that might be confused with
347	** a hexadecimal baseline or artifact ID, you can explicitly
348	** disambiguate it by prefixing it with "tag:". For instance:
349	**
350	** fossil update decaf
351	**
352	** will be taken as an artifact or baseline ID and fossil will
353	** probably complain that no such revision was found. However
354	**
355	** fossil update tag:decaf
356	**
357	** will assume that "decaf" is a tag/branch name.
358	**
359	** only allow --date-override and --user-override in
360	** %fossil tag add --date-override 'YYYY-MMM-DD HH:MM:SS' \\
361

	--- src/tag.c
	+++ src/tag.c
	@@ -345,16 +345,16 @@
345	**
346	** If you need to use a tagname that might be confused with
347	** a hexadecimal baseline or artifact ID, you can explicitly
348	** disambiguate it by prefixing it with "tag:". For instance:
349	**
350	** fossil <a>update</a> decaf
351	**
352	** will be taken as an artifact or baseline ID and fossil will
353	** probably complain that no such revision was found. However
354	**
355	** fossil <a>update</a> tag:decaf
356	**
357	** will assume that "decaf" is a tag/branch name.
358	**
359	** only allow --date-override and --user-override in
360	** %fossil tag add --date-override 'YYYY-MMM-DD HH:MM:SS' \\
361

M src/undo.c

+7 -7

		--- src/undo.c
		+++ src/undo.c
		@@ -244,15 +244,15 @@
244	244	/*
245	245	** COMMAND: undo
246	246	**
247	247	** Usage: %fossil undo ?FILENAME...?
248	248	**
249		-** Undo the most recent update or merge or revert operation. If FILENAME is
	249	+** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation. If FILENAME is
250	250	** specified then restore the content of the named file(s) but otherwise
251		-** leave the update or merge or revert in effect.
	251	+** leave the <a>update</a> or <a>merge</a> or <a>revert</a> in effect.
252	252	**
253		-** A single level of undo/redo is supported. The undo/redo stack
	253	+** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a> stack
254	254	** is cleared by the commit and checkout commands.
255	255	*/
256	256	void undo_cmd(void){
257	257	int undo_available;
258	258	db_must_be_within_tree();
		@@ -283,17 +283,17 @@
283	283	/*
284	284	** COMMAND: redo
285	285	**
286	286	** Usage: %fossil redo ?FILENAME...?
287	287	**
288		-** Redo an update or merge or revert operation that has been undone
289		-** by the undo command. If FILENAME is specified then restore the changes
	288	+** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been undone
	289	+** by the <a>undo</a> command. If FILENAME is specified then restore the changes
290	290	** associated with the named file(s) but otherwise leave the update
291	291	** or merge undone.
292	292	**
293		-** A single level of undo/redo is supported. The undo/redo stack
294		-** is cleared by the commit and checkout commands.
	293	+** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
	294	+** is cleared by the <a>commit</a> and <a>checkout</a> commands.
295	295	*/
296	296	void redo_cmd(void){
297	297	int undo_available;
298	298	db_must_be_within_tree();
299	299	db_begin_transaction();
300	300

	--- src/undo.c
	+++ src/undo.c
	@@ -244,15 +244,15 @@
244	/*
245	** COMMAND: undo
246	**
247	** Usage: %fossil undo ?FILENAME...?
248	**
249	** Undo the most recent update or merge or revert operation. If FILENAME is
250	** specified then restore the content of the named file(s) but otherwise
251	** leave the update or merge or revert in effect.
252	**
253	** A single level of undo/redo is supported. The undo/redo stack
254	** is cleared by the commit and checkout commands.
255	*/
256	void undo_cmd(void){
257	int undo_available;
258	db_must_be_within_tree();
	@@ -283,17 +283,17 @@
283	/*
284	** COMMAND: redo
285	**
286	** Usage: %fossil redo ?FILENAME...?
287	**
288	** Redo an update or merge or revert operation that has been undone
289	** by the undo command. If FILENAME is specified then restore the changes
290	** associated with the named file(s) but otherwise leave the update
291	** or merge undone.
292	**
293	** A single level of undo/redo is supported. The undo/redo stack
294	** is cleared by the commit and checkout commands.
295	*/
296	void redo_cmd(void){
297	int undo_available;
298	db_must_be_within_tree();
299	db_begin_transaction();
300

	--- src/undo.c
	+++ src/undo.c
	@@ -244,15 +244,15 @@
244	/*
245	** COMMAND: undo
246	**
247	** Usage: %fossil undo ?FILENAME...?
248	**
249	** Undo the most recent <a>update</a> or <a>merge</a> or <a>revert</a> operation. If FILENAME is
250	** specified then restore the content of the named file(s) but otherwise
251	** leave the <a>update</a> or <a>merge</a> or <a>revert</a> in effect.
252	**
253	** A single level of undo/<a>redo</a> is supported. The undo/<a>redo</a> stack
254	** is cleared by the commit and checkout commands.
255	*/
256	void undo_cmd(void){
257	int undo_available;
258	db_must_be_within_tree();
	@@ -283,17 +283,17 @@
283	/*
284	** COMMAND: redo
285	**
286	** Usage: %fossil redo ?FILENAME...?
287	**
288	** Redo an <a>update</a>, <a>merge</a> or <a>revert</a> operation that has been undone
289	** by the <a>undo</a> command. If FILENAME is specified then restore the changes
290	** associated with the named file(s) but otherwise leave the update
291	** or merge undone.
292	**
293	** A single level of <a>undo</a>/redo is supported. The <a>undo</a>/redo stack
294	** is cleared by the <a>commit</a> and <a>checkout</a> commands.
295	*/
296	void redo_cmd(void){
297	int undo_available;
298	db_must_be_within_tree();
299	db_begin_transaction();
300

M src/update.c

+1 -1

		--- src/update.c
		+++ src/update.c
		@@ -348,11 +348,11 @@
348	348	** appears.
349	349	**
350	350	** Revert all files if no file name is provided.
351	351	**
352	352	** If a file is reverted accidently, it can be restored using
353		-** the "fossil undo" command.
	353	+** the "<a>undo</a>" command.
354	354	*/
355	355	void revert_cmd(void){
356	356	const char *zFile;
357	357	const char *zRevision;
358	358	Blob record;
359	359

	--- src/update.c
	+++ src/update.c
	@@ -348,11 +348,11 @@
348	** appears.
349	**
350	** Revert all files if no file name is provided.
351	**
352	** If a file is reverted accidently, it can be restored using
353	** the "fossil undo" command.
354	*/
355	void revert_cmd(void){
356	const char *zFile;
357	const char *zRevision;
358	Blob record;
359

	--- src/update.c
	+++ src/update.c
	@@ -348,11 +348,11 @@
348	** appears.
349	**
350	** Revert all files if no file name is provided.
351	**
352	** If a file is reverted accidently, it can be restored using
353	** the "<a>undo</a>" command.
354	*/
355	void revert_cmd(void){
356	const char *zFile;
357	const char *zRevision;
358	Blob record;
359

Fossil SCM

Keyboard Shortcuts