Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
50 events occurring around 150bb5b77ce86be2.
|
2021-10-09
| ||
| 05:35 | Experimentally added provisions for color coding using ANSI escape sequences to the fsl_diff_opt interface and applied it to the v2 unified and split diff views. The interface for this is subject to change. check-in: b462692d92 user: stephan tags: trunk | |
| 03:57 | Minor diff builder API renaming. Switched f-vdiff to use the diff builder API. Deprecated the fsl_diff_text() (v1) diff API, but have no short-term plans to remove it. check-in: ea96c7c987 user: stephan tags: trunk | |
| 03:04 | Latest upstream fnc.c, adapted for changes made to the library earlier tonight. check-in: 072d639651 user: stephan tags: trunk | |
| 02:57 | More diff builder-related docs. Added diff-skip lines to the split-diff output and made that diff builder always emit line numbers. check-in: 32c14ba175 user: stephan tags: trunk | |
|
2021-10-08
| ||
| 23:30 | Initial impl of text-mode split (side-by-side) diff. check-in: 6e55183b23 user: stephan tags: trunk | |
| 21:51 | Moved from code from f-vdiff into the public API. Several fixes in f-vdiff. check-in: 39180d2fe8 user: stephan tags: trunk | |
| 20:03 | • Post: Proposal/RFC: Makefile reorgs artifact: a85015dfb7 user: stephan | |
| 19:55 | • Changes to wiki page "building" artifact: 73876b9817 user: stephan | |
| 19:46 | Fixed a NULL deref in the diff code when one version of a file being diffed does not exist (e.g. when diffing a new file against a non-existent prior version). This fixes a segfault when fnc is asked to diff a checkin which contains a new file. check-in: 6aac145a22 user: stephan tags: trunk | |
| 18:20 | Added more makefile-style patterns to editorconfig. check-in: 92022044d9 user: stephan tags: trunk | |
| 18:15 | Added .editorconfig. check-in: cf791eca0b user: stephan tags: trunk | |
| 03:56 | Added f-annotate to the list of installed f-apps. check-in: 3633f30572 user: stephan tags: trunk | |
| 03:55 | Latest upstream fnc.c. check-in: 4df3ad2d82 user: stephan tags: trunk | |
| 03:15 | Added an #if to protect a var made unused by the previous checkin. check-in: acbd39275f user: stephan tags: trunk | |
| 02:58 | Build: delay build of libfossil.c/h/o until needed. Disabled inclusion of the as-yet-unused regexp sqlite3 module because of mysterious link errors triggered by the build reordering. check-in: a5fa64f558 user: stephan tags: trunk | |
|
2021-10-07
| ||
| 04:14 | Updated f-apps/index.md for f-annotate. check-in: 975dccb1ce user: stephan tags: trunk | |
| 04:13 | • Changes to wiki page "FossilApp" artifact: b4b4fa70b7 user: stephan | |
| 03:36 | • Changes to wiki page "TODOs" artifact: bd2ec21ced user: stephan | |
| 03:34 | Merged in annotate feature branch and fixed horrible diff calculation bug. check-in: e3d91a7fed user: stephan tags: trunk | |
| 03:28 | Remove all but -R and -V short form global options. To avoid collisions with app code, restrict global options to long-form, with the exception of the abovementioned two common options as discussed in /chat. check-in: 6d2c463307 user: mark tags: trunk | |
| 03:27 | Resolved the mind-numbing diff problem, caused by having used an (unsigned int) where a uint64_t was needed for the fsl_dline::h member (hash value overflow led to mismatches between this impl and fossil's). Annotate, at least in its basic form, now works (testing with ignoring whitespace and such is pending). Closed-Leaf check-in: e456c5ab39 user: stephan tags: port-annotate | |
| 02:02 | Eliminated some extraneous diff-internal code. check-in: 32ba71065d user: stephan tags: trunk | |
| 01:55 | Merged inadvertent fork. check-in: 81a7b3af8a user: stephan tags: trunk | |
|
2021-10-06
| ||
| 23:21 | Have narrowed down the source of the annotation difference (as it were) to the lower-level diff code, but _why_ libf is getting different results from fossil there (unless we force _both_ to do optimal matching on all diffs) is still a complete mystery. check-in: 0e55962dc9 user: stephan tags: port-annotate | |
| 21:23 | Initial port of annotate/praise op is working but final results differ considerably from fossil's, so leaving it in a branch for now. The selected range of versions match, but the end results do not. check-in: 150bb5b77c user: stephan tags: port-annotate | |
| 16:18 | fsl_ckout_fingerprint_check() now returns 0 if no checkout is opened. check-in: 1fb9a31f45 user: stephan tags: trunk | |
| 16:07 | Add a few errno error codes to fsl_errno_to_rc(). check-in: 12ce7c1243 user: mark tags: trunk | |
| 14:53 | Latest upstream sqlite3 amalgamation. check-in: dfcc431208 user: stephan tags: trunk | |
|
2021-10-03
| ||
| 15:19 | • Changes to wiki page "TODOs" artifact: 516cfb2c9e user: stephan | |
| 09:04 | Fixed a segfault in f-zip when trying to zip an unnamed project. Fixed fsl_repo_manifest_write() to not require an opened checkout so long as it is given an RID to work with. check-in: b7282cdbdc user: stephan tags: trunk | |
|
2021-10-02
| ||
| 20:16 | • Changes to wiki page "TODOs" artifact: 311a15a9d2 user: stephan | |
| 19:52 | • Changes to wiki page "TODOs" artifact: 4acf16a677 user: stephan | |
| 18:39 | Expanded fsl_vpath_shortest_store_in_ancestor()'s interface a bit. check-in: 8ad0b44715 user: stephan tags: trunk | |
| 18:21 | Minor simplification of a bit of the previous checkin. check-in: d3d618d140 user: stephan tags: trunk | |
| 18:12 | More work on the annotate interface, plus far too many nearby-yet-unrelated tweaks such as costness changes. check-in: b601f20cff user: stephan tags: trunk | |
| 14:11 | Started work on the annotate/praise/blame interfaces but they're not yet even remotely implemented. check-in: 434ede2046 user: stephan tags: trunk | |
| 14:06 | Some diff API renaming. Fixed a bit of memory corruption (overwriting of part of a struct) in the tcl-format diff builder. check-in: 3fc18938fd user: stephan tags: trunk | |
| 04:04 | Corrected install path for man pages: PREFIX/share/man instead of PREFIX/man. check-in: 1b1d755e76 user: stephan tags: trunk | |
|
2021-10-01
| ||
| 18:00 | Minor tinkering with the new diff API. check-in: a8ac65d267 user: stephan tags: trunk | |
| 16:31 | Minor fixes to address gcc-11 errors discussed in chat. Check a set but unused variable in the new diff implementation, and fix arguments with mismatched bound in the md5 code. check-in: a161c58256 user: mark tags: trunk | |
|
2021-09-28
| ||
| 03:07 | Added line number support to the unified diff builder. Adjacent tinkering. check-in: eddb657374 user: stephan tags: trunk | |
|
2021-09-27
| ||
| 19:39 | Minor tcl diff output cleanups. check-in: 0cce2e5e25 user: stephan tags: trunk | |
| 19:19 | Implemented the tcl-generating diff builder, but just the actual diff output. Adding the fossil-side diff.tcl wrapper for it is TODO. check-in: ec81b8c45b user: stephan tags: trunk | |
| 17:50 | diff builder: some API renaming. Unified diff now elides the Index line until it's toggled on with a flag. Doc improvements. check-in: 16d03d5f00 user: stephan tags: trunk | |
| 14:58 | Found a seemingly agreeable workaround for the unified diff format chunk header disagreement with the diff builder driver algo. Doc improvements. Renamed several diff builder methods. check-in: cb7851a865 user: stephan tags: trunk | |
| 02:11 | diff-builder-based unified diff now mimics fossil's non-diff-builder-based unified diff except that this one adds an Index line (feature or bug?), but to do this we had to bypass what _appears_ to be purely cosmetic feature of the diff-builder approach which merged blocks which have a gap equal to or smaller than the diff context size. How best to resolve that is as yet unclear. check-in: a192f3e814 user: stephan tags: trunk | |
|
2021-09-26
| ||
| 22:56 | Seem to have gotten unified text diff _mostly_ working with the diff builder interface, though it required extending that interface a bit. We're still outputing more context than fossil does, for as-yet-unknown reasons, but the suspected off-by-one mentioned in the last commit was solved (it was not an off-by-one, but misuse of comparison routine results in fsl__diff_optimize()). check-in: 103399cdf7 user: stephan tags: trunk | |
| 22:43 | Sigh. A facepalmy fix for the facepalmy fix at [c7a1d658fd]. check-in: 6f09ed4a26 user: stephan tags: trunk | |
| 19:15 | Started work on a text-mode unified diff fsl_diff_builder, but it seems that the interface cannot support that one (as distinct from an HTML-mode unified diff). It turns out that fossil(1) uses the older-mode diff code for that case, duplicating much of the function which drives the fsl_diff_builder. These bits are #if'd out for now, but related adjacent changes are also in this checkin. check-in: 930e2b9c78 user: stephan tags: trunk | |
| 16:32 | Ported over, but have only lightly tested, fossil's JSON-format diff builder. check-in: 14267d8d3a user: stephan tags: trunk | |