Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/diff.c at check-in 3f78dfe593630c2e
|
2021-09-11
| ||
| 19:51 | More tweaks to the diff alignment algorithm. ... (file: [e77da3b560] check-in: [f9cc72fffa] user: drh branch: trunk, size: 114103) | |
| 17:28 | Improved alignment by giving a score of 62 to an inserted or deleted line. ... (file: [c4269418e6] check-in: [2bded9fb6c] user: drh branch: trunk, size: 114099) | |
| 15:53 | Merge the diff alignment scoring tweak from trunk. ... (file: [5350bd236e] check-in: [916094f820] user: drh branch: diff-js-refactoring, size: 114072) | |
| 15:52 | Tweak the diff-alignment scoring algorithm to give extra affinity to lines that share a common prefix. ... (file: [8ab38d438d] check-in: [2921ec2588] user: drh branch: trunk, size: 113877) | |
| 00:30 | Merge recent trunk enhancements into the diff-js-refactoring branch. ... (file: [c2a4713b63] check-in: [a7fbefee38] user: drh branch: diff-js-refactoring, size: 113687) | |
|
2021-09-10
| ||
| 23:50 | When computing a diff display, if the number of rows to skip between two diff regions is less than the context size, then go ahead and show the skip area as common text. ... (file: [ca6a03d216] check-in: [674da6424a] user: drh branch: trunk, size: 113492) | |
| 23:12 | Propagate the default value of diff_context_lines() through to window.fossil.config.diffContextLines for use by the jchunk UI. Per /chat discussion, jchunk will load 3x that many lines of context per button click. ... (file: [f9d2d72e30] check-in: [8f84424fff] user: stephan branch: diff-js-refactoring, size: 113401) | |
|
2021-09-07
| ||
| 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. ... (file: [5f6d49a27f] check-in: [c275a166b3] user: drh branch: trunk, size: 113206) | |
| 17:11 | Fix the diff block alignment so that it correctly suppresses unnecessary diff marks, even when in ignore-whitespace mode. ... (file: [28215a814d] check-in: [85ca2fe5b5] user: drh branch: trunk, size: 112131) | |
| 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. ... (file: [f33373cb1e] check-in: [ca6fa4b2f3] user: drh branch: trunk, size: 112134) | |
| 11:40 | Bring back the diff command option `-N|--new-file' as an alias for `-v|--verbose' for script compatibility. ... (file: [5b3a0f20c4] check-in: [4ef3ba374c] user: florian branch: trunk, size: 112413) | |
| 00:18 | Move more diff parameters into the DiffConfig object. ... (file: [c4c57f0407] check-in: [346de5d122] user: drh branch: trunk, size: 112281) | |
|
2021-09-06
| ||
| 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. ... (file: [040e14f0ae] check-in: [4ab3525927] user: drh branch: diff-config, size: 111513) | |
| 20:51 | Begin adding value that used to be function arguments into the DiffConfig object. This check-in deals with the pRe parameter. ... (file: [d477893fb1] check-in: [bdb4bfaa3a] user: drh branch: diff-config, size: 111529) | |
| 19:24 | Futher integration of DiffConfig up and down the diff stack. ... (file: [8aa745867f] check-in: [7c1498aeff] user: drh branch: diff-config, size: 111443) | |
| 18:35 | Incremental step in integrating DiffConfig. ... (file: [828db97f9a] check-in: [f7c8416fcd] user: drh branch: diff-config, size: 111400) | |
| 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. ... (file: [71a492ee4e] check-in: [8601fb13d6] user: drh branch: diff-config, size: 110732) | |
| 13:35 | Improvements to help text for "diff" and "xdiff". ... (file: [a26ff1e957] check-in: [dc757a5d08] user: drh branch: trunk, size: 110200) | |
|
2021-09-05
| ||
| 22:58 | Identical lines in diff output should never use the "|" comparison mark. ... (file: [fd27a019ce] check-in: [99f93d9231] user: drh branch: trunk, size: 110033) | |
| 20:54 | Further improvements to diff alignment. ... (file: [cfa1af5f41] check-in: [e5b1c70e2a] user: drh branch: trunk, size: 109873) | |
| 19:16 | Add a #define for the diff block alignment algorithm threshold. ... (file: [f7779de79d] check-in: [0a4ae4408e] user: drh branch: trunk, size: 110797) | |
| 00:33 | Fix a harmless compiler warning from previous check-in. ... (file: [8affc45dd4] check-in: [bcd3e80f20] user: drh branch: diff-color-enhancements, size: 110579) | |
| 00:31 | A new, faster algorithm for alignment of rows in a change block. ... (file: [0565b973f2] check-in: [71759ef5bf] user: drh branch: diff-color-enhancements, size: 110553) | |
|
2021-09-04
| ||
| 19:45 | Add the test-line-hash command for use in debugging and analyzing the match_dline() functions. ... (file: [ae7d14d5d6] check-in: [6a2bfba43d] user: drh branch: diff-color-enhancements, size: 108717) | |
| 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. ... (file: [8c9cb2c4ee] check-in: [45c91a6670] user: drh branch: diff-color-enhancements, size: 108151) | |
| 16:22 | Fix incorrect xReplace method in the --tcl formatter. ... (file: [a9d641298a] check-in: [2e583d2a2c] user: drh branch: diff-color-enhancements, size: 107157) | |
|
2021-09-03
| ||
| 23:39 | Add chunk numbers to each row of the diff output for HTML diffs. ... (file: [160e66db1f] check-in: [8caab6155e] user: drh branch: diff-color-enhancements, size: 107152) | |
| 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. ... (file: [392709a594] check-in: [63a5c754fd] user: drh branch: diff-color-enhancements, size: 106991) | |
| 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. ... (file: [adafbb6e68] check-in: [24d28cb7c9] user: drh branch: diff-color-enhancements, size: 107107) | |
| 18:45 | Refactor the name of the sub-line change detection object. ... (file: [992e6f179f] check-in: [3e08b15858] user: drh branch: diff-color-enhancements, size: 105239) | |
| 17:51 | Escape [, \, and ] characters when quoting TCL strings. ... (file: [23e6911b2f] check-in: [fd2d27f01b] user: drh branch: diff-color-enhancements, size: 105460) | |
| 14:33 | Add the test-line-diff command for testing the oneLineChange() routine of the diff logic. ... (file: [819ae13cd9] check-in: [0755a81bb5] user: drh branch: diff-color-enhancements, size: 105505) | |
| 12:33 | Restore the blue color for changed text in side-by-side diffs. ... (file: [914365b40d] check-in: [00b5e02ab2] user: drh branch: diff-color-enhancements, size: 104196) | |
|
2021-09-02
| ||
| 23:43 | Delete a bunch of obsolete side-by-side diff code. ... (file: [13e60336bd] check-in: [9f3d89612a] user: drh branch: diff-color-enhancements, size: 103972) | |
| 22:44 | Delete unused legacy context-diff logic for HTML. ... (file: [5296fec5c4] check-in: [1fb022ff98] user: drh branch: diff-color-enhancements, size: 120394) | |
| 22:28 | Improved comments on the diff formatter and related logic. ... (file: [ffefa1d3e6] check-in: [d29ddba321] user: drh branch: diff-color-enhancements, size: 122472) | |
| 19:38 | New format for JSON diff output. Promote the "test-diff" command to "xdiff", retaining the older spelling as a backup for compatibility. ... (file: [6bcc258ea6] check-in: [b051102272] user: drh branch: diff-color-enhancements, size: 119904) | |
| 14:25 | Various improvements and bug fixes to the new diff logic. ... (file: [e76098c2f4] check-in: [10f736f04f] user: drh branch: diff-color-enhancements, size: 121045) | |
| 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. ... (file: [331f9e386d] check-in: [e933d5d731] user: drh branch: diff-color-enhancements, size: 118767) | |
|
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. ... (file: [79207dca3e] check-in: [4cd8a743cd] user: drh branch: diff-color-enhancements, size: 116189) | |
| 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. ... (file: [cda92a83e3] check-in: [ce856a8614] user: drh branch: diff-color-enhancements, size: 110151) | |
|
2021-08-31
| ||
| 22:43 | Tweaks to diff formatting. ... (file: [980fbafcec] check-in: [598d7736e7] user: drh branch: diff-color-enhancements, size: 108447) | |
| 13:33 | Improvements to the new unified diff algorithm. ... (file: [ab8b6b7bb6] check-in: [2a256a4cce] user: drh branch: diff-color-enhancements, size: 108402) | |
| 03:00 | An attempt to rework HTML unified diff to show partial line matches. Still needs CSS work. ... (file: [be84af6028] check-in: [a01e46d85e] user: drh branch: diff-color-enhancements, size: 108366) | |
|
2021-08-30
| ||
| 16:40 | Fix handling of backslash and tab in quoted JSON text for the --json option. ... (file: [ae1c3893e4] check-in: [9a30e83d88] user: drh branch: diff-color-enhancements, size: 103740) | |
| 15:03 | Add the experimental JSON diff output format. ... (file: [f880f06b6c] check-in: [5d759da711] user: drh branch: diff-color-enhancements, size: 102131) | |
| 14:23 | Fix --debug diff output for multi-byte UTF-8. ... (file: [684b72b5c3] check-in: [9191ea9e63] user: drh branch: diff-color-enhancements, size: 99618) | |
| 13:55 | In the "diff --debug" output show the regions of change. ... (file: [00d83b60a9] check-in: [4b8f203f5d] user: drh branch: diff-color-enhancements, size: 99244) | |
| 12:00 | Code and comment cleanup. Fixes to the new formatDiff() routine related to block alignment. ... (file: [057a70b615] check-in: [16a2364f36] user: drh branch: diff-color-enhancements, size: 94725) | |
| 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. ... (file: [5fb54c6f6a] check-in: [5e70c3ff96] user: drh branch: diff-color-enhancements, size: 94991) | |
|
2021-08-29
| ||
| 22:55 | Demonstrate the concept of a generic DiffBuilder object. ... (file: [c1d2e83c56] check-in: [6e8d87b398] user: drh branch: diff-color-enhancements, size: 94962) | |
|
2021-08-28
| ||
| 00:46 | Performance optimization. Now faster than trunk. ... (file: [1b76aa5855] check-in: [2cb7f2f9d1] user: drh branch: diff-color-enhancements, size: 88028) | |
| 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. ... (file: [2331c63323] check-in: [6ed7541472] user: drh branch: diff-color-enhancements, size: 87944) | |
|
2021-08-27
| ||
| 21:11 | Additional work on improved diff. Incremental check-in. Still not working right. ... (file: [88d3884dea] check-in: [4fea7cc0ca] user: drh branch: diff-color-enhancements, size: 88407) | |
| 16:48 | Coloring on side-by-side diffs allows up to 8 separate segments of change. Incremental check-in - not everything is working correctly. ... (file: [3a9cdda014] check-in: [925399da07] user: drh branch: diff-color-enhancements, size: 88837) | |
| 14:01 | Clean up the data structures associated with adding color to diffs in preparation for attempts to improve the coloration. ... (file: [3728349dec] check-in: [8c619bf278] user: drh branch: diff-color-enhancements, size: 86689) | |
|
2021-08-26
| ||
| 14:01 | Rename the new --www option (check-in [f3961f453aee1ef5]) to --browser and -b. Add the --by option as shorthand for --browser --sidebyside, as that is expected to be a common usage pattern. ... (file: [e8b48e0776] check-in: [9a3372eec5] user: drh branch: trunk, size: 86515) | |
|
2021-08-25
| ||
| 23:08 | Add the --www option to the various "diff" commands. ... (file: [857f3512b4] check-in: [f3961f453a] user: drh branch: trunk, size: 86361) | |
| 20:56 | Improved internal interfaces for diff. For --webpage, omit the CSS used only for side-by-side diffs when doing a unified diff. ... (file: [5c45d65fc1] check-in: [eb6611c4dc] user: drh branch: trunk, size: 86193) | |
| 17:18 | Fix the --webpage option so that it correctly generates the HTML closing tags for the "fossil test-diff" command. ... (file: [3af4813dfc] check-in: [7e37ae9549] user: drh branch: trunk, size: 86206) | |
| 16:10 | Add the --webpage option to the various "diff" commands. This option causes the diff output to be in the form of a stand-alone webpage that can be sent to a remote collaborator (for example via a chat attachment). ... (file: [68ee6cacbc] check-in: [ea52b7d06c] user: drh branch: trunk, size: 86191) | |
|
2021-08-23
| ||
| 02:40 | Minor internal doc tweaks. No code changes. ... (file: [eed276dad8] check-in: [4907122668] user: stephan branch: trunk, size: 85867) | |
|
2021-01-29
| ||
| 16:10 | Add new --verbose option to 'fossil commit' to display a unified diff of all changes to be committed in the editor. Only tested on OpenBSD 6.8 and preliminary testing on macOS 10.15.7 (Catalina); needs to be tested on Linux and Windows. ... (file: [3173b3c716] check-in: [a713e1e6c2] user: jamsek branch: dev-ci-verbose, size: 85698) | |
|
2021-01-07
| ||
| 16:21 | The --numstat option to "fossil diff" now shows a total at the end. ... (file: [33797a6306] check-in: [9bb61a420b] user: drh branch: trunk, size: 85695) | |
|
2020-12-22
| ||
| 12:13 | Removed the parameter from style_finish_page() since the resulting content div class is now redundant with respect to the body class. This potentially breaks CSS made against old class names that a prior commit on this branch changed, but such skins would be made against an unreleased version of Fossil, it's unlikely many are using that first version of the feature anyway, and most of the class names did *not* change unless you were targeting a "div" instead of "body" or just a generic class name. None of the shipping skins are affected. ... (file: [1abc888580] check-in: [0e83ca88ce] user: wyoung branch: body-feature-class, size: 85582) | |
| 11:58 | Calling the new style_set_current_feature() function to override the new TH1 variable $current_feature for Fossil UI pages where the page name isn't what we want used as the "body" CSS class. For the most part, this matches the value currently being passed to style_finish_page(), but a few have changed with the benefit of hindsight. Not all calls to style_finish_page() have a corresponding call to the new function since the default value for $current_page now suffices. ... (file: [a144d1b816] check-in: [8ac0830bfc] user: wyoung branch: body-feature-class, size: 85592) | |
|
2020-12-18
| ||
| 15:30 | Enhance "fossil diff --numstat" to print a grand total line, and not display statistics for non-modified files. ... (file: [e64620cfda] check-in: [f8a5a6a716] user: danield branch: diff-numstat-total, size: 85664) | |
|
2020-11-07
| ||
| 13:25 | Rename the "style_body_and_footer()" interface to "style_finish_page()" and add a more detailed header comment to the implementation. ... (file: [0bdf697cea] check-in: [942b2076c6] user: drh branch: default-css-cleanups, size: 85551) | |
|
2020-11-05
| ||
| 23:15 | Added a parameter to style_footer() and renamed it to match its actual function (style_body_and_footer()) so we can add a CSS class to each page that indicates which major Fossil feature served the page, so we can have module-specific CSS. ... (file: [56ec691306] check-in: [ef5424b683] user: wyoung branch: default-css-cleanups, size: 85555) | |
|
2020-10-17
| ||
| 12:34 | On the /finfo page, change the check-in range query parameters from ci= and orig= into from= and to=. This gets the ci= query parameter out of the way so that it can be reused. ... (file: [7f921d2577] check-in: [299800b29d] user: drh branch: trunk, size: 85536) | |
|
2020-08-19
| ||
| 13:51 | When diffing long sequences, the product of their lengths can overflow to a negative number, triggering optimalLCS() which is very expensive. Prevent this overflow. See [https://fossil-scm.org/forum/forumpost/5f9365f9fe] for discussion. ... (file: [149a5477a2] check-in: [e2b7dca948] user: andygoth branch: trunk, size: 85528) | |
|
2020-08-14
| ||
| 11:53 | Changes line-numbered output to make line numbers selectable, as discussed in [https://fossil-scm.org/forum/forumpost/dc3da10590]. A couple decisions are needed before deciding whether to merge. ... (file: [681ca5379d] check-in: [ec73edd4d0] user: stephan branch: line-number-selection, size: 85513) | |
|
2020-08-09
| ||
| 13:49 | Revise and simplify the list of 1st-tier commands that are shown by the "fossil help" command. ... (file: [a85bb1eb1c] check-in: [84f697e570] user: drh branch: trunk, size: 85520) | |
|
2020-08-08
| ||
| 23:51 | Many updates to built-in help pages. No changes to code. ... (file: [7a368acb61] check-in: [c965636958] user: drh branch: trunk, size: 85519) | |
|
2020-06-25
| ||
| 00:16 | Adjust help text to work better with the new formatter. ... (file: [a3e9c8fa29] check-in: [a8a606996b] user: drh branch: formatted-online-help, size: 85507) | |
|
2020-05-05
| ||
| 00:41 | diff -y: set the default width automatically based on the terminal width. ... (file: [5af2476da7] check-in: [3504672187] user: ashepilko branch: trunk, size: 85510) | |
|
2020-04-29
| ||
| 17:38 | Fix a formatting issue in the header comment of diff.c. More importantly, this check-in deliberately introduces a fork on trunk, because I want to see what happens, and what warning messages are provided when a branch forks. Already, I see that it won't let me check-in without the --allow-fork option. ... (file: [1372da4c74] check-in: [2a1bdab560] user: drh branch: trunk, size: 84640) | |
|
2020-04-05
| ||
| 23:45 | Match the COMMAND and WEBPAGE names with _cmd and _page functions; [https://fossil-scm.org/forum/forumpost/045bffda68|forumpost/045bffda68] ... (file: [a5f0bac493] check-in: [06afb7022f] user: ashepilko branch: api-cleanup, size: 84636) | |
|
2020-02-25
| ||
| 14:45 | Improve diff performance by using a 64-bit hash and a faster hash algorithm. ... (file: [7d45c6a622] check-in: [a4616a2c99] user: drh branch: diff-optimizations, size: 84638) | |
| 11:56 | Change the sense of the "same_dline()" routine in the diff generator so that it returns 0 if the lines are the same and non-zero if the lines are different, as this helps the diff logic to run faster. ... (file: [b4b306c32c] check-in: [2f7527e88c] user: drh branch: trunk, size: 84495) | |
|
2019-09-27
| ||
| 22:28 | Added -- support to (annotate, artifact, cat, clone). ... (file: [416a7105d5] check-in: [ef763bcf08] user: stephan branch: double-dash-flag, size: 84625) | |
|
2019-03-19
| ||
| 14:09 | Replace most calls to db_begin_transaction() with db_begin_write() to avoid having a reader locking during a COMMIT. ... (file: [d0f43472fe] check-in: [6cc5354821] user: andybradford branch: db-begin-txn-updates, size: 84477) | |
|
2019-02-05
| ||
| 15:49 | Fix the unified diff output so that it conforms with established conventions. ... (file: [cf6baad848] check-in: [7fd2a3652e] user: drh branch: trunk, size: 84483) | |
|
2019-01-22
| ||
| 23:19 | Experimental changes to unified diff output to 'ignore' sections that are purely additions. Still needs SBS support and tests. ... (file: [1e9d741b6b] check-in: [6e3f354de1] user: mistachkin branch: ignorePureAdds, size: 84794) | |
|
2018-07-07
| ||
| 20:14 | Fix annotate_file() so that it correctly errors out if the named file does not exist in the revision. ... (file: [5610fd7ea0] check-in: [ae73e4ed32] user: ashepilko branch: trunk, size: 84473) | |
|
2018-04-27
| ||
| 00:52 | Fix typo in annotate documentation ... (file: [a97d1f2821] check-in: [4dcda7d991] user: andygoth branch: trunk, size: 84240) | |
|
2018-01-21
| ||
| 23:45 | Fix the /annotate webpage so that it works even if "fossil ui" is not launched from the root of the check-out. ... (file: [3340923c7d] check-in: [48798bb119] user: drh branch: trunk, size: 84225) | |
| 23:11 | Fix annotate_file() so that it correctly errors out if the named file does not exist in the repository. ... (file: [526a75f529] check-in: [a7d9598a0d] user: drh branch: trunk, size: 84174) | |
|
2017-12-06
| ||
| 01:38 | Remove the use of in-line javascript from the submenu controls. ... (file: [313f4c51a3] check-in: [3969757f37] user: drh branch: trunk, size: 84104) | |
|
2017-11-30
| ||
| 17:58 | Refactor the symlink processing logic so that most of the file access routines take a new parameter indicating the conditions under which symlinks should and should not be followed. This should fix a few bugs related to symlink processing. Lots of testing required before merging to trunk. ... (file: [2d541c3ba5] check-in: [e7767de263] user: drh branch: symlink-refactor, size: 84321) | |
|
2017-10-02
| ||
| 12:22 | More fixes to reverse annotation via the /fdiff page. It is closer, but it is still not right. ... (file: [4d7ed8017e] check-in: [08cacbf6e5] user: drh branch: trunk, size: 84285) | |
|
2017-09-28
| ||
| 18:18 | Fix indentation of unanalyzed lines on /annotate and /blame screens. ... (file: [b3f8706d42] check-in: [00ced6df65] user: drh branch: trunk, size: 84276) | |
|
2017-09-27
| ||
| 02:10 | Add the orig= query parameter to the /finfo webpage. Use this in the hyperlink from the analysis log of the /annotate page. ... (file: [3a7cab01a2] check-in: [95cc4b90da] user: drh branch: trunk, size: 84295) | |
|
2017-09-26
| ||
| 20:41 | The revision numbers in the annotate output were off by one check-in. This changes should fix the problem. ... (file: [bb8c116b1a] check-in: [0b4c3f5a28] user: drh branch: trunk, size: 84744) | |
| 14:46 | Fix double "However" in comment. Some more end-of-line spacing. Nothing functional. ... (file: [ae3138d361] check-in: [ce1bc4fb09] user: jan.nijtmans branch: trunk, size: 84744) | |
| 03:56 | Provide a link to the reverse annotation for an /fdiff of two versions of the same file. Improvements to the description of a reverse annotation. ... (file: [4f31f37cc9] check-in: [f52a544942] user: drh branch: trunk, size: 84755) | |
|
2017-09-25
| ||
| 19:46 | Update the change log. Improved documentation of reverse annotations. (Note: The check-in time has been moved 5 minutes earlier as a test of the ability to edit check-in times.) ... (file: [ffe3356aca] check-in: [1f378f9e31] user: drh branch: trunk, size: 84179) | |
| 18:32 | Add the origin= query parameter to /annotate and the --origin option to the annotation command, to enable reverse annotations. ... (file: [305bbd6e95] check-in: [c91b810620] user: drh branch: trunk, size: 83241) | |
| 17:24 | Improved limit handling for annotation. The limit can now be expressed in compute-time seconds rather than versions analyzed, and defaults to "1.0s", which is enough to compute a complete annotation on most reasonable files. ... (file: [0b2ee81442] check-in: [517b9a5652] user: drh branch: trunk, size: 81677) | |
| 15:36 | Change the "Log" submenu element of the annotation page so that it shows or hides the log using javascript, avoiding a server roundtrip and a recomputation of the annotation. ... (file: [5d47606d72] check-in: [037e06b370] user: drh branch: trunk, size: 80384) | |
| 12:45 | Simplified and improved implementation of annotate_file(). ... (file: [a1c9288858] check-in: [d2b1565b7c] user: drh branch: andygoth-annotation-enhancements, size: 80557) | |
|
2017-09-24
| ||
| 10:58 | The annotate_file() function is now closer to being correct, but is still not quote right. ... (file: [f06a79eb61] check-in: [54c0dab0c6] user: drh branch: andygoth-annotation-enhancements, size: 81777) | |
| 09:39 | Remove unused local variables that caused breakages with -Werror. To do: This branch still gives a very different answer than trunk for [/annotate?limit=-1&checkin=8e27a5a0&filename=src/login.c&log=1] ... (file: [670ce287c7] check-in: [120ff0b8a3] user: drh branch: andygoth-annotation-enhancements, size: 82323) | |
|
2017-09-23
| ||
| 21:30 | Remove unnecessary variable initializations ... (file: [9946597a7d] check-in: [c203ba902c] user: andygoth branch: andygoth-annotation-enhancements, size: 82422) | |
| 21:24 | Convert annotate page to use checkboxes ... (file: [5040407518] check-in: [8017bad639] user: andygoth branch: andygoth-annotation-enhancements, size: 82417) | |
| 21:18 | Correct operation of filevers query parameter to annotate pages ... (file: [120bee2d21] check-in: [4b721600e7] user: andygoth branch: andygoth-annotation-enhancements, size: 82831) | |
| 21:07 | Consolidated annotation file and manifest lookup code. This changes the error handling for the annotation web page to report an error rather than redirect to home. It also enables omitting the checkin query parameter when used with a server running within a checkout. (Later, by drh:) Move this code onto a branch because of build errors on Ubuntu. ... (file: [a920a7a46c] check-in: [41f35ca4ec] user: andygoth branch: andygoth-annotation-enhancements, size: 82608) | |
| 19:10 | Fix the value of the ANN_FILE_VERS flag so that it no longer overlaps with DIFF_SLOW_SBS. Omit the ANN_FILE_ANCEST flag which was always true. Update the annotator so that it follows check-ins in generation order according to the ancestor table. ... (file: [2bc1234c4f] check-in: [d9ef474a1a] user: drh branch: trunk, size: 83022) | |
| 18:37 | Selectively revert a few changes made by the previous check-in ... (file: [1187d036d0] check-in: [b83ea94eb2] user: andygoth branch: trunk, size: 83185) | |
| 18:32 | Add the -r|--revision option to the annotate command. ... (file: [b89ef639c6] check-in: [5a6b194bc9] user: andygoth branch: trunk, size: 83061) | |
|
2017-06-30
| ||
| 19:59 | Add the --numstat option to the diff command. ... (file: [d7dd6b9c57] check-in: [3d6cf6a722] user: drh branch: trunk, size: 81802) | |
|
2017-06-11
| ||
| 16:25 | Experimental and undocument --yy option to the various diff operations does a slow O(N*N) algorithm which can sometimes compute a better side-by-side diff. But it can also take a lot longer and so is not recommended unless really needed. ... (file: [69409628ef] check-in: [1b3fa2610a] user: drh branch: trunk, size: 81391) | |
|
2017-03-01
| ||
| 15:35 | Change references to "SHA1 hash" in comments and UI labels to be "artifact hash" or similar. ... (file: [09884b53c5] check-in: [b9a1a3b9d8] user: drh branch: fossil-2.0, size: 81100) | |
|
2016-11-04
| ||
| 22:37 | Consistently use the count(X) macro in place of sizeof(X)/sizeof(*X) throughout the Fossil core, excluding things that don't use makeheaders. Also use count(X) instead of ArraySize(X) which has the same definition. ... (file: [4019cd9a2c] check-in: [e5b62edb28] user: andygoth branch: trunk, size: 81105) | |
| 21:32 | Remove unused, undocumented zTitle argument to style_submenu_element(). This argument appears to have been unused all the way back to [dbda8d6ce9]. ... (file: [285cbbd242] check-in: [187424e891] user: andygoth branch: trunk, size: 81124) | |
|
2016-10-04
| ||
| 02:55 | Coding style tweak. ... (file: [010e9b187c] check-in: [b47e4cc401] user: mistachkin branch: binDiffFix, size: 81247) | |
| 02:43 | Adopt the diff algorithm changes from trunk. ... (file: [029cd144fb] check-in: [f9f2d76926] user: mistachkin branch: binDiffFix, size: 81241) | |
| 02:16 | Detect binary files that look like text but end with a sequence of zeros. ... (file: [92dfd18ed5] check-in: [0e0e29aea0] user: drh branch: trunk, size: 80766) | |
| 02:02 | The previous check-in was interpreting any file that did not end in \n as binary. This check-in should fix the problem. ... (file: [68b131d166] check-in: [47d1256cd8] user: drh branch: trunk, size: 80768) | |
| 01:53 | If a file to be diffed contains an 0x00 character, consider it to be binary and do not attempt the diff. ... (file: [94a8d1275f] check-in: [334ab15270] user: drh branch: trunk, size: 80726) | |
|
2016-10-03
| ||
| 23:23 | Minor optimization. ... (file: [8b0280f09d] check-in: [9903ce5a5b] user: mistachkin branch: binDiffFix, size: 81377) | |
| 23:18 | Further improve clarity. ... (file: [70a1908b37] check-in: [11e2c6e611] user: mistachkin branch: binDiffFix, size: 81346) | |
| 23:10 | Another adjustment to handle some corner cases. ... (file: [3f3e33ebe3] check-in: [8017c358ba] user: mistachkin branch: binDiffFix, size: 81184) | |
| 19:22 | Fix binary blob detection in the new break_into_lines() algorithm. ... (file: [c75f13e765] check-in: [dacc2bad82] user: mistachkin branch: binDiffFix, size: 80843) | |
|
2016-09-29
| ||
| 11:59 | Distinguish between a deleted file and a binary file in the side-by-side diff generator. Fix for a bug introduced by check-in [233e9328ee639b]. ... (file: [e401f9e414] check-in: [1438be02d0] user: drh branch: trunk, size: 80693) | |
|
2016-09-28
| ||
| 21:24 | Simplification and optimization of the break_into_lines() helper routine in the diff logic. Use the strchr() routine from the standard library to help locate \n characters. ... (file: [3ee56e13e7] check-in: [233e9328ee] user: drh branch: trunk, size: 80706) | |
| 20:26 | Improved hash function for the diff algorithm. ... (file: [e0facaac60] check-in: [173cca0d7d] user: drh branch: trunk, size: 80680) | |
| 19:48 | Performance improvement in LCS length computation used for side-by-side diff coloring. ... (file: [a1e0515366] check-in: [08d970d68f] user: drh branch: trunk, size: 80652) | |
| 18:19 | Performance optimization in the break_into_lines() routine of the diff logic. ... (file: [d903af43c7] check-in: [8d48885f81] user: drh branch: trunk, size: 80620) | |
|
2016-08-30
| ||
| 15:49 | Fix overlength source lines in diff.c. Raise limits and fix inappropriate use of memcmp() in mkindex.c. ... (file: [188128a31b] check-in: [df80ab0ce9] user: drh branch: trunk, size: 80583) | |
|
2016-06-25
| ||
| 03:56 | Full-text search for check-in diffs. This works, but it creates a huge index (2x the size of the BLOB table) in spite of being a contentless index. The index is slow to build because of all the diffs that must be computed. Because the index is contentless, the snippet generator runs very slowly on queries - a typical query with a couple hundred hits takes several minutes. ... (file: [73188ce5a6] check-in: [68194175fb] user: drh branch: diff-search, size: 80664) | |
|
2016-06-17
| ||
| 09:45 | More consistancy in using <br /> and <hr /> HTML tags ... (file: [c53eea5dfd] check-in: [63220d9403] user: jan.nijtmans branch: trunk, size: 80562) | |
|
2016-05-31
| ||
| 01:16 | Improved handling of exclude_robots(). Add the "isrobot" query parameter for testing. ... (file: [4daaf556f6] check-in: [abcd5df267] user: drh branch: trunk, size: 80560) | |
|
2016-04-10
| ||
| 02:10 | Merge trunk. ... (file: [ad4f332368] check-in: [cfca8ec34d] user: andygoth branch: mistake, size: 80570) | |
|
2016-04-07
| ||
| 18:41 | Make usage of 'Usage:' and 'or:' consistent in all help text. ... (file: [1d8bbe68af] check-in: [8bfd9951ca] user: rberteig branch: trunk, size: 80570) | |
|
2016-02-20
| ||
| 13:21 | Initial go at replacing URLs in the form ?name=xyz with /xyz except in places where doing so is either known to break (style_set_current_page() calls) or would require notable refactoring (/dir hyperlink generation). ... (file: [50fa8123c7] check-in: [e8735d6a47] user: stephan branch: slash-name-links, size: 80548) | |
|
2015-12-13
| ||
| 01:26 | Bring some comments in the "blame" logic up-to-date. No changes to code. ... (file: [9e68056cec] check-in: [05f73ffb87] user: drh branch: trunk, size: 80563) | |
| 00:35 | Change compute_direct_ancestors() to use a recursive common table expression. ... (file: [9b76220708] check-in: [6599d09729] user: drh branch: trunk, size: 80740) | |
|
2015-11-04
| ||
| 17:51 | Improved highlighting of changes in the color-coded side-by-side diff. ... (file: [43862aac70] check-in: [81cae7feac] user: drh branch: trunk, size: 80759) | |
|
2015-06-19
| ||
| 15:44 | Merge trunk. ... (file: [4d7320351d] check-in: [21220b21b7] user: andygoth branch: andygoth-brackets-outside-link, size: 79856) | |
|
2015-05-26
| ||
| 21:46 | Enhance file_tree_name() to be capable of producing absolute paths within the local tree. Fix --hard option to mv/rm to enable it to work properly with relative paths. ... (file: [4600d39f61] check-in: [c2df31dae8] user: mistachkin branch: mvRmHardFix, size: 79856) | |
|
2015-05-17
| ||
| 21:30 | Move all square brackets outside the hyperlink text to make it easier to copy-and-paste links sans brackets from typical browsers. ... (file: [a5777ebea5] check-in: [a2020a7ac8] user: andygoth branch: andygoth-brackets-outside-link, size: 79853) | |
|
2015-04-27
| ||
| 13:19 | Provide help text for all commands and webpages. ... (file: [7146e86986] check-in: [7ab03289ee] user: drh branch: trunk, size: 79853) | |
|
2015-03-30
| ||
| 14:08 | Add the "skins/details.txt" file to the skins. Change the skin editors so that they can show a diff of the current configuration against any built-in. ... (file: [9f3f300d40] check-in: [31a337f0c2] user: drh branch: improved-skin-edit, size: 79185) | |
|
2015-02-28
| ||
| 10:11 | replaced 'checkin' with 'check-in' in code-comment, inline command help-text, SQL-statement comment, fatal error messages and some non-functional webpage-content ... (file: [117b008502] check-in: [7c30266a45] user: michai branch: ml-jb-doc-typos, size: 79169) | |
|
2015-02-14
| ||
| 12:24 | When the user is "nobody", make the g.anon permission vector for "anonymous" available in addition to g.perm. Hyperlinks to pages that would be available to anonymous are shown rather than suppressed. When permission is denied and control jumps to login_needed() a new flag shows whether or not logging in as "anonymous" would help. Work in progress. ... (file: [1c1f0211ee] check-in: [2f50d427a9] user: drh branch: login-enhancements, size: 79168) | |
|
2015-02-11
| ||
| 15:57 | More places where the %S and/or %!S formatter are useful. ... (file: [4b5002d054] check-in: [d93f5ee3e6] user: jan.nijtmans branch: trunk, size: 79157) | |
| 15:05 | Add the ability to specify one of the built-in skins as an override of the current configuration, using the --skin option to "server", "ui", and "http" commands, or the "skin:" line in the CGI script. ... (file: [18d61394d7] check-in: [ed36e2eb51] user: drh branch: trunk, size: 79158) | |
| 11:09 | Use the "%S" formatting option for human-readable SHA1 hashes and "%!S" for SHA1 hashes in URLs. The length of these hashes are compile-time configurable using FOSSIL_SHA1_PREFIX_LEN and FOSSIL_SHA1_URLPREFIX_LEN, respectively. Defaults: 10 and 16. ... (file: [70094196f3] check-in: [1fee0377e4] user: drh branch: trunk, size: 79172) | |
|
2014-09-07
| ||
| 19:50 | More proposed fixes to the issues pointed out by Edward Berner. ... (file: [26603debe5] check-in: [4429a4c3cc] user: mistachkin branch: warningFixes, size: 79163) | |
|
2014-07-30
| ||
| 15:40 | Call verify_all_options() on most of fossil CLI commands. - Skip all the test-* commands for now (may be unnecessary) - Skip sha1sum, md5sum and artifact because they can take "-" as argument and verify_all_options() would call fatal. Need to handle those differently... - Command with subcommands that have their options are remaining: branch, bisect, cache, configuration, json, sql, stash, tag, ticket, user, wiki. (not sure how to handle those yet..) ... (file: [523bf0582c] check-in: [a426154b3e] user: mgagnon branch: verify-all-options, size: 79161) | |
|
2014-07-17
| ||
| 07:04 | Use "%S" format in stead of "%.10s" in more places, where UUID's are referenced. ... (file: [e293be07cf] check-in: [275457adf0] user: jan.nijtmans branch: trunk, size: 79093) | |
|
2014-04-28
| ||
| 11:00 | Fix function same_dline_ignore_allws(), for the case where one side of the diff was an empty line. Example where it went wrong: [/fdiff?v1=d5e0c2dc93&v2=7ee7dd0a42&sbs=1&w] ... (file: [0d33c3b047] check-in: [1274c97d70] user: jan.nijtmans branch: trunk, size: 79111) | |
|
2014-04-07
| ||
| 12:35 | Put more long UUID's in hyperlinks, without modifying the visible appearance in the UI. ... (file: [2171544b20] check-in: [b34fda9692] user: jan.nijtmans branch: trunk, size: 79089) | |
|
2014-04-03
| ||
| 07:05 | Fix highlight algorithm when used in combination with "Ignore Whitespace" ... (file: [d9e9227f13] check-in: [c23190a61d] user: jan.nijtmans branch: trunk, size: 79089) | |
|
2014-03-27
| ||
| 10:11 | Fix (not so harmless) gcc compiler warning. ... (file: [ca1a437473] check-in: [22d7996f8c] user: jan.nijtmans branch: trunk, size: 79145) | |
|
2014-03-18
| ||
| 08:39 | merge trunk ... (file: [ac0654b0ec] check-in: [5efa7d2e62] user: jan.nijtmans branch: strip-trailing-cr, size: 79147) | |
|
2014-03-17
| ||
| 21:05 | Added a pedantic catch for a corner case which never happens (for porting's sake). ... (file: [ed9f8acfe1] check-in: [7413229200] user: stephan branch: trunk, size: 77756) | |
| 13:12 | Eliminate DIFF_INLINE flag (which is 0 anyway, no longer necessary). Strip end-of-line CR's in json_wiki_diff page as well. ... (file: [b9799dccb0] check-in: [e6309e051b] user: jan.nijtmans branch: trunk, size: 77729) | |
| 12:47 | Make stripping of end-of-line CR work correctly now (REALLY!) ... (file: [246229ccd5] check-in: [597d1101b4] user: jan.nijtmans branch: trunk, size: 77810) | |
| 11:34 | Make -w|--ignore-all-space option work the same as the GNU diff option with the same name. ... (file: [2cdc2a3709] check-in: [a7a61cdd6f] user: jan.nijtmans branch: strip-trailing-cr, size: 79158) | |
|
2014-03-16
| ||
| 10:33 | Fix the display of all web-pages which contain annotation- or diff-like sections for the case windows-style line endings are used: The CR's should be stripped in those cases. ... (file: [de96bb2b9b] check-in: [1472cd811f] user: jan.nijtmans branch: trunk, size: 77817) | |
|
2014-03-14
| ||
| 20:49 | Fix the display of unified-diff lines on web pages when the files being compared have windows-style line endings. ... (file: [7dee8b5a49] check-in: [e2e8531ba7] user: drh branch: trunk, size: 77727) | |
|
2014-03-13
| ||
| 14:32 | Merge trunk. Split same_dline() in 3 different functions. Ongoing. ... (file: [1c2b96a3ec] check-in: [a915aa03b3] user: jan.nijtmans branch: strip-trailing-cr, size: 79499) | |
| 12:55 | merge trunk (ongoing) ... (file: [bf596301f9] check-in: [2e45fb7b39] user: jan.nijtmans branch: strip-trailing-cr, size: 78645) | |
|
2014-03-10
| ||
| 08:49 | GNU diff doesn't translate \t to whitespace and strip eol-spacing from diff output (when using -w/-Z options), so "fossil diff" shouldn't do that either. ... (file: [9c0837cd56] check-in: [ac3fcebb19] user: jan.nijtmans branch: trunk, size: 77635) | |
|
2014-03-09
| ||
| 00:15 | Add the ability to restrict CPU-intensive web pages when the server load average gets too high. This feature is turned off by default. ... (file: [aa915f2d44] check-in: [5e26a1b9b2] user: drh branch: trunk, size: 78478) | |
|
2014-03-07
| ||
| 20:14 | Minor bug-fix when using -w or -Z flag in diff logic. Make sure that the common lines printed in a diff always come from the left-side, it might be that the right-side is different by white-space only. ... (file: [baaeb0706d] check-in: [d38f0ce759] user: jan.nijtmans branch: trunk, size: 78460) | |
| 20:02 | Minor bug-fix when using -w or -Z flag in diff logic. Make sure that the common lines printed in a diff always come from the left-side, it might be that the right-side is different by white-space only. ... (file: [0472df48c1] check-in: [07e6957526] user: jan.nijtmans branch: mistake, size: 78507) | |
| 19:45 | Since Annotation flags and DIFF flags are so closely related, allow then to reside in a single variable ... (file: [e75869761c] check-in: [0bc584fe02] user: jan.nijtmans branch: trunk, size: 78460) | |
| 15:49 | Rename the options for whitespace handling in annotate/blame/diff following GNU diff, not following GIT. So whether your diff tool is configured being internal or external, the same options can be used. ... (file: [a8661064bc] check-in: [28234db8bc] user: jan.nijtmans branch: trunk, size: 78607) | |
| 14:38 | Implement -b|--ignore-space-change. Doesn't work right yet (needs better hash function)! ... (file: [ebb0d6c696] check-in: [c0d1ed927e] user: jan.nijtmans branch: strip-trailing-cr, size: 79487) | |
| 13:11 | Combine ANN flags and DIFF flags into a single 64-bit variable, where appropriate. Make DIFF_STRIP_EOLCR a separate flag, as this flag does more than the other whitespace-related flags. Merge trunk. ... (file: [0383445e86] check-in: [da205cf44b] user: jan.nijtmans branch: strip-trailing-cr, size: 78520) | |
| 11:42 | Make annotation work with UTF-16 files. Remove some unnecessary end-of-line spaces in (UTF-8 and UTF-16) text files. ... (file: [6fc8f83bf4] check-in: [46459fd922] user: jan.nijtmans branch: trunk, size: 78872) | |
| 11:29 | Fix some spacing issues (blame output should be exactly the same as Fossil 1.28) Make annotation work with UTF-16 files. Remove some unnecessary end-of-line spaces in text files. ... (file: [92a71fb9d2] check-in: [4514910a5f] user: jan.nijtmans branch: strip-trailing-cr, size: 78603) | |
| 11:02 | Fix -w|--ignore-all-space option such that it does exactly the same as GNU diff's option with the same name. ... (file: [8ddd8e9dd5] check-in: [bb3388345d] user: jan.nijtmans branch: strip-trailing-cr, size: 78489) | |
| 09:01 | Rename --ignore-space-at-eol (from Git) to -Z|--ignore-trailing-space (gnu diff). Add --ignore-all-space as well (doesn't behave exactly like GNU's option yet) ... (file: [cffcca4318] check-in: [d9e79f685b] user: jan.nijtmans branch: strip-trailing-cr, size: 78976) | |
|
2014-03-06
| ||
| 08:50 | Add "fossil praise" which is exactly the same as "fossil blame". As in subversion. ... (file: [8c665ce6fb] check-in: [fb573e7203] user: jan.nijtmans branch: trunk, size: 78796) | |
|
2014-03-05
| ||
| 22:54 | Implement --strip-trailing-cr option ... (file: [ca2e402525] check-in: [4e6cfaf8f8] user: jan.nijtmans branch: strip-trailing-cr, size: 77879) | |
| 22:13 | merge trunk ... (file: [96e879ccdc] check-in: [e8f422283a] user: jan.nijtmans branch: diff-eolws, size: 78738) | |
| 22:06 | Flag DIFF_INLINE was 0 and that should stay so ... (file: [5300d0df5d] check-in: [466f8de3c2] user: jan.nijtmans branch: trunk, size: 77577) | |
| 21:48 | remember "log" option with "Ignore whitespace" button. ... (file: [95a4f650da] check-in: [e15c42390b] user: jan.nijtmans branch: diff-eolws, size: 78738) | |
| 21:43 | Merge trunk. Simplify handling of "w" option a little. ... (file: [4506ccd04f] check-in: [f4d98b2b9e] user: jan.nijtmans branch: diff-eolws, size: 78754) | |
| 21:29 | Add new --ignore-space-at-sol, -ignore-space-at-eol and -w options to "fossil diff" and "fossil stash diff" commands. Modify annotation/blame such that any change (eol-whitespace too) is considered a change, after ML request. ... (file: [3a38bb55e8] check-in: [e663d5e330] user: jan.nijtmans branch: trunk, size: 77577) | |
| 15:11 | merge diff-eolws ... (file: [8f5b5883c5] check-in: [91add0e03d] user: jan.nijtmans branch: diff-eolws, size: 78502) | |
| 11:59 | Revert default diffFlags used for annotation as it is on trunk. This way, the annotation behavior is fully configurable with the diffFlags (0, DIFF_IGNORE_SOLWS, DIFF_IGNORE_EOLWS or both flags, or newly-to-be-implemented flags). Merging of the "diff-eolws" branch to trunk can be considered independant of the current discussion on the ML. ... (file: [9fe74dec98] check-in: [c38fbe235e] user: jan.nijtmans branch: diff-eolws, size: 77681) | |
| 08:43 | Merge trunk. Fix indentation in annotation/blame commands/pages, which was broken since [28b39cc516]. Changelog entry. ... (file: [9544fc3a3b] check-in: [bcb22ce1b0] user: jan.nijtmans branch: diff-eolws, size: 77570) | |
| 06:24 | Cherry-pick from [f1e99a5a408c]: minor annotate/blame url rendering bug. ... (file: [30dd1e9704] check-in: [904ab4bbb8] user: andybradford branch: trunk, size: 75622) | |
| 06:14 | Add button to annotate/blame pages. Also minor bug fix for annotate/blame pages url rendering. ... (file: [e13daed618] check-in: [f1e99a5a40] user: andybradford branch: diff-eolws, size: 78059) | |
|
2014-03-04
| ||
| 08:21 | Don't ignore whitespace by default, except in annotations/blames. Add new "w" option to some Web UI pages, allowing to ignore whitespace (no buttons yet). ... (file: [250a6c04fd] check-in: [28b39cc516] user: jan.nijtmans branch: diff-eolws, size: 77208) | |
|
2014-03-03
| ||
| 15:00 | Bug-fix: correct calculation of hash-value for lines with different eol-spacing. Taken from [8f885df209], but without the other enhancements. Eliminate some double semicolons. ... (file: [543f54ceb4] check-in: [7a0f4af68e] user: jan.nijtmans branch: trunk, size: 75556) | |
| 12:02 | Adapt some comments. ... (file: [e05caf959d] check-in: [c0b42f23a3] user: jan.nijtmans branch: diff-eolws, size: 77141) | |
| 11:55 | Make option --ignore-space-at-sol work correctly with side-by-side diff as well. ... (file: [5b935e8f66] check-in: [7763b2e64c] user: jan.nijtmans branch: diff-eolws, size: 76985) | |
| 11:37 | Oops ... (file: [db0b17df16] check-in: [65397b575e] user: jan.nijtmans branch: diff-eolws, size: 76879) | |
| 11:17 | Fix indenting behavior of --ignore-space-at-sol option ... (file: [083129fb9e] check-in: [2faa1a272b] user: jan.nijtmans branch: diff-eolws, size: 76855) | |
| 10:50 | Implement new --ignore-space-at-sol option for all diff variants. And "-w" which means (for now) both --ignore-space-at-sol and --ignore-space-at-eol. Problem: diffs using --ignore-space-at-sol don't indent any more. to be solved. ... (file: [61482131e2] check-in: [6392c032ce] user: jan.nijtmans branch: diff-eolws, size: 76446) | |
| 10:28 | Wrong parameter type: should be 64 bits otherwise the diffFlags parameter cannot hold all possible bits. ... (file: [0cc3fb028e] check-in: [d3f69bd48e] user: jan.nijtmans branch: diff-eolws, size: 76098) | |
| 10:15 | Rename --ignore-eolws back to --ignore-space-at-eol. Change last parameter of break_into_lines() to hold multiple flags. This opens the way to implement --ignore-all-space" and "--ignore-space-at-sol" as well. ... (file: [e60c3a6989] check-in: [2dffb0e026] user: jan.nijtmans branch: diff-eolws, size: 76093) | |
| 09:31 | Rename --ignore-space-at-eol to --ignore-eolws|-w, make it work with "fossil stash diff" as well, and make it the default with "fossil diff --tk". Remark: renaming probably was a bad idea, and "-w" should correspond with git's "--ignore-all-space". This would suggest implementing a "--ignore-space-at-sol" options as well, even though I doubt anyone would use that. ... (file: [418b5971f6] check-in: [31d25923bd] user: jan.nijtmans branch: diff-eolws, size: 76009) | |
| 08:22 | Try to fix it more better so it'll work with CLI diffs. Add --ignore-space-at-eol option (name taken from Git) to diff cmd. ... (file: [3064f64301] check-in: [554607d35b] user: joel branch: diff-eolws, size: 75863) | |
| 06:44 | Fix diffs that use the DIFF_IGNORE_EOLWS flag. Add a message for diffs that involve only EOL whitespace changes. ... (file: [82413a76cd] check-in: [8f885df209] user: joel branch: diff-eolws, size: 75709) | |
|
2014-02-28
| ||
| 10:34 | Remove unnecessary spaces at end-of-lines. No change in functionality. ... (file: [7dee86b5c7] check-in: [3df526ca41] user: jan.nijtmans branch: trunk, size: 75558) | |
|
2014-01-14
| ||
| 12:44 | Add the ability to display content and diffs for UTF16 text files in the web interface. ... (file: [afd9c46410] check-in: [5a66b6e785] user: drh branch: trunk, size: 75565) | |
|
2014-01-11
| ||
| 20:39 | Prevent buffer overruns when trying to do side-by-side diff alignment of lines that contain non-UTF8 characters and a prefix match. ... (file: [5a027708a3] check-in: [37ffaaa911] user: drh branch: trunk, size: 75495) | |
|
2013-12-27
| ||
| 03:42 | Fix segfault on certain /annotate pages. (Discovered using many-www.tcl test script.) ... (file: [060d80231c] check-in: [7a988eed37] user: joel branch: trunk, size: 75511) | |
|
2013-11-20
| ||
| 08:57 | Add "blame" WEBPAGE, just as "annotate" but giving comparable output as "fossil blame". ... (file: [a0aaf79281] check-in: [d7160dc195] user: jan.nijtmans branch: trunk, size: 75481) | |
|
2013-10-08
| ||
| 14:13 | minor help text typo. ... (file: [d54bdafec4] check-in: [eb6b14723a] user: stephan branch: trunk, size: 74854) | |
| 12:54 | Add the "fossil blame" command that shows the username without a line number. The "fossil annotate" command continues to show the line number and omit the username. ... (file: [38f3e00ec4] check-in: [6f686403d7] user: drh branch: trunk, size: 74853) | |
|
2013-08-31
| ||
| 14:03 | Optimized out an unnecessary string copy in appendDiffLine(), #undef'd a local macro in EncodeHttp(). ... (file: [dd237c5933] check-in: [a789e85ff6] user: stephan branch: trunk, size: 74176) | |
|
2013-08-30
| ||
| 03:06 | Change most uses of fossil_panic() to fossil_fatal(). Modify fossil_panic() to avoid allocating heap memory and to close the database connection before doing anything else. ... (file: [1a99ca13f6] check-in: [320f14363e] user: drh branch: trunk, size: 74245) | |
|
2013-08-25
| ||
| 02:11 | Spiders and robots are presented with a captcha if they request the annotation page. ... (file: [90ed5dfac7] check-in: [f8a2aa0ce7] user: drh branch: trunk, size: 74245) | |
|
2013-07-20
| ||
| 15:59 | Added a width to table.sbsdiffcols so that skins with a flexible body width can expand it as necessary. Seems to have no visible effect on fixed-width layouts. ... (file: [cf56784a53] check-in: [47ee082a75] user: stephan branch: trunk, size: 74215) | |
|
2013-07-18
| ||
| 21:11 | Retain tab characters in HTML side-by-side diffs. Display should be unchanged (still mod-8 indentation). ... (file: [9cb8813108] check-in: [f341072453] user: joel branch: trunk, size: 74201) | |
|
2013-07-17
| ||
| 12:04 | merge trunk ... (file: [99d7c0a02d] check-in: [5d8551bfa1] user: jan.nijtmans branch: ui-no-utf8, size: 74511) | |
|
2013-07-11
| ||
| 20:04 | Move the "looks_like" functions out of diff.c and into a source file of their own: "lookslike.c". ... (file: [7a1c2df4c5] check-in: [b4c97d76a7] user: drh branch: sbsreloaded, size: 74186) | |
|
2013-07-09
| ||
| 10:54 | Comment enhancements. No changes to code. ... (file: [b5bfc1e614] check-in: [f04a3242ec] user: drh branch: sbsreloaded, size: 87626) | |
|
2013-07-06
| ||
| 02:35 | Support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. ... (file: [2a478ef366] check-in: [4081a91c84] user: joel branch: sbsreloaded, size: 87411) | |
|
2013-05-28
| ||
| 10:53 | Fix a division by zero that can occur when trying to annotate a file that has never been changed. ... (file: [1aa8d0a48c] check-in: [f370ab3948] user: drh branch: trunk, size: 86400) | |
|
2013-05-27
| ||
| 02:25 | Remove an unused variable from the annotation logic in diff.c. ... (file: [7754e32f1c] check-in: [770fd05fe8] user: drh branch: trunk, size: 86368) | |
| 02:18 | Further improvements to the web display of annotations and file history. ... (file: [2ab07e6f80] check-in: [ef26e7624e] user: drh branch: trunk, size: 86430) | |
| 01:56 | Improvements to the web display of file annotations. ... (file: [2b7f9fad92] check-in: [59d70140f6] user: drh branch: trunk, size: 86028) | |
|
2013-05-25
| ||
| 01:57 | Remove unused variables in the annotation engine. ... (file: [d4712a4e68] check-in: [305e3951cc] user: drh branch: trunk, size: 86368) | |
| 01:49 | Improved default background colors for web annotations. Remove the diff hyperlinks from the annotation log. ... (file: [aff9f769fd] check-in: [8987a6bbbf] user: drh branch: annotate, size: 86897) | |
| 01:27 | Improvements to the longest-common-subsequence (LCS) function inside the diff engine. ... (file: [ce3a074021] check-in: [477d1150cf] user: drh branch: annotate, size: 86817) | |
|
2013-05-24
| ||
| 21:54 | Fix a minor formatting error in the web annotation page. ... (file: [04bc7fbb5a] check-in: [1fcc6bda2f] user: drh branch: annotate, size: 86750) | |
| 21:39 | Add links to diff pages on the annotation log in the web interface. ... (file: [1c18d6a201] check-in: [7799ff3a00] user: drh branch: annotate, size: 86751) | |
| 21:18 | Do not display the user on annotation output. Show only the check-in ID, date, and line number. ... (file: [844d3ed38b] check-in: [8fee580ded] user: drh branch: annotate, size: 86298) | |
| 21:11 | Show gradient background colors on the web annotation screen, with deeper colors the further back in time we go. ... (file: [be442d301f] check-in: [0b0ab858a8] user: drh branch: annotate, size: 86377) | |
| 17:16 | Web-based annotation shows lines numbers and the log by default. ... (file: [55b77b0bd5] check-in: [434be79b43] user: drh branch: trunk, size: 85139) | |
| 17:04 | Fix the "Hide Line Numbers" button on the annotate web page. ... (file: [97fdcd0c01] check-in: [d3fd72f442] user: drh branch: trunk, size: 85115) | |
| 17:02 | On the web-based annotate screen, do not show the annotations on lines that are older than the analysis. ... (file: [a7659b2333] check-in: [e46935e962] user: drh branch: trunk, size: 85116) | |
|
2013-05-15
| ||
| 08:13 | Some more -v|--verbose additions. Old options names are deprecated, but still work. ... (file: [6b3c8bdec0] check-in: [e3f7ba556b] user: jan.nijtmans branch: trunk, size: 84803) | |
|
2013-05-14
| ||
| 08:08 | Make sure that find_option() is called before the argument check for the test-looks-like-utf command. ... (file: [38a5bcbe74] check-in: [fd2fbdb965] user: mistachkin branch: trunk, size: 84803) | |
| 07:45 | Re-apply off-by-one fix. Otherwise blobs like {0x00, 0x0a, 0x00} will result in access of the 4th byte of the BLOB. In test-looks-like-utf, could_be_utf16() should be called always, otherwise the behavior on UTF-16 without BOM will be endian-dependant. ... (file: [6926f5ab75] check-in: [e545d3514e] user: jan.nijtmans branch: trunk, size: 84756) | |
|
2013-05-13
| ||
| 22:52 | Style and clarity revisions to the looks_like_utf*() functions. Correct off-by-one fix for the looks_like_utf16() function. Add -utf8 and -utf16 options to the 'test-looks-like-utf' command. ... (file: [dfda57a04d] check-in: [4ffaf2ee08] user: mistachkin branch: trunk, size: 84800) | |
| 09:21 | One more off-by-one error. ... (file: [12b505e79f] check-in: [1484625d6e] user: jan.nijtmans branch: trunk, size: 84479) | |
| 09:12 | Some optimizations. No change in functionality. - In clean_cmd, use new function vfile_scan2. - When checking for multiple bytes/characters always do that in order of likelihood: '\n' is more likely than '\0', which is more likely than '\r'. - Off-by-one error in looks_like_utf16(). - Allow starts_with_utf16_bom() to be used in detecting UTF-16 without BOM as well: Always determine pbReverse, even if no BOM is present. - Remove unused variable. ... (file: [1b13e33a95] check-in: [fa50694405] user: jan.nijtmans branch: trunk, size: 84478) | |
|
2013-05-09
| ||
| 15:30 | Add submenu elements to the web-based "annotate" display to turn features on and off. Make the default depth of an annotation 20. ... (file: [51a8ce6855] check-in: [f4bcdb62fb] user: drh branch: trunk, size: 84170) | |
|
2013-04-23
| ||
| 08:40 | Add --limit as alias to --count in "fossil timeline" for consistancy with other commands. Add many short options, like "-a" for "--all" and "-c" for "--closed" (The JSON part already had those) ... (file: [c672e40bf0] check-in: [8b17c2360a] user: jan.nijtmans branch: trunk, size: 82447) | |
|
2013-04-19
| ||
| 07:55 | Rename "--limit" to "--count" and "--test" to "--nochange" in some fossil commands ... (file: [6fbdbce6c5] check-in: [e72af5058e] user: jan.nijtmans branch: count-nochange, size: 82521) | |
|
2013-04-16
| ||
| 09:01 | More comments ... (file: [ea1f1cbc4a] check-in: [d3e5f30be8] user: jan.nijtmans branch: ui-no-utf8, size: 86088) | |
|
2013-04-15
| ||
| 12:35 | merge trunk ... (file: [333f4487b1] check-in: [3d82be0e3f] user: jan.nijtmans branch: ui-no-utf8, size: 84412) | |
|
2013-04-08
| ||
| 10:42 | Consistant use of DIFF_CANNOT_COMPUTE_??? messages ... (file: [ccf0675c66] check-in: [b18276cbde] user: jan.nijtmans branch: ui-no-utf8, size: 83768) | |
| 09:03 | Implement LOOK_INVALID for utf-16, and use it to detect UTF-16 without BOM in network byte order ... (file: [9d2311d5c8] check-in: [2d14d82c6b] user: jan.nijtmans branch: ui-no-utf8, size: 83969) | |
|
2013-04-05
| ||
| 07:44 | Branches "use-blob_strip_bom" and "improve_commit_warning" go together in a single new (experimental) branch ... (file: [0917d257ef] check-in: [a7e77a66b0] user: jan.nijtmans branch: ui-no-utf8, size: 83612) | |
|
2013-04-04
| ||
| 15:24 | eliminate goto ... (file: [03ad55a4c7] check-in: [c11b373671] user: jan.nijtmans branch: improve_commit_warning, size: 82784) | |
| 11:35 | merge trunk ... (file: [d9f03c1312] check-in: [d8bc29f346] user: jan.nijtmans branch: improve_commit_warning, size: 82907) | |
| 06:53 | Simplyfy/speed-up use of LOOK_??? flags. Rename LOOK_CR/LF to LOOK_ANY_CR/LF. ... (file: [44742194b1] check-in: [468f134659] user: jan.nijtmans branch: looks-like-utf, size: 82265) | |
| 06:43 | copy/paste error in comment ... (file: [e09a3a97c8] check-in: [eb3c9b34df] user: jan.nijtmans branch: trunk, size: 82440) | |
|
2013-04-03
| ||
| 09:59 | merge trunk ... (file: [ba30821228] check-in: [ccc9896f1c] user: jan.nijtmans branch: looks-like-utf, size: 82336) | |
| 09:39 | Implement LOOK_SHORT flag Re-order test-cases such that adding to "data" array will not result in more renumberings any more. This should prevent the "More than 10,000 changes" in some (not all) cases. ... (file: [cd620c278c] check-in: [1686ff716a] user: jan.nijtmans branch: trunk, size: 82440) | |
|
2013-04-02
| ||
| 08:43 | too long line ... (file: [6c84525be6] check-in: [eff988b280] user: jan.nijtmans branch: looks-like-utf, size: 82180) | |
| 08:36 | More compact, better readable, output for test-looks-like-utf command. ... (file: [76c461ebd7] check-in: [caa50cffb5] user: jan.nijtmans branch: looks-like-utf, size: 82198) | |
|
2013-03-27
| ||
| 23:13 | Make the intent of the code in commit_warning() clearer. Style cleanup. ... (file: [7017c616d0] check-in: [3f78dfe593] user: mistachkin branch: trunk, size: 82284) | |
| 09:45 | Allow looks_like_utf8/16 to specify when the loop should stop, in stead of leaving it unspecified. Minor comment/doc fixes. ... (file: [4396e6743d] check-in: [79f7eb2fc5] user: jan.nijtmans branch: trunk, size: 82272) | |
|
2013-03-26
| ||
| 11:12 | Enable fossil to distinguish correctly CR/CRNL/mixed line endings. ... (file: [c363de23b4] check-in: [f89e2eccbb] user: jan.nijtmans branch: trunk, size: 82166) | |
|
2013-03-21
| ||
| 12:06 | Add flag LOOK_INVALID, not used yet. Add many more UTF8/16 test-cases. ... (file: [7d1f33f8a9] check-in: [3ec3909b17] user: jan.nijtmans branch: trunk, size: 82086) | |
| 10:57 | merge trunk (testcases not adapted yet!) ... (file: [2c51c26a10] check-in: [43aa3b2d8b] user: jan.nijtmans branch: improve_commit_warning, size: 83472) | |
|
2013-03-19
| ||
| 17:37 | Fix overly eager byte swapping when checking for UTF-16 text. ... (file: [ca06fbaa3b] check-in: [3f2f1e62fa] user: mistachkin branch: bomRefactor, size: 81914) | |
| 14:12 | take over new testcases from bomRefactor branch. ... (file: [19b8d87887] check-in: [f58bc2dfc7] user: jan.nijtmans branch: trunk, size: 81490) | |
| 10:06 | merge trunk (still experimental) ... (file: [5701f56213] check-in: [af4d780446] user: jan.nijtmans branch: use-blob_strip_bom, size: 81553) | |
| 08:59 | Merge "cr-warning" branch to trunk: Fossil now warns before committing files with CR line-endings and offers to convert them to LF line-endings; fossil's diff cannot handle those. In checkin.c, use LOOK_BINARY in stead of LOOK_NUL, in case more flags are added to the BINARY detection. Rename LOOK_LENGTH to LOOK_LONG. ... (file: [9915030779] check-in: [ea2598e447] user: jan.nijtmans branch: trunk, size: 81316) | |
|
2013-03-18
| ||
| 23:47 | Make sure that LOOK_CR is set even when a CR/LF pair is detected. Rename the LOOK_LENGTH flag to LOOK_LONG for clarify. Add LOOK_SHORT flag to indicate that the looks_like_utf16() function did not perform a full check. Support tests for UTF-16 in reverse byte order. Enhancements to the test-looks-like-utf command. ... (file: [5cf2b21355] check-in: [b0b3f2a44f] user: mistachkin branch: bomRefactor, size: 81819) | |
| 12:37 | Adapt test-case 112 such that it contains a reversed CR/LF, a case not covered before. Fix detection of reversed CR/LF and lone CR in reversed UTF-16 case, broken by [e3f9a42b58]. ... (file: [0215008a22] check-in: [a4cdc7235a] user: jan.nijtmans branch: trunk, size: 81330) | |
| 09:30 | Remove dead code from checkin.c Fix LOOK_BINARY macro: LOOK_ODD doesn't say anything about being binary or not, it only means it cannot be UTF-16. ... (file: [0c19604400] check-in: [12ce0041f5] user: jan.nijtmans branch: trunk, size: 81529) | |
| 05:38 | Correct inverted result of looks_like_binary() macro. Correct off-by-one error in the looks_like_utf16() function. Restore original meaning of the LOOK_CR and LOOK_LF flags. Restore LOOK_ODD flag, abstracting UTF-16 content inspection away from blob length. When performing byte swaps, do so consistently. Fix test cases to work with Tcl versions prior to 8.6. Add could_be_utf16() function to preform the preliminary blob checks. Adjustments to style and comments. ... (file: [cfde94839c] check-in: [e3f9a42b58] user: mistachkin branch: trunk, size: 81442) | |
|
2013-03-17
| ||
| 09:54 | remove the LOOK_ODD flag. It doesn't fit in looks_like_utf16() because it doesn't need each character to be scanned. ... (file: [e660dfa514] check-in: [d4fe8be6a3] user: jan.nijtmans branch: trunk, size: 78168) | |
|
2013-03-16
| ||
| 06:46 | move starts_with_utf16_bom() call out of looks_like_utf16(), so we do it only once. ... (file: [adcc5fe822] check-in: [b58800e5eb] user: jan.nijtmans branch: trunk, size: 78348) | |
|
2013-03-15
| ||
| 12:29 | merge trunk ... (file: [6d54980ceb] check-in: [59f2644788] user: jan.nijtmans branch: bomRefactor, size: 78955) | |
| 12:23 | Don't let looks_like_utf8/16 decide any more whether the blob is text or binary. Calling code can do that based on the returned flags. This simplifies looks_like_utf8/16 a lot. ... (file: [985ae12de3] check-in: [276b34955b] user: jan.nijtmans branch: trunk, size: 78334) | |
| 11:16 | minor simplifications ... (file: [a0b9cb7050] check-in: [731e07dd94] user: jan.nijtmans branch: bomRefactor, size: 80486) | |
| 10:28 | fix comments ... (file: [0fa259165e] check-in: [d0a36540fd] user: jan.nijtmans branch: bomRefactor, size: 80555) | |
| 10:17 | re-apply [3d6d2e7f35]: Better handling and tests for initial CR/LF chars in the looks_like_utf*() functions. ... (file: [2847a7f073] check-in: [3528062ac1] user: jan.nijtmans branch: bomRefactor, size: 80559) | |
| 10:05 | Add two new utf-16 test-cases, which were handled wrong up to now, and fix the code accordingly. ... (file: [56f4481995] check-in: [fab2b8aea5] user: jan.nijtmans branch: trunk, size: 79882) | |
|
2013-03-14
| ||
| 22:14 | Better handling and tests for initial CR/LF chars in the looks_like_utf*() functions. ... (file: [be0926cef5] check-in: [3d6d2e7f35] user: mistachkin branch: trunk, size: 80948) | |
| 20:45 | The VSEEN table added in the previous check-in should be a TEMP table. ... (file: [b8cb493259] check-in: [ec4c9787c9] user: drh branch: trunk, size: 80353) | |
| 20:27 | Prevent time warps from causing infinite loops in the annotator. ... (file: [101510c782] check-in: [1605649f3e] user: drh branch: trunk, size: 80348) | |
| 14:48 | Merging from trunk to get the annotate fixes. Trivial conflict solved. <strong>Update:</strong> the new branch viric_flavour ([b31afcc2ca]) includes most of these changes in a more recent fossil. ... (file: [2096e9a9eb] check-in: [f14798e0e3] user: viriketo branch: annotate_links, size: 81734) | |
| 14:18 | Update the "annotate" command and webpage to prefer to take changes from direct ancestors of the version being analyzed, rather than more recent changes on branches. ... (file: [fe26c2a4cc] check-in: [e320f0cd79] user: drh branch: trunk, size: 79914) | |
| 14:09 | style ... (file: [f1539720e1] check-in: [3ba9a4d5ca] user: jan.nijtmans branch: trunk, size: 79649) | |
| 13:51 | LOOK_LENGTH flags only has meaning when LOOK_NUL is not set. ... (file: [47fdb7f207] check-in: [8923e06cea] user: jan.nijtmans branch: trunk, size: 79669) | |
| 12:11 | Simplify many if() expressions. Use the fact that if the last char in a file is CR, it cannot be followed by a LF any more. This way we don't need to verify the value of 'n' (number of characters remaining) any more. ... (file: [462308013a] check-in: [bd1dcc1c52] user: jan.nijtmans branch: trunk, size: 79669) | |
| 10:33 | Fix detection of LOOK_LONE_CR/LOOK_LONE_LF for the first byte/character of the file. Fix off-by-one error in utf8 LOOK_LONE_CR detection, which could access one byte past the blob. Simplify the code, making use of the know relation between some LOOK_XXX flags. ... (file: [78b3806d53] check-in: [ce9d6abea2] user: jan.nijtmans branch: trunk, size: 79990) | |
|
2013-03-13
| ||
| 13:44 | remove debug code ... (file: [cb0e447b75] check-in: [7ef1890c19] user: jan.nijtmans branch: bomRefactor, size: 80793) | |
| 13:37 | merge trunk ... (file: [7fd0b165b3] check-in: [3718383e5c] user: jan.nijtmans branch: bomRefactor, size: 80792) | |
|
2013-03-12
| ||
| 22:37 | Modify the looks_like_utf*() functions to detect lone CR and LF characters and set new output flags accordingly. ... (file: [d1fbeeef30] check-in: [7dee903839] user: mistachkin branch: trunk, size: 80056) | |
| 12:00 | Fix determination of LOOK_CR/LOOK_LF to include the first character in the file, eliminating overlap with LOOK_CRLF. This way, inconsistant line endings can be determined by verifying that at most one of the flags LOOK_CR/LOOK_LF/LOOK_CRLF may be set. Test cases adapted accordingly. ... (file: [2d452d0ea6] check-in: [c1d3526741] user: jan.nijtmans branch: trunk, size: 79470) | |
|
2013-03-11
| ||
| 15:37 | Combine looks_like_utf8/looks_like_utf16 to a single looks_like_utf function, which can be used in both checkin.c and utf.test. This assures that utf.test really checks the same thing as checkin.c is using. ... (file: [b62c5dfb2b] check-in: [e42ea98f95] user: jan.nijtmans branch: bomRefactor, size: 79923) | |
|
2013-03-08
| ||
| 13:02 | merge trunk ... (file: [3265110f91] check-in: [17e972c318] user: jan.nijtmans branch: improve_commit_warning, size: 80372) | |
| 11:56 | merge trunk ... (file: [e12e8feab9] check-in: [8be674a133] user: jan.nijtmans branch: bomRefactor, size: 78906) | |
| 00:09 | Revise the looks_like_utf16() function so that it can handle blobs with an odd number of bytes and still set all the applicable output flags. Add tests for the UTF-8/UTF-16 detection functions. ... (file: [3fdd1c0158] check-in: [e3ae41483d] user: mistachkin branch: trunk, size: 79156) | |
|
2013-03-07
| ||
| 22:26 | Detect overlong and nul-bytes for files starting with utf-16 BOM but with odd number of bytes. ... (file: [b09743228e] check-in: [14019cb0e2] user: jan.nijtmans branch: bomRefactor, size: 79045) | |
| 10:16 | Fix gcc warning, and add test-case (which fails in current trunk) ... (file: [90b3daaadb] check-in: [c53b128f15] user: jan.nijtmans branch: bomRefactor, size: 78874) | |
| 09:56 | Since the blob size is unsigned, looks_like_utf16() cannot easily process the content if the size is not even. ... (file: [1bdbb18c0c] check-in: [32b8fc7dcd] user: mistachkin branch: trunk, size: 79006) | |
| 09:21 | Better comment. ... (file: [2f581dc02e] check-in: [2237e34377] user: jan.nijtmans branch: bomRefactor, size: 78872) | |
| 08:54 | Forgot to remove the odd bytes check, and fixed comment. ... (file: [fa97cad1a3] check-in: [b5a3f0b48a] user: jan.nijtmans branch: bomRefactor, size: 78817) | |
| 08:21 | If the blob has an odd number of bytes, it means that the content of the file cannot be interpreted as UTF-16 characters. So, starts_with_utf16_bom() should return false and looks_like_utf16() shouldn't even be called. The flag LOOK_ODD makes no sense in starts_with_utf16_bom(). ... (file: [90b8f7a639] check-in: [7b0b7ec87d] user: jan.nijtmans branch: bomRefactor, size: 78828) | |
| 01:27 | Add support for detecting standalone carriage-return characters via the looks_like_utf*() functions. ... (file: [6f532798dc] check-in: [6c7185d9ba] user: mistachkin branch: trunk, size: 79008) | |
| 01:14 | Fix typo in comments. ... (file: [0af71f1918] check-in: [30e4e3e25d] user: mistachkin branch: trunk, size: 78707) | |
| 01:12 | For the looks_like_utf*() functions, continue to examine blob content in order to fully set the output flags, even if it appears to be binary. Also, increase the strictness of starts_with_utf16_bom() and make it more accurate. ... (file: [dc8a1eb26c] check-in: [13fac7f74a] user: mistachkin branch: trunk, size: 78709) | |
|
2013-03-06
| ||
| 20:46 | Modify the commit_warning() function so the warning for possible binary content is higher priority than the other warnings. ... (file: [1922493f65] check-in: [2d9ae4ee73] user: mistachkin branch: trunk, size: 77987) | |
| 20:27 | Add the test-looks-like-utf test command to help test the looks_like_utf*() and related functions. ... (file: [a872174dff] check-in: [08b96cedee] user: mistachkin branch: trunk, size: 77915) | |
| 15:33 | fix commit dialog (problem is introduced in [30a63b8b66]) for files containing crlf or long lines followed by nul byte. test-case: $ tclsh8.6 % set f [open abc w];fconfigure $f -translation binary;puts -nonewline $f \r\n\0;close $f;exit $ fossil add abc ADDED abc $ fossil commit --test ./abc contains CR/NL line endings. Use --no-warnings or the "crnl-glob" setting to disable this warning. Commit anyhow (a=all/c=convert/y/N)? n After correction: $ ./fossil commit --test ./abc contains binary data. Use --no-warnings or the "binary-glob" setting to disable this warning. Commit anyhow (a=all/y/N)? n ... (file: [c759ede462] check-in: [af0ca3b4eb] user: jan.nijtmans branch: trunk, size: 76483) | |
| 07:50 | Refactor the looks_like_utf*() functions to use a single output flags argument to convey the various pieces of blob status information. ... (file: [a9ee4af8df] check-in: [30a63b8b66] user: mistachkin branch: trunk, size: 76555) | |
|
2013-03-05
| ||
| 09:24 | Don't trigger the long-lines warning if the long line is followed by a null-byte: it's a normal binary file then. re-write looks_like_utf8/16 to handle crlf the same way as long lines (thanks, Joe, for the long-lines rewrite!) ... (file: [56fdb20f1e] check-in: [ab2920c2b9] user: jan.nijtmans branch: trunk, size: 76283) | |
| 02:06 | Add warning for overly long lines found during the commit process. ... (file: [aefa41cd65] check-in: [10fbcda270] user: mistachkin branch: trunk, size: 76272) | |
|
2013-03-04
| ||
| 23:13 | Revert check-in [3a74f9fe52], which added a special warning for overly long lines being detected as binary files. ... (file: [7c4d3451fa] check-in: [dd9e030bc9] user: mistachkin branch: noLineLenWarning, size: 76003) | |
| 16:10 | Fix coloration of side-by-side diff lines with multibyte UTF8 where the lines are completely inserted or deleted. ... (file: [b7665e7c83] check-in: [6184037c31] user: drh branch: trunk, size: 76455) | |
|
2013-03-03
| ||
| 15:39 | minor cut/paste error ... (file: [50d3d679bb] check-in: [b163569a8c] user: jan.nijtmans branch: trunk, size: 76431) | |
| 15:32 | New warning when file is considered binary due to long lines only. ... (file: [e80b036562] check-in: [3a74f9fe52] user: jan.nijtmans branch: trunk, size: 76434) | |
|
2013-03-02
| ||
| 18:30 | Additional fixes to side-by-side diff coloration for multibyte UTF8 text. ... (file: [ec0dac07d7] check-in: [85ca387557] user: drh branch: trunk, size: 75979) | |
|
2013-02-28
| ||
| 20:44 | Make sure side-by-side diff highlighting encloses complete UTF8 characters and does not divide a UTF8 character into two invalid characters. ... (file: [be58c56a6d] check-in: [e2b3490676] user: drh branch: trunk, size: 75979) | |
|
2013-02-27
| ||
| 11:26 | merge trunk ... (file: [fd63799ff9] check-in: [d085eb9aca] user: jan.nijtmans branch: use-blob_strip_bom, size: 76660) | |
|
2013-02-23
| ||
| 21:45 | merge trunk ... (file: [cb2d76ffe9] check-in: [eeb0231b9b] user: jan.nijtmans branch: improve_commit_warning, size: 76581) | |
|
2013-02-20
| ||
| 08:33 | Simplify/speedup starts_with_utf16_bom and enhance doc for it. ... (file: [6f375fd13c] check-in: [957be42625] user: jan.nijtmans branch: trunk, size: 75356) | |
|
2013-02-17
| ||
| 21:37 | merge trunk ... (file: [aa58d1fd0f] check-in: [fdf9050c4b] user: jan.nijtmans branch: improve_commit_warning, size: 76782) | |
| 14:47 | More simplification in UTF-16 bom detection ... (file: [4be92b4332] check-in: [1e70f211f9] user: jan.nijtmans branch: utf16Bom, size: 75361) | |
| 14:43 | Remove two unused variables ... (file: [c686d984a4] check-in: [a98467b661] user: jan.nijtmans branch: trunk, size: 75557) | |
|
2013-02-16
| ||
| 14:12 | Limit the complexity of the diff display on check-in information pages. ... (file: [881d1e37b7] check-in: [4f95ea8c56] user: drh branch: trunk, size: 75573) | |
|
2013-02-15
| ||
| 19:57 | Improvements to UTF-16 byte-order-mark detection. ... (file: [b697140bc3] check-in: [3d988df670] user: mistachkin branch: trunk, size: 74836) | |
| 15:14 | On a side-by-side diff, shift small differences as far to the left as possible. ... (file: [67175a9aec] check-in: [89a2e88107] user: drh branch: trunk, size: 74196) | |
| 14:37 | Fixing annotate. It was hanging. ... (file: [4aee7b0bd8] check-in: [96c3133576] user: viriketo branch: annotate_links, size: 76016) | |
|
2013-02-13
| ||
| 20:16 | Correct comment and remove superfluous return statement. ... (file: [b3eb4a6dd2] check-in: [a49749ed5d] user: mistachkin branch: utf16Bom, size: 74836) | |
| 09:28 | "reverse" should mean big-endian on little-endian machines. ... (file: [99176d2f2e] check-in: [cdffec2b63] user: jan.nijtmans branch: utf16Bom, size: 74858) | |
| 03:14 | Improvements to the UTF-16 BOM detection. ... (file: [dfad5ce773] check-in: [81c4d78137] user: mistachkin branch: utf16Bom, size: 76021) | |
|
2013-02-11
| ||
| 20:36 | Fixed the auto-width diff display. ... (file: [f11493528a] check-in: [1b07b3d9b2] user: viriketo branch: annotate_links, size: 76016) | |
| 19:46 | Making it build; diff doesn't work well, about with calculation, yet. ... (file: [376b02686d] check-in: [facd98ce8c] user: viriketo branch: annotate_links, size: 75965) | |
| 19:30 | Merging from trunk. I still have merge conflicts since my previous merge. ... (file: [a5d06771c2] check-in: [bdeb633a6c] user: viriketo branch: annotate_links, size: 78449) | |
|
2013-02-08
| ||
| 09:37 | Eliminate use of starts_with_utf16(be|le)_bom functions, starts_with_utf16_bom should be enough. External code will typically call "starts_with_utf16_bom" first, and if it returns true call "blob_to_utf8_no_bom" converting it to utf-8. There is no reason any more then for external code to know wheter the BOM was le or be. ... (file: [fc3d370f02] check-in: [fab09a1710] user: jan.nijtmans branch: trunk, size: 74196) | |
|
2013-02-07
| ||
| 15:28 | Divide blob length check (even number of bytes) and UTF-32 check in the 3 versions of the UTF-16 BOM functions. ... (file: [3d2781b919] check-in: [be6756e26b] user: jan.nijtmans branch: trunk, size: 75180) | |
| 09:39 | merge trunk ... (file: [92dbe1b5d6] check-in: [8994f3680a] user: jan.nijtmans branch: improve_commit_warning, size: 75275) | |
| 09:19 | If file starts with UTF-32 BOM, always consider it binary without warning. ... (file: [13a5bf3a8d] check-in: [c209105f0f] user: jan.nijtmans branch: simplify-starts-with, size: 74055) | |
| 08:47 | Combine 4 "starts_with_utf??_bom" functions to a single - easier to use - function "starts_with_bom". In addition, it only checks for an UTF-16 BOM if the blob has an even number of bytes. ... (file: [53e136deed] check-in: [6c417d8bf5] user: jan.nijtmans branch: simplify-starts-with, size: 73917) | |
|
2013-01-21
| ||
| 10:29 | merge trunk ... (file: [5a7b94ae69] check-in: [a68dffbff3] user: jan.nijtmans branch: improve_commit_warning, size: 76148) | |
|
2013-01-15
| ||
| 02:29 | Fix compiler warnings. ... (file: [2ada0d3531] check-in: [b3bac1158b] user: drh branch: trunk, size: 74928) | |
|
2013-01-03
| ||
| 20:02 | Rename re_execute() to re_match(). Other fixes to regex matcher bugs that were introduced when porting the code from SQLite. ... (file: [deffd29b50] check-in: [c84051f38d] user: drh branch: trunk, size: 75023) | |
| 13:38 | regexp.c (re_next_char): 3 off-by-one errors, and disallow characters > 0x10ffff unicode.c/diff.c: fix some gcc warnings ... (file: [dcfa5085b0] check-in: [a13e0a20a8] user: jan.nijtmans branch: trunk, size: 75025) | |
| 10:31 | Updating from trunk. I've left some merge conflicts to solve (annotate, diff) ... (file: [801bc53c02] check-in: [b5b8448ece] user: viriketo branch: annotate_links, size: 79309) | |
|
2013-01-02
| ||
| 11:39 | s/re_exec\b/re_execute/g, for compatibility with BSD. ... (file: [97b080180d] check-in: [6a26eb3497] user: stephan branch: trunk, size: 75056) | |
| 00:58 | Enhance the diff logic so that it can suppress differences that do not match a regular expression. This capability is so far only exposed on the test-diff command. ... (file: [6ad97f9bef] check-in: [97a7b924c0] user: drh branch: trunk, size: 75053) | |
|
2013-01-01
| ||
| 22:56 | Allow the --context option on diff to have a value of 0. ... (file: [bbd9e7d590] check-in: [d74698ec28] user: drh branch: trunk, size: 72070) | |
|
2012-12-17
| ||
| 14:00 | Enhanced comments in the diff.c source code file. No code changes. ... (file: [94c5660882] check-in: [a39a992b4e] user: drh branch: trunk, size: 71940) | |
|
2012-12-16
| ||
| 07:16 | Remove unused local variable. ... (file: [802db6ae1d] check-in: [01d6ef7cf8] user: mistachkin branch: trunk, size: 71803) | |
|
2012-12-15
| ||
| 21:55 | Do not attempt to translate tabs into spaces on a unified diff. ... (file: [6fdf524491] check-in: [b912619403] user: drh branch: trunk, size: 71812) | |
| 14:25 | Add robustness to the handling of command-line options in the "diff" and "test-diff" commands. ... (file: [0b777826bc] check-in: [60d5b1f5a2] user: drh branch: trunk, size: 71937) | |
| 01:17 | More compact representation of a left/right rewrite on side-by-side diffs. ... (file: [277116b6b8] check-in: [233c4975a8] user: drh branch: trunk, size: 71914) | |
| 00:59 | If the left/right alignment in side-by-side diff becomes too busy and hard for a human to read, then show it simplified: as inserting one side and then deleting the other. ... (file: [853d818bc2] check-in: [52db049b89] user: drh branch: trunk, size: 70797) | |
|
2012-12-14
| ||
| 21:24 | Improvements to the side-by-side diff display for indentation changes with minor edits. ... (file: [ca0160d5ae] check-in: [c4bbc4a9af] user: drh branch: trunk, size: 69939) | |
| 18:58 | Rename the test-udiff command to test-diff and give it the capability to use the --tk option. ... (file: [8832774f73] check-in: [4cf8c16cd8] user: drh branch: trunk, size: 69533) | |
|
2012-12-12
| ||
| 13:08 | merge trunk ... (file: [076203f084] check-in: [b70a320288] user: jan.nijtmans branch: improve_commit_warning, size: 70540) | |
|
2012-12-04
| ||
| 01:10 | The "ln" query parameter causes lines numbers to be shown on the "annotate" webpage. ... (file: [69115cf516] check-in: [08f4eda728] user: drh branch: trunk, size: 69320) | |
|
2012-11-27
| ||
| 12:10 | merge trunk ... (file: [601f0d84bd] check-in: [2e1f2e69d5] user: jan.nijtmans branch: improve_commit_warning, size: 70088) | |
|
2012-11-26
| ||
| 22:51 | Merge byte-order-mark handling enhancements to trunk. ... (file: [d793daedef] check-in: [9b800ee41c] user: mistachkin branch: trunk, size: 68868) | |
|
2012-11-19
| ||
| 20:39 | Allow the get_utf8_bom function to return the size as well. ... (file: [604f19d9d7] check-in: [d857d20bef] user: mistachkin branch: convert_before_commit_v2, size: 68688) | |
| 04:39 | Modularize byte-order-mark and blob UTF-8 conversion handling. ... (file: [cfaee26db9] check-in: [d29dd5449c] user: mistachkin branch: convert_before_commit_v2, size: 68596) | |
|
2012-11-15
| ||
| 20:43 | The annotator follows name changes. ... (file: [0d960664a9] check-in: [ee33b951a4] user: drh branch: trunk, size: 67378) | |
|
2012-11-12
| ||
| 13:19 | merge trunk ... (file: [eee29f29e4] check-in: [aaa1cb04dd] user: jan.nijtmans branch: improve_commit_warning, size: 68588) | |
|
2012-11-08
| ||
| 16:25 | Short-circuit a rare pathological case in the diff generator to prevent it from taking too much time. ... (file: [a7ceea3b03] check-in: [353438a83b] user: drh branch: trunk, size: 67366) | |
|
2012-11-07
| ||
| 12:10 | merge trunk <p>Fix continuation-byte check for UTF-8 chars > 2 bytes. ... (file: [5ef4cdf6f8] check-in: [3920fa67bd] user: jan.nijtmans branch: improve_commit_warning, size: 68337) | |
| 09:47 | styling ... (file: [de0ffe7453] check-in: [c8eaeb1b8a] user: jan.nijtmans branch: improve_commit_warning, size: 68337) | |
| 09:43 | merge trunk. <p>simplify utf-8 continuation byte checking, using a loop in stead of separater 2/3/4-byte versions. ... (file: [1e873a9f40] check-in: [2f7ac60f78] user: jan.nijtmans branch: improve_commit_warning, size: 68338) | |
|
2012-11-06
| ||
| 16:35 | When one version of a file ends in a newline and the other does not, be sure to show that difference. Ticket [7541963870703f0]. ... (file: [eac3efd0da] check-in: [d764f449d7] user: drh branch: trunk, size: 67115) | |
|
2012-11-05
| ||
| 13:56 | merge trunk ... (file: [b9e8546e27] check-in: [b0e05a90b6] user: jan.nijtmans branch: use-blob_strip_bom, size: 68337) | |
| 11:23 | Add commit warning message when text files have a long line length ... (file: [cebaa876ff] check-in: [879012769b] user: jan.nijtmans branch: improve_commit_warning, size: 68533) | |
|
2012-11-04
| ||
| 18:03 | merge trunk ... (file: [254b516e0a] check-in: [e86aa2a1e8] user: jan.nijtmans branch: improve_commit_warning, size: 68386) | |
| 18:00 | merge trunk <p>Factor out main part of UTF-8 check to macro ... (file: [995db27e1a] check-in: [ce7c52223e] user: jan.nijtmans branch: improve_commit_warning, size: 68386) | |
| 12:59 | Fix typos. ... (file: [5006e9fe32] check-in: [45065c5c28] user: dmitry branch: spelling, size: 67033) | |
| 10:50 | merge trunk ... (file: [c1ecaef4b2] check-in: [bd7b8a485f] user: jan.nijtmans branch: improve_commit_warning, size: 68764) | |
| 10:48 | merge trunk, some improvements in messages (not yet ready yet) ... (file: [1096106102] check-in: [517a6f7a53] user: jan.nijtmans branch: improve_commit_warning, size: 67468) | |
|
2012-11-02
| ||
| 17:22 | Adjustments to looks_like_utf16 to handle wchar_t being missing or not 2 bytes. ... (file: [cb28d616af] check-in: [7d881d8280] user: mistachkin branch: trunk, size: 67033) | |
| 14:22 | don't forget to compensate for the line-length check ... (file: [729f39f877] check-in: [9011fe1226] user: jan.nijtmans branch: improve_commit_warning, size: 67363) | |
| 10:55 | Generate warning when to-be-committed file contains invalid UTF-8 ... (file: [a88475a1d5] check-in: [4e86b06a9f] user: jan.nijtmans branch: improve_commit_warning, size: 67329) | |
| 08:31 | speedup mimetype_from_content() by using a 256 byte array. <br>Mark VT and Ctrl-Z as text bytes, not binary. <br>Decrease maximum UTF-16 line length to 2731 <br>Check for FFFF in addition to 0, in UTF-16/binary detection. ... (file: [ca927be57f] check-in: [d804902f23] user: jan.nijtmans branch: trunk, size: 65737) | |
| 03:10 | Use local variable when checking for a carriage-return in looks_like_utf8/utf16. Update custom MinGW makefile. ... (file: [ac05f9f7bb] check-in: [531b2e2df0] user: mistachkin branch: trunk, size: 65678) | |
| 02:27 | Merge commit warning and file content type detection changes to trunk. ... (file: [98197f1f1a] check-in: [0c7c61447f] user: mistachkin branch: trunk, size: 65643) | |
|
2012-11-01
| ||
| 20:09 | Improve detection of UTF-8, UTF-16, binary data, and carriage returns during commit operations. ... (file: [fc8d745905] check-in: [c837e44445] user: mistachkin branch: commitWarningV2, size: 65638) | |
| 15:38 | Correct wrong manual merge. ... (file: [a6ceffe5b8] check-in: [5963c2dde8] user: jan.nijtmans branch: improve_looks_like_binary, size: 64135) | |
| 14:49 | Add back checks for FFFE and FFFF in looks_like_text: <br>- FFFE is a reversed BOM. It could arise when an UTF-16LE and an UTF-16BE file are concatenated. This is always a fatal error, so diff should bail out early. <br>- FFFF is a permanently unassigned character as well, which doesn't exist in any font. Sometimes uninitialized variables are either initialized with 0000 or FFFF, so this makes it much more likely that binary files are detected early. <p>The earlier check for FEFF was not sensible: A BOM in the middle of an UTF-16 file could easily arise when two UTF-16LE or twe UTF-16BE files are concatenated. Nothing goes wrong in that case, the BOM should just be displayed a zero-width-space. Therefore, diff should not bail out. ... (file: [9fecfa0e9d] check-in: [64868f2b98] user: jan.nijtmans branch: improve_looks_like_binary, size: 64135) | |
| 12:32 | merge trunk ... (file: [a648f16613] check-in: [9e97de3410] user: jan.nijtmans branch: use-blob_strip_bom, size: 63953) | |
| 11:48 | merge trunk <p>let looks_like_text() give different values for UTF-16 BE/LE. Not used yet. ... (file: [3816601f25] check-in: [348637dedf] user: jan.nijtmans branch: improve_looks_like_binary, size: 63906) | |
| 07:40 | dont check for same BOM twice ... (file: [c6e79f2c04] check-in: [8c32e6f0dd] user: jan.nijtmans branch: trunk, size: 63239) | |
|
2012-10-31
| ||
| 20:56 | adapt comments accordingly ... (file: [7c124f7d5b] check-in: [b5123d5154] user: jan.nijtmans branch: improve_looks_like_binary, size: 63806) | |
| 20:49 | Don't make it too complicated, too much risk to break other things. ... (file: [39b4b80bc5] check-in: [de5a2ef661] user: jan.nijtmans branch: improve_looks_like_binary, size: 63902) | |
| 13:58 | fix comment ... (file: [6124262f6d] check-in: [e1aed25eee] user: jan.nijtmans branch: improve_looks_like_binary, size: 64334) | |
| 12:58 | Two more enhancements. <br>- DOS text files sometimes use Control-Z (0x1a) as eof-marker, so this byte should be considered text. <br>- FEFF, FFFE and FFFF are invalid UTF-16 code points (when not used as BOM), so files containing those should be considered binary. ... (file: [d478cdf59b] check-in: [e3f3c390f1] user: jan.nijtmans branch: improve_looks_like_binary, size: 64290) | |
| 09:15 | Fix UTF-16 line length determination: j is counted in characters, not bytes. ... (file: [26b705c5f4] check-in: [44c6be2ab6] user: jan.nijtmans branch: improve_looks_like_binary, size: 64055) | |
| 08:43 | Enhance looks_like_text(): <br>- Detect line-length overflow earlier, not at the next NL <br>- Implement the same binary and line-length check for UTF-16 as well <p>For UTF-16, the line-length limit is set to 2/3th of the line length limit for other text, because UTF-16 -> UTF-8 conversion can increase the line length (in bytes) by max 50%. This guarantees that a UTF-16 diff can be made by converting the two UTF-16 files to UTF-8 and then do a normal diff. ... (file: [7b7879a7fc] check-in: [58702daa55] user: jan.nijtmans branch: improve_looks_like_binary, size: 64055) | |
|
2012-10-30
| ||
| 20:10 | Faster determination of binary files, by not only checking for NUL <p>re-use looks_like_blob ... (file: [2c85916ecd] check-in: [0ba08f9d26] user: jan.nijtmans branch: improve_looks_like_binary, size: 63144) | |
| 16:14 | Style en comment fixes, backported from [d57f0a9361] ... (file: [25cec3d2bd] check-in: [c7b2b2ed3c] user: jan.nijtmans branch: trunk, size: 62966) | |
| 15:18 | working utf-16 diff, still being tested ... (file: [71e6c11194] check-in: [879d1e2405] user: jan.nijtmans branch: use-blob_strip_bom, size: 63110) | |
| 08:06 | take over various stylistic adjustments ... (file: [7b46f0d227] check-in: [ab5a6b436e] user: jan.nijtmans branch: use-blob_strip_bom, size: 63063) | |
| 02:17 | Refactor commit warning functionality. Break out UTF-16 BOM detection into a new function. Style and comment fixes. ... (file: [c1da01cdcc] check-in: [d57f0a9361] user: mistachkin branch: commitWarning, size: 63239) | |
|
2012-10-29
| ||
| 22:09 | Working "c=convert" option for <nowiki>[fossil commit]</nowiki>. Just to be tested a little bit more. ... (file: [d1700c6515] check-in: [a97aa34920] user: jan.nijtmans branch: use-blob_strip_bom, size: 62513) | |
| 08:27 | merge trunk ... (file: [5771152f24] check-in: [f61d0a1c50] user: jan.nijtmans branch: use-blob_strip_bom, size: 62461) | |
|
2012-10-28
| ||
| 23:01 | Simplify the looks_like_binary() macro. Remove literal tab character, adjust styling and comments in looks_like_text(). ... (file: [a6943a2f41] check-in: [c8e72df08e] user: mistachkin branch: trunk, size: 62263) | |
| 22:08 | merge trunk ... (file: [cf9d22ad66] check-in: [6c41027335] user: jan.nijtmans branch: use-blob_strip_bom, size: 62422) | |
| 21:38 | - finally, do the ++j update in looks_like_text() right - More consistancy in prompt handling: accept Capitals everywhere, use '(' not '[', and abbreviate yes/no to y/N everywhere ... (file: [06680055cf] check-in: [7c527165a6] user: jan.nijtmans branch: trunk, size: 62226) | |
| 20:47 | .. but don't forget to update j ... (file: [b3196ae3ca] check-in: [6542935c9d] user: jan.nijtmans branch: trunk, size: 62223) | |
| 20:40 | speed-up looks_like_text(), by eliminating variable "i" and handle first character separately. ... (file: [c7a1144003] check-in: [204680eedc] user: jan.nijtmans branch: trunk, size: 62221) | |
| 10:03 | merge trunk ... (file: [2810a1c1a0] check-in: [0b6b0dfd0b] user: jan.nijtmans branch: use-blob_strip_bom, size: 62301) | |
| 09:34 | modify looks_like_binary() to looks_like_text() such that it is usable in cr_warning() as well ... (file: [b517463575] check-in: [1bffce5230] user: jan.nijtmans branch: trunk, size: 62099) | |
|
2012-10-26
| ||
| 09:44 | Even though wiki pages can now be in UNICODE on Windows, this is still not recommended: A diff doesn't work, and it is Windows-only. <br>So give out a warning when a UNICODE file is attempted to be checked in on Windows, just as for CrLf files as well <p>Implement looks_like_text(), similar to looks_like_binary() but it can distinguish more types of text/binary files. ... (file: [804bf0f6a4] check-in: [748071a25d] user: jan.nijtmans branch: use-blob_strip_bom, size: 62716) | |
| 02:35 | Improvements to side-by-side diff alignment. ... (file: [c3dbacc3e4] check-in: [511405f426] user: drh branch: trunk, size: 61883) | |
|
2012-10-25
| ||
| 14:50 | diff.c:looks_like_binary(): No need to make the blob null-terminated. <p>checkin.c: Make limits the same as in looks_like_binary(), preparation to move the function to diff.c ... (file: [2fb8301afe] check-in: [c3ec6309fd] user: jan.nijtmans branch: improve_looks_like_binary, size: 61221) | |
|
2012-10-16
| ||
| 12:18 | Fixing buffer overflows in the width calculation of sbsDiff. ... (file: [d1bdd97703] check-in: [314a294321] user: viriketo branch: annotate_links, size: 63016) | |
|
2012-10-09
| ||
| 13:48 | Updating from trunk. I solved some merge conflicts: 1) the checkin info in the vdiff page, taking that from trunk, and 2) the vdiff menu options, which I tried to get similar to what I had in the branch. ... (file: [5e1e188477] check-in: [f4b082d464] user: viriketo branch: annotate_links, size: 62956) | |
|
2012-10-05
| ||
| 20:39 | Add the "stash show" command. Simplifications to the diff code, and especially the looks_like_binary() function. ... (file: [ba6c48d4b0] check-in: [4e0e69f691] user: drh branch: trunk, size: 61225) | |
|
2012-09-30
| ||
| 06:25 | Add support for skipping binary files when using an external diff program. The existing 'binary-glob' setting and new 'diff-binary' boolean setting control this feature. ... (file: [8be46c386b] check-in: [c50eb50718] user: mistachkin branch: diffBinExternal, size: 60843) | |
|
2012-09-27
| ||
| 01:38 | Fixes to the --tk diff option to support unified diff on Windows. ... (file: [2211c7d89b] check-in: [1048bccf14] user: mistachkin branch: trunk, size: 60205) | |
| 00:37 | Allow unified diff for the --tk diff option. ... (file: [382886537f] check-in: [5be507df71] user: mistachkin branch: trunk, size: 59982) | |
|
2012-09-26
| ||
| 00:11 | Escape "<" and ">" characters denoting removed and inserted line in the HTML version of side-by-side diff. ... (file: [1f6c64f1db] check-in: [28cfb2fb10] user: drh branch: trunk, size: 59845) | |
|
2012-09-05
| ||
| 12:55 | const-qualification ... (file: [fd9eee2b62] check-in: [645f34834d] user: jan.nijtmans branch: eclipse-project, size: 59660) | |
|
2012-08-29
| ||
| 13:57 | Allow UTF-8 characters in sources. translate.exe will translate it to ASCII ... (file: [c98621e358] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 59653) | |
|
2012-08-20
| ||
| 19:01 | Expand the "diffFlags" variable to 64-bits in order to accommodate new options to the various "diff" commands. ... (file: [02c6c15cda] check-in: [2b1767500e] user: drh branch: trunk, size: 59654) | |
| 13:20 | Fixing the automatic calculation of sbs line length, for the case of TABs and UTF8 sequences. I also set the tab size to 4 spaces. ... (file: [1285309796] check-in: [36cdc17cc8] user: viriketo branch: annotate_links, size: 61283) | |
|
2012-08-08
| ||
| 13:46 | Updating from trunk. I solved three merge conflicts about hyperlinks. ... (file: [e2788d90d2] check-in: [08db320464] user: viriketo branch: annotate_links, size: 60811) | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". ... (file: [be140f71f6] check-in: [0328d68181] user: drh branch: sqlite4, size: 59553) | |
|
2012-06-27
| ||
| 12:30 | Begin a branch that is modified to use sqlite4 instead of sqlite3 as the storage engine. This check-in compiles (on unix) but does not work. ... (file: [cc2ead660b] check-in: [6823912746] user: drh branch: sqlite4, size: 59552) | |
|
2012-06-22
| ||
| 22:39 | Huge performance improvement for certain pathological cases for diffing of very large files. ... (file: [42067ab6c1] check-in: [9e15437e97] user: drh branch: trunk, size: 59552) | |
|
2012-06-20
| ||
| 11:02 | Account for multibyte unicode characters when computing column widths for side-by-side diffs. ... (file: [58d1a8991b] check-in: [484f8d29af] user: drh branch: trunk, size: 59537) | |
| 10:57 | Add a comment that contains multi-byte unicode characters. This will be used for testing diff logic. ... (file: [d1c60722e0] check-in: [d1fc2f4a16] user: drh branch: trunk, size: 59506) | |
|
2012-06-11
| ||
| 17:33 | merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) ... (file: [f5ddb362b9] check-in: [7a57ab6465] user: mgagnon branch: mgagnon_fix, size: 59394) | |
|
2012-04-28
| ||
| 07:15 | Changes anchor tags (<a>) so that the href= attribute can be set by javascript rather than by HTML. This is to make it harder for spiders to follow the hyperlinks to every diff and annotation in the project history. It all seems to work, but it needs further testing and review before going live. ... (file: [c8c7a3a979] check-in: [8ae52fc418] user: drh branch: spider-defense, size: 59352) | |
|
2012-04-06
| ||
| 17:24 | (1) Show cherrypick and backout merges in the status command (2) Allow partial commits of cherrypick and backout merges (3) Prompt user to continue if a check-in comment is unedited (4) Fixing a jump on uninitialized data on web sbs diff - cherrypick of [92b2a5c390467a] (5) Updates against an uncommitted merge are now a warning, not a fatal error. ... (file: [58c6432c3b] check-in: [195517a9c9] user: drh branch: trunk, size: 59358) | |
|
2012-04-04
| ||
| 16:20 | Updating from trunk to get the latest trunk fixes. ... (file: [836ed74a1c] check-in: [b7f3a32d4e] user: viriketo branch: annotate_links, size: 60633) | |
| 16:19 | Fixing a jump on uninitialized data on web sbs diff. Noticed after having seen text file corruption in the web SBS, and traced by valgrind. ... (file: [ed29f01bb2] check-in: [92b2a5c390] user: viriketo branch: annotate_links, size: 60555) | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere ... (file: [768756e3fe] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 59383) | |
|
2012-03-19
| ||
| 11:58 | Avoid a valgrind warning in the side-by-side diff logic. ... (file: [9787d3423d] check-in: [9262546e43] user: drh branch: trunk, size: 59341) | |
|
2012-03-18
| ||
| 19:46 | Fixing an unnecessary heap accumulation. ... (file: [1e3ebbd60b] check-in: [801a759589] user: viriketo branch: annotate_links, size: 60538) | |
| 14:53 | Making the side-by-side diffs autocalculate the width, by default. ... (file: [8a792bd2c9] check-in: [16397d8625] user: viriketo branch: annotate_links, size: 60511) | |
|
2012-03-09
| ||
| 02:07 | Tweak to the side-by-side diff alignment algorithm. Add diff test cases to the release checklist. ... (file: [f7608cab26] check-in: [3be264b57f] user: drh branch: trunk, size: 59313) | |
|
2012-03-01
| ||
| 22:30 | Merging from trunk. I manually solved the conflict widening the user name on annotate. ... (file: [155d3a26aa] check-in: [f201fbaea3] user: viriketo branch: annotate_links, size: 60249) | |
|
2012-02-24
| ||
| 11:36 | For annotate, make the fixed user name field wider (e.g. 'Administrator'). ... (file: [78c74c3b37] check-in: [dbf4ecf414] user: mistachkin branch: wideAnnotateUser, size: 59263) | |
|
2012-02-17
| ||
| 21:47 | Removing the 'd' link on the annotate page for lines introduced in a checkin with the parent don't having that file. ... (file: [82e55d7e2c] check-in: [4036b5df51] user: viriketo branch: annotate_links, size: 60243) | |
| 21:36 | Merging what I had at [61523cbe67] over trunk related to href targets. ... (file: [ad2340493e] check-in: [d5129ae101] user: viriketo branch: annotate_links, size: 60003) | |
| 21:29 | Merging from trunk, to get the branch up to date. ... (file: [b47642ae4b] check-in: [6b7ddfefbf] user: viriketo branch: annotate_links, size: 59716) | |
|
2012-02-11
| ||
| 18:25 | Further diff enhancements: Allow up to two diff-marks per line on a side-by-side diff. ... (file: [b1fa7e636c] check-in: [937514b968] user: drh branch: trunk, size: 59259) | |
|
2012-02-10
| ||
| 18:02 | climb up the trunk. From up here, clarify wording of the "building and installing" wiki page: you don't need to log in to get the source code for released versions of fossil, the download page will have a shiny source package for you to fetch. ... (file: [1d49306d9e] check-in: [587dd57fe1] user: martin.weber branch: msw-docco, size: 54253) | |
|
2012-02-07
| ||
| 20:04 | Another minor performance enhancement on sbs diff. ... (file: [f78d6f216c] check-in: [3e3feb2dda] user: drh branch: trunk, size: 54215) | |
| 18:58 | Performance optimization for the alignment calculation on side-by-side diffs. Noticably faster. ... (file: [0143d68811] check-in: [87f867018b] user: drh branch: trunk, size: 54222) | |
| 18:13 | Optimize the inner loop of the LCS algorithm for the main diff generator. ... (file: [1a183093d6] check-in: [4ab6071145] user: drh branch: trunk, size: 53011) | |
| 16:13 | Minor tweak to the side-by-side alignment algorithm so that it handles pure white-space lines better. ... (file: [ff877a1c9d] check-in: [312590a9ee] user: drh branch: trunk, size: 52705) | |
| 15:38 | Add the --brief option to the "diff" command. ... (file: [abe39d187f] check-in: [e0565d4351] user: drh branch: trunk, size: 52707) | |
| 04:15 | Add chunk number fragment marks to HTML diff output. ... (file: [ac353718d9] check-in: [b1530c29ab] user: drh branch: trunk, size: 52394) | |
| 03:57 | Convert the similarity measure for side-by-side diff alignment to use LCS instead of edit distance. LCS is faster and gives comparable results. ... (file: [9d3dd93b35] check-in: [469462b69a] user: drh branch: trunk, size: 52132) | |
| 00:01 | Change back to using minimum edit distance for computing similarity of lines for alignment in side-by-side diff change blocks. ... (file: [fc00bfd839] check-in: [51bda5e441] user: drh branch: trunk, size: 52812) | |
|
2012-02-06
| ||
| 15:02 | Tweak to side-by-side alignment: Be more aggressive about marking lines as changed if they are naturally aligned to begin with. ... (file: [d46d49428a] check-in: [5d836cbda7] user: drh branch: diff-experimental, size: 52116) | |
| 14:28 | Adjust the alignment similarity cutoff score. ... (file: [c87a2c697e] check-in: [9713e42356] user: drh branch: diff-experimental, size: 52094) | |
| 14:22 | Improvements to the alignment algorithm for block changes in side-by-side diff. ... (file: [17125cdca7] check-in: [a484cfc2f2] user: drh branch: diff-experimental, size: 52094) | |
| 03:38 | When a line changes in a side-by-side diff, only highlight the part of line that actually changed. ... (file: [90125488ac] check-in: [357d26bc36] user: drh branch: diff-experimental, size: 49644) | |
| 01:55 | Trying out a greedy algorithm for aligning the two sides of a change with side-by-side diff. This helps in some cases, but we could probably benefit from a better algorithm. ... (file: [ff30365b52] check-in: [881b65141b] user: drh branch: diff-experimental, size: 46862) | |
|
2012-02-05
| ||
| 20:22 | Add the "diff optimizer" which tries to shift inserts and deletes to align with natural boundaries in the text. The resulting diff is no more or less correct than the original; it just seems more natural to human readers. ... (file: [5c86b214e2] check-in: [98cf5c33bc] user: drh branch: trunk, size: 45067) | |
| 17:19 | Rearrange code and edit comments in diff logic, for clarity of presentation. No functional changes. ... (file: [75dcc6e16e] check-in: [032da543f0] user: drh branch: trunk, size: 41383) | |
| 02:49 | Fix yet another issue with tables in side-by-side diffs - an off-by-one error this time. ... (file: [05126e9cd3] check-in: [de719b4396] user: drh branch: trunk, size: 40661) | |
| 02:43 | Fix another bug in table handling for side-by-side diffs. ... (file: [c143bfc750] check-in: [db1365bc3b] user: drh branch: trunk, size: 40661) | |
| 00:22 | Bug fix in the handling of tabs on a side-by-side diff. ... (file: [63328e7277] check-in: [07a0ade926] user: drh branch: trunk, size: 40547) | |
|
2012-02-04
| ||
| 20:16 | Suppress the top divider on a context-diff with line numbers. ... (file: [a4789c5f45] check-in: [43cbe9dd5a] user: drh branch: retro-sbsdiff, size: 40529) | |
| 20:13 | Fix off-by-one line numbers in the context-diff display. Improvements to the formatting of context-diff displays. ... (file: [1c527ecead] check-in: [56ad4ac7ae] user: drh branch: retro-sbsdiff, size: 40465) | |
| 20:00 | Bug fix in the context-diff colorization. ... (file: [374d4f828b] check-in: [ecf30837d4] user: drh branch: retro-sbsdiff, size: 40159) | |
| 19:55 | Colorize the context diff. Add color to the line numbers so that they can be deemphasized. ... (file: [6db3826b7b] check-in: [b57b035654] user: drh branch: retro-sbsdiff, size: 40095) | |
| 19:34 | Revised default color scheme. Add line-numbers to context diff. ... (file: [18cc5c11bc] check-in: [6a6697694c] user: drh branch: retro-sbsdiff, size: 39294) | |
| 18:54 | Add color to the retro sbs diff. ... (file: [4a157892d8] check-in: [7372c0a5c4] user: drh branch: retro-sbsdiff, size: 38271) | |
|
2012-02-03
| ||
| 16:15 | Add URI query parameters "dw=" and "dc=" to control the width of columns and the lines of context on side-by-side diffs in the web interface. ... (file: [a4fb713007] check-in: [6474a92a87] user: drh branch: retro-sbsdiff, size: 36177) | |
|
2012-01-01
| ||
| 15:57 | Simplified display of side-by-side diff in the web browser. ... (file: [c84e745762] check-in: [a1e667e6b5] user: drh branch: retro-sbsdiff, size: 36102) | |
|
2011-10-22
| ||
| 13:29 | Tweak the command-line side-by-side diff output so that it deals sanely with \r and \f characters. ... (file: [db8561a4f8] check-in: [4092208afc] user: drh branch: trunk, size: 41151) | |
| 03:37 | Rework the side-by-side diff so that it handles tab characters. Fix an off-by-one error in the line numbers of side-by-side diffs. ... (file: [c352a38e9b] check-in: [8670373321] user: drh branch: trunk, size: 41084) | |
|
2011-10-21
| ||
| 23:44 | Improved formatting for command-line side-by-side diff. Extend command-line side-by-side diff to all diff operations, including stash diffs. ... (file: [0f3e5f6bb9] check-in: [ab47cc73d7] user: drh branch: trunk, size: 40365) | |
| 21:50 | Fix a spacing bug in the display of side-by-side diffs. ... (file: [8c837f1701] check-in: [a505abccc6] user: drh branch: diff-enhancements, size: 39444) | |
| 21:31 | Add support for side-by-side diff from the command-line "diff" command. ... (file: [7e89d5aed4] check-in: [ac81759f65] user: drh branch: diff-enhancements, size: 39443) | |
| 20:24 | Begin improvement efforts on the "diff" functions by adding the --context option to the "diff" command. ... (file: [b3ff26c590] check-in: [3bbbbdfd7d] user: drh branch: diff-enhancements, size: 34464) | |
|
2011-10-20
| ||
| 14:50 | Change strcpy() to memcpy() inside diff.c to avoid compiler warnings on OpenBSD. ... (file: [52714538a2] check-in: [06e9863cb0] user: drh branch: trunk, size: 33540) | |
|
2011-10-18
| ||
| 21:20 | Adding a space I forgot in in the html output. ... (file: [e974796e7d] check-in: [61523cbe67] user: viriketo branch: targets_setting, size: 33354) | |
| 20:55 | Adding a boolean setting to choose the use of 'targets' in the anchors href. Default enabled. Related to the thread starting at [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg06588.html] ... (file: [feca6c40ff] check-in: [d29df2f0a2] user: viriketo branch: targets_setting, size: 33353) | |
| 19:49 | Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. ... (file: [201ec8ba9c] check-in: [ef5d2176f9] user: viriketo branch: annotate_links, size: 33647) | |
| 19:45 | Should fix ticket [f0f9aff371f2]. Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out. I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does what I'd like it to do. Maybe someone else can come up with a faster or simpler implementation. I changed the compute_direct_ancestors code so I could call it twice in a single run. ... (file: [6a9672991a] check-in: [c7c4279f13] user: viriketo branch: annotatecmd_fix, size: 33537) | |
|
2011-10-17
| ||
| 01:18 | Remove unused variables and surplus blank lines from the side-by-side diff code. ... (file: [34c60666c8] check-in: [a92908a6b5] user: drh branch: jan-sbsdiff, size: 33190) | |
|
2011-10-16
| ||
| 00:14 | Updated styles/skins. Built-in skin 4 can now wrap lines. ... (file: [d070ddd384] check-in: [1c40493cb5] user: jan branch: jan-sbsdiff, size: 33279) | |
|
2011-10-15
| ||
| 15:42 | Merge the latest trunk changes into the side-by-side diff branch. ... (file: [6c6b5fa870] check-in: [15de70c21f] user: drh branch: jan-sbsdiff, size: 33119) | |
| 14:33 | Updated comments. Slightly more centralization of sbsdiff table generation. ... (file: [ecf9d8641c] check-in: [c5ac4f800e] user: jan branch: jan-sbsdiff, size: 33141) | |
| 12:22 | Make sure sbsdiff lines are escaped properly. Started adding side-by-side diff support to fdiff. ... (file: [e5827f7c54] check-in: [ff41d4be8a] user: jan branch: jan-sbsdiff, size: 33122) | |
| 10:17 | A very simple fix to the annotate memory leak problem. ... (file: [44fc8779b0] check-in: [9929bab702] user: drh branch: trunk, size: 28145) | |
| 00:26 | Code documentation. ... (file: [6db07e500b] check-in: [9b7955b5a4] user: jan branch: jan-sbsdiff, size: 33123) | |
| 00:10 | The link <strong>p</strong> in the annotate page was totally bad implemented. As I don't see an easy way to implement it, I take it out. There is only <strong>d</strong> left. ... (file: [8a1684fe4e] check-in: [4bae75a08e] user: viriketo branch: annotate_links, size: 30792) | |
| 00:06 | The plink is not needed at all in the annotate query ... (file: [31291c8cb7] check-in: [40cbb69c4f] user: viriketo branch: annotate_links, size: 31193) | |
|
2011-10-14
| ||
| 23:38 | Starting a branch to add more information into the annotate web page. I added a link <strong>p</strong> to the annotation of the version previous to that line change, and a link <strong>d</strong> to the checkin file diff that introduced the given line. I'd want also the links to bring the users to the concerning line of annotate; we should have something like line numbering and line anchors, like the artifact page. ... (file: [41528228d3] check-in: [9e3b6ad052] user: viriketo branch: annotate_links, size: 31236) | |
| 22:21 | Added two (local) options to sbsdiff (allow expansion and max columns limit), though they can't be changed in runtime yet. Added some missing error handling. ... (file: [8caddc5eeb] check-in: [47cdbbf2fb] user: jan branch: jan-sbsdiff, size: 32735) | |
| 16:11 | Merging the annotate_noleak changes, about removing an important memory leak in the annotate operation. It also fixes some blob behaviour in blob.c and content.c. <b>Update:</b> Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] ... (file: [fc9c44f73a] check-in: [409f370a6d] user: viriketo branch: declined, size: 30335) | |
|
2011-10-13
| ||
| 23:48 | Started adding support for showing side-by-side diffs in the web ui. ... (file: [19cf0dd42c] check-in: [a6a8e89413] user: jan branch: jan-sbsdiff, size: 32368) | |
|
2011-09-15
| ||
| 00:54 | Further progress towards jerusalem on yet another holy docco crusade! Checkin #3/n ... (file: [e5b0b0fa37] check-in: [17f21f2482] user: martin.weber branch: msw-docco, size: 28205) | |
|
2011-09-14
| ||
| 17:45 | Refactored g.okXXX perms flags to g.perm.XXX. ... (file: [c57cf060da] check-in: [34b4dec0bc] user: stephan branch: stephan-hack, size: 28167) | |
| 00:32 | Begin streamline the online documentation to: * always include a short overview of the options supported by a given command, alphabetically sorted * reference similar/related commands with a final See also: section * Use ?x? for optional arguments * collapse supported options into ?OPTIONS? This is commit #1/n. ... (file: [949f21b722] check-in: [3fbf8caa87] user: martin.weber branch: msw-docco, size: 28161) | |
|
2011-09-13
| ||
| 17:18 | The Label list was not properly freed in some cases; looking at the annotate of 'win/Makefile.msc' was triggering the case. ... (file: [d5d5a7025a] check-in: [4860d9f234] user: viriketo branch: annotate_noleak, size: 30319) | |
|
2011-09-06
| ||
| 20:30 | Documenting the Label structure I introduced. ... (file: [2aa5f51533] check-in: [58a02a2e4a] user: viriketo branch: label_linkedlist, size: 29867) | |
|
2011-09-04
| ||
| 22:14 | Implementation of a linked list to solve the memory leak described in a TODO in [e2ebb1f5cae8]. This code is slower than having the memory leak, and at the end, it was not a big memory leak. Let's say, 10 byte per revision involved in a file annotate. If a file has 30000 revisions, it may go around 300KB then. For this leak to be noticeable (as we have a content cache until 50MB), it would mean having above a milion revisions for the file annotated. So, I keep this in a branch apart, as maybe the leak is worth the faster code. I have not measured the speed difference though. ... (file: [b26ec39d2f] check-in: [ef8266b710] user: viriketo branch: label_linkedlist, size: 29537) | |
| 21:39 | Reducing the leak of annotate even more. I wrote a TODO in the file, for a leak still present and relevant for files modified by many versions, but that requires harder work to get right. ... (file: [c75d75e6cc] check-in: [e2ebb1f5ca] user: viriketo branch: annotate_noleak, size: 28458) | |
| 20:41 | What I did to get the 'annotate' command not leak. Notice that I disabled again the check for blob_is_reset, as in trunk. ... (file: [debf1bc949] check-in: [7ad4dfbe8b] user: viriketo branch: annotate_noleak, size: 28191) | |
|
2011-06-07
| ||
| 15:51 | Improvements to the "annotate" algorithm: Only search primary ancestors; ignore branchs. ... (file: [5dfb1d6ff8] check-in: [621be70494] user: drh branch: trunk, size: 28151) | |
|
2011-06-01
| ||
| 22:32 | In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. ... (file: [7cdb9de46d] check-in: [2a013f0228] user: drh branch: trunk, size: 28078) | |
|
2011-05-30
| ||
| 06:55 | Online help for several more commands adapted ... (file: [c82fa72ce9] check-in: [d23f98877d] user: Arjen Markus branch: arjen-doc-updates, size: 28143) | |
|
2011-05-12
| ||
| 12:14 | Pull the latest changes from trunk into windows-i18n. ... (file: [8229499656] check-in: [f25b6c00c8] user: drh branch: windows-i18n, size: 28067) | |
|
2011-05-11
| ||
| 21:43 | Add the --filevers option to the "annotate" command and the "filevers" query parameter to the "annotate" web method. This was used to help analyze the problem described by ticket [f91862eed367] ... (file: [17eaeee2d3] check-in: [c8f10e551e] user: drh branch: trunk, size: 28025) | |
|
2011-05-06
| ||
| 16:55 | Merge the latest trunk changes into windows-i18n branch. ... (file: [f383885a48] check-in: [59ddd3c8ae] user: drh branch: windows-i18n, size: 27438) | |
| 16:32 | Improvements to the annotation algorithm so that if a line changes from X to Y then back to X, the annotation shows the second X not the first. Ticket [f0f9aff371f26] ... (file: [bcb2dbb5a1] check-in: [73c38a3add] user: drh branch: trunk, size: 27396) | |
| 14:36 | Add --limit and --log options to the "annotate" command and corresponding query parameters to the web annotation interface. Part of the investigation of ticket [f0f9aff371f26b4] ... (file: [1069ab9c4d] check-in: [bd36723c3d] user: drh branch: trunk, size: 27068) | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. ... (file: [fe7a8d55af] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 25649) | |
|
2011-04-15
| ||
| 15:36 | Use a target= field on the hyperlink of the annotation web page. ... (file: [d9bd197c10] check-in: [0e477a48e5] user: drh branch: trunk, size: 25607) | |
|
2011-03-08
| ||
| 22:13 | Fix diffs from or to an empty file to use the special position marker 0,0. Makes "fossil diff -N" create patches that are accepted by patch. ... (file: [a413ab030c] check-in: [4e77507e70] user: joerg branch: trunk, size: 25582) | |
|
2010-12-16
| ||
| 14:46 | Use relative URLs for hyperlinks whereever possible, so that Fossil can work better behind a reverse proxy. ... (file: [4ed3cdb38c] check-in: [daeb10f65f] user: drh branch: trunk, size: 25327) | |
|
2010-10-16
| ||
| 17:33 | merge from trunk ... (file: [514bb8aeca] check-in: [586b0eb144] user: wolfgang branch: wolfgangHelpCmd, size: 25465) | |
|
2010-10-15
| ||
| 17:13 | Replace all malloc() calls with fossil_malloc(). The fossil_malloc() routine panics rather than return a NULL pointer. ... (file: [de7d2a7150] check-in: [8f41b2fa75] user: drh branch: trunk, size: 25331) | |
| 16:11 | merge from trunk ... (file: [efcd866194] check-in: [c127179362] user: wolfgang branch: wolfgangHelpCmd, size: 25631) | |
|
2010-10-14
| ||
| 19:14 | Remove all use of ctypes.h in order to avoid compiler warnings and other problems associated with changing locales. ... (file: [1e36fe673f] check-in: [2fac809165] user: drh branch: trunk, size: 25497) | |
| 18:38 | Work towards including full text of deleted and added files in a diff when the -N or --new-file option is used. Ticket [e90d38c2054e9b44792eb] ... (file: [14b976d07e] check-in: [585360b47d] user: drh branch: trunk, size: 25490) | |
|
2010-10-10
| ||
| 08:59 | added more cross reference ... (file: [f401de3d4e] check-in: [c2ef371590] user: Ratte branch: wolfgangHelpCmd, size: 25575) | |
|
2010-10-09
| ||
| 20:13 | show references to commandline on webpages; add httptrace to windows http server ... (file: [1fae772dd4] check-in: [d1d1cd122b] user: wolfgang branch: wolfgangHelpCmd, size: 25573) | |
| 15:34 | link the command line help to the gui pages, where appropriate ... (file: [e4aa7b3f0b] check-in: [a5cd79272f] user: wolfgang branch: wolfgangHelpCmd, size: 25556) | |
|
2010-09-18
| ||
| 16:04 | more pedantic language adj ... (file: [33a14209b5] check-in: [ee96785db6] user: bharder branch: lang, size: 25435) | |
| 15:16 | Clearify the operation of the "fossil annotate" command in the built-in help. Ticket [a182bd01a9c8dde66b1f] ... (file: [eff6dcec76] check-in: [bb1b3fa928] user: drh branch: trunk, size: 25441) | |
|
2010-08-21
| ||
| 17:32 | Use a more precise (though slower) diff algorithm when working with small strings whose differences are hard to detect. ... (file: [dded333413] check-in: [1e08452c65] user: drh branch: trunk, size: 25438) | |
| 04:06 | The command-line "diff" does not ignore whitespace at the end of lines and it generates a well-formed patch file that can be fed directly into "patch -p 0". Ticket [a9f7b23c2e376af]. GUI diffs and the merge commands do ignore end-of-line whitespace. ... (file: [3c77ae51b5] check-in: [5ef7435ac0] user: drh branch: trunk, size: 23163) | |
| 03:33 | Change the built-in "diff" so that it no longer ignores whitespace at the end of lines, as doing so confuses the "patch" command. Ticket [a9f7b23c2e376af5b0] ... (file: [3c68c9ab1a] check-in: [7f788bdb04] user: drh branch: trunk, size: 22977) | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. ... (file: [dc52154079] check-in: [c06edd231f] user: drh branch: clear-title, size: 22815) | |
|
2010-03-21
| ||
| 21:51 | Avoid the use of rowids in URLs, since they can change on a rebuild. Use SHA1-derived artifact IDs instead. ... (file: [ab12301267] check-in: [a4b10f43e2] user: drh branch: trunk, size: 23091) | |
|
2010-01-19
| ||
| 14:15 | Show the edited user id in annotations. ... (file: [6039c71513] check-in: [e7efca9ee9] user: drh branch: trunk, size: 23007) | |
|
2009-12-18
| ||
| 20:15 | Add an "annotate" command to the command-line to suppliment the "annotate" web page. ... (file: [189451b157] check-in: [73b7faa58b] user: drh branch: trunk, size: 22971) | |
|
2009-08-28
| ||
| 22:59 | Deleted some obsolete "todo" files. Updated the FAQ. Modified the the "vinfo" page to show check-in differences and made "vinfo" the default display for check-ins instead of "vdiff". ... (file: [423e7bd7db] check-in: [713b8be852] user: drh branch: trunk, size: 21686) | |
|
2008-05-16
| ||
| 18:11 | Progress toward getting ticket handling to work. ... (file: [cebb8ba99c] check-in: [68c24b1857] user: drh branch: trunk, size: 21569) | |
|
2008-05-05
| ||
| 20:18 | Work toward making the "h" permission mean "hyperlink". Without "h", many pages will display, but there are few hyperlinks. A message invites users to login as anonymous. ... (file: [626c13bd4e] check-in: [2b0d4519dc] user: drh branch: trunk, size: 21567) | |
|
2008-02-08
| ||
| 21:23 | Improvements to annotated diffs - now takes into account contributions from other branches. ... (file: [a8aca97812] check-in: [840699ecd9] user: drh branch: trunk, size: 21463) | |
| 17:22 | Avoid showing a short block of unchanged code at the end of a unified diff. ... (file: [fa6ef41ff5] check-in: [ba433cc4fc] user: drh branch: trunk, size: 22834) | |
|
2008-02-04
| ||
| 18:28 | Add support for annotation in the web interface. ... (file: [464a37e277] check-in: [eae7ddfa4e] user: drh branch: trunk, size: 22831) | |
| 16:39 | Begin inserting code to implement an "annotate" command. ... (file: [f5f8837cf7] check-in: [9b68bc33bd] user: drh branch: trunk, size: 20047) | |
| 14:24 | Additional cleanup in the differencing engine. The new "dir" webpage now uses name= instead of the d= for the query parameter. ... (file: [06ee9b8f1e] check-in: [e81cc91aa4] user: drh branch: trunk, size: 15568) | |
| 14:05 | Improvements to comments on the diff algorithm code. Completely remove the older Wagner/Myers algorithm which had been commented out. ... (file: [7a0eb09931] check-in: [eeea77f340] user: drh branch: trunk, size: 15579) | |
| 13:53 | Tweaks to the diff algorithm give a 4x performance increase. Now comparable to command-line diff. ... (file: [50ab9d9846] check-in: [e8cf0061cc] user: drh branch: trunk, size: 24670) | |
|
2008-02-02
| ||
| 23:39 | A completely new diff algorithm. It is not guaranteed to find the minimum difference between files, but it seems to do a good job and runs much faster on larger files. But command-line diff is still faster for really large files. More work needed. ... (file: [62a5d65904] check-in: [95c07a5033] user: drh branch: trunk, size: 23745) | |
|
2007-11-27
| ||
| 03:30 | Fix a bug in the unified diff generator. ... (file: [ec5d799613] check-in: [7e9e5fea77] user: drh branch: trunk, size: 14111) | |
|
2007-11-25
| ||
| 17:13 | Changes to the diff algorithm to put bounds on run-time for very large files with many differences. (This came up on the previous check-in when you try to diff the two versions of sqlite3.c.) ... (file: [562003166f] check-in: [4c22ae52fd] user: drh branch: trunk, size: 14097) | |
|
2007-11-21
| ||
| 16:03 | Fix a bug in the unified diff generator. ... (file: [0027a16891] check-in: [4db464a748] user: drh branch: trunk, size: 13961) | |
|
2007-11-17
| ||
| 00:29 | Merge aku's CVS import changes into the main line. Fix a small bug in diff.c. ... (file: [fe83b4caec] check-in: [38b967dcf5] user: drh branch: trunk, size: 13877) | |
|
2007-11-16
| ||
| 20:42 | Rework the merge algorithm. It now only works for text files. But, it no longer gets confused by line endings (\r\n versus \n) and it reports conflicts. ... (file: [017b424914] check-in: [36b96b8616] user: drh branch: trunk, size: 13878) | |
| 03:17 | Bug fixes in the Myers diff algorithm. ... (file: [09050dfe39] check-in: [f1b55da0ac] user: drh branch: trunk, size: 12579) | |
|
2007-11-15
| ||
| 21:49 | Enhanced text diff subroutine uses Myers enhancements to Wagners minimum edit distance algorithm. White space at the end of lines is ignored. ... (file: [cb5702628e] check-in: [57b2735ebd] user: drh branch: trunk, size: 11745) | |
|
2007-09-25
| ||
| 21:21 | Fixed many uninitialized variable warnings and some potential bug found via -Wall -Werror on gcc. ... (file: [a87d303450] check-in: [e63a9fd9d0] user: jnc branch: trunk, size: 5665) | |
|
2007-07-21
| ||
| 14:10 | Initial check-in of m1 sources. ... (file: [43924b3721] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 5661) | |