f5740d09c3e… — Fossil SCM

M Makefile

+13 -3

		--- Makefile
		+++ Makefile
		@@ -41,13 +41,10 @@
41	41	# other dependencies. We sometimes add the -static option here
42	42	# so that we can build a static executable that will run in a
43	43	# chroot jail.
44	44	#
45	45	LIB = -lz $(LDFLAGS)
46		-HOST_OS!= uname -s
47		-LIB.SunOS= -lsocket -lnsl
48		-LIB += $(LIB.$(HOST_OS))
49	46
50	47	# If using HTTPS:
51	48	LIB += -lcrypto -lssl
52	49
53	50	#### Tcl shell for use in running the fossil testsuite.
		@@ -54,6 +51,19 @@
54	51	#
55	52	TCLSH = tclsh
56	53
57	54	# You should not need to change anything below this line
58	55	###############################################################################
	56	+#
	57	+# Automatic platform-specific options.
	58	+HOST_OS!= uname -s
	59	+
	60	+LIB.SunOS= -lsocket -lnsl
	61	+LIB += $(LIB.$(HOST_OS))
	62	+
	63	+TCC.DragonFly += -DUSE_PREAD
	64	+TCC.FreeBSD += -DUSE_PREAD
	65	+TCC.NetBSD += -DUSE_PREAD
	66	+TCC.OpenBSD += -DUSE_PREAD
	67	+TCC += $(TCC.$(HOST_OS))
	68	+
59	69	include $(SRCDIR)/main.mk
60	70

	--- Makefile
	+++ Makefile
	@@ -41,13 +41,10 @@
41	# other dependencies. We sometimes add the -static option here
42	# so that we can build a static executable that will run in a
43	# chroot jail.
44	#
45	LIB = -lz $(LDFLAGS)
46	HOST_OS!= uname -s
47	LIB.SunOS= -lsocket -lnsl
48	LIB += $(LIB.$(HOST_OS))
49
50	# If using HTTPS:
51	LIB += -lcrypto -lssl
52
53	#### Tcl shell for use in running the fossil testsuite.
	@@ -54,6 +51,19 @@
54	#
55	TCLSH = tclsh
56
57	# You should not need to change anything below this line
58	###############################################################################













59	include $(SRCDIR)/main.mk
60

	--- Makefile
	+++ Makefile
	@@ -41,13 +41,10 @@
41	# other dependencies. We sometimes add the -static option here
42	# so that we can build a static executable that will run in a
43	# chroot jail.
44	#
45	LIB = -lz $(LDFLAGS)



46
47	# If using HTTPS:
48	LIB += -lcrypto -lssl
49
50	#### Tcl shell for use in running the fossil testsuite.
	@@ -54,6 +51,19 @@
51	#
52	TCLSH = tclsh
53
54	# You should not need to change anything below this line
55	###############################################################################
56	#
57	# Automatic platform-specific options.
58	HOST_OS!= uname -s
59
60	LIB.SunOS= -lsocket -lnsl
61	LIB += $(LIB.$(HOST_OS))
62
63	TCC.DragonFly += -DUSE_PREAD
64	TCC.FreeBSD += -DUSE_PREAD
65	TCC.NetBSD += -DUSE_PREAD
66	TCC.OpenBSD += -DUSE_PREAD
67	TCC += $(TCC.$(HOST_OS))
68
69	include $(SRCDIR)/main.mk
70

M src/content.c

+6 -2

		--- src/content.c
		+++ src/content.c
		@@ -283,22 +283,26 @@
283	283	}
284	284
285	285	/*
286	286	** COMMAND: artifact
287	287	**
288		-** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME?
	288	+** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? ?OPTIONS?
289	289	**
290	290	** Extract an artifact by its SHA1 hash and write the results on
291	291	** standard output, or if the optional 4th argument is given, in
292	292	** the named output file.
	293	+**
	294	+** Options:
	295	+**
	296	+** -R\|--repository FILE Extract artifacts from repository FILE
293	297	*/
294	298	void artifact_cmd(void){
295	299	int rid;
296	300	Blob content;
297	301	const char *zFile;
298	302	db_find_and_open_repository(1);
299		- if( g.argc!=4 && g.argc!=3 ) usage("RECORDID ?FILENAME?");
	303	+ if( g.argc!=4 && g.argc!=3 ) usage("ARTIFACT-ID ?FILENAME? ?OPTIONS?");
300	304	zFile = g.argc==4 ? g.argv[3] : "-";
301	305	rid = name_to_rid(g.argv[2]);
302	306	content_get(rid, &content);
303	307	blob_write_to_file(&content, zFile);
304	308	}
305	309

	--- src/content.c
	+++ src/content.c
	@@ -283,22 +283,26 @@
