Fossil SCM
Write the new manifest file to the root of the check-out tree when doing an update.
Commit
a040ae6e17e68b6f4de4ff7f3ec6ebee940c0ff3
Parent
77327ae14ec08e7…
2 files changed
+17
-7
+1
+17
-7
| --- src/checkout.c | ||
| +++ src/checkout.c | ||
| @@ -89,10 +89,26 @@ | ||
| 89 | 89 | } |
| 90 | 90 | content_get(vid, &manifest); |
| 91 | 91 | vfile_build(vid, &manifest); |
| 92 | 92 | blob_reset(&manifest); |
| 93 | 93 | } |
| 94 | + | |
| 95 | +/* | |
| 96 | +** Read the manifest file given by vid out of the repository | |
| 97 | +** and store it in the root of the local check-out. | |
| 98 | +*/ | |
| 99 | +void manifest_to_disk(int vid){ | |
| 100 | + char *zManFile; | |
| 101 | + Blob manifest; | |
| 102 | + | |
| 103 | + blob_zero(&manifest); | |
| 104 | + zManFile = mprintf("%smanifest", g.zLocalRoot); | |
| 105 | + content_get(vid, &manifest); | |
| 106 | + blob_write_to_file(&manifest, zManFile); | |
| 107 | + free(zManFile); | |
| 108 | + blob_reset(&manifest); | |
| 109 | +} | |
| 94 | 110 | |
| 95 | 111 | /* |
| 96 | 112 | ** COMMAND: checkout |
| 97 | 113 | ** |
| 98 | 114 | ** Check out a version specified on the command-line. |
| @@ -124,18 +140,12 @@ | ||
| 124 | 140 | if( !noWrite ){ |
| 125 | 141 | uncheckout(prior); |
| 126 | 142 | } |
| 127 | 143 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 128 | 144 | if( !noWrite ){ |
| 129 | - Blob manifest; | |
| 130 | - char *zManFile; | |
| 131 | 145 | vfile_to_disk(vid, 0, 1); |
| 132 | - blob_zero(&manifest); | |
| 133 | - zManFile = mprintf("%smanifest", g.zLocalRoot); | |
| 134 | - content_get(vid, &manifest); | |
| 135 | - blob_write_to_file(&manifest, zManFile); | |
| 136 | - free(zManFile); | |
| 146 | + manifest_to_disk(vid); | |
| 137 | 147 | db_lset_int("checkout", vid); |
| 138 | 148 | } |
| 139 | 149 | db_multi_exec("DELETE FROM vmerge"); |
| 140 | 150 | vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b); |
| 141 | 151 | vfile_aggregate_checksum_disk(vid, &cksum2); |
| 142 | 152 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -89,10 +89,26 @@ | |
| 89 | } |
| 90 | content_get(vid, &manifest); |
| 91 | vfile_build(vid, &manifest); |
| 92 | blob_reset(&manifest); |
| 93 | } |
| 94 | |
| 95 | /* |
| 96 | ** COMMAND: checkout |
| 97 | ** |
| 98 | ** Check out a version specified on the command-line. |
| @@ -124,18 +140,12 @@ | |
| 124 | if( !noWrite ){ |
| 125 | uncheckout(prior); |
| 126 | } |
| 127 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 128 | if( !noWrite ){ |
| 129 | Blob manifest; |
| 130 | char *zManFile; |
| 131 | vfile_to_disk(vid, 0, 1); |
| 132 | blob_zero(&manifest); |
| 133 | zManFile = mprintf("%smanifest", g.zLocalRoot); |
| 134 | content_get(vid, &manifest); |
| 135 | blob_write_to_file(&manifest, zManFile); |
| 136 | free(zManFile); |
| 137 | db_lset_int("checkout", vid); |
| 138 | } |
| 139 | db_multi_exec("DELETE FROM vmerge"); |
| 140 | vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b); |
| 141 | vfile_aggregate_checksum_disk(vid, &cksum2); |
| 142 |
| --- src/checkout.c | |
| +++ src/checkout.c | |
| @@ -89,10 +89,26 @@ | |
| 89 | } |
| 90 | content_get(vid, &manifest); |
| 91 | vfile_build(vid, &manifest); |
| 92 | blob_reset(&manifest); |
| 93 | } |
| 94 | |
| 95 | /* |
| 96 | ** Read the manifest file given by vid out of the repository |
| 97 | ** and store it in the root of the local check-out. |
| 98 | */ |
| 99 | void manifest_to_disk(int vid){ |
| 100 | char *zManFile; |
| 101 | Blob manifest; |
| 102 | |
| 103 | blob_zero(&manifest); |
| 104 | zManFile = mprintf("%smanifest", g.zLocalRoot); |
| 105 | content_get(vid, &manifest); |
| 106 | blob_write_to_file(&manifest, zManFile); |
| 107 | free(zManFile); |
| 108 | blob_reset(&manifest); |
| 109 | } |
| 110 | |
| 111 | /* |
| 112 | ** COMMAND: checkout |
| 113 | ** |
| 114 | ** Check out a version specified on the command-line. |
| @@ -124,18 +140,12 @@ | |
| 140 | if( !noWrite ){ |
| 141 | uncheckout(prior); |
| 142 | } |
| 143 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid); |
| 144 | if( !noWrite ){ |
| 145 | vfile_to_disk(vid, 0, 1); |
| 146 | manifest_to_disk(vid); |
| 147 | db_lset_int("checkout", vid); |
| 148 | } |
| 149 | db_multi_exec("DELETE FROM vmerge"); |
| 150 | vfile_aggregate_checksum_manifest(vid, &cksum1, &cksum1b); |
| 151 | vfile_aggregate_checksum_disk(vid, &cksum2); |
| 152 |
+1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -174,8 +174,9 @@ | ||
| 174 | 174 | |
| 175 | 175 | /* |
| 176 | 176 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 177 | 177 | */ |
| 178 | 178 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 179 | + manifest_to_disk(tid); | |
| 179 | 180 | db_lset_int("checkout", tid); |
| 180 | 181 | db_end_transaction(0); |
| 181 | 182 | } |
| 182 | 183 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -174,8 +174,9 @@ | |
| 174 | |
| 175 | /* |
| 176 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 177 | */ |
| 178 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 179 | db_lset_int("checkout", tid); |
| 180 | db_end_transaction(0); |
| 181 | } |
| 182 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -174,8 +174,9 @@ | |
| 174 | |
| 175 | /* |
| 176 | ** Clean up the mid and pid VFILE entries. Then commit the changes. |
| 177 | */ |
| 178 | db_multi_exec("DELETE FROM vfile WHERE vid!=%d", tid); |
| 179 | manifest_to_disk(tid); |
| 180 | db_lset_int("checkout", tid); |
| 181 | db_end_transaction(0); |
| 182 | } |
| 183 |