Fossil SCM
Merge updates from trunk.
Commit
fcc9116a5476caedd83d65766227dd8fd85df827
Parent
527d4eddc7f3be9…
1 file changed
+3
-6
+3
-6
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -134,24 +134,19 @@ | ||
| 134 | 134 | ** "manifest.tags". |
| 135 | 135 | */ |
| 136 | 136 | void manifest_to_disk(int vid){ |
| 137 | 137 | char *zManFile; |
| 138 | 138 | Blob manifest; |
| 139 | - Blob hash; | |
| 140 | 139 | Blob taglist; |
| 141 | 140 | int flg; |
| 142 | 141 | |
| 143 | 142 | flg = db_get_manifest_setting(); |
| 144 | 143 | |
| 145 | - if( flg & (MFESTFLG_RAW|MFESTFLG_UUID) ){ | |
| 144 | + if( flg & MFESTFLG_RAW ){ | |
| 146 | 145 | blob_zero(&manifest); |
| 147 | 146 | content_get(vid, &manifest); |
| 148 | - blob_zero(&hash); | |
| 149 | - sha1sum_blob(&manifest, &hash); | |
| 150 | 147 | sterilize_manifest(&manifest); |
| 151 | - } | |
| 152 | - if( flg & MFESTFLG_RAW ){ | |
| 153 | 148 | zManFile = mprintf("%smanifest", g.zLocalRoot); |
| 154 | 149 | blob_write_to_file(&manifest, zManFile); |
| 155 | 150 | free(zManFile); |
| 156 | 151 | }else{ |
| 157 | 152 | if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){ |
| @@ -159,11 +154,13 @@ | ||
| 159 | 154 | file_delete(zManFile); |
| 160 | 155 | free(zManFile); |
| 161 | 156 | } |
| 162 | 157 | } |
| 163 | 158 | if( flg & MFESTFLG_UUID ){ |
| 159 | + Blob hash; | |
| 164 | 160 | zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 161 | + blob_set_dynamic(&hash, rid_to_uuid(vid)); | |
| 165 | 162 | blob_append(&hash, "\n", 1); |
| 166 | 163 | blob_write_to_file(&hash, zManFile); |
| 167 | 164 | free(zManFile); |
| 168 | 165 | blob_reset(&hash); |
| 169 | 166 | }else{ |
| 170 | 167 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -134,24 +134,19 @@ | |
| 134 | ** "manifest.tags". |
| 135 | */ |
| 136 | void manifest_to_disk(int vid){ |
| 137 | char *zManFile; |
| 138 | Blob manifest; |
| 139 | Blob hash; |
| 140 | Blob taglist; |
| 141 | int flg; |
| 142 | |
| 143 | flg = db_get_manifest_setting(); |
| 144 | |
| 145 | if( flg & (MFESTFLG_RAW|MFESTFLG_UUID) ){ |
| 146 | blob_zero(&manifest); |
| 147 | content_get(vid, &manifest); |
| 148 | blob_zero(&hash); |
| 149 | sha1sum_blob(&manifest, &hash); |
| 150 | sterilize_manifest(&manifest); |
| 151 | } |
| 152 | if( flg & MFESTFLG_RAW ){ |
| 153 | zManFile = mprintf("%smanifest", g.zLocalRoot); |
| 154 | blob_write_to_file(&manifest, zManFile); |
| 155 | free(zManFile); |
| 156 | }else{ |
| 157 | if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){ |
| @@ -159,11 +154,13 @@ | |
| 159 | file_delete(zManFile); |
| 160 | free(zManFile); |
| 161 | } |
| 162 | } |
| 163 | if( flg & MFESTFLG_UUID ){ |
| 164 | zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 165 | blob_append(&hash, "\n", 1); |
| 166 | blob_write_to_file(&hash, zManFile); |
| 167 | free(zManFile); |
| 168 | blob_reset(&hash); |
| 169 | }else{ |
| 170 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -134,24 +134,19 @@ | |
| 134 | ** "manifest.tags". |
| 135 | */ |
| 136 | void manifest_to_disk(int vid){ |
| 137 | char *zManFile; |
| 138 | Blob manifest; |
| 139 | Blob taglist; |
| 140 | int flg; |
| 141 | |
| 142 | flg = db_get_manifest_setting(); |
| 143 | |
| 144 | if( flg & MFESTFLG_RAW ){ |
| 145 | blob_zero(&manifest); |
| 146 | content_get(vid, &manifest); |
| 147 | sterilize_manifest(&manifest); |
| 148 | zManFile = mprintf("%smanifest", g.zLocalRoot); |
| 149 | blob_write_to_file(&manifest, zManFile); |
| 150 | free(zManFile); |
| 151 | }else{ |
| 152 | if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){ |
| @@ -159,11 +154,13 @@ | |
| 154 | file_delete(zManFile); |
| 155 | free(zManFile); |
| 156 | } |
| 157 | } |
| 158 | if( flg & MFESTFLG_UUID ){ |
| 159 | Blob hash; |
| 160 | zManFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 161 | blob_set_dynamic(&hash, rid_to_uuid(vid)); |
| 162 | blob_append(&hash, "\n", 1); |
| 163 | blob_write_to_file(&hash, zManFile); |
| 164 | free(zManFile); |
| 165 | blob_reset(&hash); |
| 166 | }else{ |
| 167 |