Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
86 check-ins using file client/fnc/settings.h version d645d60d2a
|
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: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 | |