Fossil SCM

Merge trunk into autodef-build-fixes

danshearer 2026-08-18 11:39 UTC autodef-build-fixes merge
Commit f116b4ed598e8c59a361ce6fdd2db9acbdc2a8614f663c5ef8c21e8afdb98c54
Parent 37713fc1280bb92…
4 files changed +2 -2 +1 -1 +2 -2 +1 -1
~ src/checkin.c ~ src/db.c ~ src/fileedit.c ~ src/xfer.c
M src/checkin.c
+2 -2
--- src/checkin.c
+++ src/checkin.c
@@ -2606,11 +2606,11 @@
26062606
 }
26072607
 if( forceDelta ){
26082608
 if( forceBaseline ){
26092609
 fossil_fatal("cannot use --delta and --baseline together");
26102610
 }
2611
- if( db_get_boolean("forbid-delta-manifests",0) ){
2611
+ if( db_get_boolean("forbid-delta-manifests",1) ){
26122612
 fossil_fatal("delta manifests are prohibited in this repository");
26132613
 }
26142614
 }
26152615
 dryRunFlag = find_option("dry-run","n",0)!=0;
26162616
 if( !dryRunFlag ){
@@ -2784,11 +2784,11 @@
27842784
 ** --delta option is specified. The remote repo will send the
27852785
 ** avoid-delta-manifests pragma if its "forbid-delta-manifests"
27862786
 ** setting is enabled.
27872787
 */
27882788
 if( !(forceDelta || db_get_boolean("seen-delta-manifest",0))
2789
- || db_get_boolean("forbid-delta-manifests",0)
2789
+ || db_get_boolean("forbid-delta-manifests",1)
27902790
 || g.bAvoidDeltaManifests
27912791
 ){
27922792
 forceBaseline = 1;
27932793
 }
27942794
27952795
--- src/checkin.c
+++ src/checkin.c
@@ -2606,11 +2606,11 @@
2606 }
2607 if( forceDelta ){
2608 if( forceBaseline ){
2609 fossil_fatal("cannot use --delta and --baseline together");
2610 }
2611 if( db_get_boolean("forbid-delta-manifests",0) ){
2612 fossil_fatal("delta manifests are prohibited in this repository");
2613 }
2614 }
2615 dryRunFlag = find_option("dry-run","n",0)!=0;
2616 if( !dryRunFlag ){
@@ -2784,11 +2784,11 @@
2784 ** --delta option is specified. The remote repo will send the
2785 ** avoid-delta-manifests pragma if its "forbid-delta-manifests"
2786 ** setting is enabled.
2787 */
2788 if( !(forceDelta || db_get_boolean("seen-delta-manifest",0))
2789 || db_get_boolean("forbid-delta-manifests",0)
2790 || g.bAvoidDeltaManifests
2791 ){
2792 forceBaseline = 1;
2793 }
2794
2795
--- src/checkin.c
+++ src/checkin.c
@@ -2606,11 +2606,11 @@
2606 }
2607 if( forceDelta ){
2608 if( forceBaseline ){
2609 fossil_fatal("cannot use --delta and --baseline together");
2610 }
2611 if( db_get_boolean("forbid-delta-manifests",1) ){
2612 fossil_fatal("delta manifests are prohibited in this repository");
2613 }
2614 }
2615 dryRunFlag = find_option("dry-run","n",0)!=0;
2616 if( !dryRunFlag ){
@@ -2784,11 +2784,11 @@
2784 ** --delta option is specified. The remote repo will send the
2785 ** avoid-delta-manifests pragma if its "forbid-delta-manifests"
2786 ** setting is enabled.
2787 */
2788 if( !(forceDelta || db_get_boolean("seen-delta-manifest",0))
2789 || db_get_boolean("forbid-delta-manifests",1)
2790 || g.bAvoidDeltaManifests
2791 ){
2792 forceBaseline = 1;
2793 }
2794
2795
M src/db.c
+1 -1
--- src/db.c
+++ src/db.c
@@ -4894,11 +4894,11 @@
48944894
 ** complex; see https://fossil-scm.org/home/doc/trunk/www/globs.md#syntax
48954895
 ** Note that /fileedit cannot edit binary files, so the list should not
48964896
 ** contain any globs for, e.g., images or PDFs.
48974897
 */
48984898
 /*
4899
-** SETTING: forbid-delta-manifests boolean default=off
4899
+** SETTING: forbid-delta-manifests boolean default=on
49004900
 ** If enabled on a client, new delta manifests are prohibited on
49014901
 ** commits. If enabled on a server, whenever a client attempts
49024902
 ** to obtain a check-in lock during auto-sync, the server will
49034903
 ** send the "pragma avoid-delta-manifests" statement in its reply,
49044904
 ** which will cause the client to avoid generating a delta
49054905
--- src/db.c
+++ src/db.c
@@ -4894,11 +4894,11 @@
4894 ** complex; see https://fossil-scm.org/home/doc/trunk/www/globs.md#syntax
4895 ** Note that /fileedit cannot edit binary files, so the list should not
4896 ** contain any globs for, e.g., images or PDFs.
4897 */
4898 /*
4899 ** SETTING: forbid-delta-manifests boolean default=off
4900 ** If enabled on a client, new delta manifests are prohibited on
4901 ** commits. If enabled on a server, whenever a client attempts
4902 ** to obtain a check-in lock during auto-sync, the server will
4903 ** send the "pragma avoid-delta-manifests" statement in its reply,
4904 ** which will cause the client to avoid generating a delta
4905
--- src/db.c
+++ src/db.c
@@ -4894,11 +4894,11 @@
4894 ** complex; see https://fossil-scm.org/home/doc/trunk/www/globs.md#syntax
4895 ** Note that /fileedit cannot edit binary files, so the list should not
4896 ** contain any globs for, e.g., images or PDFs.
4897 */
4898 /*
4899 ** SETTING: forbid-delta-manifests boolean default=on
4900 ** If enabled on a client, new delta manifests are prohibited on
4901 ** commits. If enabled on a server, whenever a client attempts
4902 ** to obtain a check-in lock during auto-sync, the server will
4903 ** send the "pragma avoid-delta-manifests" statement in its reply,
4904 ** which will cause the client to avoid generating a delta
4905
M src/fileedit.c
+2 -2
--- src/fileedit.c
+++ src/fileedit.c
@@ -356,11 +356,11 @@
356356
 ** tiny gain for doing so. That heuristic is not *quite*
357357
 ** right, in that when we're deriving from another delta, we
358358
 ** really should compare the F-card count between it and its
359359
 ** baseline, and create a delta if the baseline has (say)
360360
 ** twice or more as many F-cards as the previous delta. */)
361
- && !db_get_boolean("forbid-delta-manifests",0)
361
+ && !db_get_boolean("forbid-delta-manifests",1)
362362
 ){
363363
 asDelta = 1;
364364
 blob_appendf(pOut, "B %s\n",
365365
 pCI->pParent->zBaseline
366366
 ? pCI->pParent->zBaseline
@@ -1875,11 +1875,11 @@
18751875
 "what appear to be fossil merge conflict "
18761876
 "markers?");
18771877
 style_labeled_checkbox("cb-prefer-delta",
18781878
 "prefer_delta",
18791879
 "Prefer delta manifest?", "1",
1880
- db_get_boolean("forbid-delta-manifests",0)
1880
+ db_get_boolean("forbid-delta-manifests",1)
18811881
 ? 0
18821882
 : (db_get_boolean("seen-delta-manifest",0)
18831883
 || cimi.flags & CIMINI_PREFER_DELTA),
18841884
 "Will create a delta manifest, instead of "
18851885
 "baseline, if conditions are favorable to "
18861886
--- src/fileedit.c
+++ src/fileedit.c
@@ -356,11 +356,11 @@
356 ** tiny gain for doing so. That heuristic is not *quite*
357 ** right, in that when we're deriving from another delta, we
358 ** really should compare the F-card count between it and its
359 ** baseline, and create a delta if the baseline has (say)
360 ** twice or more as many F-cards as the previous delta. */)
361 && !db_get_boolean("forbid-delta-manifests",0)
362 ){
363 asDelta = 1;
364 blob_appendf(pOut, "B %s\n",
365 pCI->pParent->zBaseline
366 ? pCI->pParent->zBaseline
@@ -1875,11 +1875,11 @@
1875 "what appear to be fossil merge conflict "
1876 "markers?");
1877 style_labeled_checkbox("cb-prefer-delta",
1878 "prefer_delta",
1879 "Prefer delta manifest?", "1",
1880 db_get_boolean("forbid-delta-manifests",0)
1881 ? 0
1882 : (db_get_boolean("seen-delta-manifest",0)
1883 || cimi.flags & CIMINI_PREFER_DELTA),
1884 "Will create a delta manifest, instead of "
1885 "baseline, if conditions are favorable to "
1886
--- src/fileedit.c
+++ src/fileedit.c
@@ -356,11 +356,11 @@
356 ** tiny gain for doing so. That heuristic is not *quite*
357 ** right, in that when we're deriving from another delta, we
358 ** really should compare the F-card count between it and its
359 ** baseline, and create a delta if the baseline has (say)
360 ** twice or more as many F-cards as the previous delta. */)
361 && !db_get_boolean("forbid-delta-manifests",1)
362 ){
363 asDelta = 1;
364 blob_appendf(pOut, "B %s\n",
365 pCI->pParent->zBaseline
366 ? pCI->pParent->zBaseline
@@ -1875,11 +1875,11 @@
1875 "what appear to be fossil merge conflict "
1876 "markers?");
1877 style_labeled_checkbox("cb-prefer-delta",
1878 "prefer_delta",
1879 "Prefer delta manifest?", "1",
1880 db_get_boolean("forbid-delta-manifests",1)
1881 ? 0
1882 : (db_get_boolean("seen-delta-manifest",0)
1883 || cimi.flags & CIMINI_PREFER_DELTA),
1884 "Will create a delta manifest, instead of "
1885 "baseline, if conditions are favorable to "
1886
M src/xfer.c
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1826,11 +1826,11 @@
18261826
 blob_str(&xfer.aToken[2]), g.zLogin,
18271827
 blob_str(&xfer.aToken[3])
18281828
 );
18291829
 db_protect_pop();
18301830
 }
