Login
Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

50 most recent check-ins that include changes to files matching 'include/fossil-scm/*'

2024-04-16
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:07
Add support for binary-format SEE keys. check-in: b35914490e 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
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-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
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
2023-11-21
18:01
Remove some (admittedly justified) rough language from config.h. check-in: fab3d8f252 user: stephan tags: trunk
2023-04-26
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: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-19
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
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-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
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-10-18
13:50
Merge in trunk. Leaf check-in: 24a840f9cf user: stephan tags: dev-blame-ignore
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-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
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
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
07:03
Make sure that #defines for prototypical "empty" structs are complete. check-in: 029c225df6 user: bch 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
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-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
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: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-03-10
04:50
Minor constness tweaks and removed a superfluous NULL arg check. check-in: 420a8985e1 user: stephan tags: trunk