Fossil

File History
Login

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

History of src/diff.c

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: [5610fd7e] check-in: [ae73e4ed] user: ashepilko branch: trunk, size: 84473
2018-04-27
00:52
Fix typo in annotate documentation file: [a97d1f28] check-in: [4dcda7d9] 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: [3340923c] check-in: [48798bb1] 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: [526a75f5] check-in: [a7d9598a] user: drh branch: trunk, size: 84174
2017-12-06
01:38
Remove the use of in-line javascript from the submenu controls. file: [313f4c51] check-in: [3969757f] 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: [2d541c3b] check-in: [e7767de2] 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: [4d7ed801] check-in: [08cacbf6] user: drh branch: trunk, size: 84285
2017-09-28
18:18
Fix indentation of unanalyzed lines on /annotate and /blame screens. file: [b3f8706d] check-in: [00ced6df] 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: [3a7cab01] check-in: [95cc4b90] 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: [bb8c116b] check-in: [0b4c3f5a] user: drh branch: trunk, size: 84744
14:46
Fix double "However" in comment. Some more end-of-line spacing. Nothing functional. file: [ae3138d3] check-in: [ce1bc4fb] 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: [4f31f37c] check-in: [f52a5449] 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: [ffe3356a] check-in: [1f378f9e] 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: [305bbd6e] check-in: [c91b8106] 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: [0b2ee814] check-in: [517b9a56] 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: [5d47606d] check-in: [037e06b3] user: drh branch: trunk, size: 80384
12:45
Simplified and improved implementation of annotate_file(). file: [a1c92888] check-in: [d2b1565b] user: drh branch: 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: [f06a79eb] check-in: [54c0dab0] user: drh branch: 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: [670ce287] check-in: [120ff0b8] user: drh branch: annotation-enhancements, size: 82323
2017-09-23
21:30
Remove unnecessary variable initializations file: [9946597a] check-in: [c203ba90] user: andygoth branch: annotation-enhancements, size: 82422
21:24
Convert annotate page to use checkboxes file: [50404075] check-in: [8017bad6] user: andygoth branch: annotation-enhancements, size: 82417
21:18
Correct operation of filevers query parameter to annotate pages file: [120bee2d] check-in: [4b721600] user: andygoth branch: 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: [a920a7a4] check-in: [41f35ca4] user: andygoth branch: 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: [2bc1234c] check-in: [d9ef474a] user: drh branch: trunk, size: 83022
18:37
Selectively revert a few changes made by the previous check-in file: [1187d036] check-in: [b83ea94e] user: andygoth branch: trunk, size: 83185
18:32
Add the -r|--revision option to the annotate command. file: [b89ef639] check-in: [5a6b194b] user: andygoth branch: trunk, size: 83061
2017-06-30
19:59
Add the --numstat option to the diff command. file: [d7dd6b9c] check-in: [3d6cf6a7] 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: [69409628] check-in: [1b3fa261] 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: [09884b53] check-in: [b9a1a3b9] 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: [4019cd9a] check-in: [e5b62edb] 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: [285cbbd2] check-in: [187424e8] user: andygoth branch: trunk, size: 81124
2016-10-04
02:55
Coding style tweak. file: [010e9b18] check-in: [b47e4cc4] user: mistachkin branch: binDiffFix, size: 81247
02:43
Adopt the diff algorithm changes from trunk. file: [029cd144] check-in: [f9f2d769] user: mistachkin branch: binDiffFix, size: 81241
02:16
Detect binary files that look like text but end with a sequence of zeros. file: [92dfd18e] check-in: [0e0e29ae] 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: [68b131d1] check-in: [47d1256c] 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: [94a8d127] check-in: [334ab152] user: drh branch: trunk, size: 80726
2016-10-03
23:23
Minor optimization. file: [8b0280f0] check-in: [9903ce5a] user: mistachkin branch: binDiffFix, size: 81377
23:18
Further improve clarity. file: [70a1908b] check-in: [11e2c6e6] user: mistachkin branch: binDiffFix, size: 81346
23:10
Another adjustment to handle some corner cases. file: [3f3e33eb] check-in: [8017c358] user: mistachkin branch: binDiffFix, size: 81184
19:22
Fix binary blob detection in the new break_into_lines() algorithm. file: [c75f13e7] check-in: [dacc2bad] 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: [e401f9e4] check-in: [1438be02] 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: [3ee56e13] check-in: [233e9328] user: drh branch: trunk, size: 80706
20:26
Improved hash function for the diff algorithm. file: [e0facaac] check-in: [173cca0d] user: drh branch: trunk, size: 80680
19:48
Performance improvement in LCS length computation used for side-by-side diff coloring. file: [a1e05153] check-in: [08d970d6] user: drh branch: trunk, size: 80652
18:19
Performance optimization in the break_into_lines() routine of the diff logic. file: [d903af43] check-in: [8d48885f] 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: [188128a3] check-in: [df80ab0c] 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: [73188ce5] check-in: [68194175] user: drh branch: diff-search, size: 80664
2016-06-17
09:45
More consistancy in using <br /> and <hr /> HTML tags file: [c53eea5d] check-in: [63220d94] 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: [4daaf556] check-in: [abcd5df2] user: drh branch: trunk, size: 80560
2016-04-10
02:10
Merge trunk. file: [ad4f3323] check-in: [cfca8ec3] user: andygoth branch: mistake, size: 80570
2016-04-07
18:41
Make usage of 'Usage:' and 'or:' consistent in all help text. file: [1d8bbe68] check-in: [8bfd9951] 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: [50fa8123] check-in: [e8735d6a] 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: [9e68056c] check-in: [05f73ffb] user: drh branch: trunk, size: 80563
00:35
Change compute_direct_ancestors() to use a recursive common table expression. file: [9b762207] check-in: [6599d097] user: drh branch: trunk, size: 80740
2015-11-04
17:51
Improved highlighting of changes in the color-coded side-by-side diff. file: [43862aac] check-in: [81cae7fe] user: drh branch: trunk, size: 80759
2015-06-19
15:44
Merge trunk. file: [4d732035] check-in: [21220b21] 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: [4600d39f] check-in: [c2df31da] 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: [a5777ebe] check-in: [a2020a7a] user: andygoth branch: andygoth-brackets-outside-link, size: 79853
2015-04-27
13:19
Provide help text for all commands and webpages. file: [7146e869] check-in: [7ab03289] 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: [9f3f300d] check-in: [31a337f0] 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: [117b0085] check-in: [7c30266a] 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: [1c1f0211] check-in: [2f50d427] user: drh branch: login-enhancements, size: 79168
2015-02-11
15:57
More places where the %S and/or %!S formatter are useful. file: [4b5002d0] check-in: [d93f5ee3] 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: [18d61394] check-in: [ed36e2eb] 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: [70094196] check-in: [1fee0377] user: drh branch: trunk, size: 79172
2014-09-07
19:50
More proposed fixes to the issues pointed out by Edward Berner. file: [26603deb] check-in: [4429a4c3] 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: [523bf058] check-in: [a426154b] 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: [e293be07] check-in: [275457ad] 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: [0d33c3b0] check-in: [1274c97d] 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: [2171544b] check-in: [b34fda96] user: jan.nijtmans branch: trunk, size: 79089
2014-04-03
07:05
Fix highlight algorithm when used in combination with "Ignore Whitespace" file: [d9e9227f] check-in: [c23190a6] user: jan.nijtmans branch: trunk, size: 79089
2014-03-27
10:11
Fix (not so harmless) gcc compiler warning. file: [ca1a4374] check-in: [22d7996f] user: jan.nijtmans branch: trunk, size: 79145
2014-03-18
08:39
merge trunk file: [ac0654b0] check-in: [5efa7d2e] 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: [ed9f8acf] check-in: [74132292] 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: [b9799dcc] check-in: [e6309e05] user: jan.nijtmans branch: trunk, size: 77729
12:47
Make stripping of end-of-line CR work correctly now (REALLY!) file: [246229cc] check-in: [597d1101] 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: [2cdc2a37] check-in: [a7a61cdd] 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: [de96bb2b] check-in: [1472cd81] 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: [7dee8b5a] check-in: [e2e8531b] user: drh branch: trunk, size: 77727
2014-03-13
14:32
Merge trunk. Split same_dline() in 3 different functions. Ongoing. file: [1c2b96a3] check-in: [a915aa03] user: jan.nijtmans branch: strip-trailing-cr, size: 79499
12:55
merge trunk (ongoing) file: [bf596301] check-in: [2e45fb7b] 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: [9c0837cd] check-in: [ac3fcebb] 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: [aa915f2d] check-in: [5e26a1b9] 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: [baaeb070] check-in: [d38f0ce7] 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: [0472df48] check-in: [07e69575] 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: [e7586976] check-in: [0bc584fe] 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: [a8661064] check-in: [28234db8] user: jan.nijtmans branch: trunk, size: 78607
14:38
Implement -b|--ignore-space-change. Doesn't work right yet (needs better hash function)! file: [ebb0d6c6] check-in: [c0d1ed92] 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: [0383445e] check-in: [da205cf4] 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: [6fc8f83b] check-in: [46459fd9] 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: [92a71fb9] check-in: [4514910a] 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: [8ddd8e9d] check-in: [bb338834] 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: [cffcca43] check-in: [d9e79f68] 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: [8c665ce6] check-in: [fb573e72] user: jan.nijtmans branch: trunk, size: 78796
2014-03-05
22:54
Implement --strip-trailing-cr option file: [ca2e4025] check-in: [4e6cfaf8] user: jan.nijtmans branch: strip-trailing-cr, size: 77879
22:13
merge trunk file: [96e879cc] check-in: [e8f42228] user: jan.nijtmans branch: diff-eolws, size: 78738
22:06
Flag DIFF_INLINE was 0 and that should stay so file: [5300d0df] check-in: [466f8de3] user: jan.nijtmans branch: trunk, size: 77577
21:48
remember "log" option with "Ignore whitespace" button. file: [95a4f650] check-in: [e15c4239] user: jan.nijtmans branch: diff-eolws, size: 78738
21:43
Merge trunk. Simplify handling of "w" option a little. file: [4506ccd0] check-in: [f4d98b2b] 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: [3a38bb55] check-in: [e663d5e3] user: jan.nijtmans branch: trunk, size: 77577
15:11
merge diff-eolws file: [8f5b5883] check-in: [91add0e0] 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: [9fe74dec] check-in: [c38fbe23] 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: [9544fc3a] check-in: [bcb22ce1] user: jan.nijtmans branch: diff-eolws, size: 77570
06:24
Cherry-pick from [f1e99a5a408c]: minor annotate/blame url rendering bug. file: [30dd1e97] check-in: [904ab4bb] 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: [e13daed6] check-in: [f1e99a5a] 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: [250a6c04] check-in: [28b39cc5] 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: [543f54ce] check-in: [7a0f4af6] user: jan.nijtmans branch: trunk, size: 75556
12:02
Adapt some comments. file: [e05caf95] check-in: [c0b42f23] 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: [5b935e8f] check-in: [7763b2e6] user: jan.nijtmans branch: diff-eolws, size: 76985
11:37
Oops file: [db0b17df] check-in: [65397b57] user: jan.nijtmans branch: diff-eolws, size: 76879
11:17
Fix indenting behavior of --ignore-space-at-sol option file: [083129fb] check-in: [2faa1a27] 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: [61482131] check-in: [6392c032] 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: [0cc3fb02] check-in: [d3f69bd4] 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: [e60c3a69] check-in: [2dffb0e0] 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: [418b5971] check-in: [31d25923] 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: [3064f643] check-in: [554607d3] 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: [82413a76] check-in: [8f885df2] user: joel branch: diff-eolws, size: 75709
2014-02-28
10:34
Remove unnecessary spaces at end-of-lines. No change in functionality. file: [7dee86b5] check-in: [3df526ca] 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: [afd9c464] check-in: [5a66b6e7] 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: [5a027708] check-in: [37ffaaa9] 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: [060d8023] check-in: [7a988eed] 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: [a0aaf792] check-in: [d7160dc1] user: jan.nijtmans branch: trunk, size: 75481
2013-10-08
14:13
minor help text typo. file: [d54bdafe] check-in: [eb6b1472] 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: [38f3e00e] check-in: [6f686403] 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: [dd237c59] check-in: [a789e85f] 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: [1a99ca13] check-in: [320f1436] 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: [90ed5dfa] check-in: [f8a2aa0c] 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: [cf56784a] check-in: [47ee082a] 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: [9cb88131] check-in: [f3410724] user: joel branch: trunk, size: 74201
2013-07-17
12:04
merge trunk file: [99d7c0a0] check-in: [5d8551bf] 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: [7a1c2df4] check-in: [b4c97d76] user: drh branch: sbsreloaded, size: 74186
2013-07-09
10:54
Comment enhancements. No changes to code. file: [b5bfc1e6] check-in: [f04a3242] 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: [2a478ef3] check-in: [4081a91c] 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: [1aa8d0a4] check-in: [f370ab39] user: drh branch: trunk, size: 86400
2013-05-27
02:25
Remove an unused variable from the annotation logic in diff.c. file: [7754e32f] check-in: [770fd05f] user: drh branch: trunk, size: 86368
02:18
Further improvements to the web display of annotations and file history. file: [2ab07e6f] check-in: [ef26e762] user: drh branch: trunk, size: 86430
01:56
Improvements to the web display of file annotations. file: [2b7f9fad] check-in: [59d70140] user: drh branch: trunk, size: 86028
2013-05-25
01:57
Remove unused variables in the annotation engine. file: [d4712a4e] check-in: [305e3951] user: drh branch: trunk, size: 86368
01:49
Improved default background colors for web annotations. Remove the diff hyperlinks from the annotation log. file: [aff9f769] check-in: [8987a6bb] user: drh branch: annotate, size: 86897
01:27
Improvements to the longest-common-subsequence (LCS) function inside the diff engine. file: [ce3a0740] check-in: [477d1150] user: drh branch: annotate, size: 86817
2013-05-24
21:54
Fix a minor formatting error in the web annotation page. file: [04bc7fbb] check-in: [1fcc6bda] user: drh branch: annotate, size: 86750
21:39
Add links to diff pages on the annotation log in the web interface. file: [1c18d6a2] check-in: [7799ff3a] 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: [844d3ed3] check-in: [8fee580d] 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: [be442d30] check-in: [0b0ab858] user: drh branch: annotate, size: 86377
17:16
Web-based annotation shows lines numbers and the log by default. file: [55b77b0b] check-in: [434be79b] user: drh branch: trunk, size: 85139
17:04
Fix the "Hide Line Numbers" button on the annotate web page. file: [97fdcd0c] check-in: [d3fd72f4] 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: [a7659b23] check-in: [e46935e9] 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: [6b3c8bde] check-in: [e3f7ba55] 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: [38a5bcbe] check-in: [fd2fbdb9] 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: [6926f5ab] check-in: [e545d351] 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: [dfda57a0] check-in: [4ffaf2ee] user: mistachkin branch: trunk, size: 84800
09:21
One more off-by-one error. file: [12b505e7] check-in: [1484625d] 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: [1b13e33a] check-in: [fa506944] 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: [51a8ce68] check-in: [f4bcdb62] 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: [c672e40b] check-in: [8b17c236] 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: [6fbdbce6] check-in: [e72af505] user: jan.nijtmans branch: count-nochange, size: 82521
2013-04-16
09:01
More comments file: [ea1f1cbc] check-in: [d3e5f30b] user: jan.nijtmans branch: ui-no-utf8, size: 86088
2013-04-15
12:35
merge trunk file: [333f4487] check-in: [3d82be0e] user: jan.nijtmans branch: ui-no-utf8, size: 84412
2013-04-08
10:42
Consistant use of DIFF_CANNOT_COMPUTE_??? messages file: [ccf0675c] check-in: [b18276cb] 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: [9d2311d5] check-in: [2d14d82c] 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: [0917d257] check-in: [a7e77a66] user: jan.nijtmans branch: ui-no-utf8, size: 83612
2013-04-04
15:24
eliminate goto file: [03ad55a4] check-in: [c11b3736] user: jan.nijtmans branch: improve_commit_warning, size: 82784
11:35
merge trunk file: [d9f03c13] check-in: [d8bc29f3] 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: [44742194] check-in: [468f1346] user: jan.nijtmans branch: looks-like-utf, size: 82265
06:43
copy/paste error in comment file: [e09a3a97] check-in: [eb3c9b34] user: jan.nijtmans branch: trunk, size: 82440
2013-04-03
09:59
merge trunk file: [ba308212] check-in: [ccc9896f] 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: [cd620c27] check-in: [1686ff71] user: jan.nijtmans branch: trunk, size: 82440
2013-04-02
08:43
too long line file: [6c84525b] check-in: [eff988b2] user: jan.nijtmans branch: looks-like-utf, size: 82180
08:36
More compact, better readable, output for test-looks-like-utf command. file: [76c461eb] check-in: [caa50cff] 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: [7017c616] check-in: [3f78dfe5] 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: [4396e674] check-in: [79f7eb2f] user: jan.nijtmans branch: trunk, size: 82272
2013-03-26
11:12
Enable fossil to distinguish correctly CR/CRNL/mixed line endings. file: [c363de23] check-in: [f89e2ecc] 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: [7d1f33f8] check-in: [3ec3909b] user: jan.nijtmans branch: trunk, size: 82086
10:57
merge trunk (testcases not adapted yet!) file: [2c51c26a] check-in: [43aa3b2d] 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: [ca06fbaa] check-in: [3f2f1e62] user: mistachkin branch: bomRefactor, size: 81914
14:12
take over new testcases from bomRefactor branch. file: [19b8d878] check-in: [f58bc2df] user: jan.nijtmans branch: trunk, size: 81490
10:06
merge trunk (still experimental) file: [5701f562] check-in: [af4d7804] 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: [99150307] check-in: [ea2598e4] 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: [5cf2b213] check-in: [b0b3f2a4] 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: [0215008a] check-in: [a4cdc723] 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: [0c196044] check-in: [12ce0041] 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: [cfde9483] check-in: [e3f9a42b] 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: [e660dfa5] check-in: [d4fe8be6] 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: [adcc5fe8] check-in: [b58800e5] user: jan.nijtmans branch: trunk, size: 78348
2013-03-15
12:29
merge trunk file: [6d54980c] check-in: [59f26447] 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: [985ae12d] check-in: [276b3495] user: jan.nijtmans branch: trunk, size: 78334
11:16
minor simplifications file: [a0b9cb70] check-in: [731e07dd] user: jan.nijtmans branch: bomRefactor, size: 80486
10:28
fix comments file: [0fa25916] check-in: [d0a36540] 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: [2847a7f0] check-in: [3528062a] 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: [56f44819] check-in: [fab2b8ae] 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: [be0926ce] check-in: [3d6d2e7f] user: mistachkin branch: trunk, size: 80948
20:45
The VSEEN table added in the previous check-in should be a TEMP table. file: [b8cb4932] check-in: [ec4c9787] user: drh branch: trunk, size: 80353
20:27
Prevent time warps from causing infinite loops in the annotator. file: [101510c7] check-in: [1605649f] user: drh branch: trunk, size: 80348
14:48
Merging from trunk to get the annotate fixes. Trivial conflict solved.    Update: the new branch viric_flavour ([b31afcc2ca]) includes most of these changes in a more recent fossil. file: [2096e9a9] check-in: [f14798e0] 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: [fe26c2a4] check-in: [e320f0cd] user: drh branch: trunk, size: 79914
14:09
style file: [f1539720] check-in: [3ba9a4d5] user: jan.nijtmans branch: trunk, size: 79649
13:51
LOOK_LENGTH flags only has meaning when LOOK_NUL is not set. file: [47fdb7f2] check-in: [8923e06c] 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: [46230801] check-in: [bd1dcc1c] 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: [78b3806d] check-in: [ce9d6abe] user: jan.nijtmans branch: trunk, size: 79990
2013-03-13
13:44
remove debug code file: [cb0e447b] check-in: [7ef1890c] user: jan.nijtmans branch: bomRefactor, size: 80793
13:37
merge trunk file: [7fd0b165] check-in: [3718383e] 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: [d1fbeeef] check-in: [7dee9038] 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: [2d452d0e] check-in: [c1d35267] 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: [b62c5dfb] check-in: [e42ea98f] user: jan.nijtmans branch: bomRefactor, size: 79923
2013-03-08
13:02
merge trunk file: [3265110f] check-in: [17e972c3] user: jan.nijtmans branch: improve_commit_warning, size: 80372
11:56
merge trunk file: [e12e8fea] check-in: [8be674a1] 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: [3fdd1c01] check-in: [e3ae4148] 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: [b0974322] check-in: [14019cb0] user: jan.nijtmans branch: bomRefactor, size: 79045
10:16
Fix gcc warning, and add test-case (which fails in current trunk) file: [90b3daaa] check-in: [c53b128f] 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: [1bdbb18c] check-in: [32b8fc7d] user: mistachkin branch: trunk, size: 79006
09:21
Better comment. file: [2f581dc0] check-in: [2237e343] user: jan.nijtmans branch: bomRefactor, size: 78872
08:54
Forgot to remove the odd bytes check, and fixed comment. file: [fa97cad1] check-in: [b5a3f0b4] 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: [90b8f7a6] check-in: [7b0b7ec8] user: jan.nijtmans branch: bomRefactor, size: 78828
01:27
Add support for detecting standalone carriage-return characters via the looks_like_utf*() functions. file: [6f532798] check-in: [6c7185d9] user: mistachkin branch: trunk, size: 79008
01:14
Fix typo in comments. file: [0af71f19] check-in: [30e4e3e2] 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: [dc8a1eb2] check-in: [13fac7f7] 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: [1922493f] check-in: [2d9ae4ee] 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: [a872174d] check-in: [08b96ced] 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: [c759ede4] check-in: [af0ca3b4] 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: [a9ee4af8] check-in: [30a63b8b] 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: [56fdb20f] check-in: [ab2920c2] user: jan.nijtmans branch: trunk, size: 76283
02:06
Add warning for overly long lines found during the commit process. file: [aefa41cd] check-in: [10fbcda2] 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: [7c4d3451] check-in: [dd9e030b] 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: [b7665e7c] check-in: [6184037c] user: drh branch: trunk, size: 76455
2013-03-03
15:39
minor cut/paste error file: [50d3d679] check-in: [b163569a] user: jan.nijtmans branch: trunk, size: 76431
15:32
New warning when file is considered binary due to long lines only. file: [e80b0365] check-in: [3a74f9fe] 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: [ec0dac07] check-in: [85ca3875] 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: [be58c56a] check-in: [e2b34906] user: drh branch: trunk, size: 75979
2013-02-27
11:26
merge trunk file: [fd63799f] check-in: [d085eb9a] user: jan.nijtmans branch: use-blob_strip_bom, size: 76660
2013-02-23
21:45
merge trunk file: [cb2d76ff] check-in: [eeb0231b] 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: [6f375fd1] check-in: [957be426] user: jan.nijtmans branch: trunk, size: 75356
2013-02-17
21:37
merge trunk file: [aa58d1fd] check-in: [fdf9050c] user: jan.nijtmans branch: improve_commit_warning, size: 76782
14:47
More simplification in UTF-16 bom detection file: [4be92b43] check-in: [1e70f211] user: jan.nijtmans branch: utf16Bom, size: 75361
14:43
Remove two unused variables file: [c686d984] check-in: [a98467b6] 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: [881d1e37] check-in: [4f95ea8c] user: drh branch: trunk, size: 75573
2013-02-15
19:57
Improvements to UTF-16 byte-order-mark detection. file: [b697140b] check-in: [3d988df6] 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: [67175a9a] check-in: [89a2e881] user: drh branch: trunk, size: 74196
14:37
Fixing annotate. It was hanging. file: [4aee7b0b] check-in: [96c31335] user: viriketo branch: annotate_links, size: 76016
2013-02-13
20:16
Correct comment and remove superfluous return statement. file: [b3eb4a6d] check-in: [a49749ed] user: mistachkin branch: utf16Bom, size: 74836
09:28
"reverse" should mean big-endian on little-endian machines. file: [99176d2f] check-in: [cdffec2b] user: jan.nijtmans branch: utf16Bom, size: 74858
03:14
Improvements to the UTF-16 BOM detection. file: [dfad5ce7] check-in: [81c4d781] user: mistachkin branch: utf16Bom, size: 76021
2013-02-11
20:36
Fixed the auto-width diff display. file: [f1149352] check-in: [1b07b3d9] user: viriketo branch: annotate_links, size: 76016
19:46
Making it build; diff doesn't work well, about with calculation, yet. file: [376b0268] check-in: [facd98ce] user: viriketo branch: annotate_links, size: 75965
19:30
Merging from trunk. I still have merge conflicts since my previous merge. file: [a5d06771] check-in: [bdeb633a] 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: [fc3d370f] check-in: [fab09a17] 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: [3d2781b9] check-in: [be6756e2] user: jan.nijtmans branch: trunk, size: 75180
09:39
merge trunk file: [92dbe1b5] check-in: [8994f368] 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: [13a5bf3a] check-in: [c209105f] 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: [53e136de] check-in: [6c417d8b] user: jan.nijtmans branch: simplify-starts-with, size: 73917
2013-01-21
10:29
merge trunk file: [5a7b94ae] check-in: [a68dffbf] user: jan.nijtmans branch: improve_commit_warning, size: 76148
2013-01-15
02:29
Fix compiler warnings. file: [2ada0d35] check-in: [b3bac115] 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: [deffd29b] check-in: [c84051f3] 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: [dcfa5085] check-in: [a13e0a20] user: jan.nijtmans branch: trunk, size: 75025
10:31
Updating from trunk. I've left some merge conflicts to solve (annotate, diff) file: [801bc53c] check-in: [b5b8448e] user: viriketo branch: annotate_links, size: 79309
2013-01-02
11:39
s/re_exec\b/re_execute/g, for compatibility with BSD. file: [97b08018] check-in: [6a26eb34] 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: [6ad97f9b] check-in: [97a7b924] user: drh branch: trunk, size: 75053
2013-01-01
22:56
Allow the --context option on diff to have a value of 0. file: [bbd9e7d5] check-in: [d74698ec] user: drh branch: trunk, size: 72070
2012-12-17
14:00
Enhanced comments in the diff.c source code file. No code changes. file: [94c56608] check-in: [a39a992b] user: drh branch: trunk, size: 71940
2012-12-16
07:16
Remove unused local variable. file: [802db6ae] check-in: [01d6ef7c] user: mistachkin branch: trunk, size: 71803
2012-12-15
21:55
Do not attempt to translate tabs into spaces on a unified diff. file: [6fdf5244] check-in: [b9126194] 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: [0b777826] check-in: [60d5b1f5] user: drh branch: trunk, size: 71937
01:17
More compact representation of a left/right rewrite on side-by-side diffs. file: [277116b6] check-in: [233c4975] 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: [853d818b] check-in: [52db049b] 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: [ca0160d5] check-in: [c4bbc4a9] 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: [8832774f] check-in: [4cf8c16c] user: drh branch: trunk, size: 69533
2012-12-12
13:08
merge trunk file: [076203f0] check-in: [b70a3202] 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: [69115cf5] check-in: [08f4eda7] user: drh branch: trunk, size: 69320
2012-11-27
12:10
merge trunk file: [601f0d84] check-in: [2e1f2e69] user: jan.nijtmans branch: improve_commit_warning, size: 70088
2012-11-26
22:51
Merge byte-order-mark handling enhancements to trunk. file: [d793daed] check-in: [9b800ee4] user: mistachkin branch: trunk, size: 68868
2012-11-19
20:39
Allow the get_utf8_bom function to return the size as well. file: [604f19d9] check-in: [d857d20b] user: mistachkin branch: convert_before_commit_v2, size: 68688
04:39
Modularize byte-order-mark and blob UTF-8 conversion handling. file: [cfaee26d] check-in: [d29dd544] user: mistachkin branch: convert_before_commit_v2, size: 68596
2012-11-15
20:43
The annotator follows name changes. file: [0d960664] check-in: [ee33b951] user: drh branch: trunk, size: 67378
2012-11-12
13:19
merge trunk file: [eee29f29] check-in: [aaa1cb04] 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: [a7ceea3b] check-in: [353438a8] user: drh branch: trunk, size: 67366
2012-11-07
12:10
merge trunk Fix continuation-byte check for UTF-8 chars > 2 bytes. file: [5ef4cdf6] check-in: [3920fa67] user: jan.nijtmans branch: improve_commit_warning, size: 68337
09:47
styling file: [de0ffe74] check-in: [c8eaeb1b] user: jan.nijtmans branch: improve_commit_warning, size: 68337
09:43
merge trunk. simplify utf-8 continuation byte checking, using a loop in stead of separater 2/3/4-byte versions. file: [1e873a9f] check-in: [2f7ac60f] 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: [eac3efd0] check-in: [d764f449] user: drh branch: trunk, size: 67115
2012-11-05
13:56
merge trunk file: [b9e8546e] check-in: [b0e05a90] 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: [cebaa876] check-in: [87901276] user: jan.nijtmans branch: improve_commit_warning, size: 68533
2012-11-04
18:03
merge trunk file: [254b516e] check-in: [e86aa2a1] user: jan.nijtmans branch: improve_commit_warning, size: 68386
18:00
merge trunk Factor out main part of UTF-8 check to macro file: [995db27e] check-in: [ce7c5222] user: jan.nijtmans branch: improve_commit_warning, size: 68386
12:59
Fix typos. file: [5006e9fe] check-in: [45065c5c] user: dmitry branch: spelling, size: 67033
10:50
merge trunk file: [c1ecaef4] check-in: [bd7b8a48] user: jan.nijtmans branch: improve_commit_warning, size: 68764
10:48
merge trunk, some improvements in messages (not yet ready yet) file: [10961061] check-in: [517a6f7a] 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: [cb28d616] check-in: [7d881d82] user: mistachkin branch: trunk, size: 67033
14:22
don't forget to compensate for the line-length check file: [729f39f8] check-in: [9011fe12] user: jan.nijtmans branch: improve_commit_warning, size: 67363
10:55
Generate warning when to-be-committed file contains invalid UTF-8 file: [a88475a1] check-in: [4e86b06a] user: jan.nijtmans branch: improve_commit_warning, size: 67329
08:31
speedup mimetype_from_content() by using a 256 byte array. Mark VT and Ctrl-Z as text bytes, not binary. Decrease maximum UTF-16 line length to 2731 Check for FFFF in addition to 0, in UTF-16/binary detection. file: [ca927be5] check-in: [d804902f] 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: [ac05f9f7] check-in: [531b2e2d] user: mistachkin branch: trunk, size: 65678
02:27
Merge commit warning and file content type detection changes to trunk. file: [98197f1f] check-in: [0c7c6144] 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: [fc8d7459] check-in: [c837e444] user: mistachkin branch: commitWarningV2, size: 65638
15:38
Correct wrong manual merge. file: [a6ceffe5] check-in: [5963c2dd] user: jan.nijtmans branch: improve_looks_like_binary, size: 64135
14:49
Add back checks for FFFE and FFFF in looks_like_text: - 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. - 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. 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: [9fecfa0e] check-in: [64868f2b] user: jan.nijtmans branch: improve_looks_like_binary, size: 64135
12:32
merge trunk file: [a648f166] check-in: [9e97de34] user: jan.nijtmans branch: use-blob_strip_bom, size: 63953
11:48
merge trunk let looks_like_text() give different values for UTF-16 BE/LE. Not used yet. file: [3816601f] check-in: [348637de] user: jan.nijtmans branch: improve_looks_like_binary, size: 63906
07:40
dont check for same BOM twice file: [c6e79f2c] check-in: [8c32e6f0] user: jan.nijtmans branch: trunk, size: 63239
2012-10-31
20:56
adapt comments accordingly file: [7c124f7d] check-in: [b5123d51] 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: [39b4b80b] check-in: [de5a2ef6] user: jan.nijtmans branch: improve_looks_like_binary, size: 63902
13:58
fix comment file: [6124262f] check-in: [e1aed25e] user: jan.nijtmans branch: improve_looks_like_binary, size: 64334
12:58
Two more enhancements. - DOS text files sometimes use Control-Z (0x1a) as eof-marker, so this byte should be considered text. - FEFF, FFFE and FFFF are invalid UTF-16 code points (when not used as BOM), so files containing those should be considered binary. file: [d478cdf5] check-in: [e3f3c390] 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: [26b705c5] check-in: [44c6be2a] user: jan.nijtmans branch: improve_looks_like_binary, size: 64055
08:43
Enhance looks_like_text(): - Detect line-length overflow earlier, not at the next NL - Implement the same binary and line-length check for UTF-16 as well 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: [7b7879a7] check-in: [58702daa] 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 re-use looks_like_blob file: [2c85916e] check-in: [0ba08f9d] user: jan.nijtmans branch: improve_looks_like_binary, size: 63144
16:14
Style en comment fixes, backported from [d57f0a9361] file: [25cec3d2] check-in: [c7b2b2ed] user: jan.nijtmans branch: trunk, size: 62966
15:18
working utf-16 diff, still being tested file: [71e6c111] check-in: [879d1e24] user: jan.nijtmans branch: use-blob_strip_bom, size: 63110
08:06
take over various stylistic adjustments file: [7b46f0d2] check-in: [ab5a6b43] 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: [c1da01cd] check-in: [d57f0a93] user: mistachkin branch: commitWarning, size: 63239
2012-10-29
22:09
Working "c=convert" option for [fossil commit]. Just to be tested a little bit more. file: [d1700c65] check-in: [a97aa349] user: jan.nijtmans branch: use-blob_strip_bom, size: 62513
08:27
merge trunk file: [5771152f] check-in: [f61d0a1c] 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: [a6943a2f] check-in: [c8e72df0] user: mistachkin branch: trunk, size: 62263
22:08
merge trunk file: [cf9d22ad] check-in: [6c410273] 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: [06680055] check-in: [7c527165] user: jan.nijtmans branch: trunk, size: 62226
20:47
.. but don't forget to update j file: [b3196ae3] check-in: [6542935c] user: jan.nijtmans branch: trunk, size: 62223
20:40
speed-up looks_like_text(), by eliminating variable "i" and handle first character separately. file: [c7a11440] check-in: [204680ee] user: jan.nijtmans branch: trunk, size: 62221
10:03
merge trunk file: [2810a1c1] check-in: [0b6b0dfd] 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: [b5174635] check-in: [1bffce52] 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. So give out a warning when a UNICODE file is attempted to be checked in on Windows, just as for CrLf files as well Implement looks_like_text(), similar to looks_like_binary() but it can distinguish more types of text/binary files. file: [804bf0f6] check-in: [748071a2] user: jan.nijtmans branch: use-blob_strip_bom, size: 62716
02:35
Improvements to side-by-side diff alignment. file: [c3dbacc3] check-in: [511405f4] user: drh branch: trunk, size: 61883
2012-10-25
14:50
diff.c:looks_like_binary(): No need to make the blob null-terminated. checkin.c: Make limits the same as in looks_like_binary(), preparation to move the function to diff.c file: [2fb8301a] check-in: [c3ec6309] 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: [d1bdd977] check-in: [314a2943] 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: [5e1e1884] check-in: [f4b082d4] 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: [ba6c48d4] check-in: [4e0e69f6] 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: [8be46c38] check-in: [c50eb507] user: mistachkin branch: diffBinExternal, size: 60843
2012-09-27
01:38
Fixes to the --tk diff option to support unified diff on Windows. file: [2211c7d8] check-in: [1048bccf] user: mistachkin branch: trunk, size: 60205
00:37
Allow unified diff for the --tk diff option. file: [38288653] check-in: [5be507df] 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: [1f6c64f1] check-in: [28cfb2fb] user: drh branch: trunk, size: 59845
2012-09-05
12:55
const-qualification file: [fd9eee2b] check-in: [645f3483] 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: [c98621e3] check-in: [9f6abc59] 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: [02c6c15c] check-in: [2b176750] 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: [12853097] check-in: [36cdc17c] user: viriketo branch: annotate_links, size: 61283
2012-08-08
13:46
Updating from trunk. I solved three merge conflicts about hyperlinks. file: [e2788d90] check-in: [08db3204] 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: [be140f71] check-in: [0328d681] 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: [cc2ead66] check-in: [68239127] 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: [42067ab6] check-in: [9e15437e] 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: [58d1a899] check-in: [484f8d29] 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: [d1c60722] check-in: [d1fc2f4a] 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: [f5ddb362] check-in: [7a57ab64] 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: [c8c7a3a9] check-in: [8ae52fc4] 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: [58c6432c] check-in: [195517a9] user: drh branch: trunk, size: 59358
2012-04-04
16:20
Updating from trunk to get the latest trunk fixes. file: [836ed74a] check-in: [b7f3a32d] 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: [ed29f01b] check-in: [92b2a5c3] user: viriketo branch: annotate_links, size: 60555
2012-03-29
14:54
Add vim modline everywhere file: [768756e3] check-in: [a496d8e8] user: mgagnon branch: mgagnon_fix, size: 59383
2012-03-19
11:58
Avoid a valgrind warning in the side-by-side diff logic. file: [9787d342] check-in: [9262546e] user: drh branch: trunk, size: 59341
2012-03-18
19:46
Fixing an unnecessary heap accumulation. file: [1e3ebbd6] check-in: [801a7595] user: viriketo branch: annotate_links, size: 60538
14:53
Making the side-by-side diffs autocalculate the width, by default. file: [8a792bd2] check-in: [16397d86] 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: [f7608cab] check-in: [3be264b5] 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: [155d3a26] check-in: [f201fbae] 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: [78c74c3b] check-in: [dbf4ecf4] 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: [82e55d7e] check-in: [4036b5df] user: viriketo branch: annotate_links, size: 60243
21:36
Merging what I had at [61523cbe67] over trunk related to href targets. file: [ad234049] check-in: [d5129ae1] user: viriketo branch: annotate_links, size: 60003
21:29
Merging from trunk, to get the branch up to date. file: [b47642ae] check-in: [6b7ddfef] 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: [b1fa7e63] check-in: [937514b9] 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: [1d49306d] check-in: [587dd57f] user: martin.weber branch: msw-docco, size: 54253
2012-02-07
20:04
Another minor performance enhancement on sbs diff. file: [f78d6f21] check-in: [3e3feb2d] user: drh branch: trunk, size: 54215
18:58
Performance optimization for the alignment calculation on side-by-side diffs. Noticably faster. file: [0143d688] check-in: [87f86701] user: drh branch: trunk, size: 54222
18:13
Optimize the inner loop of the LCS algorithm for the main diff generator. file: [1a183093] check-in: [4ab60711] 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: [ff877a1c] check-in: [312590a9] user: drh branch: trunk, size: 52705
15:38
Add the --brief option to the "diff" command. file: [abe39d18] check-in: [e0565d43] user: drh branch: trunk, size: 52707
04:15
Add chunk number fragment marks to HTML diff output. file: [ac353718] check-in: [b1530c29] 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: [9d3dd93b] check-in: [469462b6] 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: [fc00bfd8] check-in: [51bda5e4] 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: [d46d4942] check-in: [5d836cbd] user: drh branch: diff-experimental, size: 52116
14:28
Adjust the alignment similarity cutoff score. file: [c87a2c69] check-in: [9713e423] user: drh branch: diff-experimental, size: 52094
14:22
Improvements to the alignment algorithm for block changes in side-by-side diff. file: [17125cdc] check-in: [a484cfc2] 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: [90125488] check-in: [357d26bc] 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: [ff30365b] check-in: [881b6514] 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: [5c86b214] check-in: [98cf5c33] user: drh branch: trunk, size: 45067
17:19
Rearrange code and edit comments in diff logic, for clarity of presentation. No functional changes. file: [75dcc6e1] check-in: [032da543] 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: [05126e9c] check-in: [de719b43] user: drh branch: trunk, size: 40661
02:43
Fix another bug in table handling for side-by-side diffs. file: [c143bfc7] check-in: [db1365bc] user: drh branch: trunk, size: 40661
00:22
Bug fix in the handling of tabs on a side-by-side diff. file: [63328e72] check-in: [07a0ade9] user: drh branch: trunk, size: 40547
2012-02-04
20:16
Suppress the top divider on a context-diff with line numbers. file: [a4789c5f] check-in: [43cbe9dd] 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: [1c527ece] check-in: [56ad4ac7] user: drh branch: retro-sbsdiff, size: 40465
20:00
Bug fix in the context-diff colorization. file: [374d4f82] check-in: [ecf30837] 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: [6db3826b] check-in: [b57b0356] user: drh branch: retro-sbsdiff, size: 40095
19:34
Revised default color scheme. Add line-numbers to context diff. file: [18cc5c11] check-in: [6a669769] user: drh branch: retro-sbsdiff, size: 39294
18:54
Add color to the retro sbs diff. file: [4a157892] check-in: [7372c0a5] 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: [a4fb7130] check-in: [6474a92a] user: drh branch: retro-sbsdiff, size: 36177
2012-01-01
15:57
Simplified display of side-by-side diff in the web browser. file: [c84e7457] check-in: [a1e667e6] 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: [db8561a4] check-in: [4092208a] 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: [c352a38e] check-in: [86703733] 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: [0f3e5f6b] check-in: [ab47cc73] user: drh branch: trunk, size: 40365
21:50
Fix a spacing bug in the display of side-by-side diffs. file: [8c837f17] check-in: [a505abcc] user: drh branch: diff-enhancements, size: 39444
21:31
Add support for side-by-side diff from the command-line "diff" command. file: [7e89d5ae] check-in: [ac81759f] 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: [b3ff26c5] check-in: [3bbbbdfd] 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: [52714538] check-in: [06e9863c] user: drh branch: trunk, size: 33540
2011-10-18
21:20
Adding a space I forgot in in the html output. file: [e974796e] check-in: [61523cbe] 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: [feca6c40] check-in: [d29df2f0] user: viriketo branch: targets_setting, size: 33353
19:49
Bringing the changes I had in [4bae75a08e] to a trunk-derived branch. file: [201ec8ba] check-in: [ef5d2176] 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: [6a967299] check-in: [c7c4279f] 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: [34c60666] check-in: [a92908a6] user: drh branch: jan-sbsdiff, size: 33190
2011-10-16
00:14
Updated styles/skins. Built-in skin 4 can now wrap lines. file: [d070ddd3] check-in: [1c40493c] 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: [6c6b5fa8] check-in: [15de70c2] user: drh branch: jan-sbsdiff, size: 33119
14:33
Updated comments. Slightly more centralization of sbsdiff table generation. file: [ecf9d864] check-in: [c5ac4f80] 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: [e5827f7c] check-in: [ff41d4be] user: jan branch: jan-sbsdiff, size: 33122
10:17
A very simple fix to the annotate memory leak problem. file: [44fc8779] check-in: [9929bab7] user: drh branch: trunk, size: 28145
00:26
Code documentation. file: [6db07e50] check-in: [9b7955b5] user: jan branch: jan-sbsdiff, size: 33123
00:10
The link p 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 d left. file: [8a1684fe] check-in: [4bae75a0] user: viriketo branch: annotate_links, size: 30792
00:06
The plink is not needed at all in the annotate query file: [31291c8c] check-in: [40cbb69c] 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 p to the annotation of the version previous to that line change, and a link d 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: [41528228] check-in: [9e3b6ad0] 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: [8caddc5e] check-in: [47cdbbf2] 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.    Update: Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] file: [fc9c44f7] check-in: [409f370a] 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: [19cf0dd4] check-in: [a6a8e894] 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: [e5b0b0fa] check-in: [17f21f24] user: martin.weber branch: msw-docco, size: 28205
2011-09-14
17:45
Refactored g.okXXX perms flags to g.perm.XXX. file: [c57cf060] check-in: [34b4dec0] 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: [949f21b7] check-in: [3fbf8caa] 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: [d5d5a702] check-in: [4860d9f2] user: viriketo branch: annotate_noleak, size: 30319
2011-09-06
20:30
Documenting the Label structure I introduced. file: [2aa5f515] check-in: [58a02a2e] 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: [b26ec39d] check-in: [ef8266b7] 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: [c75d75e6] check-in: [e2ebb1f5] 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: [debf1bc9] check-in: [7ad4dfbe] user: viriketo branch: annotate_noleak, size: 28191
2011-06-07
15:51
Improvements to the "annotate" algorithm: Only search primary ancestors; ignore branchs. file: [5dfb1d6f] check-in: [621be704] 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: [7cdb9de4] check-in: [2a013f02] user: drh branch: trunk, size: 28078
2011-05-30
06:55
Online help for several more commands adapted file: [c82fa72c] check-in: [d23f9887] user: Arjen Markus branch: arjen-doc-updates, size: 28143
2011-05-12
12:14
Pull the latest changes from trunk into windows-i18n. file: [82294996] check-in: [f25b6c00] 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: [17eaeee2] check-in: [c8f10e55] user: drh branch: trunk, size: 28025
2011-05-06
16:55
Merge the latest trunk changes into windows-i18n branch. file: [f383885a] check-in: [59ddd3c8] 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: [bcb2dbb5] check-in: [73c38a3a] 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: [1069ab9c] check-in: [bd36723c] 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: [fe7a8d55] check-in: [e805fa8d] 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: [d9bd197c] check-in: [0e477a48] 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: [a413ab03] check-in: [4e77507e] 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: [4ed3cdb3] check-in: [daeb10f6] user: drh branch: trunk, size: 25327
2010-10-16
17:33
merge from trunk file: [514bb8ae] check-in: [586b0eb1] 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: [de7d2a71] check-in: [8f41b2fa] user: drh branch: trunk, size: 25331
16:11
merge from trunk file: [efcd8661] check-in: [c1271793] 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: [1e36fe67] check-in: [2fac8091] 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: [14b976d0] check-in: [585360b4] user: drh branch: trunk, size: 25490
2010-10-10
08:59
added more cross reference file: [f401de3d] check-in: [c2ef3715] user: Ratte branch: wolfgangHelpCmd, size: 25575
2010-10-09
20:13
show references to commandline on webpages; add httptrace to windows http server file: [1fae772d] check-in: [d1d1cd12] user: wolfgang branch: wolfgangHelpCmd, size: 25573
15:34
link the command line help to the gui pages, where appropriate file: [e4aa7b3f] check-in: [a5cd7927] user: wolfgang branch: wolfgangHelpCmd, size: 25556
2010-09-18
16:04
more pedantic language adj file: [33a14209] check-in: [ee96785d] user: bharder branch: lang, size: 25435
15:16
Clearify the operation of the "fossil annotate" command in the built-in help. Ticket [a182bd01a9c8dde66b1f] file: [eff6dcec] check-in: [bb1b3fa9] 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: [dded3334] check-in: [1e08452c] 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: [3c77ae51] check-in: [5ef7435a] 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: [3c68c9ab] check-in: [7f788bdb] user: drh branch: trunk, size: 22977
2010-05-16
19:08
Change from GPL to the Simplified BSD License. file: [dc521540] check-in: [c06edd23] 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: [ab123012] check-in: [a4b10f43] user: drh branch: trunk, size: 23091
2010-01-19
14:15
Show the edited user id in annotations. file: [6039c715] check-in: [e7efca9e] 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: [189451b1] check-in: [73b7faa5] 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: [423e7bd7] check-in: [713b8be8] user: drh branch: trunk, size: 21686
2008-05-16
18:11
Progress toward getting ticket handling to work. file: [cebb8ba9] check-in: [68c24b18] 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: [626c13bd] check-in: [2b0d4519] user: drh branch: trunk, size: 21567
2008-02-08
21:23
Improvements to annotated diffs - now takes into account contributions from other branches. file: [a8aca978] check-in: [840699ec] user: drh branch: trunk, size: 21463
17:22
Avoid showing a short block of unchanged code at the end of a unified diff. file: [fa6ef41f] check-in: [ba433cc4] user: drh branch: trunk, size: 22834
2008-02-04
18:28
Add support for annotation in the web interface. file: [464a37e2] check-in: [eae7ddfa] user: drh branch: trunk, size: 22831
16:39
Begin inserting code to implement an "annotate" command. file: [f5f8837c] check-in: [9b68bc33] 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: [06ee9b8f] check-in: [e81cc91a] 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: [7a0eb099] check-in: [eeea77f3] 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: [50ab9d98] check-in: [e8cf0061] 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: [62a5d659] check-in: [95c07a50] user: drh branch: trunk, size: 23745
2007-11-27
03:30
Fix a bug in the unified diff generator. file: [ec5d7996] check-in: [7e9e5fea] 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: [56200316] check-in: [4c22ae52] user: drh branch: trunk, size: 14097
2007-11-21
16:03
Fix a bug in the unified diff generator. file: [0027a168] check-in: [4db464a7] 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: [fe83b4ca] check-in: [38b967dc] 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: [017b4249] check-in: [36b96b86] user: drh branch: trunk, size: 13878
03:17
Bug fixes in the Myers diff algorithm. file: [09050dfe] check-in: [f1b55da0] 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: [cb570262] check-in: [57b2735e] 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: [a87d3034] check-in: [e63a9fd9] user: jnc branch: trunk, size: 5665
2007-07-21
14:10
Initial check-in of m1 sources. file: [43924b37] check-in: [dbda8d6c] user: drh branch: trunk, size: 5661 Added