Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
35 check-ins using file src/diff2.c version d33c1aaed5
|
2021-12-15
| ||
| 04:21 | More work on merge and adjacent code. Changed how fsl__ckout_clear_merge_state() works to attempt to enable partial reset when individual to-be-merged files are reverted. Whether the corresponding SQL is 100% semantically correct for the vmerge state remains to be seen, but so far, so good. See [https://fossil-scm.org/forum/forumpost/f678085f79] for the discussion about those bits. check-in: 4d88f6cbd6 user: stephan tags: trunk | |
| 00:42 | More work on the merge API. Time for work. check-in: 8fa60bfe38 user: stephan tags: trunk | |
|
2021-12-14
| ||
| 23:08 | First-ever fsl_ckout_merge() test worked, but there's still lots of testing and client status callback support to add to fsl_ckout_merge(). Added vmerge state to f-status/fcli_chkout_show_info() output. check-in: 9e719cffc5 user: stephan tags: trunk | |
| 22:43 | Latest upstream fnc to account for signature change of fsl_cx_is_case_sensitive(). check-in: fc61a0e2bd user: stephan tags: trunk | |
| 15:52 | More work on the merge port and adjacent code. check-in: b9c2a05cfe user: stephan tags: trunk | |
| 11:19 | Added fsl_file_copy(), fsl_symlink_read(), and fsl_file_isexec() as part of the merge op effort. Expanded fsl_file_tempname() to be able to accept a NULL list of directories in order to return just the name without a directory prefix. check-in: 6dca54dfde user: stephan tags: trunk | |
| 09:16 | Minor allocation optimization and tweak to how the filename prefix is applied in fsl_file_tempname(). check-in: b89b9e0058 user: stephan tags: trunk | |
| 08:55 | Ported in a variant of the temp-filename generation bits from fossil because it's needed for the next merge steps. check-in: dd3acff665 user: stephan tags: trunk | |
| 05:23 | More work on the merge API port. Still lots to do. check-in: 7d626b574d user: stephan tags: trunk | |
| 04:17 | Tweaks to the return semantics of fsl_db_exec() and fsl_stmt_step(). Doesn't/shouldn't affect any existing code. Added a test to ensure that fsl_stmt_step() behaves as expected in the face of a RETURNING clause. check-in: ad7ef26207 user: stephan tags: trunk | |
|
2021-12-13
| ||
| 06:15 | Minor code modernization in the still-far-from-complete merge code. check-in: d77e495227 user: stephan tags: trunk | |
| 03:52 | Merge in port-merge branch for further merge development - keeping this in a separate branch is unnecessary and is getting annoying. There's still plenty of work to do on the merge port. check-in: 63fe74d7f3 user: stephan tags: trunk | |
|
2021-12-11
| ||
| 07:34 | Minor internal cleanups in f-repostat.c check-in: 5a99011c5b user: stephan tags: trunk | |
|
2021-12-10
| ||
| 12:11 | As a special case, fsl_file_simplify_name() now always resolves to '/' if its input resolves to that, regardless of whether or not it is told to retain a trailing slash. The alternative would be to resolve to an empty string if it were told to strip the trailing slash for that case. check-in: 3ad71dbc66 user: stephan tags: trunk | |
| 11:35 | Fixed bug which caused fsl_file_simplify_name() to not honor its trailing backslash policy. check-in: 14fffb4e82 user: stephan tags: trunk | |
| 07:01 | Typo fix. check-in: 2b2b8c3ac9 user: stephan tags: trunk | |
| 06:49 | Wrapped f-repostat work in a transaction to avoid a minuscule corner case where another app changes the stats as they're being read. Made use of the percent-z fsl_appendf() specifier to remove a few explicit fsl_free() calls. check-in: 48d30b38a6 user: stephan tags: trunk | |
| 04:32 | Added missing status and quick-check to f-repostat. Missing only full integrity check (requires porting (fossil test-integrity)). check-in: a6ba4b4444 user: stephan tags: trunk | |
| 04:08 | Initial version of f-repostat, analog to (fossil dbstat). Some adjecent constness cleanups. check-in: 4926ae9b31 user: stephan tags: trunk | |
|
2021-12-08
| ||
| 08:17 | Minor doc updates. Changed the main db journal mode to TRUNCATE because OFF apparently leads to undefined behaviour when ROLLBACK is used (something we do often, e.g. to implement dry-run mode). check-in: a1b9594aec user: stephan tags: trunk | |
| 07:04 | Cherrypicked inadvertent checkin to the wrong branch via /fileedit. check-in: 6dddf8537b user: stephan tags: trunk | |
| 07:02 | Minor doc touchups Closed-Leaf check-in: e9c9fccc7f user: stephan tags: port-merge | |
| 06:55 | Merged in trunk. Kinda funny that f-ci can check in a merge but we don't yet have f-merge to actually create a merge. check-in: 49e14934d8 user: stephan tags: port-merge | |
|
2021-12-06
| ||
| 03:42 | Ported in line numbers in merge conflict markers from [fossil:14f44e933c0c0c2c | fossil checkin 14f44e933c0c0c2c]. check-in: 3e58eea1f3 user: stephan tags: trunk | |
| 02:33 | Minor help text and API doc cleanups. One minor allocation optimization in fsl_repo_rebuild(). check-in: 17a7f5cf12 user: stephan tags: trunk | |
|
2021-12-04
| ||
| 07:39 | Internal restructuring of crosslink callback handling, such that registered listeners are called at a later phase for ticket artifacts. This should allow client-side listeners to overwrite timeline entries for tickets without too much hassle (that wasn't possible at all before this change). check-in: 8349911eb6 user: stephan tags: trunk | |
| 06:36 | (Finally) implemented ticket crosslinking. check-in: d8e8c16cc4 user: stephan tags: trunk | |
|
2021-12-03
| ||
| 09:33 | s2 binding: extended Fossil.Db.each() to take a target array as a form of callback, appending each row to the target. check-in: 1c591b1ffc user: stephan tags: trunk | |
| 09:03 | More tinkering with the s2 binding, getting older scripts working again. check-in: 5ea356ab81 user: stephan tags: trunk | |
| 08:36 | Minor internal cleanups and costness tweaks. check-in: 8541d31570 user: stephan tags: trunk | |
| 07:39 | Tinkering with the s2 binding to get tests working after removal of the various db handles. check-in: 93a66791fe user: stephan tags: trunk | |
| 06:52 | SQL UDFs fsl_content() and fsl_sym2rid() now match any blob type, not just checkins. That they did not already do so was a bug. check-in: 624a9a175a user: stephan tags: trunk | |
| 06:23 | Moved most of the fsl_cx-specific code out of fsl_db and into the new src/udf.c. check-in: 84a59c6833 user: stephan tags: trunk | |
| 05:15 | Drastically simplify the s2 fsl_cx db mappings, exposing only the main db handle instead of separate repo/checkout/config handles. It was severely over-engineered and this approach will allow us to more easily eliminate the middle-man main db handle in the lib if we end up choosing to do so. check-in: 8ac418df2e user: stephan tags: trunk | |
| 04:49 | Removed a large swath of assigned-but-unused code in the v1 HTML sbs diff generator, as detected by clang 13. Reported by Mark via /chat. check-in: 5a433bf878 user: stephan tags: trunk | |