1831
- if( db_get_boolean("forbid-delta-manifests",0) ){
1831
+ if( db_get_boolean("forbid-delta-manifests",1) ){
18321832
 @ pragma avoid-delta-manifests
18331833
 }
18341834
 }else
18351835
18361836
 /* pragma ci-unlock CLIENT-ID
18371837
--- src/xfer.c
+++ src/xfer.c
@@ -1826,11 +1826,11 @@
1826 blob_str(&xfer.aToken[2]), g.zLogin,
1827 blob_str(&xfer.aToken[3])
1828 );
1829 db_protect_pop();
1830 }
1831 if( db_get_boolean("forbid-delta-manifests",0) ){
1832 @ pragma avoid-delta-manifests
1833 }
1834 }else
1835
1836 /* pragma ci-unlock CLIENT-ID
1837
--- src/xfer.c
+++ src/xfer.c
@@ -1826,11 +1826,11 @@
1826 blob_str(&xfer.aToken[2]), g.zLogin,
1827 blob_str(&xfer.aToken[3])
1828 );
1829 db_protect_pop();
1830 }
1831 if( db_get_boolean("forbid-delta-manifests",1) ){
1832 @ pragma avoid-delta-manifests
1833 }
1834 }else
1835
1836 /* pragma ci-unlock CLIENT-ID
1837

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button