283	}
284
285	/*
286	** COMMAND: artifact
287	**
288	** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME?
289	**
290	** Extract an artifact by its SHA1 hash and write the results on
291	** standard output, or if the optional 4th argument is given, in
292	** the named output file.




293	*/
294	void artifact_cmd(void){
295	int rid;
296	Blob content;
297	const char *zFile;
298	db_find_and_open_repository(1);
299	if( g.argc!=4 && g.argc!=3 ) usage("RECORDID ?FILENAME?");
300	zFile = g.argc==4 ? g.argv[3] : "-";
301	rid = name_to_rid(g.argv[2]);
302	content_get(rid, &content);
303	blob_write_to_file(&content, zFile);
304	}
305

	--- src/content.c
	+++ src/content.c
	@@ -283,22 +283,26 @@
283	}
284
285	/*
286	** COMMAND: artifact
287	**
288	** Usage: %fossil artifact ARTIFACT-ID ?OUTPUT-FILENAME? ?OPTIONS?
289	**
290	** Extract an artifact by its SHA1 hash and write the results on
291	** standard output, or if the optional 4th argument is given, in
292	** the named output file.
293	**
294	** Options:
295	**
296	** -R\|--repository FILE Extract artifacts from repository FILE
297	*/
298	void artifact_cmd(void){
299	int rid;
300	Blob content;
301	const char *zFile;
302	db_find_and_open_repository(1);
303	if( g.argc!=4 && g.argc!=3 ) usage("ARTIFACT-ID ?FILENAME? ?OPTIONS?");
304	zFile = g.argc==4 ? g.argv[3] : "-";
305	rid = name_to_rid(g.argv[2]);
306	content_get(rid, &content);
307	blob_write_to_file(&content, zFile);
308	}
309

M src/manifest.c

+3

		--- src/manifest.c
		+++ src/manifest.c
		@@ -1184,10 +1184,13 @@
1184	1184	*ppOther = manifest_parse(&otherContent, otherRid);
1185	1185	if( *ppOther==0 ) return;
1186	1186	}
1187	1187	if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
1188	1188	content_deltify(pid, cid, 0);
	1189	+ }else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){
	1190	+ fetch_baseline(pParent);
	1191	+ content_deltify(pParent->pBaseline->rid, cid, 0);
1189	1192	}
1190	1193
1191	1194	for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
1192	1195	if( pChildFile->zPrior ){
1193	1196	pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
1194	1197

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1184,10 +1184,13 @@
1184	*ppOther = manifest_parse(&otherContent, otherRid);
1185	if( *ppOther==0 ) return;
1186	}
1187	if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
1188	content_deltify(pid, cid, 0);



1189	}
1190
1191	for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
1192	if( pChildFile->zPrior ){
1193	pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
1194

	--- src/manifest.c
	+++ src/manifest.c
	@@ -1184,10 +1184,13 @@
1184	*ppOther = manifest_parse(&otherContent, otherRid);
1185	if( *ppOther==0 ) return;
1186	}
1187	if( (pParent->zBaseline==0)==(pChild->zBaseline==0) ){
1188	content_deltify(pid, cid, 0);
1189	}else if( pChild->zBaseline==0 && pParent->zBaseline!=0 ){
1190	fetch_baseline(pParent);
1191	content_deltify(pParent->pBaseline->rid, cid, 0);
1192	}
1193
1194	for(i=0, pChildFile=pChild->aFile; i<pChild->nFile; i++, pChildFile++){
1195	if( pChildFile->zPrior ){
1196	pParentFile = manifest_file_seek(pParent, pChildFile->zPrior);
1197

Fossil SCM