Fossil SCM

merged from trunk

Ratte 2010-10-04 11:48 wolfgangFormat2CSS_2 merge

Commit fafcb6c780557d8584499b9cb163a3d7a1357356

Parent 287dd50e7b85aca…

3 files changed +1 -1 +2 -2 +5 -1

M src/checkout.c

+1 -1

		--- src/checkout.c
		+++ src/checkout.c
		@@ -238,11 +238,11 @@
238	238	vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b);
239	239	vfile_aggregate_checksum_disk(vid, &cksum2);
240	240	if( blob_compare(&cksum1, &cksum2) ){
241	241	printf("WARNING: manifest checksum does not agree with disk\n");
242	242	}
243		- if( blob_compare(&cksum1, &cksum1b) ){
	243	+ if( blob_size(&cksum1b) && blob_compare(&cksum1, &cksum1b) ){
244	244	printf("WARNING: manifest checksum does not agree with manifest\n");
245	245	}
246	246	}
247	247	db_end_transaction(0);
248	248	}
249	249

	--- src/checkout.c
	+++ src/checkout.c
	@@ -238,11 +238,11 @@
238	vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b);
239	vfile_aggregate_checksum_disk(vid, &cksum2);
240	if( blob_compare(&cksum1, &cksum2) ){
241	printf("WARNING: manifest checksum does not agree with disk\n");
242	}
243	if( blob_compare(&cksum1, &cksum1b) ){
244	printf("WARNING: manifest checksum does not agree with manifest\n");
245	}
246	}
247	db_end_transaction(0);
248	}
249

	--- src/checkout.c
	+++ src/checkout.c
	@@ -238,11 +238,11 @@
238	vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b);
239	vfile_aggregate_checksum_disk(vid, &cksum2);
240	if( blob_compare(&cksum1, &cksum2) ){
241	printf("WARNING: manifest checksum does not agree with disk\n");
242	}
243	if( blob_size(&cksum1b) && blob_compare(&cksum1, &cksum1b) ){
244	printf("WARNING: manifest checksum does not agree with manifest\n");
245	}
246	}
247	db_end_transaction(0);
248	}
249

M src/manifest.c

+2 -2

		--- src/manifest.c
		+++ src/manifest.c
		@@ -405,12 +405,12 @@
405	405	}
406	406
407	407	/*
408	408	** R <md5sum>
409	409	**
410		- ** Specify the MD5 checksum of the entire baseline in a
411		- ** manifest.
	410	+ ** Specify the MD5 checksum over the name and content of all files
	411	+ ** in the manifest.
412	412	*/
413	413	case 'R': {
414	414	md5sum_step_text(blob_buffer(&line), blob_size(&line));
415	415	if( p->zRepoCksum!=0 ) goto manifest_syntax_error;
416	416	if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
417	417

	--- src/manifest.c
	+++ src/manifest.c
	@@ -405,12 +405,12 @@
405	}
406
407	/*
408	** R <md5sum>
409	**
410	** Specify the MD5 checksum of the entire baseline in a
411	** manifest.
412	*/
413	case 'R': {
414	md5sum_step_text(blob_buffer(&line), blob_size(&line));
415	if( p->zRepoCksum!=0 ) goto manifest_syntax_error;
416	if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
417

	--- src/manifest.c
	+++ src/manifest.c
	@@ -405,12 +405,12 @@
405	}
406
407	/*
408	** R <md5sum>
409	**
410	** Specify the MD5 checksum over the name and content of all files
411	** in the manifest.
412	*/
413	case 'R': {
414	md5sum_step_text(blob_buffer(&line), blob_size(&line));
415	if( p->zRepoCksum!=0 ) goto manifest_syntax_error;
416	if( blob_token(&line, &a1)==0 ) goto manifest_syntax_error;
417

M src/vfile.c

+5 -1

		--- src/vfile.c
		+++ src/vfile.c
		@@ -462,11 +462,15 @@
462	462	md5sum_step_text(zBuf, -1);
463	463	md5sum_step_blob(&file);
464	464	blob_reset(&file);
465	465	}
466	466	if( pManOut ){
467		- blob_append(pManOut, m.zRepoCksum, -1);
	467	+ if( m.zRepoCksum ){
	468	+ blob_append(pManOut, m.zRepoCksum, -1);
	469	+ }else{
	470	+ blob_zero(pManOut);
	471	+ }
468	472	}
469	473	manifest_clear(&m);
470	474	md5sum_finish(pOut);
471	475	}
472	476
473	477

	--- src/vfile.c
	+++ src/vfile.c
	@@ -462,11 +462,15 @@
462	md5sum_step_text(zBuf, -1);
463	md5sum_step_blob(&file);
464	blob_reset(&file);
465	}
466	if( pManOut ){
467	blob_append(pManOut, m.zRepoCksum, -1);




468	}
469	manifest_clear(&m);
470	md5sum_finish(pOut);
471	}
472
473

	--- src/vfile.c
	+++ src/vfile.c
	@@ -462,11 +462,15 @@
462	md5sum_step_text(zBuf, -1);
463	md5sum_step_blob(&file);
464	blob_reset(&file);
465	}
466	if( pManOut ){
467	if( m.zRepoCksum ){
468	blob_append(pManOut, m.zRepoCksum, -1);
469	}else{
470	blob_zero(pManOut);
471	}
472	}
473	manifest_clear(&m);
474	md5sum_finish(pOut);
475	}
476
477