Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
369 check-ins using file src/Makefile or src/GNUmakefile or include/GNUmakefile version 5d7bde5641
|
2024-09-14
| ||
| 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 | |
| 02:11 | Apply upstream [fossil:7c75e47b3c130ff1]: when merging files with no common ancestor, treat it as if an imaginary common ancestor were an empty file. check-in: b67c69a3ca user: stephan tags: no-common-ancestor | |
|
2023-03-07
| ||
| 14:32 | Change the anonymous user's default perms from 'hmncz' to 'hz' to match new fossil(1) defaults. check-in: 9a8269d737 user: stephan tags: trunk | |
|
2023-02-02
| ||
| 10:08 | Integrate upstream patch [https://fossil-scm.org/home/info/52a66829d655ff35dc52]: when cherrypicking, do not include marked-as-private merge parents in the Q-card list. check-in: fc0ae4b07e user: stephan tags: trunk | |
| 10:04 | Correct FTS index check handling and ensure the cached value of the check is invalidated on open/close of the repo. check-in: 8f60ec4138 user: stephan tags: trunk | |
|
2023-01-24
| ||
| 03:21 | Add an assert() to the previous checkin. check-in: 65cdfccb1f user: stephan tags: trunk | |
| 03:09 | Update fsl__search_doc_touch() to be able to handle both FTS4 and FTS5 search indexes, now that the port to FTS5 has started at [fossil:/timeline?r=search-fts5]. This failure was found by trying to make the first checkin on that branch. check-in: 5764b7efa6 user: stephan tags: trunk | |
|
2022-11-24
| ||
| 13:51 | add FCLI_RC_NO_CMD result code for fcli_dispatch_commands() To help distinguish between invalid commands and propagated FSL_RC_NOT_FOUND errors returned from successfully dispatched commands. ok stephan@ check-in: 46008704a6 user: mark tags: trunk | |
| 13:49 | make fcli_cmd_aliascmp() return semantics match convention Return 0 if a match is found as one would expect from a *_cmp() routine. ok stephan@ check-in: 6e0d1fbc09 user: mark tags: trunk | |
|
2022-11-21
| ||
| 03:30 | squelch gcc-11.2.0 uninitialised variable warning If fsl_buffer_cstr2() errors out, nOrig isn't initialised. ok stephan@ check-in: ef78842aea user: mark tags: trunk | |
|
2022-11-20
| ||
| 12:20 | ensure dstsz-1 is greater than the current length of dst Although somewhat contrived it's a potential problem nonetheless: if the caller passes a destination buffer that contains a string greater than the passed in size of the destination buffer (which is senseless at it means the buffer is already overflowed), we write the full length of src, which could overflow dst. This change makes our fsl_strlcat() implementation behave the same as OpenBSD's strlcat(3) in testing. check-in: f2676cbcc2 user: mark tags: trunk | |
|
2022-11-14
| ||
| 06:00 | Convert an assertion in fsl_annotate() into a proper error check. Triggered by an unclean build misbehaving. check-in: 58e7f6d7bf user: stephan tags: trunk | |
|
2022-11-12
| ||
| 09:45 | Update some old appendf.c return semantics to the newer semantics. check-in: 0a13ca28c8 user: stephan tags: trunk | |
|
2022-10-18
| ||
| 13:50 | Merge in trunk. Leaf check-in: 24a840f9cf user: stephan tags: dev-blame-ignore | |
|
2022-09-26
| ||
| 16:46 | Removed some stray debug output. check-in: 1da9baf2b7 user: stephan tags: trunk | |
|
2022-09-15
| ||
| 07:14 | f-merge: perform autosync-pull before merging. check-in: 10bedd2e61 user: stephan tags: trunk | |
|
2022-09-04
| ||
| 11:50 | Latest upstream fnc. check-in: 267e51c927 user: stephan tags: trunk | |
|
2022-08-22
| ||
| 13:56 | Corrected fsl_repo_zip_sym_to_filename() to honor the +x bit on in-repo files. Tweaked an unrelated TODO comment. check-in: cf41980877 user: stephan tags: trunk | |
|
2022-08-12
| ||
| 15:44 | Compile fix for compilers which default enums to unsigned (gcc 11.2, apparently). check-in: 26a60721cd user: stephan tags: trunk | |
|
2022-08-10
| ||
| 09:25 | f-rename now defaults the -mv flag to true if the app is invoked as f-mv or f-move. check-in: 99eed85229 user: stephan tags: trunk | |
|
2022-08-08
| ||
| 05:31 | Squelched an arguably valid variadic function warning from clang 14. check-in: 35723c0bd1 user: stephan tags: trunk | |
|
2022-07-31
| ||
| 22:52 | More generic internal cleanups. Removed undocumented -VV -VVV flags from fcli. check-in: 0df1833ab6 user: stephan tags: trunk | |
| 22:16 | Merged in buffer-errcode branch with the hope of simplifying certain fsl_buffer usages. check-in: a76f8946f6 user: stephan tags: trunk | |
| 22:15 | Generic internal cleanups. Closed-Leaf check-in: 1dffe8bdb0 user: stephan tags: buffer-errcode | |
| 21:16 | Removed some extraneous is-NULL checks. Minor internal cleanups in error reporting. check-in: 53f847261b user: stephan tags: buffer-errcode | |
| 21:03 | Make more use of fsl_buffer::errCode semantics. Make sure the fsl_error APIs ignore those semanics where necessary. check-in: 5049f44945 user: stephan tags: buffer-errcode | |
| 20:29 | Initial work on fsl_buffer::errCode, for propagating buffer-API error codes to simplify (primarily) series of append operations such that we do not have to check for an OOM error until the end of the series. Essentially works but more testing and making use of it in the core API is needed. check-in: b5a98f8a9e user: stephan tags: buffer-errcode | |
| 20:29 | f-ci: when -b BRANCH is supplied, skip the would-fork check, else it can lead to a would-fork error when trying to check in to a new branch from anywhere other than the tip. check-in: 16eb245dd4 user: stephan tags: trunk | |
|
2022-07-20
| ||
| 10:18 | f-rm: added --rm as an alias for --unlink, for symmetry with f-rename --mv. Corrected help text for fcli's --lib-version flag. check-in: fe30de82c8 user: stephan tags: trunk | |
|
2022-07-06
| ||
| 07:34 | Minor doc tweaks in autosetup code. check-in: 5527e4ca39 user: stephan tags: trunk | |
|
2022-07-03
| ||
| 08:11 | Fixed broken like-clause formatting introduced in [b33abe472b58] (percent sign needed to be doubled). Fixes remote-host check in fcli_sync(). Unrelated minor formatting tweaks. check-in: b6df9a0845 user: stephan tags: trunk | |
|
2022-07-02
| ||
| 07:47 | fcli_sync() is now a no-op if the repo config contains no 'syncwith:...' entries (avoids an error when doing initial checkin on a new repo with f-ci). When f-ci is checking in to a repo which has no commits, it now defaults the branch to trunk if no branch name is provided. It proviously left off the branch tags altogether, leading to a branchless checkin (harmless but confusing). check-in: b33abe472b user: stephan tags: trunk | |
|
2022-06-27
| ||
| 08:59 | Replaced the fallthrough __attribute__ with a more portable macro. Added an #ifdef check for __unused, as my compiler (clang 10) doesn't know it. check-in: ed4d246451 user: stephan tags: trunk | |
| 08:58 | Fixed auto.def's reading of ./manifest (to fish out the timestamp) to skip over the optional B-card in the manifest. check-in: be3deb1f28 user: stephan tags: trunk | |
| 08:53 | __attribute__ gets (both) its wings check-in: d9f04ab3d2 user: bch tags: trunk | |
| 07:18 | Tag ("(void)var;", or "__unused") vars that are not used, tag switch/case fallthroughs w/ __attribute ((fallthrough)); check-in: 73ee02a8fe user: bch tags: trunk | |
| 07:12 | Complete struct initialization. check-in: 5a46f26b1c user: bch tags: trunk | |
| 07:06 | Remove assertion that is true by definition. An unsigned int is always >= 0. check-in: 549008b363 user: bch tags: trunk | |
| 07:03 | Make sure that #defines for prototypical "empty" structs are complete. check-in: 029c225df6 user: bch tags: trunk | |
|
2022-06-25
| ||
| 19:10 | Updated sqlite3 to 3.39.0. check-in: a37ccdd6f3 user: stephan tags: trunk | |
|
2022-06-19
| ||
| 20:13 | f-remove: if a stat() fails while using the -u (unlink) flag, reset the error state to keep that unimportant error from propagating up through to main(). check-in: 2da3406516 user: stephan tags: trunk | |
|
2022-06-11
| ||
| 13:05 | Expanded the label for the 'no common ancestor found' case in f-merge's legend, to indicate that it refers to new content rateher than a genuine conflict, but probably need to find a different merge state code for that case check-in: bbb7322a75 user: stephan tags: trunk | |
| 12:49 | f-merge now unconditionally shows the symbolic name legend if any files are modified by the merge. TODO: figure out how we can make the 'no common ancestor found' report for new merged-in files less scary. check-in: 8ba74c252f user: stephan tags: trunk | |
|
2022-06-09
| ||
| 04:10 | Set transient helpRequested flag in the fcli singleton. If the client has requested help (cf. [/file?ci=tip&name=src/cli.c&ln=966]) with, for example. 'prog cmd help' set this flag. check-in: 6e9726df51 user: mark tags: trunk | |
| 00:23 | Added missing handling of (--format debug) in f-vdiff. Added a reference to ticket [746ebbe86c20b5c0f96] regarding the issue of adjacent diff chunks getting a superfluous separator. check-in: 9cee12cf17 user: stephan tags: trunk | |
|
2022-06-06
| ||
| 06:08 | Converted an assertion to a proper error check. Triggered when trying to fetch the checkout version from a checkout where the repo db is not accessible. check-in: eeb3a1b2af user: stephan tags: trunk | |
| 05:58 | Imported latest upstream fnc. check-in: 936e886f1c user: stephan tags: trunk | |
|
2022-05-17
| ||
| 11:00 | Removed some dead #includes. check-in: 307d440da4 user: stephan tags: trunk | |
| 10:56 | Added a 3rd-party drop-in impl for the missing dirent.h-related APIs for Windows builds. Many thanks to Daniel D. for finding this. check-in: 7dadc3b2bc user: stephan tags: trunk | |
| 10:37 | Removed use of a VLA in appendf.c because C11 makes that feature optional and MSVC does not implement it. check-in: f913a0611c user: stephan tags: trunk | |
|
2022-05-14
| ||
| 07:50 | Ported over Windows impl of fsl_config_global_preferred_name(), but it's untested (even for compilability) for lack of a Windows intallation. check-in: 46ffac840d user: stephan tags: trunk | |
|
2022-05-12
| ||
| 10:37 | Merged in trunk. check-in: 1ba4514284 user: stephan tags: dev-blame-ignore | |
| 08:44 | Adapted [fossil:32b11546c830e328 | upstream 32b11546c830e328] so that f-timeline's -b BRANCH flag now includes branch-specific wiki pages in its results. check-in: 31e5cc636e user: stephan tags: trunk | |
| 08:38 | Pulled in sqlite3 3.39. check-in: ea6ff4fd5f user: stephan tags: trunk | |
|
2022-05-03
| ||
| 16:26 | Upstream patch [fossil:1bf6686e76252efd | 1bf6686e76252efd] which corrects the int type used for zlib's crc32(). check-in: 4f4c058ba3 user: stephan tags: trunk | |
| 03:32 | Updated builtin sqlite3 to 3.38.3. check-in: dfc693fdb8 user: stephan tags: trunk | |
|
2022-04-29
| ||
| 16:28 | Fixed semi-broken decls in f-wiki's fcli_command callbacks. check-in: 2930c121e0 user: stephan tags: trunk | |
|
2022-04-21
| ||
| 10:58 | Ported in [fossil:c92fb60ba9e1829a], which adds the "start:" prefix option for fsl_sym_to_rid() lookups. check-in: bfd34748e6 user: stephan tags: trunk | |
|
2022-04-14
| ||
| 05:06 | Fixed a segfault in f-ci and f-update caused by variadic args misuse. check-in: 3f43f99441 user: stephan tags: trunk | |
|
2022-04-11
| ||
| 03:17 | fsl_rc_cstr() now returns NULL, instead of a dummy string, if passed an unknown result code. This change is based on experience in another source tree where we use an identical API, and will eventually permit client code to install a fallback handler to provide its owns strings for unknown-to-libf codes. check-in: fcb01c8788 user: stephan tags: trunk | |
| 03:07 | f-ci now attempts to prohibit checkins to non-leaf versions and adds the --fork flag to bypass that check. Added FSL_RC_WOULD_FORK because no other existing result code seems appropriate for reporting this case. check-in: b8c029741a user: stephan tags: trunk | |
|
2022-04-10
| ||
| 04:57 | Reversed a bit of double-negative logic in fsl__deck_F_seek_base(). check-in: b13966c8ce user: stephan tags: trunk | |
| 00:17 | Reimplemented fcli_sync() with a more flexible interface, including the ability to suppress the system()'d command's output, so fnc can potentially use this without hosing the screen state. f-update now does a pull-sync before updating if autosync is on. check-in: 0afca69968 user: stephan tags: trunk | |
|
2022-04-09
| ||
| 21:50 | Added an f-sanity test for the FSL_RC_LOCKED case of fcli_sync(). check-in: dcadf02e6c user: stephan tags: trunk | |
| 21:36 | Moved the internal fsl_cx cache-clearing to the public fsl_cx_caches_reset() so that it can be used like fcli does (after shelling out an external app which might change the db). Fixed a deck F-card search bug introduced by the cache reset (thank goodness an existing unit test tripped over that). check-in: 84154036a0 user: stephan tags: trunk | |
| 08:19 | Taught fcli_sync() to fail with the new FSL_RC_LOCKED code if a transaction is opened, as remote sync cannot succeed in that case due to the libf client holding a transaction open (i.e. a write lock). check-in: 3be18124f5 user: stephan tags: trunk | |
| 08:08 | f-ci now uses fossil(1) for autosync support. Kinda backwards, but it's a usability improvement. It honors both the fcli.autosync boolean setting and fossil's autosync, prefering the former. check-in: 44fcc2f7aa user: stephan tags: trunk | |
| 07:41 | Ported fsl_system() from fossil and added fcli_sync(). check-in: 5fb49bf7c4 user: stephan tags: trunk | |
| 06:51 | Fixed some symbol names introduced via copy/paste porting. check-in: 9861bd2474 user: stephan tags: trunk | |
| 06:49 | Ported in infrastructure for tokenizing PATH-style strings, added fsl_pathfinder_split() to quickly populate a fsl_pathfinder() from path strings, and added fcli_fossil_binary() to find the system's fossil binary. check-in: f15f9d8414 user: stephan tags: trunk | |
|
2022-04-06
| ||
| 12:10 | Swapped two lines to fix a potential mis-rollback in fsl_ckout_rename(). check-in: 5e640a2f89 user: stephan tags: trunk | |
|
2022-04-03
| ||
| 16:17 | Fixed a bug in fsl_ckout_rename() where one part of the vfile table update was missing, triggering an assert in f-vdiff after a rename. Now, after all these years, i have come to understand why Richard chose to (update vfile set origname=pathname where origname is NULL). Always thought that was an odd design decision, but now grasp what its purpose is. check-in: 7cc1faa141 user: stephan tags: trunk | |
|
2022-04-02
| ||
| 08:59 | Expanded an assert() in f-vdiff which revealed what might be a bug in/via f-rename. check-in: daa08e411b user: stephan tags: trunk | |
|
2022-04-01
| ||
| 09:38 | Latest upstream fnc. check-in: 3876fab927 user: stephan tags: trunk | |
|
2022-03-26
| ||
| 15:04 | ncurses diff view: treat a NUL byte input as a 'q' (quit) to work around the problem that (cat /dev/zero | f-vdiff -f n) hangs the app entirely. Reported by Mark in /chat. check-in: 8683c5b248 user: stephan tags: trunk | |
|
2022-03-16
| ||
| 12:52 | Latest upstream fnc. check-in: 3c54972833 user: stephan tags: trunk | |
|
2022-03-10
| ||
| 12:27 | Fixed a compiler warning triggered on an Alpine Linux build. check-in: 6f8334af0b user: stephan tags: trunk | |
| 08:02 | Upstream fnc [fnc:a97a6075b8099b662]. check-in: 6417598cf2 user: stephan tags: trunk | |
| 04:50 | Minor constness tweaks and removed a superfluous NULL arg check. check-in: 420a8985e1 user: stephan tags: trunk | |
| 03:38 | For the fsl_ckout_rename()-related bits, rename the fsMvFile option to doFsMv. check-in: b85863a91d user: stephan tags: trunk | |
|
2022-03-09
| ||
| 04:04 | Completely reimplemented fsl_ckout_rename() using fossil(1)'s impl as a basis. The code is now arguably more legible and is more behavior-compatible with fossil. check-in: bc7bfb06e3 user: stephan tags: trunk | |
|
2022-03-08
| ||
| 23:22 | Ported in [fossil:5e34c9982858163d | upstream patch 5e34c9982858163d]. check-in: 4e6d851edd user: stephan tags: trunk | |
| 07:07 | Refactored fsl_ckout_rename() to use an options object and callback. Discovered a discrepancy in how renames are handled compared to fossil(1) when the source is a single dir name: fossil includes that dir name in the target whereas we do not. That might be subject to change, pending /chat discussions. check-in: 80c84abba6 user: stephan tags: trunk | |
| 07:00 | Removed some dead code. check-in: ded6e51294 user: stephan tags: trunk | |
| 07:00 | Do not clear fsl_cx error state in fsl__ckout_version_fetch(), as that can lead to a rollback eliminating any pending error message. check-in: 0a11ddd8bc user: stephan tags: trunk | |
| 05:46 | Added f-rename. This impl revealed how/why fsl_ckout_rename() needs to be refactored to take a callback for reporting exactly which files get renamed, but that will have to wait until the muse strikes. check-in: ef1ceb0a0c user: stephan tags: trunk | |
| 05:03 | Initial (somewhat unsightly) impl of refactoring fsl_ckout_rename() to be able to handle origin filenames which are SCM-known directories. i.e. fsl_ckout_rename() can now move directory foo/bar, recursively, to a new directory. check-in: 52318ca911 user: stephan tags: trunk | |
| 04:49 | Added long-missing client/GNUmakefile. check-in: afed3698bb user: stephan tags: trunk | |
|
2022-03-07
| ||
| 01:44 | Added fsl_ckout_rename_revert() and unit tests. check-in: aa34eddd93 user: stephan tags: trunk | |
| 01:09 | Changed semantics of fsl_db_get_buffer() to _append_ to the target buffer instead of replacing its contents, as that's generally more often the capability i want and the old semantics simply require calling fsl_buffer_reuse() on the target first. check-in: 27f4feac07 user: stephan tags: trunk | |
|
2022-03-05
| ||
| 11:18 | Latest upstream fnc. check-in: 818307debb user: stephan tags: trunk | |
| 10:09 | Added fsl_ckout_rename(), the core impl of a rename/move operation for SCM-managed files. check-in: 4d2e43a8f6 user: stephan tags: trunk | |
| 10:08 | Added protection against a corner-case condition to the previous checkin. check-in: fdebf174bb user: stephan tags: trunk | |
| 10:02 | When a fossil-managed db handle does a rollback, reload the cached ckout version state, else it can get out of sync. This is an age-old bug, but was just discovered when it broke some new f-sanity tests. check-in: a0f3423462 user: stephan tags: trunk | |
|
2022-03-04
| ||
| 16:14 | Ported over Daniel D's root:XYZ tag lookup performance improvements from [fossil:/timeline?r=start-of-branch-cte]. check-in: 51863fd402 user: stephan tags: trunk | |
| 05:37 | Latest upstream fnc. check-in: 1f0c719961 user: stephan tags: trunk | |
|
2022-02-26
| ||
| 22:47 | Latest upstream fnc.c check-in: 8520337095 user: stephan tags: trunk | |
| 21:01 | Re-enabled the historical 'touch' feature of mkcdep.c to work around some otherwise weak deps handling when headers change. On the one hand, this improves rebuilding for header changes. On the other, it causes the deps files to get rebuilt twice in a row at times. check-in: d8a6b8d0c6 user: stephan tags: trunk | |
|
2022-02-24
| ||
| 11:19 | mkcdep.c no longer adds "." to the -I path by default because that backfires with generation of the amalgamation header, causing a circular dep because the amalgamation header shares a name with a non-amalgamation header. check-in: f59415334b user: stephan tags: trunk | |
|
2022-02-18
| ||
| 16:36 | Back-ported [fossil:868d1608382a9bb1] for (cosmetic) diff alignment improvements. check-in: 57f6086d58 user: stephan tags: trunk | |
| 16:25 | Improved the big/little-endian detection in mkcdep.c by taking advantage of a gcc-ism which exists for that purposes. check-in: 59dea46ad9 user: stephan tags: trunk | |
|
2022-02-15
| ||
| 14:46 | As per Stephan's suggestion in /chat, pluralise ignoreRid(s). check-in: 36b2799c8e user: mark tags: dev-blame-ignore | |
| 14:33 | Enable ignoring specific commits when annotating file. Add flag to annotate options struct to ignore all merge commits. Similarly, provide array to assign rid values of specific versions to ignore specified commits. If either are set, any changed lines from the ignored version(s) will be annotated from the previous commit in the file history. check-in: 79fd090adb user: mark tags: dev-blame-ignore | |
|
2022-02-14
| ||
| 10:06 | Replaced broken big-/little-endian determination in mkcdep.c. check-in: e71174b745 user: stephan tags: trunk | |
|
2022-02-05
| ||
| 05:37 | fsl_foci() now uses the fsl_cx instance associated with its db handle instead of fetching it from fcli. check-in: 746d6bb38a user: stephan tags: trunk | |
| 05:04 | Expanded the foci docs a bit. check-in: df374a82ef user: stephan tags: trunk | |
| 04:51 | Merged in wip-foci branch, a straight port of fossil's files_of_checkin sqlite virtual table. check-in: b78e11a588 user: stephan tags: trunk | |
| 04:45 | Got foci working and added a basic test for it in f-sanity.c. Closed-Leaf check-in: c33ddf9c91 user: stephan tags: wip-foci | |
|
2022-02-04
| ||
| 14:22 | Initial port of Fossil's files-of-checkin (foci) vtable. First pass of porting fossil(1) src/foci.c to libfossil; it's pretty much a 1:1 port using libf's ADTs. This builds, but the implementation isn't used anywhere so that's not a surprise. There is no test yet either, so branching this for further review. check-in: 677d51061d user: mark tags: wip-foci | |
|
2022-01-30
| ||
| 13:50 | Documented a bug/shortcoming in f-vdiff. check-in: 725861fdf6 user: stephan tags: trunk | |
|
2022-01-27
| ||
| 14:42 | Re-did C dependencies generation to use tools/mkcdep.c instead of GCC. MUCH faster and less kludgy. check-in: 236c0f8864 user: stephan tags: trunk | |
| 13:02 | Latest upstream fnc. check-in: e7795f680c user: stephan tags: trunk | |
| 10:08 | Removed some dead code from wh-common.tcl. check-in: 74d87e19f4 user: stephan tags: trunk | |
|
2022-01-26
| ||
| 18:04 | Corrected an argument type in fsl_branch_of_rid() which broke variadic arg handling in that function on platforms where fsl_int_t and fsl_id_t are different sizes. check-in: bcbfb21894 user: stephan tags: trunk | |
|
2022-01-24
| ||
| 07:17 | Corrected f-vdiff's file-mtime checks of local-checkout files to canonicalize the filename so that it works when called from a subdir of the checkout. check-in: 4da4e6a3f4 user: stephan tags: trunk | |
| 03:44 | Ported in upstream [fossil:8cd73dda3d10ff143740] diff generation tweaks. check-in: 75349fc193 user: stephan tags: trunk | |
|
2022-01-23
| ||
| 18:58 | Removed duplicate docs for fsl__diff_optimize(). check-in: d8d1bc92a4 user: stephan tags: trunk | |
| 18:57 | Now that the v1 diff code is gone, consolidated diff.c/diff2.c into diff.c and moved the dibu-specific code into the new dibu.c. That required exposing fsl__diff_optimize() via internal.h so that fnc.c can see it. (Edit: in hindsight, should have renamed diff2.c to dibu.c since most of diff2.c was dibu stuff. Oh, well.) check-in: 2cca86d9a0 user: stephan tags: trunk | |
| 13:47 | Fixed a segfault introduced two checkins back in [5e12e2134b76]. check-in: a8853a173b user: stephan tags: trunk | |
| 13:43 | Minor cleanup to the previous checkin. Fixed TK-format output to be syntactically correct for a no-diff run. check-in: 354f81fd5c user: stephan tags: trunk | |
| 13:19 | f-vdiff can now catch and report renames when the rename is part of the local checkout's state. Code-adjacent constness tweaks. Edit: FIXME: discovered later that this fails when the diff is run from anywhere but the top checkout dir. check-in: 5e12e2134b user: stephan tags: trunk | |
| 12:03 | Ported in the non-debug-output part of upstream [fossil:9aaefcfd0a8746b63bad]. check-in: d58a4b6237 user: stephan tags: trunk | |
| 11:24 | Minor internal doc tweaks. check-in: 12c9022cbb user: stephan tags: trunk | |
| 08:57 | Ported in upstream diff changes [fossil:fbdbc09b402b19de] and [fossil:c311efef078c8733]. Diffing still seems to work. check-in: 93f03cf9ee user: stephan tags: trunk | |
|
2022-01-22
| ||
| 18:08 | Upstream diff fix [fossil:44b6f128453b35039bc2]. check-in: 6725e728d4 user: stephan tags: trunk | |
| 18:02 | Ported in upstream incremental diff tweaks from [fossil:f6112b93e9bbb7e37f24] except that many of the const removal changes are unnecessary and weren't ported. Made fsl_dibu::opt const. Probably should have waited to see if these will be trunked in fossil before going down this rabbit hole. check-in: 01225604ab user: stephan tags: trunk | |
| 14:27 | Removed the disabled, and fundamentally flawed, attempt at catching renames in f-vdiff. check-in: 4866db6ef5 user: stephan tags: trunk | |
| 14:26 | Ported in upstream diff patch [fossil:2dad4158dbf0d92b]. check-in: 5492222b8e user: stephan tags: trunk | |
|
2022-01-20
| ||
| 17:47 | Workaround for the Excessively Massive Diff bug (in f-vdiff, not the library) by reporting renames as an add/remove pair. Make the default split-mode diff content column widths wide enough for f-vdiff's current handling of how adds/removes are reported. check-in: 1960fea37a user: stephan tags: trunk | |
| 16:34 | Latest upstream fnc, which moves the former v1 libf diff code into fnc. check-in: ed78994d64 user: stephan tags: trunk | |
| 15:55 | Merged in rm-diff-v1. This will currently only build when using the --no-fnc configure flag, pending Mark trunking his related fnc changes, at which point that updated fnc will be pulled into this tree. Recursive relationships are tricky sometimes. check-in: 74d90fcdd8 user: stephan tags: trunk | |
| 15:53 | auto.def: distinguish between the --no-fnc flag and "don't use ncurses at all" so that the ncurses-based diff view can be built when fnc is disabled. check-in: eb5e8319b3 user: stephan tags: trunk | |
| 09:38 | Replace calls to the deprecated fsl_ckout_close(f) routine. Replace with fsl_close_scm_dbs(f). check-in: f876a65bef user: mark tags: trunk | |
| 08:54 | Remove deprecated diff v1 code as per /chat discussion. This removes all exclusive diff v1 library routines and data types in preparation for importing this implementation into fnc as per chat with Stephan. It is on a branch pending review in case any bits were missed or incorrectly purged. Closed-Leaf check-in: dbf0fb30dd user: mark tags: rm-diff-v1 | |
|
2022-01-16
| ||
| 07:40 | speeling check-in: a9b499a8de user: bch tags: trunk | |
| 06:44 | f-vdiff now actively checks whether it's being asked to diff ostensibly binary content and refuses to do so. check-in: 47413486d0 user: stephan tags: trunk | |
| 05:04 | Re-added subdir-inc.make (it's used by doxygen build). Updated a path to account for new hoster. check-in: 12e08213af user: stephan tags: trunk | |
|
2022-01-12
| ||
| 04:46 | Added another test for fsl_tkt_id_to_rids(). check-in: a8d5615853 user: stephan tags: trunk | |
| 03:36 | Initialized a couple vars which gcc 11 now incorrectly reports as possibly uninitialized. Sigh. check-in: 19607914ca user: stephan tags: trunk | |
|
2022-01-08
| ||
| 05:45 | Per /chat discussion, changed semantics of fsl_tkt_id_to_rids() to be able to handle an unambiguous ticket ID prefix. check-in: 2bdb6c668f user: stephan tags: trunk | |
| 03:56 | Replaced the fundamentally flawed fsl_tkt_id_to_blob() with fsl_tkt_id_to_rids(). check-in: 7b2cbb1669 user: stephan tags: trunk | |
|
2022-01-07
| ||
| 23:40 | Added fsl_deck_foreach(). check-in: 0741f4d194 user: stephan tags: trunk | |
| 19:06 | Added fsl_tkt_id_to_blob() for Brad. check-in: 7d64642d36 user: stephan tags: trunk | |
| 10:47 | difftk.tcl: increased default width of line number columns. Inexplicably, using this exact same code from fossil expands the columns dynamically but this implementation is not doing so. Disabled {} around f-vdiff TCL output except in tk mode, for compatibility with fossil's (diff -tcl) output. check-in: 37b6d8e11f user: stephan tags: trunk | |
| 06:28 | typo check-in: d069d8d19f user: bch tags: trunk | |
| 06:28 | reference fsl_deck_C_set() in comment-notes check-in: 70abc44543 user: bch tags: trunk | |
|
2022-01-04
| ||
| 22:02 | Added fsl_randomness(). Changed fsl_deck_K_set() semantics such that a NULL ticket ID is interpreted as a new (random) ID. check-in: 896ea2a01b user: stephan tags: trunk | |
| 21:38 | Replaced a couple remaining char-as-bool references with bool. check-in: 1ac20eeb41 user: stephan tags: trunk | |
| 17:15 | Merged in inadvertent fork [fc8fb3a392]. check-in: 9259168d71 user: stephan tags: trunk | |
| 17:01 | Latest upstream fnc. check-in: 1bdf40e928 user: stephan tags: trunk | |
| 17:00 | Experimentally applied the "small gap patch" to eliminate the so-called "lineno behavior" in the diff engine. See the copious comments in diff2.c for details. check-in: 2872db4659 user: stephan tags: trunk | |
| 04:54 | Corrected a newly-broken dependency on a newly-private API. check-in: fc8fb3a392 user: stephan tags: trunk | |
| 03:51 | Corrected the no-diff display case in the ncurses diff view. Minor doc and constness tweaks. check-in: e358ca5350 user: stephan tags: trunk | |
| 03:08 | ncurses diff view: add keybindings to jump to next/previous file in the diff list. check-in: aa723e9a15 user: stephan tags: trunk | |
| 00:44 | Minor doc tweaks. check-in: a7861ad0da user: stephan tags: trunk | |
|
2022-01-03
| ||
| 22:46 | More minor cleanups in the ncurses-related bits. check-in: 1332923f62 user: stephan tags: trunk | |
| 22:27 | Moved ncurses screen init/shutdown out of f-vdiff and into the the ncurses diff builder's start()/finally() methods. Cleaned up the ncurses-related public API, making most of it private. check-in: 1c19687346 user: stephan tags: trunk | |
| 21:30 | Renamed fsl_diff_opt to fsl_dibu_opt in fnc.c. check-in: ef858ebe4f user: stephan tags: trunk | |
| 21:16 | Renamed fsl_diff_opt to fsl_dibu_opt. Moved dibu-type-specific flags out of the FSL_DIFF2_ flags and into the new FSL_DIBU_ flags. Added fsl_dibu::pimplFlags, which are implementation-private flags distinct from fsl_dibu::implFlags, the latter now being the place to apply FSL_DIBU_ flags. check-in: be968bbac7 user: stephan tags: trunk | |
| 19:42 | Improved, but not perfected, f-vdiff's ability to report add/remove/rename in a dibu-friendly way (instead of via f_out(), which is incompatible with the ncurses and tcl dibus). check-in: 096b759623 user: stephan tags: trunk | |
| 19:41 | Added file hashes to the file index lines in the ncurses unified-ish diff view. check-in: 6e33c8e83c user: stephan tags: trunk | |
| 19:39 | Minor tinkering in as-yet-unused fsl_popen2(). check-in: 03868ff9d2 user: stephan tags: trunk | |
| 19:38 | Added a "hard cached" fsl_stmt for fsl_content_blob(), shaving a few allocs and a small bit of memory from a rebuild. check-in: a7de183cd0 user: stephan tags: trunk | |
| 17:21 | Ported in fossil's diff -tk script bits and implemented (f-vdiff --format tk) but the output currently goes to stdout instead of launching tclsh. The TCL dibu can optionally include the TK bits or not, depending on its flags. check-in: 82bf08414f user: stephan tags: trunk | |
| 16:39 | Minor build reorgs as part of integrating (fossil diff -tk)-ish feature. check-in: 574b521a2b user: stephan tags: trunk | |
|
2022-01-02
| ||
| 16:10 | Minor doc updates and code reformatting. check-in: 707fecabb9 user: stephan tags: trunk | |
| 15:50 | Removed a stray failed experiment from the previous checkin. check-in: dd432df69f user: stephan tags: trunk | |
| 15:18 | ncurses unified-ish diff view: implemented delete/insertion pair collapsing and made the colors configurable (more or less). check-in: ca112741c9 user: stephan tags: trunk | |
| 01:19 | Removed long-unmaintained f-apps/test.c. check-in: 72b398779b user: stephan tags: trunk | |
| 00:32 | Added FSL_OMIT_DEPRECATED #define to cause the deprecated APIs to be elided. Got core lib building that way. Removed FSL_EXPORT from functions declared in deprecated.h. check-in: b7046bf39b user: stephan tags: trunk | |
|
2022-01-01
| ||
| 15:07 | Latest upstream fnc client. check-in: cdbcddb1a1 user: stephan tags: trunk | |
| 15:05 | Reorganized (again) fsl_cx db handle management to eliminate the middle-man temp/in-memory db. check-in: a23126bc9f user: stephan tags: trunk | |
| 15:01 | Fixed a bogus assert in f-open.c. Closed-Leaf check-in: dcdaea2f1b user: stephan tags: cx-db-handle-reorg-redux | |
| 14:58 | More work on the db handle redux. Seems to work okay. check-in: 71f5f09817 user: stephan tags: cx-db-handle-reorg-redux | |
| 14:15 | Fixed a require.s2 module broken by db handle refactoring. check-in: 44fae8d76f user: stephan tags: cx-db-handle-reorg-redux | |
| 14:12 | s2 bindings: updated a test which can fail when running from a branch. Fixed a broken attempt to copy a NULL buffer trigered by that failing test. check-in: bc3c7b1737 user: stephan tags: cx-db-handle-reorg-redux | |
| 13:34 | fsl_cx db handle reorg redux, step one. Significantly simplifies how dbs are closed, always treating them as an inseparable pair. Basic sanity checks pass, but more testing is needed and lots of docs to update. check-in: fa7c56d0ca user: stephan tags: cx-db-handle-reorg-redux | |
| 11:15 | Renaming of some internal fsl_xyz... APIs to fsl__xyz... (two underscores). Minor constness tweaks. check-in: 736abef2cc user: stephan tags: trunk | |
| 10:53 | fsl_db_open() no longer automatically applies the create-if-not-exists flag to in-memory or anonymous temp dbs, as this was at the root of a great deal of confusion the past 24 hours. Documented the propagation behaviour of the CREATE flag from an OPEN'd db to other dbs ATTACHed via that handle. See [https://sqlite.org/forum/forumpost/76963f0026b6b12a], and its top-level post, for more details. check-in: ac15c8d1d4 user: stephan tags: trunk | |
| 02:03 | Minor cleanups in the fsl_db API. Updated fsl_db SQL tracing to the sqlite3_trace_v2() API. check-in: 89e932ce1a user: stephan tags: trunk | |
| 01:13 | More cleanups moving towards taking another whack at the fsl_cx db handle reorg. Added a test case to f-sanity.c demonstrating the ATTACH-cannot-create error (whereas the sqlite3 shell can create new files that way). check-in: 51d4b05f5c user: stephan tags: trunk | |
|
2021-12-31
| ||
| 22:19 | Ported over more general-purposes pieces from the cx-db-handle-reorg branch in prep for taking a fresh whack at that. check-in: 39645644a7 user: stephan tags: trunk | |
| 21:54 | Cherrypicked [6f2027aeb4], [74964a09a5], and part of [d290f6375c]. check-in: 211eaecfcf user: stephan tags: trunk | |
| 21:36 | Cherrypicked [74964a09a5] (doxygen tag fix). check-in: 326482e519 user: stephan tags: trunk | |
| 21:34 | Cherrypicked [6e8b5b6677] (f-test-ciwoco Makefile.in reference fix). <s>(But, interestingly, it didn't show up as a cherrypick merge because i made multiple individual commits and the first one cleared the vmerge state. Hmmm.)</s> Edit: actually, the cherrypick happened, and was correctly recorded, in [f3a4ba9472]. This checkin was completely empty and should not have gone through. Hmm. check-in: 31cc119d75 user: stephan tags: trunk | |
| 21:33 | Removed old/unused bindings/Makefile.in. check-in: 8632822dd0 user: stephan tags: trunk | |
| 21:33 | f-merge now defaults to wet-run mode. check-in: f3a4ba9472 user: stephan tags: trunk | |
| 21:30 | Extended fsl__cx_attach_role() to be able to create a new db if needed (required for fsl_repo_create()) but (regardless of this change) discovered that ATTACH, when run through the new fsl_cx::dbMain handle, can no longer create new db files, which means that f-open cannot create a checkout. COMPLETELY stumped as to why that is. Edit: closing because this branch is failing in inexplicable ways and has a horrid mix of branch-relevant and branch-irrelevant changes. Pulling in the branch-irrelevant ones separately into trunk before taking another whack at the branch-relevant ones. Closed-Leaf check-in: a67b757dc0 user: stephan tags: cx-db-handle-reorg | |
| 21:26 | Corrected recently-broken Makefile.in references in f-test-ciwoco. check-in: 6e8b5b6677 user: stephan tags: cx-db-handle-reorg | |
| 15:57 | Reorganized fsl_cx-internal DB handles, eliminating the in-memory/temp main db and (once again) using the first of the repo/checkout which is opened as the main db. Seems to work okay but some fallout would not be terribly surprising. (Edit: moving back to cx-db-handle-reorg because of new, inexplicable inability to create checkout db via ATTACH.) check-in: 46656edc7e user: stephan tags: cx-db-handle-reorg | |
| 15:50 | Corrected names of several @file doxygen tags. check-in: 74964a09a5 user: stephan tags: cx-db-handle-reorg | |
| 15:48 | Doc updates. Moved all @deprecated functions into fossil-scm/deprecated.h for later weeding-out. check-in: 6f2027aeb4 user: stephan tags: cx-db-handle-reorg | |
| 15:10 | Renamed fsl_db_role_label() to fsl_db_role_name(). Doc touchups related to the db handle restructuring. check-in: d290f6375c user: stephan tags: cx-db-handle-reorg | |
| 15:08 | Removed old/unused bindings/Makefile.in. check-in: 6409509264 user: stephan tags: cx-db-handle-reorg | |
| 15:00 | fsl_ckout_open_dir() now treats a NULL dir name as ".". Updated C++ and s2 bindings for the new db changes. check-in: 05c1da0fb0 user: stephan tags: cx-db-handle-reorg | |
| 13:47 | fsl_buffer_external() may now be passed a populated buffer, clearing it before re-initializing it. check-in: 9626c2acf6 user: stephan tags: trunk | |
| 13:34 | Removed hard-coding of main db journal_mode=WAL for the time being. We might want to set it depending on which db is main (WAL for repo, TRUNCATE or DELETE for checkout?). Or we might want to leave it alone entirely. check-in: 09287e3d13 user: stephan tags: cx-db-handle-reorg | |
| 13:29 | Eliminated fsl_cx::dbMem in-memory/temp db and (again) use the first of the repo/ckout dbs which is opened as the MAIN db (aliasing it to its well-defined libf schema name). This has a high potential for fallout, so it's in a branch pending more thorough testing. check-in: aebf241ab5 user: stephan tags: cx-db-handle-reorg | |
|
2021-12-30
| ||
| 13:52 | Removed some debug output added by the previous checkin. check-in: 75eab853b5 user: stephan tags: trunk | |
| 13:49 | Global config db now uses its own fsl_db handle, no longer ATTACHed with the repo/checkout handle. fsl_ckout_open_dir() now canonicalizes the passed-in directory name (simplifies usage). Added f-query -g/--config flag to query against the global config db. Various code-adjacent tweaks. check-in: 1d7a6d2b96 user: stephan tags: trunk | |
| 05:37 | Replaced f-apps fcli_setup() calls with fcli_setup_v2(). check-in: 313b59841e user: stephan tags: trunk | |
| 05:06 | Unified-mode diff builder: reformat runs of delete/insert pairs from a series of D/I/D/I... lines to DD.../II..., like fossil does. check-in: 8752aca1b7 user: stephan tags: trunk | |
|
2021-12-29
| ||
| 23:08 | Added missing commas in JSON diff builder Edit record output. check-in: 257ae0b684 user: stephan tags: trunk | |
| 22:58 | Add backspace and form-feed to the characters escaped in the previous commit. check-in: ae8e038bdb user: stephan tags: trunk | |
| 22:49 | appendf json formatting: emit tabs as \t instead of \u0009. check-in: 50ebe24a14 user: stephan tags: trunk | |
| 03:08 | f-viff --save-format now also saves/restores the --line-numbers flag, if set. check-in: fbbbdfe556 user: stephan tags: trunk | |
|
2021-12-28
| ||
| 20:32 | ncurses unified diff: line number columns now size dynamically to fit their digits. check-in: 4883bff8f7 user: stephan tags: trunk | |
| 14:48 | Partial workaroud for the adjacent-code-block cosmetic issue in the unified text diff builder, eliminating an extraneous separator line. It only applies when using line numbers (so not technically unified diff), but the problem is less glaring now. check-in: 08fdbacefa user: stephan tags: trunk | |
|
2021-12-27
| ||
| 22:34 | Added line number support to the ncurses unified-ish diff view. check-in: 962200c936 user: stephan tags: trunk | |
| 21:07 | Corrected a rare corner case error check in the previous checkin. check-in: 5cccd60c7f user: stephan tags: trunk | |
| 15:00 | When performing a fsl_db rollback, clear the associated fsl_cx's manifest- and blob-content caches in order to ensure that they do not contain any RIDs which are part of the being-rolled-back transaction. Remove fsl_cx::cache::deltaIds as it was determined that the recursion involving that cache could have broken things (but, rather curiously, had not done so thus far). Might want to revisit that cache someday and account for the new effective tail of the array on each recursion. check-in: 35dca27909 user: stephan tags: trunk | |
|
2021-12-26
| ||
| 13:45 | Constness tweaks. check-in: 006fbfb455 user: stephan tags: trunk | |
|
2021-12-25
| ||
| 21:20 | This time tapped save before checking in. check-in: 1c6b8edc69 user: stephan tags: trunk | |
| 21:19 | Removed a resolved TODO comment. Added another comment about diffing of immediately-adjacent diff blocks. check-in: 6c943dc141 user: stephan tags: trunk | |
| 16:07 | Help text typo and removed unnecessary header. check-in: 43601bc8ab user: stephan tags: trunk | |
|
2021-12-24
| ||
| 12:47 | Refactoring and layout/navigation improvements in the unified-ish ncurses diff view. check-in: e76a139a12 user: stephan tags: trunk | |
|
2021-12-23
| ||
| 14:00 | Fixed a bit of a braindead bug in the %s appendf specifier which caused exponential strlen counting on the fsl_diff_v2() internals. This went unnoticed until Mark fed it a huge diff and the diff time went from a small fraction of a second to a minute or more. check-in: c6b3279322 user: stephan tags: trunk | |
| 07:46 | Added a missing result code check in fsl_cidiff(). Added --save-format flag to f-vdiff to tell it to persist the current diff format as its future default. check-in: d80e895807 user: stephan tags: trunk | |
| 07:14 | Cleaned up non-undefined macros which broke the amalgamation build. check-in: 6ecdbab284 user: stephan tags: trunk | |
| 07:01 | Added fsl_cidiff() API and f-test-cidiff test app. check-in: 1c6aeaf5ce user: stephan tags: trunk | |
| 03:57 | Renamed fsl_diff_builder to fsl_dibu. Sounds nicer and the older name is annoyingly long when used as a namespace/prefix. check-in: e9ec078844 user: stephan tags: trunk | |
| 03:53 | Diff format typo fix. check-in: 9fb6fae4f8 user: stephan tags: trunk | |
|
2021-12-22
| ||
| 13:41 | Integrated the ncurses unified-ish build into f-vdiff. check-in: 644d551cb4 user: stephan tags: trunk | |
| 12:46 | split the ncurses diff builder into its own source and header for eventual integration into f-vdiff and f-adiff. check-in: 84239c8219 user: stephan tags: trunk | |
| 10:14 | Added optional fsl_diff_builder::finally() method and apply it in the ncurses diff builder to add an end-of-diffs marker at the bottom of the final file. check-in: 5ec5077ca0 user: stephan tags: trunk | |
| 09:32 | Corrected max pad width calculation caused by swapped args. check-in: 2c2ab0cdb3 user: stephan tags: trunk | |
| 09:19 | More tinkering with the ncurses diff builder. check-in: e67957a38f user: stephan tags: trunk | |
| 08:18 | Squelched unused var warning. check-in: da7d9c722e user: stephan tags: trunk | |
| 08:15 | Minor cleanups in the ncurses diff builder. Fixed an off-by-one width calculation. check-in: 4c34723bb7 user: stephan tags: trunk | |
| 07:50 | ncurses diff builder ported to unified diff format and added horizontal scrolling. check-in: 6aad850343 user: stephan tags: trunk | |
| 05:59 | ncurses diff: fixed displaced attributes on the top status line. check-in: 8e94a46455 user: stephan tags: trunk | |
| 05:53 | ncurses diff builder: got basic vertical scrolling working. check-in: 95dbf8ebf9 user: stephan tags: trunk | |
| 04:51 | Fixed some non-curses output when in curses mode. Added a please wait message at startup because it's awful slow on a pi zero. check-in: b4ff15d5bc user: stephan tags: trunk | |
| 04:30 | Initial prototype/proof-of-concept for a diff builder which renders to an ncurses PAD. A stepping stone towards adding scrollable diffs to fnc. check-in: 7ee366de74 user: stephan tags: trunk | |
|
2021-12-21
| ||
| 22:10 | fsl_ckout_manage() now silently skips any directories which appear to be nested checkouts. Extended fsl_dircrawl_f() callback semantics to support skipping recursion into a dir but continuing to dir-crawl. check-in: 3f48c073cf user: stephan tags: trunk | |
| 20:38 | Corrected f-apps broken by previous checkin. check-in: 5427afd00d user: stephan tags: trunk | |
| 20:21 | Removed the fossil- name prefix from include/fossil-scm/*.h. check-in: 43a9bea8d5 user: stephan tags: trunk | |
| 19:48 | Build tweaks for the include/... bits. check-in: de1b5498cb user: stephan tags: trunk | |
| 19:43 | Minor doc touchups. check-in: 344f51c014 user: stephan tags: trunk | |
| 15:18 | Resolved a couple of semantics collisions between fsl_diff_flag_e and fsl_diff2_flag_e entries. check-in: 956162a6b1 user: stephan tags: trunk | |
| 14:54 | Added fsl_ckout_dbnames() and fsl_is_top_of_ckout(), prompted by recent fossil forum traffic. check-in: 7a9a409695 user: stephan tags: trunk | |
| 14:17 | The deps fix which [7fa0dff2747229ff] was supposed to be but, it turns out, wasn't. check-in: 7f9b8b4993 user: stephan tags: trunk | |
| 13:10 | Expanded the fsl_ckout_manage() callback interface analog to the new fsl_ckout_unmanage() changes. check-in: c00159a925 user: stephan tags: trunk | |
| 12:44 | f-rm now tries to non-fatally report, in verbose mode, if unlinking of a file fails. check-in: 88ebea4673 user: stephan tags: trunk | |
| 12:34 | Expanded fsl_ckout_unmanage()'s callback interface to facilitate client-side unlinking of newly-unmanaged files. Added f-rm --unlink option. check-in: 9be228a605 user: stephan tags: trunk | |
| 12:32 | Seem to have resolved a weird deps generation problem which causes build to fail. check-in: 7fa0dff274 user: stephan tags: trunk | |
| 12:16 | Added missing f-apps/GNUmakefile. check-in: 054cb0a7bf user: stephan tags: trunk | |
| 08:28 | Moved fossil-scm/fossil.h to ../libfossil.h so that client code can build from both the canonical tree and amalgamation using the same include name. check-in: 76d6359435 user: stephan tags: trunk | |
| 07:23 | Removed 'undefine' calls from GNUmakefile because undefine doesn't work with gmake 3.81. check-in: 22315ea459 user: stephan tags: trunk | |
| 07:20 | Removed now-broken reference to Makefile in auto.def. check-in: 1d29764382 user: stephan tags: trunk | |
| 06:58 | Overhauled the build system to use (for the most part) a single top-level makefile, with each significant subdir in its own sub-makefile. This improves parallel buildability tremendously but doesn't gain much speed on a 4-core intel i3-based system. The doc/ and bindings/s2 dirs still use the older makefiles for the time being. check-in: 5c7c8ba69e user: stephan tags: trunk | |
| 06:54 | Minor cleanups in the top-level makefile in prep for merge to trunk. Closed-Leaf check-in: 345150d88e user: stephan tags: toplevel-make | |
| 06:23 | Renamed doc/Makefile to doc/GNUmakefile. check-in: 8abd9a209c user: stephan tags: toplevel-make | |
| 06:05 | More cleanups in the top-level makefile and shakenmake. check-in: 4c4af00081 user: stephan tags: toplevel-make | |
| 05:45 | Renamed the various stub Makefiles to GNUmakefile for consistency with the top-level makefile. check-in: d489b0a596 user: stephan tags: toplevel-make | |
| 05:32 | More improvements in support of building/cleaning only the being-worked-on subdir. check-in: ac82ba5810 user: stephan tags: toplevel-make | |