| | @@ -2556,22 +2556,19 @@ |
| 2556 | 2556 | int allowEmpty = 0; /* Allow a commit with no changes */ |
| 2557 | 2557 | int onlyIfChanges = 0; /* No-op if there are no changes */ |
| 2558 | 2558 | int allowFork = 0; /* Allow the commit to fork */ |
| 2559 | 2559 | int allowOlder = 0; /* Allow a commit older than its ancestor */ |
| 2560 | 2560 | int noVerifyCom = 0; /* Allow suspicious check-in comments */ |
| 2561 | | - char *zManifestFile; /* Name of the manifest file */ |
| 2562 | 2561 | int useCksum; /* True if checksums should be computed and verified */ |
| 2563 | | - int outputManifest; /* True to output "manifest" and "manifest.uuid" */ |
| 2564 | 2562 | int dryRunFlag; /* True for a test run. Debugging only */ |
| 2565 | 2563 | CheckinInfo sCiInfo; /* Information about this check-in */ |
| 2566 | 2564 | const char *zComFile; /* Read commit message from this file */ |
| 2567 | 2565 | int nTag = 0; /* Number of --tag arguments */ |
| 2568 | 2566 | const char *zTag; /* A single --tag argument */ |
| 2569 | 2567 | ManifestFile *pFile; /* File structure in the manifest */ |
| 2570 | 2568 | Manifest *pManifest; /* Manifest structure */ |
| 2571 | 2569 | Blob manifest; /* Manifest in baseline form */ |
| 2572 | | - Blob muuid; /* Manifest uuid */ |
| 2573 | 2570 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 2574 | 2571 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 2575 | 2572 | int szD; /* Size of the delta manifest */ |
| 2576 | 2573 | int szB; /* Size of the baseline manifest */ |
| 2577 | 2574 | int nConflict = 0; /* Number of unresolved merge conflicts */ |
| | @@ -2647,11 +2644,10 @@ |
| 2647 | 2644 | sCiInfo.zUserOvrd = find_option("user-override",0,1); |
| 2648 | 2645 | noSign = db_get_boolean("omitsign", 0)|noSign; |
| 2649 | 2646 | if( db_get_boolean("clearsign", 0)==0 ){ noSign = 1; } |
| 2650 | 2647 | useCksum = db_get_boolean("repo-cksum", 1); |
| 2651 | 2648 | bIgnoreSkew = find_option("ignore-clock-skew",0,0)!=0; |
| 2652 | | - outputManifest = db_get_manifest_setting(0); |
| 2653 | 2649 | mxSize = db_large_file_size(); |
| 2654 | 2650 | if( find_option("ignore-oversize",0,0)!=0 ) mxSize = 0; |
| 2655 | 2651 | (void)fossil_text_editor(); |
| 2656 | 2652 | verify_all_options(); |
| 2657 | 2653 | |
| | @@ -3209,17 +3205,10 @@ |
| 3209 | 3205 | ** and rollback the transaction. |
| 3210 | 3206 | */ |
| 3211 | 3207 | if( dryRunFlag ){ |
| 3212 | 3208 | blob_write_to_file(&manifest, ""); |
| 3213 | 3209 | } |
| 3214 | | - if( outputManifest & MFESTFLG_RAW ){ |
| 3215 | | - zManifestFile = mprintf("%smanifest", g.zLocalRoot); |
| 3216 | | - blob_write_to_file(&manifest, zManifestFile); |
| 3217 | | - blob_reset(&manifest); |
| 3218 | | - blob_read_from_file(&manifest, zManifestFile, ExtFILE); |
| 3219 | | - free(zManifestFile); |
| 3220 | | - } |
| 3221 | 3210 | |
| 3222 | 3211 | nvid = content_put(&manifest); |
| 3223 | 3212 | if( nvid==0 ){ |
| 3224 | 3213 | fossil_fatal("trouble committing manifest: %s", g.zErrMsg); |
| 3225 | 3214 | } |
| | @@ -3242,18 +3231,10 @@ |
| 3242 | 3231 | } |
| 3243 | 3232 | } |
| 3244 | 3233 | db_finalize(&q); |
| 3245 | 3234 | |
| 3246 | 3235 | fossil_print("New_Version: %s\n", zUuid); |
| 3247 | | - if( outputManifest & MFESTFLG_UUID ){ |
| 3248 | | - zManifestFile = mprintf("%smanifest.uuid", g.zLocalRoot); |
| 3249 | | - blob_zero(&muuid); |
| 3250 | | - blob_appendf(&muuid, "%s\n", zUuid); |
| 3251 | | - blob_write_to_file(&muuid, zManifestFile); |
| 3252 | | - free(zManifestFile); |
| 3253 | | - blob_reset(&muuid); |
| 3254 | | - } |
| 3255 | 3236 | |
| 3256 | 3237 | /* Update the vfile and vmerge tables */ |
| 3257 | 3238 | db_multi_exec( |
| 3258 | 3239 | "DELETE FROM vfile WHERE (vid!=%d OR deleted) AND is_selected(id);" |
| 3259 | 3240 | "DELETE FROM vmerge;" |
| | @@ -3260,11 +3241,11 @@ |
| 3260 | 3241 | "UPDATE vfile SET vid=%d;" |
| 3261 | 3242 | "UPDATE vfile SET rid=mrid, mhash=NULL, chnged=0, deleted=0, origname=NULL" |
| 3262 | 3243 | " WHERE is_selected(id);" |
| 3263 | 3244 | , vid, nvid |
| 3264 | 3245 | ); |
| 3265 | | - db_set_checkout(nvid); |
| 3246 | + db_set_checkout(nvid, !dryRunFlag); |
| 3266 | 3247 | |
| 3267 | 3248 | /* Update the isexe and islink columns of the vfile table */ |
| 3268 | 3249 | db_prepare(&q, |
| 3269 | 3250 | "UPDATE vfile SET isexe=:exec, islink=:link" |
| 3270 | 3251 | " WHERE vid=:vid AND pathname=:path AND (isexe!=:exec OR islink!=:link)" |
| | @@ -3325,20 +3306,10 @@ |
| 3325 | 3306 | db_end_transaction(1); |
| 3326 | 3307 | return; |
| 3327 | 3308 | } |
| 3328 | 3309 | db_end_transaction(0); |
| 3329 | 3310 | |
| 3330 | | - if( outputManifest & MFESTFLG_TAGS ){ |
| 3331 | | - Blob tagslist; |
| 3332 | | - zManifestFile = mprintf("%smanifest.tags", g.zLocalRoot); |
| 3333 | | - blob_zero(&tagslist); |
| 3334 | | - get_checkin_taglist(nvid, &tagslist); |
| 3335 | | - blob_write_to_file(&tagslist, zManifestFile); |
| 3336 | | - blob_reset(&tagslist); |
| 3337 | | - free(zManifestFile); |
| 3338 | | - } |
| 3339 | | - |
| 3340 | 3311 | if( !g.markPrivate ){ |
| 3341 | 3312 | int syncFlags = SYNC_PUSH | SYNC_PULL | SYNC_IFABLE; |
| 3342 | 3313 | autosync_loop(syncFlags, 0, "commit"); |
| 3343 | 3314 | } |
| 3344 | 3315 | if( count_nonbranch_children(vid)>1 ){ |
| 3345 | 3316 | |