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