Fossil SCM

Online help for several more commands adapted

Arjen Markus 2011-05-30 06:55 arjen-doc-updates

Commit d23f98877d8e05254b4c350426a8d821e92a497b

Parent 6469b814ab739c0…

4 files changed +4 -3 +16 -12 +8 -2 +8 -5

~ src/db.c ~ src/diff.c ~ src/diffcmd.c ~ src/export.c

M src/db.c

+4 -3

		--- src/db.c
		+++ src/db.c
		@@ -1196,11 +1196,11 @@
1196	1196	db_initial_setup(zDate, zDefaultUser, 1);
1197	1197	db_end_transaction(0);
1198	1198	fossil_print("project-id: %s\n", db_get("project-code", 0));
1199	1199	fossil_print("server-id: %s\n", db_get("server-code", 0));
1200	1200	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
1201		- fossil_print("admin-user: %s (initial password is \"%s\")\n",
	1201	+ fossil_print("admin-user: %s (initial password is \"%s\")\n",
1202	1202	g.zLogin, zPassword);
1203	1203	}
1204	1204
1205	1205	/*
1206	1206	** SQL functions for debugging.
		@@ -1687,11 +1687,11 @@
1687	1687
1688	1688	/*
1689	1689	** COMMAND: settings
1690	1690	** COMMAND: unset
1691	1691	**
1692		-** %fossil settings ?PROPERTY? ?VALUE? ?-global?
	1692	+** %fossil settings ?PROPERTY? ?VALUE? ?--global?
1693	1693	** %fossil unset PROPERTY ?-global?
1694	1694	**
1695	1695	** The "settings" command with no arguments lists all properties and their
1696	1696	** values. With just a property name it shows the value of that property.
1697	1697	** With a value argument it changes the property for the current repository.
		@@ -1701,10 +1701,11 @@
1701	1701	**
1702	1702	** auto-captcha If enabled, the Login page provides a button to
1703	1703	** fill in the captcha password. Default: on
1704	1704	**
1705	1705	** auto-shun If enabled, automatically pull the shunning list
	1706	+** (for removing unwanted files and Wiki pages)
1706	1707	** from a server to which the client autosyncs.
1707	1708	** Default: on
1708	1709	**
1709	1710	** autosync If enabled, automatically pull prior to commit
1710	1711	** or update and automatically push after commit or
		@@ -1799,11 +1800,11 @@
1799	1800	** Defaults to "start" on windows, "open" on Mac,
1800	1801	** and "firefox" on Unix.
1801	1802	**
1802	1803	** SUMMARY: fossil settings ?PROPERTY? ?VALUE? ?OPTIONS?
1803	1804	** fossil unset PROPERTY ?OPTIONS?
1804		-** Options: -global
	1805	+** Options: --global
1805	1806	** Where: PROPERTY = auto-captcha, auto-shun, autosync, binary-glob,
1806	1807	** clearsign, crnl-glob, default-perms, diff-command,
1807	1808	** dont-push, editor, gdiff-command, gmerge-command,
1808	1809	** http-port, https-login, ignore-glob, localauth,
1809	1810	** main-branch, manifest, max-upload, mtime-changes,
1810	1811

	--- src/db.c
	+++ src/db.c
	@@ -1196,11 +1196,11 @@
1196	db_initial_setup(zDate, zDefaultUser, 1);
1197	db_end_transaction(0);
1198	fossil_print("project-id: %s\n", db_get("project-code", 0));
1199	fossil_print("server-id: %s\n", db_get("server-code", 0));
1200	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
1201	fossil_print("admin-user: %s (initial password is \"%s\")\n",
1202	g.zLogin, zPassword);
1203	}
1204
1205	/*
1206	** SQL functions for debugging.
	@@ -1687,11 +1687,11 @@
1687
1688	/*
1689	** COMMAND: settings
1690	** COMMAND: unset
1691	**
1692	** %fossil settings ?PROPERTY? ?VALUE? ?-global?
1693	** %fossil unset PROPERTY ?-global?
1694	**
1695	** The "settings" command with no arguments lists all properties and their
1696	** values. With just a property name it shows the value of that property.
1697	** With a value argument it changes the property for the current repository.
	@@ -1701,10 +1701,11 @@
1701	**
1702	** auto-captcha If enabled, the Login page provides a button to
1703	** fill in the captcha password. Default: on
1704	**
1705	** auto-shun If enabled, automatically pull the shunning list

1706	** from a server to which the client autosyncs.
1707	** Default: on
1708	**
1709	** autosync If enabled, automatically pull prior to commit
1710	** or update and automatically push after commit or
	@@ -1799,11 +1800,11 @@
1799	** Defaults to "start" on windows, "open" on Mac,
1800	** and "firefox" on Unix.
1801	**
1802	** SUMMARY: fossil settings ?PROPERTY? ?VALUE? ?OPTIONS?
1803	** fossil unset PROPERTY ?OPTIONS?
1804	** Options: -global
1805	** Where: PROPERTY = auto-captcha, auto-shun, autosync, binary-glob,
1806	** clearsign, crnl-glob, default-perms, diff-command,
1807	** dont-push, editor, gdiff-command, gmerge-command,
1808	** http-port, https-login, ignore-glob, localauth,
1809	** main-branch, manifest, max-upload, mtime-changes,
1810

	--- src/db.c
	+++ src/db.c
	@@ -1196,11 +1196,11 @@
1196	db_initial_setup(zDate, zDefaultUser, 1);
1197	db_end_transaction(0);
1198	fossil_print("project-id: %s\n", db_get("project-code", 0));
1199	fossil_print("server-id: %s\n", db_get("server-code", 0));
1200	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
1201	fossil_print("admin-user: %s (initial password is \"%s\")\n",
1202	g.zLogin, zPassword);
1203	}
1204
1205	/*
1206	** SQL functions for debugging.
	@@ -1687,11 +1687,11 @@
1687
1688	/*
1689	** COMMAND: settings
1690	** COMMAND: unset
1691	**
1692	** %fossil settings ?PROPERTY? ?VALUE? ?--global?
1693	** %fossil unset PROPERTY ?-global?
1694	**
1695	** The "settings" command with no arguments lists all properties and their
1696	** values. With just a property name it shows the value of that property.
1697	** With a value argument it changes the property for the current repository.
	@@ -1701,10 +1701,11 @@
1701	**
1702	** auto-captcha If enabled, the Login page provides a button to
1703	** fill in the captcha password. Default: on
1704	**
1705	** auto-shun If enabled, automatically pull the shunning list
1706	** (for removing unwanted files and Wiki pages)
1707	** from a server to which the client autosyncs.
1708	** Default: on
1709	**
1710	** autosync If enabled, automatically pull prior to commit
1711	** or update and automatically push after commit or
	@@ -1799,11 +1800,11 @@
1800	** Defaults to "start" on windows, "open" on Mac,
1801	** and "firefox" on Unix.
1802	**
1803	** SUMMARY: fossil settings ?PROPERTY? ?VALUE? ?OPTIONS?
1804	** fossil unset PROPERTY ?OPTIONS?
1805	** Options: --global
1806	** Where: PROPERTY = auto-captcha, auto-shun, autosync, binary-glob,
1807	** clearsign, crnl-glob, default-perms, diff-command,
1808	** dont-push, editor, gdiff-command, gmerge-command,
1809	** http-port, https-login, ignore-glob, localauth,
1810	** main-branch, manifest, max-upload, mtime-changes,
1811

M src/diff.c

+16 -12

		--- src/diff.c
		+++ src/diff.c
		@@ -62,11 +62,11 @@
62	62	int nTo; /* Number of lines in aTo[] */
63	63	};
64	64
65	65	/*
66	66	** Return an array of DLine objects containing a pointer to the
67		-** start of each line and a hash of that line. The lower
	67	+** start of each line and a hash of that line. The lower
68	68	** bits of the hash store the length of each line.
69	69	**
70	70	** Trailing whitespace is removed from each line. 2010-08-20: Not any
71	71	** more. If trailing whitespace is ignored, the "patch" command gets
72	72	** confused by the diff output. Ticket [a9f7b23c2e376af5b0e5b]
		@@ -171,11 +171,11 @@
171	171	}
172	172	if( nCopy==0 && nDel==0 ){
173	173	p->aEdit[p->nEdit-1] += nIns;
174	174	return;
175	175	}
176		- }
	176	+ }
177	177	if( p->nEdit+3>p->nEditAlloc ){
178	178	expandEdit(p, p->nEdit*2 + 15);
179	179	if( p->aEdit==0 ) return;
180	180	}
181	181	p->aEdit[p->nEdit++] = nCopy;
		@@ -188,11 +188,11 @@
188	188	** Given a diff context in which the aEdit[] array has been filled
189	189	** in, compute a context diff into pOut.
190	190	*/
191	191	static void contextDiff(DContext p, Blob pOut, int nContext){
192	192	DLine A; / Left side of the diff */
193		- DLine B; / Right side of the diff */
	193	+ DLine B; / Right side of the diff */
194	194	int a = 0; /* Index of next line in A[] */
195	195	int b = 0; /* Index of next line in B[] */
196	196	int R; / Array of COPY/DELETE/INSERT triples */
197	197	int r; /* Index into R[] */
198	198	int nr; /* Number of COPY/DELETE/INSERT triples to process */
		@@ -341,11 +341,11 @@
341	341	** input range.
342	342	**
343	343	** Ideally, the common sequence should be the longest possible common
344	344	** sequence. However, an exact computation of LCS is O(N*N) which is
345	345	** way too slow for larger files. So this routine uses an O(N)
346		-** heuristic approximation based on hashing that usually works about
	346	+** heuristic approximation based on hashing that usually works about
347	347	** as well. But if the O(N) algorithm doesn't get a good solution
348	348	** and N is not too large, we fall back to an exact solution by
349	349	** calling optimalLCS().
350	350	*/
351	351	static void longestCommonSequence(
		@@ -372,11 +372,11 @@
372	372	iEYb = iEYp = iS2;
373	373	mid = (iE1 + iS1)/2;
374	374	for(i=iS1; i<iE1; i++){
375	375	int limit = 0;
376	376	j = p->aTo[p->aFrom[i].h % p->nTo].iHash;
377		- while( j>0
	377	+ while( j>0
378	378	&& (j-1<iS2 \|\| j>=iE2 \|\| !same_dline(&p->aFrom[i], &p->aTo[j-1]))
379	379	){
380	380	if( limit++ > 10 ){
381	381	j = 0;
382	382	break;
		@@ -425,11 +425,11 @@
425	425	*piSX = iSXb;
426	426	*piSY = iSYb;
427	427	*piEX = iEXb;
428	428	*piEY = iEYb;
429	429	}
430		- /* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
	430	+ /* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
431	431	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
432	432	}
433	433
434	434	/*
435	435	** Do a single step in the difference. Compute a sequence of
		@@ -525,11 +525,11 @@
525	525
526	526	/*
527	527	** Generate a report of the differences between files pA and pB.
528	528	** If pOut is not NULL then a unified diff is appended there. It
529	529	** is assumed that pOut has already been initialized. If pOut is
530		-** NULL, then a pointer to an array of integers is returned.
	530	+** NULL, then a pointer to an array of integers is returned.
531	531	** The integers come in triples. For each triple,
532	532	** the elements are the number of lines copied, the number of
533	533	** lines deleted, and the number of lines inserted. The vector
534	534	** is terminated by a triple of all zeros.
535	535	**
		@@ -543,11 +543,11 @@
543	543	Blob pOut, / Write unified diff here if not NULL */
544	544	int nContext, /* Amount of context to unified diff */
545	545	int ignoreEolWs /* Ignore whitespace at the end of lines */
546	546	){
547	547	DContext c;
548		-
	548	+
549	549	/* Prepare the input files */
550	550	memset(&c, 0, sizeof(c));
551	551	c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
552	552	&c.nFrom, ignoreEolWs);
553	553	c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
		@@ -710,11 +710,11 @@
710	710	p->c.aEdit = 0;
711	711	p->c.nEdit = 0;
712	712	p->c.nEditAlloc = 0;
713	713
714	714	/* Clear out the from file */
715		- free(p->c.aFrom);
	715	+ free(p->c.aFrom);
716	716	blob_zero(pParent);
717	717
718	718	/* Return no errors */
719	719	return 0;
720	720	}
		@@ -781,11 +781,11 @@
781	781	}
782	782	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
783	783	compute_ancestors(mid, 1000000000);
784	784	annotation_start(p, &toAnnotate);
785	785
786		- db_prepare(&q,
	786	+ db_prepare(&q,
787	787	"SELECT mlink.fid,"
788	788	" (SELECT uuid FROM blob WHERE rid=mlink.%s),"
789	789	" date(event.mtime), "
790	790	" coalesce(event.euser,event.user) "
791	791	" FROM mlink, event"
		@@ -803,11 +803,11 @@
803	803	const char *zUuid = db_column_text(&q, 1);
804	804	const char *zDate = db_column_text(&q, 2);
805	805	const char *zUser = db_column_text(&q, 3);
806	806	if( webLabel ){
807	807	zLabel = mprintf(
808		- "<a href='%s/info/%s' target='infowindow'>%.10s</a> %s %9.9s",
	808	+ "<a href='%s/info/%s' target='infowindow'>%.10s</a> %s %9.9s",
809	809	g.zTop, zUuid, zUuid, zDate, zUser
810	810	);
811	811	}else{
812	812	zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
813	813	}
		@@ -879,10 +879,14 @@
879	879	**
880	880	** Options:
881	881	** --limit N Only look backwards in time by N versions
882	882	** --log List all versions analyzed
883	883	** --filevers Show file version numbers rather than check-in versions
	884	+**
	885	+**
	886	+** SUMMARY: fossil annotate FILENAME ?options?
	887	+** Options: --limit N, --log, --filevers
884	888	*/
885	889	void annotate_cmd(void){
886	890	int fnid; /* Filename ID */
887	891	int fid; /* File instance ID */
888	892	int mid; /* Manifest where file was checked in */
		@@ -926,9 +930,9 @@
926	930	printf("version %3d: %s\n", i+1, ann.azVers[i]);
927	931	}
928	932	printf("---------------------------------------------------\n");
929	933	}
930	934	for(i=0; i<ann.nOrig; i++){
931		- fossil_print("%s: %.*s\n",
	935	+ fossil_print("%s: %.*s\n",
932	936	ann.aOrig[i].zSrc, ann.aOrig[i].n, ann.aOrig[i].z);
933	937	}
934	938	}
935	939

	--- src/diff.c
	+++ src/diff.c
	@@ -62,11 +62,11 @@
62	int nTo; /* Number of lines in aTo[] */
63	};
64
65	/*
66	** Return an array of DLine objects containing a pointer to the
67	** start of each line and a hash of that line. The lower
68	** bits of the hash store the length of each line.
69	**
70	** Trailing whitespace is removed from each line. 2010-08-20: Not any
71	** more. If trailing whitespace is ignored, the "patch" command gets
72	** confused by the diff output. Ticket [a9f7b23c2e376af5b0e5b]
	@@ -171,11 +171,11 @@
171	}
172	if( nCopy==0 && nDel==0 ){
173	p->aEdit[p->nEdit-1] += nIns;
174	return;
175	}
176	}
177	if( p->nEdit+3>p->nEditAlloc ){
178	expandEdit(p, p->nEdit*2 + 15);
179	if( p->aEdit==0 ) return;
180	}
181	p->aEdit[p->nEdit++] = nCopy;
	@@ -188,11 +188,11 @@
188	** Given a diff context in which the aEdit[] array has been filled
189	** in, compute a context diff into pOut.
190	*/
191	static void contextDiff(DContext p, Blob pOut, int nContext){
192	DLine A; / Left side of the diff */
193	DLine B; / Right side of the diff */
194	int a = 0; /* Index of next line in A[] */
195	int b = 0; /* Index of next line in B[] */
196	int R; / Array of COPY/DELETE/INSERT triples */
197	int r; /* Index into R[] */
198	int nr; /* Number of COPY/DELETE/INSERT triples to process */
	@@ -341,11 +341,11 @@
341	** input range.
342	**
343	** Ideally, the common sequence should be the longest possible common
344	** sequence. However, an exact computation of LCS is O(N*N) which is
345	** way too slow for larger files. So this routine uses an O(N)
346	** heuristic approximation based on hashing that usually works about
347	** as well. But if the O(N) algorithm doesn't get a good solution
348	** and N is not too large, we fall back to an exact solution by
349	** calling optimalLCS().
350	*/
351	static void longestCommonSequence(
	@@ -372,11 +372,11 @@
372	iEYb = iEYp = iS2;
373	mid = (iE1 + iS1)/2;
374	for(i=iS1; i<iE1; i++){
375	int limit = 0;
376	j = p->aTo[p->aFrom[i].h % p->nTo].iHash;
377	while( j>0
378	&& (j-1<iS2 \|\| j>=iE2 \|\| !same_dline(&p->aFrom[i], &p->aTo[j-1]))
379	){
380	if( limit++ > 10 ){
381	j = 0;
382	break;
	@@ -425,11 +425,11 @@
425	*piSX = iSXb;
426	*piSY = iSYb;
427	*piEX = iEXb;
428	*piEY = iEYb;
429	}
430	/* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
431	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
432	}
433
434	/*
435	** Do a single step in the difference. Compute a sequence of
	@@ -525,11 +525,11 @@
525
526	/*
527	** Generate a report of the differences between files pA and pB.
528	** If pOut is not NULL then a unified diff is appended there. It
529	** is assumed that pOut has already been initialized. If pOut is
530	** NULL, then a pointer to an array of integers is returned.
531	** The integers come in triples. For each triple,
532	** the elements are the number of lines copied, the number of
533	** lines deleted, and the number of lines inserted. The vector
534	** is terminated by a triple of all zeros.
535	**
	@@ -543,11 +543,11 @@
543	Blob pOut, / Write unified diff here if not NULL */
544	int nContext, /* Amount of context to unified diff */
545	int ignoreEolWs /* Ignore whitespace at the end of lines */
546	){
547	DContext c;
548
549	/* Prepare the input files */
550	memset(&c, 0, sizeof(c));
551	c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
552	&c.nFrom, ignoreEolWs);
553	c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
	@@ -710,11 +710,11 @@
710	p->c.aEdit = 0;
711	p->c.nEdit = 0;
712	p->c.nEditAlloc = 0;
713
714	/* Clear out the from file */
715	free(p->c.aFrom);
716	blob_zero(pParent);
717
718	/* Return no errors */
719	return 0;
720	}
	@@ -781,11 +781,11 @@
781	}
782	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
783	compute_ancestors(mid, 1000000000);
784	annotation_start(p, &toAnnotate);
785
786	db_prepare(&q,
787	"SELECT mlink.fid,"
788	" (SELECT uuid FROM blob WHERE rid=mlink.%s),"
789	" date(event.mtime), "
790	" coalesce(event.euser,event.user) "
791	" FROM mlink, event"
	@@ -803,11 +803,11 @@
803	const char *zUuid = db_column_text(&q, 1);
804	const char *zDate = db_column_text(&q, 2);
805	const char *zUser = db_column_text(&q, 3);
806	if( webLabel ){
807	zLabel = mprintf(
808	"<a href='%s/info/%s' target='infowindow'>%.10s</a> %s %9.9s",
809	g.zTop, zUuid, zUuid, zDate, zUser
810	);
811	}else{
812	zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
813	}
	@@ -879,10 +879,14 @@
879	**
880	** Options:
881	** --limit N Only look backwards in time by N versions
882	** --log List all versions analyzed
883	** --filevers Show file version numbers rather than check-in versions




884	*/
885	void annotate_cmd(void){
886	int fnid; /* Filename ID */
887	int fid; /* File instance ID */
888	int mid; /* Manifest where file was checked in */
	@@ -926,9 +930,9 @@
926	printf("version %3d: %s\n", i+1, ann.azVers[i]);
927	}
928	printf("---------------------------------------------------\n");
929	}
930	for(i=0; i<ann.nOrig; i++){
931	fossil_print("%s: %.*s\n",
932	ann.aOrig[i].zSrc, ann.aOrig[i].n, ann.aOrig[i].z);
933	}
934	}
935

	--- src/diff.c
	+++ src/diff.c
	@@ -62,11 +62,11 @@
62	int nTo; /* Number of lines in aTo[] */
63	};
64
65	/*
66	** Return an array of DLine objects containing a pointer to the
67	** start of each line and a hash of that line. The lower
68	** bits of the hash store the length of each line.
69	**
70	** Trailing whitespace is removed from each line. 2010-08-20: Not any
71	** more. If trailing whitespace is ignored, the "patch" command gets
72	** confused by the diff output. Ticket [a9f7b23c2e376af5b0e5b]
	@@ -171,11 +171,11 @@
171	}
172	if( nCopy==0 && nDel==0 ){
173	p->aEdit[p->nEdit-1] += nIns;
174	return;
175	}
176	}
177	if( p->nEdit+3>p->nEditAlloc ){
178	expandEdit(p, p->nEdit*2 + 15);
179	if( p->aEdit==0 ) return;
180	}
181	p->aEdit[p->nEdit++] = nCopy;
	@@ -188,11 +188,11 @@
188	** Given a diff context in which the aEdit[] array has been filled
189	** in, compute a context diff into pOut.
190	*/
191	static void contextDiff(DContext p, Blob pOut, int nContext){
192	DLine A; / Left side of the diff */
193	DLine B; / Right side of the diff */
194	int a = 0; /* Index of next line in A[] */
195	int b = 0; /* Index of next line in B[] */
196	int R; / Array of COPY/DELETE/INSERT triples */
197	int r; /* Index into R[] */
198	int nr; /* Number of COPY/DELETE/INSERT triples to process */
	@@ -341,11 +341,11 @@
341	** input range.
342	**
343	** Ideally, the common sequence should be the longest possible common
344	** sequence. However, an exact computation of LCS is O(N*N) which is
345	** way too slow for larger files. So this routine uses an O(N)
346	** heuristic approximation based on hashing that usually works about
347	** as well. But if the O(N) algorithm doesn't get a good solution
348	** and N is not too large, we fall back to an exact solution by
349	** calling optimalLCS().
350	*/
351	static void longestCommonSequence(
	@@ -372,11 +372,11 @@
372	iEYb = iEYp = iS2;
373	mid = (iE1 + iS1)/2;
374	for(i=iS1; i<iE1; i++){
375	int limit = 0;
376	j = p->aTo[p->aFrom[i].h % p->nTo].iHash;
377	while( j>0
378	&& (j-1<iS2 \|\| j>=iE2 \|\| !same_dline(&p->aFrom[i], &p->aTo[j-1]))
379	){
380	if( limit++ > 10 ){
381	j = 0;
382	break;
	@@ -425,11 +425,11 @@
425	*piSX = iSXb;
426	*piSY = iSYb;
427	*piEX = iEXb;
428	*piEY = iEYb;
429	}
430	/* printf("LCS(%d..%d/%d..%d) = %d..%d/%d..%d\n",
431	iS1, iE1, iS2, iE2, piSX, piEX, piSY, piEY); */
432	}
433
434	/*
435	** Do a single step in the difference. Compute a sequence of
	@@ -525,11 +525,11 @@
525
526	/*
527	** Generate a report of the differences between files pA and pB.
528	** If pOut is not NULL then a unified diff is appended there. It
529	** is assumed that pOut has already been initialized. If pOut is
530	** NULL, then a pointer to an array of integers is returned.
531	** The integers come in triples. For each triple,
532	** the elements are the number of lines copied, the number of
533	** lines deleted, and the number of lines inserted. The vector
534	** is terminated by a triple of all zeros.
535	**
	@@ -543,11 +543,11 @@
543	Blob pOut, / Write unified diff here if not NULL */
544	int nContext, /* Amount of context to unified diff */
545	int ignoreEolWs /* Ignore whitespace at the end of lines */
546	){
547	DContext c;
548
549	/* Prepare the input files */
550	memset(&c, 0, sizeof(c));
551	c.aFrom = break_into_lines(blob_str(pA_Blob), blob_size(pA_Blob),
552	&c.nFrom, ignoreEolWs);
553	c.aTo = break_into_lines(blob_str(pB_Blob), blob_size(pB_Blob),
	@@ -710,11 +710,11 @@
710	p->c.aEdit = 0;
711	p->c.nEdit = 0;
712	p->c.nEditAlloc = 0;
713
714	/* Clear out the from file */
715	free(p->c.aFrom);
716	blob_zero(pParent);
717
718	/* Return no errors */
719	return 0;
720	}
	@@ -781,11 +781,11 @@
781	}
782	db_multi_exec("CREATE TEMP TABLE ok(rid INTEGER PRIMARY KEY)");
783	compute_ancestors(mid, 1000000000);
784	annotation_start(p, &toAnnotate);
785
786	db_prepare(&q,
787	"SELECT mlink.fid,"
788	" (SELECT uuid FROM blob WHERE rid=mlink.%s),"
789	" date(event.mtime), "
790	" coalesce(event.euser,event.user) "
791	" FROM mlink, event"
	@@ -803,11 +803,11 @@
803	const char *zUuid = db_column_text(&q, 1);
804	const char *zDate = db_column_text(&q, 2);
805	const char *zUser = db_column_text(&q, 3);
806	if( webLabel ){
807	zLabel = mprintf(
808	"<a href='%s/info/%s' target='infowindow'>%.10s</a> %s %9.9s",
809	g.zTop, zUuid, zUuid, zDate, zUser
810	);
811	}else{
812	zLabel = mprintf("%.10s %s %9.9s", zUuid, zDate, zUser);
813	}
	@@ -879,10 +879,14 @@
879	**
880	** Options:
881	** --limit N Only look backwards in time by N versions
882	** --log List all versions analyzed
883	** --filevers Show file version numbers rather than check-in versions
884	**
885	**
886	** SUMMARY: fossil annotate FILENAME ?options?
887	** Options: --limit N, --log, --filevers
888	*/
889	void annotate_cmd(void){
890	int fnid; /* Filename ID */
891	int fid; /* File instance ID */
892	int mid; /* Manifest where file was checked in */
	@@ -926,9 +930,9 @@
930	printf("version %3d: %s\n", i+1, ann.azVers[i]);
931	}
932	printf("---------------------------------------------------\n");
933	}
934	for(i=0; i<ann.nOrig; i++){
935	fossil_print("%s: %.*s\n",
936	ann.aOrig[i].zSrc, ann.aOrig[i].n, ann.aOrig[i].z);
937	}
938	}
939

M src/diffcmd.c

+8 -2

		--- src/diffcmd.c
		+++ src/diffcmd.c
		@@ -412,15 +412,15 @@
412	412	**
413	413	** Usage: %fossil diff\|gdiff ?options? ?FILE?
414	414	**
415	415	** Show the difference between the current version of FILE (as it
416	416	** exists on disk) and that same file as it was checked out. Or
417		-** if the FILE argument is omitted, show the unsaved changed currently
	417	+** if the FILE argument is omitted, show the unsaved changes currently
418	418	** in the working check-out.
419	419	**
420	420	** If the "--from VERSION" or "-r VERSION" option is used it specifies
421		-** the source check-in for the diff operation. If not specified, the
	421	+** the source check-in for the diff operation. If not specified, the
422	422	** source check-in is the base check-in for the current check-out.
423	423	**
424	424	** If the "--to VERSION" option appears, it specifies the check-in from
425	425	** which the second version of the file or files is taken. If there is
426	426	** no "--to" option then the (possibly edited) files in the current check-out
		@@ -431,10 +431,16 @@
431	431	** the "setting" command. If no external diff program is configured, then
432	432	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
433	433	**
434	434	** The "-N" or "--new-file" option causes the complete text of added or
435	435	** deleted files to be displayed.
	436	+**
	437	+**
	438	+** SUMMARY: fossil diff ?options? ?FILE?
	439	+** fossil gdiff ?options? ?FILE?
	440	+** Options: -i, --from VERSION, --to VERSION, -N\|--new-file
	441	+**
436	442	*/
437	443	void diff_cmd(void){
438	444	int isGDiff; /* True for gdiff. False for normal diff */
439	445	int isInternDiff; /* True for internal diff */
440	446	int hasNFlag; /* True if -N or --new-file flag is used */
441	447

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -412,15 +412,15 @@
412	**
413	** Usage: %fossil diff\|gdiff ?options? ?FILE?
414	**
415	** Show the difference between the current version of FILE (as it
416	** exists on disk) and that same file as it was checked out. Or
417	** if the FILE argument is omitted, show the unsaved changed currently
418	** in the working check-out.
419	**
420	** If the "--from VERSION" or "-r VERSION" option is used it specifies
421	** the source check-in for the diff operation. If not specified, the
422	** source check-in is the base check-in for the current check-out.
423	**
424	** If the "--to VERSION" option appears, it specifies the check-in from
425	** which the second version of the file or files is taken. If there is
426	** no "--to" option then the (possibly edited) files in the current check-out
	@@ -431,10 +431,16 @@
431	** the "setting" command. If no external diff program is configured, then
432	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
433	**
434	** The "-N" or "--new-file" option causes the complete text of added or
435	** deleted files to be displayed.






436	*/
437	void diff_cmd(void){
438	int isGDiff; /* True for gdiff. False for normal diff */
439	int isInternDiff; /* True for internal diff */
440	int hasNFlag; /* True if -N or --new-file flag is used */
441

	--- src/diffcmd.c
	+++ src/diffcmd.c
	@@ -412,15 +412,15 @@
412	**
413	** Usage: %fossil diff\|gdiff ?options? ?FILE?
414	**
415	** Show the difference between the current version of FILE (as it
416	** exists on disk) and that same file as it was checked out. Or
417	** if the FILE argument is omitted, show the unsaved changes currently
418	** in the working check-out.
419	**
420	** If the "--from VERSION" or "-r VERSION" option is used it specifies
421	** the source check-in for the diff operation. If not specified, the
422	** source check-in is the base check-in for the current check-out.
423	**
424	** If the "--to VERSION" option appears, it specifies the check-in from
425	** which the second version of the file or files is taken. If there is
426	** no "--to" option then the (possibly edited) files in the current check-out
	@@ -431,10 +431,16 @@
431	** the "setting" command. If no external diff program is configured, then
432	** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff".
433	**
434	** The "-N" or "--new-file" option causes the complete text of added or
435	** deleted files to be displayed.
436	**
437	**
438	** SUMMARY: fossil diff ?options? ?FILE?
439	** fossil gdiff ?options? ?FILE?
440	** Options: -i, --from VERSION, --to VERSION, -N\|--new-file
441	**
442	*/
443	void diff_cmd(void){
444	int isGDiff; /* True for gdiff. False for normal diff */
445	int isInternDiff; /* True for internal diff */
446	int hasNFlag; /* True if -N or --new-file flag is used */
447

M src/export.c

+8 -5

		--- src/export.c
		+++ src/export.c
		@@ -86,19 +86,22 @@
86	86	**
87	87	** Usage: %fossil export --git ?REPOSITORY?
88	88	**
89	89	** Write an export of all check-ins to standard output. The export is
90	90	** written in the git-fast-export file format assuming the --git option is
91		-** provided. The git-fast-export format is currently the only VCS
	91	+** provided. The git-fast-export format is currently the only VCS
92	92	** interchange format supported, though other formats may be added in
93	93	** the future.
94	94	**
95		-** Run this command within a checkout. Or use the -R or --repository
96		-** option to specify a Fossil repository to be exported.
	95	+** Run this command within a checkout or specify the name of the
	96	+** Fossil repository to be exported.
97	97	**
98		-** Only check-ins are exported using --git. Git does not support tickets
	98	+** Only check-ins are exported using --git. Git does not support tickets
99	99	** or wiki or events or attachments, so none of those are exported.
	100	+**
	101	+**
	102	+** SUMMARY: fossil export --git ?REPOSITORY?
100	103	*/
101	104	void export_cmd(void){
102	105	Stmt q;
103	106	int i;
104	107	int firstCkin; /* Integer offset to check-in marks */
		@@ -110,11 +113,11 @@
110	113	db_find_and_open_repository(0, 2);
111	114	verify_all_options();
112	115	if( g.argc!=2 && g.argc!=3 ){ usage("--git ?REPOSITORY?"); }
113	116
114	117	/* Step 1: Generate "blob" records for every artifact that is part
115		- ** of a check-in
	118	+ ** of a check-in
116	119	*/
117	120	fossil_binary_mode(stdout);
118	121	db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0");
119	122	while( db_step(&q)==SQLITE_ROW ){
120	123	int rid = db_column_int(&q, 0);
121	124

	--- src/export.c
	+++ src/export.c
	@@ -86,19 +86,22 @@
86	**
87	** Usage: %fossil export --git ?REPOSITORY?
88	**
89	** Write an export of all check-ins to standard output. The export is
90	** written in the git-fast-export file format assuming the --git option is
91	** provided. The git-fast-export format is currently the only VCS
92	** interchange format supported, though other formats may be added in
93	** the future.
94	**
95	** Run this command within a checkout. Or use the -R or --repository
96	** option to specify a Fossil repository to be exported.
97	**
98	** Only check-ins are exported using --git. Git does not support tickets
99	** or wiki or events or attachments, so none of those are exported.



100	*/
101	void export_cmd(void){
102	Stmt q;
103	int i;
104	int firstCkin; /* Integer offset to check-in marks */
	@@ -110,11 +113,11 @@
110	db_find_and_open_repository(0, 2);
111	verify_all_options();
112	if( g.argc!=2 && g.argc!=3 ){ usage("--git ?REPOSITORY?"); }
113
114	/* Step 1: Generate "blob" records for every artifact that is part
115	** of a check-in
116	*/
117	fossil_binary_mode(stdout);
118	db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0");
119	while( db_step(&q)==SQLITE_ROW ){
120	int rid = db_column_int(&q, 0);
121

	--- src/export.c
	+++ src/export.c
	@@ -86,19 +86,22 @@
86	**
87	** Usage: %fossil export --git ?REPOSITORY?
88	**
89	** Write an export of all check-ins to standard output. The export is
90	** written in the git-fast-export file format assuming the --git option is
91	** provided. The git-fast-export format is currently the only VCS
92	** interchange format supported, though other formats may be added in
93	** the future.
94	**
95	** Run this command within a checkout or specify the name of the
96	** Fossil repository to be exported.
97	**
98	** Only check-ins are exported using --git. Git does not support tickets
99	** or wiki or events or attachments, so none of those are exported.
100	**
101	**
102	** SUMMARY: fossil export --git ?REPOSITORY?
103	*/
104	void export_cmd(void){
105	Stmt q;
106	int i;
107	int firstCkin; /* Integer offset to check-in marks */
	@@ -110,11 +113,11 @@
113	db_find_and_open_repository(0, 2);
114	verify_all_options();
115	if( g.argc!=2 && g.argc!=3 ){ usage("--git ?REPOSITORY?"); }
116
117	/* Step 1: Generate "blob" records for every artifact that is part
118	** of a check-in
119	*/
120	fossil_binary_mode(stdout);
121	db_prepare(&q, "SELECT DISTINCT fid FROM mlink WHERE fid>0");
122	while( db_step(&q)==SQLITE_ROW ){
123	int rid = db_column_int(&q, 0);
124

Fossil SCM

Keyboard Shortcuts