Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
40 check-ins using file src/diff.js version 3fe31f5122
|
2021-09-07
| ||
| 21:32 | Re-added the file-toggle checkboxes to the diff views which were disabled via recent refactoring. check-in: cf4b9fbd9c user: stephan tags: trunk | |
| 21:12 | json API: removed reference to recently-removed DIFF_CONTEXT_MASK. check-in: 0c496d8ad3 user: stephan tags: trunk | |
| 19:15 | On the /jtext page, terminate the JSON array early if there are insufficient lines of text in the file to complete the request. check-in: 6f5dfd9d80 user: drh tags: trunk | |
| 19:09 | Add the /jtext webpage, intended for use by XHR. check-in: 5f7fcbabf0 user: drh tags: trunk | |
| 18:45 | When HTML diffs are generated from a webpage, include sufficient information in class names ids, and data- elements to permit JS to redraw the separators to include context fill-in buttons. check-in: c275a166b3 user: drh tags: trunk | |
| 17:11 | Fix the diff block alignment so that it correctly suppresses unnecessary diff marks, even when in ignore-whitespace mode. check-in: 85ca2fe5b5 user: drh tags: trunk | |
| 16:06 | Further simplification of the DiffConfig object by splitting out the lines of context and column width values from the diffFlags vector into separate columns. There should be no user-visible changes in behavior. check-in: ca6fa4b2f3 user: drh tags: trunk | |
| 13:29 | Take advantage of the new pBlob==NULL capabilities in blob_appendf() to simplify some of the diff logic. check-in: 590e01dbdd user: drh tags: trunk | |
| 12:51 | Enhance the blob_append(), blob_appendf(), blob_append_char(), and similar interfaces such that if the Blob pointer in the first argument is NULL, the result is written directly to stdout. check-in: 3a561322ca user: drh tags: trunk | |
| 12:18 | Simplify the interface to the internal diff_file() routine. check-in: db034a5a6c user: drh tags: trunk | |
| 11:40 | Bring back the diff command option `-N|--new-file' as an alias for `-v|--verbose' for script compatibility. check-in: 4ef3ba374c user: florian tags: trunk | |
| 10:42 | Minor fix to adapt the `append_diff_javascript()' function and its call points to the new diff logic (already partially done with check-in [1347a1ddb9]). check-in: f9761abb6a user: florian tags: trunk | |
| 00:18 | Move more diff parameters into the DiffConfig object. check-in: 346de5d122 user: drh tags: trunk | |
|
2021-09-06
| ||
| 22:26 | Internally, use the new DiffConfig object to pass around diff settings, rather than the legacy u64 bit array. This provides increased flexibility to the internals. There should be no user-visible changes (unless I made a mistake). Note that more parameters could be folded into the DiffConfig object. This check-in is just a start. check-in: 1347a1ddb9 user: drh tags: trunk | |
| 22:24 | For the --json diff output, generate an array of objects, one object per file and the diff array all contained within the object. Closed-Leaf check-in: 4ab3525927 user: drh tags: diff-config | |
| 20:51 | Begin adding value that used to be function arguments into the DiffConfig object. This check-in deals with the pRe parameter. check-in: bdb4bfaa3a user: drh tags: diff-config | |
| 19:24 | Futher integration of DiffConfig up and down the diff stack. check-in: 7c1498aeff user: drh tags: diff-config | |
| 18:52 | Continue integrating DiffConfig up the diff stack. check-in: 153a464dab user: drh tags: diff-config | |
| 18:35 | Incremental step in integrating DiffConfig. check-in: f7c8416fcd user: drh tags: diff-config | |
| 18:14 | Create the new DiffConfig object used to pass around information about a file difference computation. Begin integrating this new object into various interfaces. Lots more work to be done. check-in: 8601fb13d6 user: drh tags: diff-config | |
| 14:07 | Updates the change log to talk briefly about the new diff enhancements. check-in: 68d728867f user: drh tags: trunk | |
| 13:35 | Improvements to help text for "diff" and "xdiff". check-in: dc757a5d08 user: drh tags: trunk | |
| 13:22 | Expand the 'fossil wiki export --technote' interface to support technote retrieval via tag name as discussed in the chat. The query looks to match against both 'sym-TAG' and 'TAG' as technote tags are presently prefixed with 'sym-'. This identifier should be reserved for branches, however, so may be removed from technotes, at which point this query should be changed. check-in: d71b648c6c user: jamsek tags: trunk | |
| 13:06 | Update the built-in SQLite to the latest 3.37.0 alpha, for testing. check-in: 04b725d9bf user: drh tags: trunk | |
| 12:00 | Improvement to the ticket customization documentation suggested by [forum:/forumpost/31e44444cda1a7821912|forum post 31e44444cda1a7821912] check-in: 3fcdfb0cd8 user: drh tags: trunk | |
| 01:22 | The diff --tk option shows an error message on the display if it encounters an input line that it does not understand. This means that "cannot compute difference between binary files" errors, and similar, are dealt with correctly. check-in: 86f0722e0c user: drh tags: trunk | |
|
2021-09-05
| ||
| 22:58 | Identical lines in diff output should never use the "|" comparison mark. check-in: 99f93d9231 user: drh tags: trunk | |
| 22:11 | Improved hyperlinks on the "Fossil Self-Hosting Repositories" page. check-in: 6decc47add user: drh tags: trunk | |
| 20:59 | Minimum line-number width in --tk output is 3, to accommodate ellipses. check-in: 719498bd5f user: drh tags: trunk | |
| 20:54 | Further improvements to diff alignment. check-in: e5b1c70e2a user: drh tags: trunk | |
| 19:31 | Added just a tiny bit of left/right padding on the new diff tables so that the line numbers don't run right up to the edge of the border. check-in: f25a987bae user: stephan tags: trunk | |
| 19:16 | Add a #define for the diff block alignment algorithm threshold. check-in: 0a4ae4408e user: drh tags: trunk | |
| 19:02 | Refactor the diff logic for improved modularity and performance. This check-in transitions the diff improvement efforts from a branch to trunk. The effort is not yet complete, but it is stable enough to continue going on trunk. User-visible changes include (1) improved diff display, especially for unified diffs, (2) the new "fossil xdiff" command (promoting the older "test-diff" command into a supported command), and improved performance. Behind the scenes, (3) the class names DOM module used for for HTML diffs is simplified - which may break custom skins, (4) the internal processing of diffs is simplified in many ways. check-in: 9e330740cc user: drh tags: trunk | |
| 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 | |