Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
233 check-ins using file src/merge3.c version 98a3c41ab9
|
2025-04-04
| ||
| 02:36 | On Haiku, if no --prefix is provided then default to /boot/home/config/non-packaged, per /chat input from Brickviking. With this change, (./configure && make && make install) work on Haiku and the f-apps binaries and fnc run :-D. Or, in haiku form: On Haiku systems / If no prefix is defined / use boot/.../non-packaged Leaf check-in: 8ba26d0b75 user: stephan tags: trunk | |
|
2025-04-03
| ||
| 22:50 | Update autosetup from upstream trunk. (With my apologies for the time warp in the history - the previous checkin was from a VM with an incorrect clock.) check-in: 9628e48654 user: stephan tags: trunk | |
| 19:18 | Merge in Haiku fixes from BrickViking. (Later amended for a clock skew, caused by checking this in from a HaikuOS VM with a wrong clock.) check-in: a4f53f05fd user: stephan tags: trunk | |
| 19:14 | Import upstream fnc, patched with the fixes from this branch. Closed-Leaf check-in: bc0b1d6836 user: stephan tags: bv-haiku | |
| 10:00 | Changes provided by OscarL from #haiku@irc.oftc.net to correct linker and compiling failures on Haiku. check-in: fb917fc1c9 user: brickviking tags: bv-haiku | |
| 09:51 | Create new branch named "bv-haiku" check-in: 304c6670d3 user: brickviking tags: bv-haiku | |
|
2025-04-02
| ||
| 11:32 | Update proj.tcl from upstream sqlite tree. check-in: 6bb8b0d8ce user: stephan tags: trunk | |
| 11:14 | Add tools/mkccode.tcl (from the sqlite tree) for future use in re-doing how the amalgamation is built. check-in: 9855980b93 user: stephan tags: trunk | |
|
2025-03-26
| ||
| 12:42 | Include technote artifacts in the always-has-a-W-card-even-if-empty category in fsl_deck_to_json(). check-in: cfbc760d32 user: stephan tags: trunk | |
| 12:38 | Apply upstream fix [fossil:0d8c913658cdf45] to fsl_deck_to_json(). check-in: 200b19c2e1 user: stephan tags: trunk | |
|
2025-03-25
| ||
| 17:39 | In f-aparse, when checking for an in-repo match of the input manifest's hash, try sha3 before sha1, as that's the more likely case (it wasn't when this app was initially written). check-in: 177f145fab user: stephan tags: trunk | |
| 17:34 | Remove extranous whitespace from fsl_deck_to_json(). check-in: 4122e5f498 user: stephan tags: trunk | |
| 16:10 | Minor fsl_artifact_to_json() UDF doc update. check-in: df285b91cf user: stephan tags: trunk | |
| 16:05 | Port in artifact-to-json support from [fossil:/timeline?r=artifact-to-json]. check-in: 149c8451ef user: stephan tags: trunk | |
| 16:04 | Add fsl_artifact_to_json() UDF. Closed-Leaf check-in: 2c5339b85c user: stephan tags: artifact-to-json | |
| 15:37 | Implement fsl_deck_to_json(). Corresponding UDF is still TODO. check-in: 9023ab840a user: stephan tags: artifact-to-json | |
| 13:49 | Initial work for porting over [fossil:/timeline?r=artifact-to-json]. The API skeleton is in place but the core to-json is not. check-in: 0c7c6d665d user: stephan tags: artifact-to-json | |
|
2025-03-20
| ||
| 18:49 | Remove a too-strict assert() in fsl_db_get_textv() reported by Martin G. in /chat. Add SQLITE_BUSY == FSL_RC_LOCKED to the error code translations which happens in fsl__db_errcode() (as that's what triggered the assert). check-in: 1dacda897c user: stephan tags: trunk | |
|
2025-03-16
| ||
| 14:57 | -Add a partial workaround to f-ci for checkin messages which start with a minus sign: leading space in a -m message is now stripped, so -m '-foo...' can be formulated like -m ' -foo...' to work around this flag-parsing limitation. (Yes, that actually bit me in [https://sqlite.org/src/info/44f2c64ec16f4720], and there i worked around it by using fossil, instead of f-ci, for the checkin.) check-in: eead046a57 user: stephan tags: trunk | |
|
2025-03-12
| ||
| 20:14 | EOL-whitespace cleanups, minor internal doc additions, and rename an internal-use-only function to match current conventions. No functional changes. check-in: 3b62ac66fc user: stephan tags: trunk | |
|
2025-02-21
| ||
| 04:02 | Update autosetup/proj.tcl to the latest copy from the sqlite tree. check-in: 7bf051dcd5 user: stephan tags: trunk | |
|
2024-12-26
| ||
| 09:56 | Some small SQL UDF flag tweaks inspired by [fossil:bd7f5c0b3780286f344a]. check-in: b0f9e9c732 user: stephan tags: trunk | |
|
2024-12-14
| ||
| 00:35 | Minor formatting tweaks. No functional changes. check-in: 73aca2454e user: stephan tags: trunk | |
|
2024-12-11
| ||
| 06:43 | A slightly more robust check for is-this-a-checkout-db, analog to upstream [fossil:36f916c504c525c72f48]. check-in: 37dacc1787 user: stephan tags: trunk | |
|
2024-12-08
| ||
| 22:11 | Rename some internal vars for clarity's sake. check-in: fa7ef96f90 user: stephan tags: trunk | |
|
2024-12-07
| ||
| 03:14 | Remove unnecessary OMIT and ENABLE flags from appendf.c - they were ancient artifacts from a several-source-trees-ago version of that file. Also remove appendf.c's use of long double for reasons documented in this change's comments. check-in: d3533b0365 user: stephan tags: trunk | |
| 02:53 | Add a TODO which will be relevant for porting over the mergeinfo bits, specifically for the glob_expr() function (which is also to-port). check-in: 0ea42c1b3e user: stephan tags: trunk | |
| 01:45 | Add a TODO to port over fossil's etSHELLESC string formatting option (for building properly-escape strings for passing to an external process). It's a more involved port than current aspirations allow for :/. check-in: a1e5c8034d user: stephan tags: trunk | |
|
2024-12-06
| ||
| 22:31 | Add a comment linking to upstream [fossil:aeec557e897f] as a point to consider for porting over. check-in: 3334e09635 user: stephan tags: trunk | |
| 14:10 | Apply minor backwards-compatible repo schema changes from [fossil:b8011bf50817c]. check-in: 6a3de57394 user: stephan tags: trunk | |
| 14:05 | Apply the part of [fossil:55f136610030f7] which is relevant for this tree. The other part of that upstream checkin is related to still-pending merge-related porting. check-in: 828f82e90a user: stephan tags: trunk | |
|
2024-11-22
| ||
| 09:16 | Myriad miniscule modifications - space removals. check-in: 8a3bc44c30 user: brickviking tags: trunk | |
|
2024-11-18
| ||
| 17:59 | Pull in upstream [fossil:4862fc5ed0c3d4dfdf] to correct a rare (so far singular) delta checksum mismatch. check-in: 538a929f82 user: stephan tags: trunk | |
| 17:49 | Tiny doc typo fix. check-in: d2a8980d16 user: stephan tags: trunk | |
|
2024-11-04
| ||
| 07:41 | Tweaks to doc/db-udf.md check-in: d4075d41e4 user: brickviking tags: trunk | |
|
2024-11-03
| ||
| 08:04 | Remove an extranous dibu::finally call in some test code. check-in: 0e7b03ca7b user: stephan tags: trunk | |
|
2024-10-31
| ||
| 23:48 | Pull in upstream [fossil:f214aba4f5c4846de0e1] to fix an obscure assert() triggered by diffs with hundreds of thousands of lines. However, this fix leads to the same offending diff now causing an apparently hang in libfossil (still waiting after four minutes, whereas fossil diff took only 2s). That's to be investigated Real Soon Now. check-in: 203439be88 user: stephan tags: trunk | |
| 23:01 | Stashing some unused auto.def code for later: determines whether a given linenoise.h refers to the antirez or msteveb flavor of that API. check-in: cbf755a343 user: stephan tags: trunk | |
|
2024-10-29
| ||
| 18:51 | Upstream fix for proj.tcl:proj-first-bin-of. check-in: 8a931ee5db user: stephan tags: trunk | |
| 03:09 | Adapt auto.def bits to renaming of the upstream 'hwaci' API to the more generic 'proj' API. check-in: 1da9021841 user: stephan tags: trunk | |
|
2024-10-25
| ||
| 05:40 | Upstream fix to autosetup/autosetup-find-tcl to work around an OpenBSD-ism of emitting noise to stdout at link-time. check-in: 41ef58fc27 user: stephan tags: trunk | |
|
2024-10-24
| ||
| 01:23 | Fix an autosetup misuse which breaks ./configure --help. Latest upstream hwaci-common.tcl check-in: 1918daa559 user: stephan tags: trunk | |
|
2024-10-23
| ||
| 00:59 | Add a TODO to use autosetup's pkg-config support, rather than manual invocation of pkg-config, for ncurses detection. check-in: 113e3f9c38 user: stephan tags: trunk | |
|
2024-10-19
| ||
| 22:52 | Latest upstream hwaci-common.tcl. check-in: 5e942a7a1c user: stephan tags: trunk | |
| 15:11 | Internal doc cleanups and API renaming. No functional changes. check-in: 742b1d61c2 user: stephan tags: trunk | |
|
2024-10-15
| ||
| 11:47 | Add a comment about integrating [fossil:9919dfbbaa2019e7eb7b], which will require a Windows-using developer. check-in: fe4c22a0ba user: stephan tags: trunk | |
|
2024-10-12
| ||
| 18:43 | fcli: move the cliFlags and appHelp members into fcli.config. Curiously, this does not affect any of the f-apps but will likely break any clients still using fcli_setup() instead of fcli_setup_v2() (they just need to add '.config' to those member accesses). check-in: b979896288 user: stephan tags: trunk | |
| 18:37 | Part 1 of N of some restructuring of the fcli_t struct: consolidate fcli.clientFlags and fcli.config into fcli.config. check-in: 2f7bf3f7d0 user: stephan tags: trunk | |
| 15:22 | Initial work on fcli_setup_v3(). Not yet sure if this will be a real thing. Closed-Leaf check-in: 5789a03da2 user: stephan tags: fcli_setup_v3 | |
| 11:29 | Further simplify the import of FNC_... vars into autosetup. (Who know that tcl has a shell-like 'source' command?) check-in: c27eb7d5d2 user: stephan tags: trunk | |
| 11:07 | Simplify how the FNC_... config vars are exposed to auto.def by generating them directly to TCL into instead into intermediary files which TCL then processes. check-in: dcc52232fc user: stephan tags: trunk | |
| 06:03 | Eliminate deps on external sed and awk when extracting FNC_DATE. (The sed was superfluous, anyway.) Remove the T part from FNC_DATE for consistency with the upstream build. check-in: e2a3072074 user: stephan tags: trunk | |
| 05:51 | Add fnc version/date/hash info to the build and add a script to copy the upstream fnc, along with that metadata. That this info has been missing was reported in [/forumpost/cc99a0b0a8]. check-in: 578074a169 user: stephan tags: trunk | |
|
2024-10-09
| ||
| 07:50 | Latest hwaci-common.tcl. check-in: 43e15355d5 user: stephan tags: trunk | |
|
2024-10-01
| ||
| 14:12 | Minor makefile doc update. No functional changes. check-in: e9b3572f47 user: stephan tags: trunk | |
| 13:20 | A different approach (the initially intended one) to squelch the warning about missing shakenmake-custom.make. check-in: 1cd610fce6 user: stephan tags: trunk | |
| 13:19 | Squelch the warning about missing shakenmake-custom.make. check-in: e5390f0257 user: stephan tags: trunk | |
| 11:03 | Minor text formatting tweak for the ncurses check results. check-in: 8a801eebba user: stephan tags: trunk | |
| 11:02 | Fix reversed logic in the build/target/host names in several hwaci-* functions. check-in: 32064fe005 user: stephan tags: trunk | |
|
2024-09-30
| ||
| 20:28 | Attempt to determine the proper flag to pass for building shared libs: -shared for .so or -dynamiclib for .dylib. This info is based entirely from a StackOverflow post, so is to be taken with a proverbial grain of salt. check-in: e4a5ca7d02 user: stephan tags: trunk | |
| 20:12 | Latest upstream hwaci-common.tcl. Attempt to use the dylib extension for Mac builds of libfossil.so (can't test that here, though). check-in: 8daf857e24 user: stephan tags: trunk | |
| 14:33 | Teach the rpath check to not append to the global build flags. check-in: 7f2f79925f user: stephan tags: trunk | |
| 14:24 | Move the rpath flag check in hwaci-common.tcl and correct {-Wl,-rpath -Wl,/...} to be checked as a single flag. check-in: f8b4758038 user: stephan tags: trunk | |
| 14:14 | More build tinkering - latest upstream hwaci-common.tcl. Potential fix for the missing -liconv flags on Mac builds, broken in [9c54655f16d96708]. check-in: 0d09d97189 user: stephan tags: trunk | |
|
2024-09-29
| ||
| 12:10 | Second part of --help text correction in f-annotate, as reported in [9305e3173f]. check-in: 60c6beadb0 user: stephan tags: trunk | |
| 12:09 | An attempt at finding an -rpath option which will work on Mac w/ clang 16. The compiler reports that it supports -Wl,-R... but then fails to build with that flag. The same flag works on OpenBSD with clang 16. check-in: 7e4286ab80 user: stephan tags: trunk | |
| 12:04 | Minor --help text correction in f-annotate, as reported in [9305e3173f]. check-in: 28cf441d61 user: stephan tags: trunk | |
|
2024-09-28
| ||
| 00:33 | Latest upstream autosetup and fix a variable mis-use in wh-common.tcl's module loading check. check-in: 4e15fa0ef5 user: stephan tags: trunk | |
| 00:31 | Do not clear the fsl_cx error state in the db hooks, as that hides propagating info like a merge failure report. check-in: 08ed83fecc user: stephan tags: trunk | |
|
2024-09-27
| ||
| 10:41 | Avoid some duplicate build flags, as reported in [b4cf8266a3]. check-in: cafc3ca524 user: stephan tags: trunk | |
|
2024-09-26
| ||
| 20:48 | Fix dangling tcl func name references introduced in [64155cdbf3] and uncovered on an OpenBSD build. check-in: f8a5f96599 user: stephan tags: trunk | |
| 19:28 | Move much of wh-common.tcl into hwaci-common.tcl, which will soon make its way into the Fossil tree, and it will be simpler to be able to share hwaci-common.tcl than to maintain multiple independent copies of the autosetup utils it adds. check-in: 64155cdbf3 user: stephan tags: trunk | |
| 16:27 | EOL cleanups and fix an age-old stack overwrite discovered via Martin's QNX. Edit: the stack-overwrite of 18 bytes traces back to [896ea2a01b33de25]. check-in: f6812e43bd user: stephan tags: trunk | |
| 15:52 | Swap --loud for --disable-loud (--quiet is an autoset-private flag). When linking f-apps, use SH_LINKRPATH instead of SH_LINKFLAGS, as the former works on both my systems and Martin's QNX, whereas the latter fails on QNX. check-in: 41e77534fb user: stephan tags: trunk | |
| 14:41 | Correct the definition of the --disable-ncurses flag so that it shows up properly in the --help. check-in: 0caa19aff0 user: stephan tags: trunk | |
| 14:38 | Add --disable-ncurses flag to completely disable ncurses pieces. On Martin's QNX curses is detected but fails to compile because of an error in ncurses.h. check-in: ad1277f63a user: stephan tags: trunk | |
| 14:28 | Disable compile-commands by default, requiring --enable-compile-commands to turn it on. Run cc-check-flags on autosetup's detected SH_LINKFLAGS and, if they fail that test, clear SH_LINKFLAGS, in an attempt to avoid adding -rdynamic to Martin's QNX build. check-in: 8a3934327c user: stephan tags: trunk | |
| 14:03 | Fix a typo which broke sqlite3.o build in [c7cfd91a97]. Add -fPIC to CFLAGS if the compiler supports it. Remove hard-coded -rdynamic flag from the module-loader detection bits (which we don't currently use). check-in: 2045612e56 user: stephan tags: trunk | |
| 13:52 | Initialize an uninited var exposed by gcc 4.x check-in: 04f3b7d2e3 user: stephan tags: trunk | |
| 13:35 | C99 detection: always use -std=c99 when --assume-c99 is used. When detecting c99, if -std=c99 is not supported, also try -Wc,-std=c99 (for QNX qcc). When compiling sqlite3.c, remove -std=c99 and -Werror from its CFLAGs. check-in: c7cfd91a97 user: stephan tags: trunk | |
| 12:59 | Only add -gdwarf-4 to the CFLAGS if CC supports that flag. This resolves the TODO in [a22ed480f10f2212533]. check-in: 35f61b176e user: stephan tags: trunk | |
| 12:55 | Do not add -gdwarf-4 to the CFLAGS if --assume-c99 is used. TODO: add a proper test of that flag to see if the compiler supports it. check-in: a22ed480f1 user: stephan tags: trunk | |
| 11:20 | An alternative, supposedly more portable, approach to applying the rpath to the f-apps. Add the --assume-c99 configure flag to bypass the explicit check for C99, as a potential workaround for gcc 4.x on QNX. check-in: dcbf5cf9d4 user: stephan tags: trunk | |
|
2024-09-25
| ||
| 02:00 | In fsl_checkin_commit(), be sure to propagate the privateness of content when the commit derives from a private checkin. This should have been part of [f511d7e63292]. check-in: 9eecc8a2be user: stephan tags: trunk | |
| 01:52 | Add a license header to wh-common.tcl. check-in: 0f66ef287d user: stephan tags: trunk | |
|
2024-09-24
| ||
| 21:37 | Some insignificant internal touchups. check-in: 76751c68a6 user: stephan tags: trunk | |
| 21:24 | Comment cleanups. check-in: 5861c30dce user: stephan tags: trunk | |
| 21:13 | Add --private flag to f-ci. It seems to work, too. check-in: f511d7e632 user: stephan tags: trunk | |
| 18:22 | Comment and doc cleanups. check-in: 6c21831158 user: stephan tags: trunk | |
| 15:58 | Remove some stray debug output added in [71fbbe959b34]. check-in: 57771ce4fc user: stephan tags: trunk | |
| 15:47 | Remove some auto.def debug output and add a comment explaining the new test in f-sanity.c. check-in: b096fe0978 user: stephan tags: trunk | |
| 15:43 | Extend fsl_mtime_of_manifest_file() to be able to return the mtime of any artifact type if given a file ID of 0 or less. Simplify its internal impl a bit. check-in: 71fbbe959b user: stephan tags: trunk | |
| 14:05 | Minor autosetup-related reorgs. check-in: ed02fb6b2d user: stephan tags: trunk | |
|
2024-09-23
| ||
| 10:43 | include limits.h header for LONG_MAX on darwin While here, change buf->cursor precondition comparison check to ensure it is not greater than buf->used. It may be an unreachable state but we must guard it nonetheless. And expand getdelim() regress by covering the empty or end-of-buffer precondition path, and the no matching delimiter found in the stream path. check-in: 322452cb8b user: mark tags: trunk | |
|
2024-09-22
| ||
| 15:38 | implement fsl_buffer_get{delim,line}() and regress test This API provides the same semantics as POSIX.1-2024 getdelim(3), which the fsl_buffer structure conveniently facilitates. A new regress test case is also added to f-sanity. Briefly discussed in /chat with Stephan. https://pubs.opengroup.org/onlinepubs/9799919799/functions/getdelim.html check-in: efb25dec6f user: mark tags: trunk | |
|
2024-09-21
| ||
| 01:27 | zap deadstore via missing break statement in switch block I suspect this fallthrough attribute was incorrectly added to silence a compiler warning that was in this case warranted. We don't want to clobber c; `c = offset` is correct for SEEK_SET. Incidentally, this routine's regress test was not failing the SEEK_SET case[0] because bin->cursor is at 0 so the fallthrough to the SEEK_CUR case[1] equates to `c = 0 + offset`. As such this commit also reorders test cases for a more rigorous regresssion test of fsl_buffer_seek(). [0]: assert(0==fsl_buffer_seek(&bin, 0, FSL_BUFFER_SEEK_SET)); [1]: case FSL_BUFFER_SEEK_CUR: c = (int64_t)b->cursor + offset; break; check-in: 5d2f636c0c user: mark tags: trunk | |
|
2024-09-20
| ||
| 18:52 | Fix a call to free() which should have been fsl_free(). check-in: 5474491f74 user: stephan tags: trunk | |
|
2024-09-18
| ||
| 18:52 | Minor cleanups and doc tweaks. check-in: 2ee07f48f0 user: stephan tags: trunk | |
|
2024-09-17
| ||
| 05:15 | Update fsl_cx_empty_m to C99-style. check-in: 071f8b629f user: stephan tags: trunk | |
|
2024-09-16
| ||
| 23:03 | EOL whitespace cleanups and simplify one silly code block. check-in: 2074b15145 user: stephan tags: trunk | |
| 22:31 | Simplify fsl__cx_db_hook_transaction() a bit. check-in: 40d724d923 user: stephan tags: trunk | |
| 21:26 | Merge db-hooks branch into trunk. Summary: eliminate the fsl_db class's hard dependency on the fsl_cx class via introduction of hooks which fsl_cx installs in its db instance. check-in: 8884282b35 user: stephan tags: trunk | |
| 21:22 | Remove some debug output. Update some docs. Closed-Leaf check-in: ccd8bc3369 user: stephan tags: db-hooks | |
| 21:05 | Docs and cleanups related to the new fsl_db hooks. check-in: a189336bdd user: stephan tags: db-hooks | |
| 20:34 | Remove the fsl_db::f (fsl_cx*) member. This touches a lot of code lines but was not anywhere near as invasive as expected. check-in: f00a5025f5 user: stephan tags: db-hooks | |
| 17:41 | More work towards moving fsl_cx-specific pieces of fsl_db internals into fsl_cx-side hooks. check-in: 7fce228983 user: stephan tags: db-hooks | |
| 17:06 | More work on the db hooks. check-in: 12b3603cd3 user: stephan tags: db-hooks | |
| 16:02 | Initial work on adding some hooks to the fsl_db API, the goal being to eliminate the hard dependency of fsl_cx in fsl_db internals. This compiles but is untested (not counting this commit, which will do at least a minimal test) but other matters require attention so this is being stashed for later development. check-in: 1c4ec95d75 user: stephan tags: db-hooks | |
| 12:21 | Add --date-override and --allow-older flags to f-ci. check-in: 580ec03020 user: stephan tags: trunk | |
| 11:41 | Remove the --languages flags from the ctags/etags invocation, as it's a GNU-ism. check-in: 7613d9182b user: stephan tags: trunk | |
| 11:22 | Rework the tags to support both ctags and etags. Use the --etags and/or --ctags configure flag to opt in to tags generation. They're off by default because they can be slow and aren't commonly used. check-in: ec5d660e8f user: stephan tags: trunk | |
| 10:07 | Doc typo fix reported in the forum. check-in: 391184a785 user: stephan tags: trunk | |
|
2024-09-15
| ||
| 11:11 | latest upstream fnc [fnc:26adf1707c] check-in: 8e0da47996 user: mark tags: trunk | |
| 09:55 | Remove -DSQLITE_USE_ALLOCA from build flags. No idea why it was there but it causes grief (see [/forumpost/f4f1fdb1df]). check-in: 6f743f092d user: stephan tags: trunk | |
|
2024-09-14
| ||
| 23:54 | Re-integrate the C++ bits into the build. Remove some obsolete files. check-in: 60415d2654 user: stephan tags: trunk | |
| 14:37 | Update to latest upstream fnc. check-in: 0dfa7dd72c user: stephan tags: trunk | |
| 13:54 | Merge build-rework branch into trunk. Summary: reduce the complexity of the build considerably (while, admittedly, also reducing its flexibility, but that's okay). check-in: ecf32ada1a user: stephan tags: trunk | |
| 11:47 | Remove the long-unmaintained bindings/s2 dir. Closed-Leaf check-in: 08f28aa79f user: stephan tags: build-rework | |
| 11:30 | Update subdir makefiles for the build rework. check-in: 07f62bbf5e user: stephan tags: build-rework | |
| 10:59 | Further improvements to the amalgamation build. check-in: 4c6d994afd user: stephan tags: build-rework | |
| 10:41 | Add -lbsd to fnc build if -lbsd is available on the system (forum post [5fa7ecd1eeba08b5]). Rename LIB_CURSES to LDFLAGS_CURSES for consistency. check-in: b1f5a72dd8 user: stephan tags: build-rework | |
| 10:16 | Remove another obsolete sub-makefile. check-in: d3fcc259ff user: stephan tags: build-rework | |
| 10:16 | Improve the build process for the amalgamation. check-in: 95ada2b2b9 user: stephan tags: build-rework | |
| 08:00 | Build fixes uncovered on the OpenBSD machine. Edit: the time warp here happened because my pi4 does not keep proper time with OpenBSD - the clock has to be manually re-synced after each reboot (which didn't happen here). This was initially mistaken for an unintentional fork but it's really a linear roller coaster loop in the history. Edit: timestamp was amended to a close approximate of the real time to straighten out the /timeline. check-in: 06424d9854 user: stephan tags: build-rework | |
| 02:27 | Minor build cleanups. check-in: 181490a1c0 user: stephan tags: build-rework | |
| 02:12 | Add a output to auto.def indicating that the C++ components are not currently built. check-in: 4de3be33a3 user: stephan tags: build-rework | |
| 02:10 | Get fnc building. Remove the now-obsolete sub-makefiles. check-in: 160e441f8a user: stephan tags: build-rework | |
| 01:27 | Get the curses components of f-apps building. check-in: 5c701aadb7 user: stephan tags: build-rework | |
| 01:23 | Get the f-apps building. check-in: 82493c1ad9 user: stephan tags: build-rework | |
| 00:56 | Cleanups in the main lib build. check-in: 9c54655f16 user: stephan tags: build-rework | |
| 00:27 | Get the core lib building. Move make-amalgamation.bash into ./tools. check-in: df99c89b4f user: stephan tags: build-rework | |
| 00:09 | More work towards a single mega-makefile. Add deps generation for the main lib. check-in: 403e7b73f4 user: stephan tags: build-rework | |
|
2024-09-13
| ||
| 23:27 | Build workaround for breakage introduced in [321baf1e600b]. check-in: beef8d3f15 user: stephan tags: trunk | |
| 23:23 | Break down build to its bare minimum (more or less) so we can start to recreate it. It currently builds nothing at all. Move the amalgamation zip/html generation into make-amalgamation.bash. check-in: 4f105c0050 user: stephan tags: build-rework | |
| 22:44 | Move generation of the amalgamation from the makefile to a shell script as the first step in reworking the build (the aim being to escape its over-engineeredness). check-in: 321baf1e60 user: stephan tags: trunk | |
| 16:07 | A potential fix for the bug tagged as tag:bug:revert-merge-hiccup and described in [00377f482a0d], with the caveat that i've been unable to reproduce it, so cannot be 100% certain that this is adequate. It seems sound, anyway. check-in: aebe930b2c user: stephan tags: trunk | |
| 14:44 | Latest upstream fnc for CentOS build fixes. check-in: 8abe7bd29b user: stephan tags: trunk | |
| 14:04 | Add f-apps/f-test-canonical-name.c. check-in: 8a50b9b6e7 user: stephan tags: trunk | |
| 13:56 | Add f-ls --checkouts flag to show open checkouts to the given repository, with the caveat that checkouts opened via different names for the repo (e.g. via dir symlinks) are not resolved. check-in: dec80338e1 user: stephan tags: trunk | |
| 12:57 | Document an obscure, difficult-to-trigger misinteraction between revert/merge ops (fixing it is todo, once a good solution is found). Fix fsl_ckout_has_changes() to return true also when vfile.deleted is true and restrict it to matching only when vid=current-ckout-version to cover a wildly hypothetical case of multiple distinct vfile.vid values being in the table. check-in: 00377f482a user: stephan tags: trunk | |
| 10:30 | Update fnc to the upstream trunk. i apparently made a mess of it yesterday, pulling an older version when sync failed (due to an out of date login) without my noticing it. check-in: e3cd510fda user: stephan tags: trunk | |
| 10:27 | Correct setting of CFLAGS and CPPFLAGS for client/fnc and add -fPIE to fnc's flags in an attempt to appease Fedora 39. check-in: aff8157664 user: stephan tags: trunk | |
|
2024-09-12
| ||
| 14:11 | Remove an extraneous internal-use-only header from f-import-blob.c. check-in: a371058aeb user: stephan tags: trunk | |
| 12:13 | Update to latest upstream fnc. check-in: 25a3a7ceea user: stephan tags: trunk | |
|
2024-09-03
| ||
| 16:44 | As a late-stage step in the checkin process, ensure that vfile.isexe and vfile.islink match what the new manifest says. This has been a long-missing step which fossil(1) does but libfossil noted in a TODO comment but never implemented. This completes, hopefully, the fix started in [4243008e112140], but it's difficult to _really_ test without doing a genuine checkin (not a dry-run). check-in: 404f376c0e user: stephan tags: trunk | |
| 15:25 | latest upstream autosetup. check-in: 21a48eac26 user: stephan tags: trunk | |
| 15:13 | Minor doc updates in autosetup utility code. check-in: 5829e02ee3 user: stephan tags: trunk | |
| 13:42 | Remove config-win32.h, as it's apparently long since been unused (or at least unmaintained). check-in: 439cee847a user: stephan tags: trunk | |
| 13:26 | Swap the configure flag --no-c++ with --c++ (a.k.a. --enable-c++), making the C++ bits explicitly opt-in, because the C++ pieces fail to compile or link on many clang hosts for reasons known only to clang (as opposed to code bugs). check-in: 58c9b25ca1 user: stephan tags: trunk | |
| 13:11 | Minor doc correction. check-in: 207ac5bab3 user: stephan tags: trunk | |
|
2024-09-02
| ||
| 03:05 | Do a better job of determining the default fossil user name, first extracting it from the checkout (if available), then the repo (if available), then the environment. Automatically do this when opening a repo and/or checkout and clear the name when the SCM dbs are closed. check-in: 20e4e80b87 user: stephan tags: trunk | |
| 01:50 | Latest upstream fnc. check-in: dd368cb55d user: stephan tags: trunk | |
| 00:37 | A workaround for OpenBSD-specific [https://github.com/msteveb/autosetup/issues/67|autosetup issue #67]. check-in: 2031595764 user: stephan tags: trunk | |
|
2024-08-24
| ||
| 09:47 | Build flag fix for a long-standing problem (cannot find sqlite3.h) which was only incidentally triggered on a newly-installed OpenBSD system. check-in: a5f03751bc user: stephan tags: trunk | |
| 09:46 | Add a hack to mkdeps.c to work around OpenBSD's link-time "strcpy() is evil, use our non-standard variant instead" warning. check-in: 6b2a066f10 user: stephan tags: trunk | |
|
2024-08-16
| ||
| 20:00 | Update sqlite3.c/h to current upstream trunk versions. check-in: 6ece2a8500 user: stephan tags: trunk | |
| 19:58 | Apply [fossil:60debc7ed76b9d8fc0aa|upstream fossil(1) fix 60debc7ed76b9d8fc0aa]. check-in: 3e6ae0d74f user: stephan tags: trunk | |
|
2024-08-01
| ||
| 11:53 | Tweaks to the previous checkin's comments. check-in: 8cb2f47a28 user: stephan tags: trunk | |
| 11:50 | Work around a GNU Make behavior change which breaks how the CPPFLAGS are handled when building the amalgamated libfossil.o. check-in: 33d2bad579 user: stephan tags: trunk | |
| 11:26 | When reverting files, report those which were modified only via a merge as reverted (it was formerly not reporting those via the callback). Adjacent cleanups and a potential resource leak fix in two as-yet-have-never-happened error cases. See code comments, in particular in fsl_ckout_revert(), for why this fix is not as satisfactory as it should be. check-in: 888c0dfe9a user: stephan tags: trunk | |
| 10:38 | Typo fix and add a reminder-to-self about why we don't combine all of the project's headers into a single mega-header. check-in: 0d024cd949 user: stephan tags: trunk | |
|
2024-07-29
| ||
| 10:38 | Run Doxyfile through (doxygen -u). check-in: 5f5fbb46fb user: stephan tags: trunk | |
|
2024-07-23
| ||
| 10:26 | Update autosetup to upstream 0.7.1+. This is what uncovered the bug fixed in [4243008e112140618628ad]. check-in: 654c61c6c0 user: stephan tags: trunk | |
| 10:26 | Fix a bug in fsl_checkin_calc_F_card2() which caused a change of (only) the exec bit to go un-marked in the manifest (the file retained its old exec-bit status, but otherwise no harm done). check-in: 4243008e11 user: stephan tags: trunk | |
|
2024-07-03
| ||
| 09:13 | Remove some superfluous warnings from f-update and f-merge. check-in: 8861e4557f user: stephan tags: trunk | |
|
2024-06-29
| ||
| 22:45 | Add --dry-run/-n flag to f-import-blob.c. check-in: a5cfa53b2e user: stephan tags: trunk | |
| 22:30 | Fix the aforementioned double-free bug. Facepalm. check-in: b25fae6fbe user: stephan tags: trunk | |
| 22:15 | Minor cleanups in the previous checkin. Import forum repo into this repo, but the aforementioned double-free bug is still lingering. check-in: e62167460d user: stephan tags: trunk | |
| 22:02 | Add a test app to import raw blobs, initially for use with importing the libfossil forum repo into the main libfossil forum. In the process, discovered, but have not yet resolved, a double-free bug via fcli_shutdown()'s cleanup of the argv memory. check-in: 44f248ffb4 user: stephan tags: trunk | |
|
2024-06-20
| ||
| 11:12 | Minor test code cleanup and update license header copyright years. check-in: 6b98eb601b user: stephan tags: trunk | |
| 11:01 | Correct lookup of the checkout db file in fsl_ckout_db_search() when checkParentDirs is false. It was aborting the loop prematurely, before checking all db file name options. check-in: f0a970b0dc user: stephan tags: trunk | |
| 10:45 | Add f-apps/f-test-ckout-db-search.c to test for a bug in fsl_ckout_db_search() discovered by Przemysław Kamiński. Fixing the bug is the next step. check-in: f73f305f22 user: stephan tags: trunk | |
|
2024-06-16
| ||
| 17:06 | EOL whitespace cleanups. check-in: 30b6b94913 user: stephan tags: trunk | |
|
2024-05-29
| ||
| 15:32 | Latest upstream mkcdep.c from the sewal tree. check-in: b97e4ac1e5 user: stephan tags: trunk | |
|
2024-04-27
| ||
| 11:51 | Apply the case-handling change from [0e50f798e6a5] to f-rename.c, analog to [fossil:859b00b7|upstream 859b00b7]. Edit: this change and the related one it links to should ideally be done transparently in the library, but retrofitting it into those two places is beyond my current level of ambition. Patches to that effect would be welcomed! check-in: 070f359a1e user: stephan tags: trunk | |
|
2024-04-16
| ||
| 20:50 | Add a very basic test script for SEE-based builds and remove the -W flags added for SEE sources, as those warnings were fixed upstream. check-in: 740e55b047 user: stephan tags: trunk | |
| 08:50 | Add a brief document explaining SEE integration. check-in: 29378505dc user: stephan tags: trunk | |
| 08:22 | Initial support for repositories encrypted using the SQLite Encryption Extension (SEE). The interface is still subject to change but currently seems reasonably sane. Milestone: we can create, open, work with, and check in to repositories encrypted with SEE, but it's tedious to have to pass the encryption key for every command invocation using the f-... apps. check-in: 661421ef0c user: stephan tags: trunk | |
| 08:21 | Gotta tap save before checking in. Closed-Leaf check-in: 2efbe19541 user: stephan tags: sqlite-see | |
| 08:07 | Add support for binary-format SEE keys. check-in: b35914490e user: stephan tags: sqlite-see | |
| 07:40 | Reinstate --see-hexmode in fcli. check-in: 0803fb9c84 user: stephan tags: sqlite-see | |
| 07:40 | Correct f-ciwoco to not force dry-run mode. check-in: 0ad6c888be user: stephan tags: sqlite-see | |
| 07:02 | Add support for --see-textkey to fcli. check-in: fe27725d07 user: stephan tags: sqlite-see | |
| 06:26 | More work on SEE integration. check-in: 7240c7d988 user: stephan tags: sqlite-see | |
| 06:06 | More work on adding library-level SEE support. It seems to basically work but it's not complete. check-in: 3d4d0d3a05 user: stephan tags: sqlite-see | |
| 04:58 | Build tweaks to facilitate SEE integration. check-in: 914a6ea914 user: stephan tags: trunk | |
| 03:37 | Move sqlite3.c/h from src to extsrc in prep for further configuration options for specifying which sqlite3.c (primarily for SEE support). check-in: ff9c41a8dd user: stephan tags: trunk | |
|
2024-04-10
| ||
| 22:26 | Merge current trunk into sqlite-see branch. check-in: d0c7ccf526 user: stephan tags: sqlite-see | |
| 22:22 | More docs for [0e50f798e6a5]. check-in: 0e6501b5df user: stephan tags: trunk | |
| 22:06 | Minor doc touchup for the previous checkin. check-in: 753e4c72e6 user: stephan tags: trunk | |
| 22:03 | Port in [fossil:f1f7e27e0cdb8943|upstream f1f7e27e0cdb8943], a routine which ensures that a given filename matches the case it is stored in in the filesystem. Use that in f-add.c, where it's applied even for case-sensitive filesystems (primarily as a test for that routine). check-in: 0e50f798e6 user: stephan tags: trunk | |
|
2024-03-28
| ||
| 11:50 | More work on close-at-checkin, but this is turning into a rat's nest of side effects and does not address the partial-checkin case, so shelving this idea for the time being. Unrelated: this checkin is showing src/checkin.c as a full-file diff with both fossil(1) diff and f-vdiff, whereas doing a diff --from prev shows the expected changes only. Shrug. Closed-Leaf check-in: 075379b921 user: stephan tags: ci-close | |
| 09:49 | Add new fsl_checkin_opt::writeCheckoutVersion (default=true) as a way to suppress automatic rewriting of checkout version to match the new checking version, for use with... Add f-cli --close and --close-with-comment flags which enable checking in and closing at the same time. When doing so, do _not_ update the checkout to the newly branched-and-closed version. Edit: this messes up the checkout state by setting the vfile state to match the new branch instead of the current branch. Need to investigate that further. check-in: 1f286fb52a user: stephan tags: ci-close | |
|
2024-03-19
| ||
| 14:18 | Doc typo fixes. check-in: a9c39d66de user: stephan tags: trunk | |
|
2024-03-15
| ||
| 13:15 | Pull in [fossil:34276d22e558fbde2705] micro-patch to resolve a potential int overflow in fsl_id_bag_hash(). check-in: 40e3dd6eed user: stephan tags: trunk | |
|
2024-02-27
| ||
| 13:02 | Change -g CFLAG to -gdwarf-4 for clang compatibility with valgrind versions still commonly deployed. See link in code comment for details. Discovered that gcc v10 and v12 cause the f-sanity test app to bus fault on my pi4 and pi5, for unknown reasons, but clang works fine on both. check-in: f0979f89b3 user: stephan tags: trunk | |
|
2024-02-11
| ||
| 12:20 | This was supposed to have been in trunk. check-in: 8caf0ac36e user: stephan tags: trunk | |
|
2024-02-07
| ||
| 10:21 | In autosetup's wh-make-from-dot, make the resulting file read-only for all users, not just the current one. check-in: 6482447a69 user: stephan tags: sqlite-see | |
|
2024-02-03
| ||
| 16:18 | More tinkering with the SEE integration, but this reveals that we have to(?), for portability's sake, limit encryption to repositories and checkouts, and keep the global config from being encrypted (else we risk breaking fossil(1)'s use of the config db). It also begs the question of whether arbitrary databases opened via the fossil API should get this support (which would require a different API, as the db API can be used without a fsl_cx object). check-in: f226dbd76a user: stephan tags: sqlite-see | |
| 10:16 | Add initial experimental interface for fetching passwords from clients for databases encrypted with the SQLite Encryption Extension (SEE). This is just the (untested) interface, with no functional code which makes use of it. check-in: 1ddc5a8c6e user: stephan tags: sqlite-see | |
|
2024-01-07
| ||
| 17:59 | Upstream patch [fossil:b295f86db5417cea1e7a]: in fsl_vfile_changes_scan(), if mtime of a file is unchanged but is equal to the current system time, check the hash to work around a corner case where a script modifies a file immediately after an open/update. Also fix two code-adjacent misuses of fsl__cx_scratchpad() in that same function, where fsl__cx_scratchpad_yield() was not being called. check-in: 8616c93b6f user: stephan tags: trunk | |
|
2023-12-08
| ||
| 09:35 | Upstream tweak [fossil:a45c7f0a560a90541967f790c4b5] to adjust diff output slightly. check-in: 9313a01a00 user: stephan tags: trunk | |
|
2023-11-23
| ||
| 13:07 | fix 'f-delta -a' cli option clobbering so that the delta in arg1 actually gets applied to the file in arg2 and the result written to stdout rather than outputting the delta between arg1 and arg2 as we do when no option is passed to 'f-delta' check-in: 72f05d4c41 user: mark tags: trunk | |
| 12:49 | fix rejection of zero-length deltas to make delta creation and application consistent with fossil(1) check-in: cd5b50685b user: mark tags: trunk | |
|
2023-11-22
| ||
| 11:54 | s/__unused/fsl__unused as discussed in /chat with stephan@ to help avoid name collisions with package maintainers; no functional change intended check-in: 230cf225fc user: mark tags: trunk | |
| 01:53 | Add EXTRA_CFLAGS option to the build to append arbitrary CFLAGS (to assist in tracking down compiler-specific warnings). Squelch a bogus gcc-specific warning about a potentially uninitialized var in fsl_ckout_merge(). check-in: 2e45143605 user: stephan tags: trunk | |
|
2023-11-21
| ||
| 18:07 | Reformulate how TAGS is generated to avoid an error about reading from '-' on some versions of etags. check-in: 1a5f7a870b user: stephan tags: trunk | |
| 18:01 | Remove some (admittedly justified) rough language from config.h. check-in: fab3d8f252 user: stephan tags: trunk | |
| 17:59 | Replace several __attribute__((fallthrough)) markers with a macro which conditionally resolves to that. check-in: b018045507 user: stephan tags: trunk | |
| 15:25 | Latest upstream fnc. check-in: 1c09e802b2 user: stephan tags: trunk | |
|
2023-11-19
| ||
| 16:21 | Latest upstream fnc. check-in: e9ce1d49cf user: stephan tags: trunk | |
|
2023-09-08
| ||
| 12:29 | Add --no-c++ configure flag to work around a problem where my local c++ is not finding standard headers. check-in: 58651fd515 user: stephan tags: trunk | |
|
2023-07-28
| ||
| 16:22 | Apply upstream diff int overflow patch [fossil:5882e9e87861c7c0]. check-in: ef095328f7 user: stephan tags: trunk | |
|
2023-07-12
| ||
| 10:36 | Minor internal doc update. check-in: dac7770456 user: stephan tags: trunk | |
|
2023-06-22
| ||
| 08:42 | Rephrase the cryptic sed expression for generating compile_commands.json into something more platform-portable. check-in: c6b9b86399 user: stephan tags: trunk | |
|
2023-06-20
| ||
| 13:48 | Remove some stray end-of-line whitespace. check-in: ab6ce6037c user: stephan tags: trunk | |
| 13:44 | Remove some stray whitespace. check-in: 9c2357b976 user: stephan tags: trunk | |
|
2023-06-17
| ||
| 08:27 | Minor text updates in f-update output. check-in: f9ba9cc02f user: stephan tags: trunk | |
|
2023-05-17
| ||
| 02:20 | Update to sqlite3 trunk (pre-3.43, a few checkins after 3.42.0). check-in: 21063409f6 user: stephan tags: trunk | |
|
2023-04-26
| ||
| 16:26 | Latest upstream fnc. check-in: 251db8cb45 user: stephan tags: trunk | |
| 16:24 | Merge no-common-ancestor branch into trunk. check-in: 0657571903 user: stephan tags: trunk | |
| 16:23 | Remove the no-common-ancestor check from the merge algorith, for conformance with fossil(1)'s new behavior. Closed-Leaf check-in: 3ca3706652 user: stephan tags: no-common-ancestor | |
|
2023-04-23
| ||
| 12:09 | Patch some interrupted-mid-sentence comments. check-in: 1bb1139c7b user: stephan tags: no-common-ancestor | |
| 12:07 | Apply upstream [fossil:7c75e47b3c130ff1]: when merging files with no common ancestor, treat it as if an imaginary common ancestor were an empty file. We currently retain the no-common-ancestor diagnosis but may yet remove it or augment it to permit the user to specify which side of the merge to retain. check-in: 30bd3e8b14 user: stephan tags: no-common-ancestor | |
|
2023-04-21
| ||
| 15:57 | Remove sqlite3ext.h and a C-side reference to it. check-in: 0fe561416a user: stephan tags: trunk | |
|
2023-04-19
| ||
| 12:46 | Update to latest upstream sqlite3ext.h (used by ext_regexp.c). check-in: 231fed9533 user: stephan tags: trunk | |
| 04:03 | Add more missing f(void). check-in: 43181beb49 user: mgagnon tags: trunk | |
| 03:35 | Cherrypick changes from the no-common-ancestor branch which are not strictly relevant to that change. check-in: 1ee281f8ed user: stephan tags: trunk | |
| 03:23 | Remove FSL_MERGE_FCHANGE_CONFLICT_ANCESTOR and its associated handling, as fossil no longer reports that as a problem. (Edit: closing this broken branch to re-start from a clean slate after some sleep.) Closed-Leaf check-in: c575ac0028 user: stephan tags: no-common-ancestor | |
| 03:02 | Additional work on porting over Martin's no-common-ancestor patch. check-in: 5d8201ce25 user: stephan tags: no-common-ancestor | |
| 02:33 | Add missing f(void) for some static func decls to appease newer compilers. check-in: e2d7986f9e user: stephan tags: no-common-ancestor | |
| 02:33 | Latest upstream sqlite3. check-in: a26e462b9c user: stephan tags: no-common-ancestor | |
| 02:26 | Apply a set of missing f(void) and assigned-but-unused vars from Mark J. check-in: b96f5840ea user: stephan tags: no-common-ancestor | |