Fossil

Timeline
Login

Timeline

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

47 check-ins tagged with "diff-color-enhancements"

2021-09-05
00:33
Fix a harmless compiler warning from previous check-in. ... (Closed-Leaf check-in: bcd3e80f20 user: drh tags: diff-color-enhancements)
00:31
A new, faster algorithm for alignment of rows in a change block. ... (check-in: 71759ef5bf user: drh tags: diff-color-enhancements)
2021-09-04
19:45
Add the test-line-hash command for use in debugging and analyzing the match_dline() functions. ... (check-in: 6a2bfba43d user: drh tags: diff-color-enhancements)
16:51
If unable to get good alignment between two diff block, try merging the current diff block with the subsequent diff block, if it is nearby. ... (check-in: 45c91a6670 user: drh tags: diff-color-enhancements)
16:22
Fix incorrect xReplace method in the --tcl formatter. ... (check-in: 2e583d2a2c user: drh tags: diff-color-enhancements)
15:00
Fix the SKIP display for --tk diffs. ... (check-in: 581d3f8d88 user: drh tags: diff-color-enhancements)
10:38
Fix diff.js so that it does not limit the width of unified diff <pre> elements. ... (check-in: 723ce36ddb user: drh tags: diff-color-enhancements)
10:27
Fix the blob_append_tcl_literal() routine to escape carriage-return characters (U+000d). Possible fix for the problem reported at [forum:/forumpost/390440e9793bfef7|forum post 390440e9793bfef7]. ... (check-in: b4c961e8fb user: drh tags: diff-color-enhancements)
2021-09-03
23:39
Add chunk numbers to each row of the diff output for HTML diffs. ... (check-in: 8caab6155e user: drh tags: diff-color-enhancements)
23:00
Draw a thin box around diffs in the default skin (per [forum:/forumpost/a42aade32dd9d42|forum post a42aade32dd9d42]). Show ellipsis at the tops and bottoms of files, if warranted. Fix a problem with "diff.js" that was failing to link all scrollbars associated with a single diff. ... (check-in: 63a5c754fd user: drh tags: diff-color-enhancements)
22:49
Improved alignment of partial line diffs. More work to be done in this area. Also fix a problem in diff.js that was causing problems when comparing two empty files. ... (check-in: 24d28cb7c9 user: drh tags: diff-color-enhancements)
18:45
Refactor the name of the sub-line change detection object. ... (check-in: 3e08b15858 user: drh tags: diff-color-enhancements)
17:51
Escape [, \, and ] characters when quoting TCL strings. ... (check-in: fd2d27f01b user: drh tags: diff-color-enhancements)
14:33
Add the test-line-diff command for testing the oneLineChange() routine of the diff logic. ... (check-in: 0755a81bb5 user: drh tags: diff-color-enhancements)
14:05
Adjust CSS to show blue change text for the --by option. ... (check-in: 4381c7ea8c user: drh tags: diff-color-enhancements)
13:39
First attempt at documenting the new diff web layout. ... (check-in: 07d28ec886 user: drh tags: diff-color-enhancements)
12:33
Restore the blue color for changed text in side-by-side diffs. ... (check-in: 00b5e02ab2 user: drh tags: diff-color-enhancements)
12:23
Merge recent trunk enhancements into the diff-color-enhancement branch. ... (check-in: 17dde4c75b user: drh tags: diff-color-enhancements)
11:51
Adjust diff colors in all skins. ... (check-in: 3910360677 user: drh tags: diff-color-enhancements)
2021-09-02
23:43
Delete a bunch of obsolete side-by-side diff code. ... (check-in: 9f3d89612a user: drh tags: diff-color-enhancements)
22:44
Delete unused legacy context-diff logic for HTML. ... (check-in: 1fb022ff98 user: drh tags: diff-color-enhancements)
22:28
Improved comments on the diff formatter and related logic. ... (check-in: d29ddba321 user: drh tags: diff-color-enhancements)
19:38
New format for JSON diff output. Promote the "test-diff" command to "xdiff", retaining the older spelling as a backup for compatibility. ... (check-in: b051102272 user: drh tags: diff-color-enhancements)
18:44
Better control over the blue/red/green colors in the --tk TCL code. ... (check-in: 1df8b9d773 user: drh tags: diff-color-enhancements)
16:15
Fix line numbers off-by-one in --tk display. ... (check-in: b3e1fd9ff4 user: drh tags: diff-color-enhancements)
14:25
Various improvements and bug fixes to the new diff logic. ... (check-in: 10f736f04f user: drh tags: diff-color-enhancements)
10:09
Get the --tk option working with the new --tcl format. ... (check-in: 63610f3f27 user: drh tags: diff-color-enhancements)
09:19
Add the --tcl format option to the diff commands. The plan is to use this to implement --tk (in place of --html -y) but that part is not yet implemented. ... (check-in: e933d5d731 user: drh tags: diff-color-enhancements)
2021-09-01
19:53
First attempt to generate side-by-side diffs using the new formatter. This breaks the --tk option. The "fossil diff -b" and "--by" work, but side-by-side diff on /info pages and similar is currently busted. CSS is simplified, which means that skins will need to be modified. This is an incremental check-in. ... (check-in: 4cd8a743cd user: drh tags: diff-color-enhancements)
15:38
Further improvements to unified diff. Simplified CSS that can be used in common with split diff. Separate columns for each line number and the change mark. ... (check-in: ce856a8614 user: drh tags: diff-color-enhancements)
2021-08-31
22:43
Tweaks to diff formatting. ... (check-in: 598d7736e7 user: drh tags: diff-color-enhancements)
13:33
Improvements to the new unified diff algorithm. ... (check-in: 2a256a4cce user: drh tags: diff-color-enhancements)
03:00
An attempt to rework HTML unified diff to show partial line matches. Still needs CSS work. ... (check-in: a01e46d85e user: drh tags: diff-color-enhancements)
2021-08-30
22:39
Merge fixed from trunk into the diff-color-enhancements branch. ... (check-in: 06a4494e01 user: drh tags: diff-color-enhancements)
16:40
Fix handling of backslash and tab in quoted JSON text for the --json option. ... (check-in: 9a30e83d88 user: drh tags: diff-color-enhancements)
15:03
Add the experimental JSON diff output format. ... (check-in: 5d759da711 user: drh tags: diff-color-enhancements)
14:23
Fix --debug diff output for multi-byte UTF-8. ... (check-in: 9191ea9e63 user: drh tags: diff-color-enhancements)
13:55
In the "diff --debug" output show the regions of change. ... (check-in: 4b8f203f5d user: drh tags: diff-color-enhancements)
12:00
Code and comment cleanup. Fixes to the new formatDiff() routine related to block alignment. ... (check-in: 16a2364f36 user: drh tags: diff-color-enhancements)
02:36
Corrections to line counting in the formatDiff procedure that drives the DiffBuilder object. Remove the test-rawdiff command and substitute and undocumented --raw option on the various diff commands. ... (check-in: 5e70c3ff96 user: drh tags: diff-color-enhancements)
2021-08-29
22:55
Demonstrate the concept of a generic DiffBuilder object. ... (check-in: 6e8d87b398 user: drh tags: diff-color-enhancements)
2021-08-28
15:47
Merge trunk fixes into the diff-color-enhancements branch. ... (check-in: e696aa705c user: drh tags: diff-color-enhancements)
00:46
Performance optimization. Now faster than trunk. ... (check-in: 2cb7f2f9d1 user: drh tags: diff-color-enhancements)
00:13
Side-by-side diff coloration now appears to be technically correct, though further improves are needed to optimize for human perception, and for performance. ... (check-in: 6ed7541472 user: drh tags: diff-color-enhancements)
2021-08-27
21:11
Additional work on improved diff. Incremental check-in. Still not working right. ... (check-in: 4fea7cc0ca user: drh tags: diff-color-enhancements)
16:48
Coloring on side-by-side diffs allows up to 8 separate segments of change. Incremental check-in - not everything is working correctly. ... (check-in: 925399da07 user: drh tags: diff-color-enhancements)
14:01
Clean up the data structures associated with adding color to diffs in preparation for attempts to improve the coloration. ... (check-in: 8c619bf278 user: drh tags: diff-color-enhancements)