Login
Timeline
Login

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

43 check-ins using file include/fossil-scm/core.h version 91ab44a194

2024-04-16
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: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-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