Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge updates from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | fossil-2.0 |
| Files: | files | file ages | folders |
| SHA1: |
fcc9116a5476caedd83d65766227dd8f |
| User & Date: | drh 2017-03-01 00:35:32 |
Context
|
2017-03-01
| ||
| 00:49 | Use generic hash validity checking in the purge.c module. check-in: 7bd36bc5 user: drh tags: fossil-2.0 | |
| 00:35 | Merge updates from trunk. check-in: fcc9116a user: drh tags: fossil-2.0 | |
| 00:34 | Avoid unnecessary SHA1 calls in the bundle.c module. check-in: 527d4edd user: drh tags: fossil-2.0 | |
| 00:25 | On a check-out the manifest.uuid file is determined by the display name, not the SHA1 hash of the manifest. check-in: 41af304e user: drh tags: trunk | |
Changes
Changes to src/checkout.c.
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 |
** If the manifest setting is set, but is not a boolean value, then treat
** each character as a flag to enable writing "manifest", "manifest.uuid" or
** "manifest.tags".
*/
void manifest_to_disk(int vid){
char *zManFile;
Blob manifest;
Blob hash;
Blob taglist;
int flg;
flg = db_get_manifest_setting();
if( flg & (MFESTFLG_RAW|MFESTFLG_UUID) ){
blob_zero(&manifest);
content_get(vid, &manifest);
blob_zero(&hash);
sha1sum_blob(&manifest, &hash);
sterilize_manifest(&manifest);
}
if( flg & MFESTFLG_RAW ){
zManFile = mprintf("%smanifest", g.zLocalRoot);
blob_write_to_file(&manifest, zManFile);
free(zManFile);
}else{
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){
zManFile = mprintf("%smanifest", g.zLocalRoot);
file_delete(zManFile);
free(zManFile);
}
}
if( flg & MFESTFLG_UUID ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
blob_append(&hash, "\n", 1);
blob_write_to_file(&hash, zManFile);
free(zManFile);
blob_reset(&hash);
}else{
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
|
< | < < < < > > |
132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
** If the manifest setting is set, but is not a boolean value, then treat
** each character as a flag to enable writing "manifest", "manifest.uuid" or
** "manifest.tags".
*/
void manifest_to_disk(int vid){
char *zManFile;
Blob manifest;
Blob taglist;
int flg;
flg = db_get_manifest_setting();
if( flg & MFESTFLG_RAW ){
blob_zero(&manifest);
content_get(vid, &manifest);
sterilize_manifest(&manifest);
zManFile = mprintf("%smanifest", g.zLocalRoot);
blob_write_to_file(&manifest, zManFile);
free(zManFile);
}else{
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest'") ){
zManFile = mprintf("%smanifest", g.zLocalRoot);
file_delete(zManFile);
free(zManFile);
}
}
if( flg & MFESTFLG_UUID ){
Blob hash;
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
blob_set_dynamic(&hash, rid_to_uuid(vid));
blob_append(&hash, "\n", 1);
blob_write_to_file(&hash, zManFile);
free(zManFile);
blob_reset(&hash);
}else{
if( !db_exists("SELECT 1 FROM vfile WHERE pathname='manifest.uuid'") ){
zManFile = mprintf("%smanifest.uuid", g.zLocalRoot);
|