Artifact
0a005465e81780c13a8e4f36cabeb727bbeada1f:
Attachment "r-card.diff" to
ticket [a32ff1eddb]
added by
anonymous
2010-10-03 13:04:03.
0000: 49 6e 64 65 78 3a 20 73 72 63 2f 63 68 65 63 6b Index: src/check
0010: 69 6e 2e 63 0a 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d in.c.===========
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 0a 2d 2d 2d 20 73 72 63 ========.--- src
0060: 2f 63 68 65 63 6b 69 6e 2e 63 0a 2b 2b 2b 20 73 /checkin.c.+++ s
0070: 72 63 2f 63 68 65 63 6b 69 6e 2e 63 0a 40 40 20 rc/checkin.c.@@
0080: 2d 39 32 35 2c 31 31 20 2b 39 32 35 2c 31 31 20 -925,11 +925,11
0090: 40 40 0a 20 20 20 20 20 66 6f 73 73 69 6c 5f 70 @@. fossil_p
00a0: 61 6e 69 63 28 22 74 72 65 65 20 63 68 65 63 6b anic("tree check
00b0: 73 75 6d 20 64 6f 65 73 20 6e 6f 74 20 6d 61 74 sum does not mat
00c0: 63 68 20 72 65 70 6f 73 69 74 6f 72 79 20 61 66 ch repository af
00d0: 74 65 72 20 63 6f 6d 6d 69 74 22 29 3b 0a 20 20 ter commit");.
00e0: 20 7d 0a 20 0a 20 20 20 2f 2a 20 56 65 72 69 66 }. . /* Verif
00f0: 79 20 74 68 61 74 20 74 68 65 20 6d 61 6e 69 66 y that the manif
0100: 65 73 74 20 63 68 65 63 6b 73 75 6d 20 6d 61 74 est checksum mat
0110: 63 68 65 73 20 74 68 65 20 65 78 70 65 63 74 65 ches the expecte
0120: 64 20 63 68 65 63 6b 73 75 6d 20 2a 2f 0a 20 20 d checksum */.
0130: 20 76 66 69 6c 65 5f 61 67 67 72 65 67 61 74 65 vfile_aggregate
0140: 5f 63 68 65 63 6b 73 75 6d 5f 6d 61 6e 69 66 65 _checksum_manife
0150: 73 74 28 6e 76 69 64 2c 20 26 63 6b 73 75 6d 32 st(nvid, &cksum2
0160: 2c 20 26 63 6b 73 75 6d 31 62 29 3b 0a 2d 20 20 , &cksum1b);.-
0170: 69 66 28 20 62 6c 6f 62 5f 63 6f 6d 70 61 72 65 if( blob_compare
0180: 28 26 63 6b 73 75 6d 31 2c 20 26 63 6b 73 75 6d (&cksum1, &cksum
0190: 31 62 29 20 29 7b 0a 2b 20 20 69 66 28 20 62 6c 1b) ){.+ if( bl
01a0: 6f 62 5f 73 69 7a 65 28 26 63 6b 73 75 6d 31 62 ob_size(&cksum1b
01b0: 29 20 26 26 20 62 6c 6f 62 5f 63 6f 6d 70 61 72 ) && blob_compar
01c0: 65 28 26 63 6b 73 75 6d 31 2c 20 26 63 6b 73 75 e(&cksum1, &cksu
01d0: 6d 31 62 29 20 29 7b 0a 20 20 20 20 20 66 6f 73 m1b) ){. fos
01e0: 73 69 6c 5f 70 61 6e 69 63 28 22 6d 61 6e 69 66 sil_panic("manif
01f0: 65 73 74 20 63 68 65 63 6b 73 75 6d 20 64 6f 65 est checksum doe
0200: 73 20 6e 6f 74 20 61 67 72 65 65 20 77 69 74 68 s not agree with
0210: 20 6d 61 6e 69 66 65 73 74 3a 20 22 0a 20 20 20 manifest: ".
0220: 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 22 "
0230: 25 62 20 76 65 72 73 75 73 20 25 62 22 2c 20 26 %b versus %b", &
0240: 63 6b 73 75 6d 31 2c 20 26 63 6b 73 75 6d 31 62 cksum1, &cksum1b
0250: 29 3b 0a 20 20 20 7d 0a 20 20 20 69 66 28 20 62 );. }. if( b
0260: 6c 6f 62 5f 63 6f 6d 70 61 72 65 28 26 63 6b 73 lob_compare(&cks
0270: 75 6d 31 2c 20 26 63 6b 73 75 6d 32 29 20 29 7b um1, &cksum2) ){
0280: 0a 20 20 20 20 20 66 6f 73 73 69 6c 5f 70 61 6e . fossil_pan
0290: 69 63 28 22 74 72 65 65 20 63 68 65 63 6b 73 75 ic("tree checksu
02a0: 6d 20 64 6f 65 73 20 6e 6f 74 20 6d 61 74 63 68 m does not match
02b0: 20 6d 61 6e 69 66 65 73 74 20 61 66 74 65 72 20 manifest after
02c0: 63 6f 6d 6d 69 74 3a 20 22 0a 0a 49 6e 64 65 78 commit: "..Index
02d0: 3a 20 73 72 63 2f 63 68 65 63 6b 6f 75 74 2e 63 : src/checkout.c
02e0: 0a 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d .===============
02f0: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0300: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0310: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0320: 3d 3d 3d 3d 0a 2d 2d 2d 20 73 72 63 2f 63 68 65 ====.--- src/che
0330: 63 6b 6f 75 74 2e 63 0a 2b 2b 2b 20 73 72 63 2f ckout.c.+++ src/
0340: 63 68 65 63 6b 6f 75 74 2e 63 0a 40 40 20 2d 32 checkout.c.@@ -2
0350: 33 38 2c 31 31 20 2b 32 33 38 2c 31 31 20 40 40 38,11 +238,11 @@
0360: 0a 20 20 20 20 20 76 66 69 6c 65 5f 61 67 67 72 . vfile_aggr
0370: 65 67 61 74 65 5f 63 68 65 63 6b 73 75 6d 5f 6d egate_checksum_m
0380: 61 6e 69 66 65 73 74 28 76 69 64 2c 20 26 63 6b anifest(vid, &ck
0390: 73 75 6d 31 2c 20 26 63 6b 73 75 6d 31 62 29 3b sum1, &cksum1b);
03a0: 0a 20 20 20 20 20 76 66 69 6c 65 5f 61 67 67 72 . vfile_aggr
03b0: 65 67 61 74 65 5f 63 68 65 63 6b 73 75 6d 5f 64 egate_checksum_d
03c0: 69 73 6b 28 76 69 64 2c 20 26 63 6b 73 75 6d 32 isk(vid, &cksum2
03d0: 29 3b 0a 20 20 20 20 20 69 66 28 20 62 6c 6f 62 );. if( blob
03e0: 5f 63 6f 6d 70 61 72 65 28 26 63 6b 73 75 6d 31 _compare(&cksum1
03f0: 2c 20 26 63 6b 73 75 6d 32 29 20 29 7b 0a 20 20 , &cksum2) ){.
0400: 20 20 20 20 20 70 72 69 6e 74 66 28 22 57 41 52 printf("WAR
0410: 4e 49 4e 47 3a 20 6d 61 6e 69 66 65 73 74 20 63 NING: manifest c
0420: 68 65 63 6b 73 75 6d 20 64 6f 65 73 20 6e 6f 74 hecksum does not
0430: 20 61 67 72 65 65 20 77 69 74 68 20 64 69 73 6b agree with disk
0440: 5c 6e 22 29 3b 0a 20 20 20 20 20 7d 0a 2d 20 20 \n");. }.-
0450: 20 20 69 66 28 20 62 6c 6f 62 5f 63 6f 6d 70 61 if( blob_compa
0460: 72 65 28 26 63 6b 73 75 6d 31 2c 20 26 63 6b 73 re(&cksum1, &cks
0470: 75 6d 31 62 29 20 29 7b 0a 2b 20 20 20 20 69 66 um1b) ){.+ if
0480: 28 20 62 6c 6f 62 5f 73 69 7a 65 28 26 63 6b 73 ( blob_size(&cks
0490: 75 6d 31 62 29 20 26 26 20 62 6c 6f 62 5f 63 6f um1b) && blob_co
04a0: 6d 70 61 72 65 28 26 63 6b 73 75 6d 31 2c 20 26 mpare(&cksum1, &
04b0: 63 6b 73 75 6d 31 62 29 20 29 7b 0a 20 20 20 20 cksum1b) ){.
04c0: 20 20 20 70 72 69 6e 74 66 28 22 57 41 52 4e 49 printf("WARNI
04d0: 4e 47 3a 20 6d 61 6e 69 66 65 73 74 20 63 68 65 NG: manifest che
04e0: 63 6b 73 75 6d 20 64 6f 65 73 20 6e 6f 74 20 61 cksum does not a
04f0: 67 72 65 65 20 77 69 74 68 20 6d 61 6e 69 66 65 gree with manife
0500: 73 74 5c 6e 22 29 3b 0a 20 20 20 20 20 7d 0a 20 st\n");. }.
0510: 20 20 7d 0a 20 20 20 64 62 5f 65 6e 64 5f 74 72 }. db_end_tr
0520: 61 6e 73 61 63 74 69 6f 6e 28 30 29 3b 0a 20 7d ansaction(0);. }
0530: 0a 0a 49 6e 64 65 78 3a 20 73 72 63 2f 76 66 69 ..Index: src/vfi
0540: 6c 65 2e 63 0a 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d le.c.===========
0550: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0560: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0570: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0580: 3d 3d 3d 3d 3d 3d 3d 3d 0a 2d 2d 2d 20 73 72 63 ========.--- src
0590: 2f 76 66 69 6c 65 2e 63 0a 2b 2b 2b 20 73 72 63 /vfile.c.+++ src
05a0: 2f 76 66 69 6c 65 2e 63 0a 40 40 20 2d 34 36 31 /vfile.c.@@ -461
05b0: 2c 31 32 20 2b 34 36 31 2c 31 35 20 40 40 0a 20 ,12 +461,15 @@.
05c0: 20 20 20 20 73 70 72 69 6e 74 66 28 7a 42 75 66 sprintf(zBuf
05d0: 2c 20 22 20 25 64 5c 6e 22 2c 20 62 6c 6f 62 5f , " %d\n", blob_
05e0: 73 69 7a 65 28 26 66 69 6c 65 29 29 3b 0a 20 20 size(&file));.
05f0: 20 20 20 6d 64 35 73 75 6d 5f 73 74 65 70 5f 74 md5sum_step_t
0600: 65 78 74 28 7a 42 75 66 2c 20 2d 31 29 3b 0a 20 ext(zBuf, -1);.
0610: 20 20 20 20 6d 64 35 73 75 6d 5f 73 74 65 70 5f md5sum_step_
0620: 62 6c 6f 62 28 26 66 69 6c 65 29 3b 0a 20 20 20 blob(&file);.
0630: 20 20 62 6c 6f 62 5f 72 65 73 65 74 28 26 66 69 blob_reset(&fi
0640: 6c 65 29 3b 0a 20 20 20 7d 0a 2d 20 20 69 66 28 le);. }.- if(
0650: 20 70 4d 61 6e 4f 75 74 20 29 7b 0a 2d 20 20 20 pManOut ){.-
0660: 20 62 6c 6f 62 5f 61 70 70 65 6e 64 28 70 4d 61 blob_append(pMa
0670: 6e 4f 75 74 2c 20 6d 2e 7a 52 65 70 6f 43 6b 73 nOut, m.zRepoCks
0680: 75 6d 2c 20 2d 31 29 3b 0a 2b 20 20 69 66 28 20 um, -1);.+ if(
0690: 70 4d 61 6e 4f 75 74 29 7b 0a 2b 20 20 20 20 69 pManOut){.+ i
06a0: 66 20 28 6d 2e 7a 52 65 70 6f 43 6b 73 75 6d 29 f (m.zRepoCksum)
06b0: 0a 2b 20 20 20 20 20 20 62 6c 6f 62 5f 61 70 70 .+ blob_app
06c0: 65 6e 64 28 70 4d 61 6e 4f 75 74 2c 20 6d 2e 7a end(pManOut, m.z
06d0: 52 65 70 6f 43 6b 73 75 6d 2c 20 2d 31 29 3b 0a RepoCksum, -1);.
06e0: 2b 20 20 20 20 65 6c 73 65 0a 2b 20 20 20 20 20 + else.+
06f0: 20 62 6c 6f 62 5f 7a 65 72 6f 28 70 4d 61 6e 4f blob_zero(pManO
0700: 75 74 29 3b 0a 20 20 20 7d 0a 20 20 20 6d 61 6e ut);. }. man
0710: 69 66 65 73 74 5f 63 6c 65 61 72 28 26 6d 29 3b ifest_clear(&m);
0720: 0a 20 20 20 6d 64 35 73 75 6d 5f 66 69 6e 69 73 . md5sum_finis
0730: 68 28 70 4f 75 74 29 3b 0a 20 7d 0a 20 0a 0a h(pOut);. }. ..