Timeline
Not logged in

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

110 check-ins using file src/main.c version 077d574ff2

2021-09-08
11:11
Caught more instances of the previous commit's fix. check-in: 992b62fa8b user: stephan tags: trunk
11:03
Attempt to squelch stdout errors from manifest parsing when it encounters a non-manifest. Reported at [forum:/forumpost/d6a8e3b2a843c498 | forum post d6a8e3b2a843c498]. check-in: 65dbc19eae user: stephan tags: trunk
02:43
Minor tweaks in the diff-related JS and CSS. check-in: fd7d2557aa user: stephan tags: diff-js-refactoring
01:01
Fix the /vpatch webpage output, apparently broken by check-in [3a561322cafbc337]. [forum:/forumpost/2a0e4c729e|Forum post 2a0e4c729e]. check-in: ebcad739e8 user: drh tags: trunk
2021-09-07
23:08
Optimize diff.js's width updater to only perform DOM selection when it's first run. Also delay its execution until the onload event. check-in: 077f3db109 user: stephan tags: diff-js-refactoring
22:28
Ongoing refactoring and feature-adding related to the JS/ajax components of the new diff views. check-in: 65aa2c9643 user: stephan tags: diff-js-refactoring
22:24
Made diff view table 100% wide instead of 98%. The unsightly horizontal scrollbars still don't appear at that width and this eliminates an odd-looking gap on the right. check-in: be9602d0df user: stephan tags: trunk
21:55
diff.js: instead of polling for window size changes every 100ms, listen for window resize events. check-in: c5f8e79990 user: stephan tags: trunk
21:32
Re-added the file-toggle checkboxes to the diff views which were disabled via recent refactoring. check-in: cf4b9fbd9c user: stephan tags: trunk
21:12
json API: removed reference to recently-removed DIFF_CONTEXT_MASK. check-in: 0c496d8ad3 user: stephan tags: trunk
19:15
On the /jtext page, terminate the JSON array early if there are insufficient lines of text in the file to complete the request. check-in: 6f5dfd9d80 user: drh tags: trunk
19:09
Add the /jtext webpage, intended for use by XHR. check-in: 5f7fcbabf0 user: drh tags: trunk
18:45
When HTML diffs are generated from a webpage, include sufficient information in class names ids, and data- elements to permit JS to redraw the separators to include context fill-in buttons. check-in: c275a166b3 user: drh tags: trunk
17:11
Fix the diff block alignment so that it correctly suppresses unnecessary diff marks, even when in ignore-whitespace mode. check-in: 85ca2fe5b5 user: drh tags: trunk
16:06
Further simplification of the DiffConfig object by splitting out the lines of context and column width values from the diffFlags vector into separate columns. There should be no user-visible changes in behavior. check-in: ca6fa4b2f3 user: drh tags: trunk
13:29
Take advantage of the new pBlob==NULL capabilities in blob_appendf() to simplify some of the diff logic. check-in: 590e01dbdd user: drh tags: trunk
12:51
Enhance the blob_append(), blob_appendf(), blob_append_char(), and similar interfaces such that if the Blob pointer in the first argument is NULL, the result is written directly to stdout. check-in: 3a561322ca user: drh tags: trunk
12:18
Simplify the interface to the internal diff_file() routine. check-in: db034a5a6c user: drh tags: trunk
11:40
Bring back the diff command option `-N|--new-file' as an alias for `-v|--verbose' for script compatibility. check-in: 4ef3ba374c user: florian tags: trunk
10:42
Minor fix to adapt the `append_diff_javascript()' function and its call points to the new diff logic (already partially done with check-in [1347a1ddb9]). check-in: f9761abb6a user: florian tags: trunk
00:18
Move more diff parameters into the DiffConfig object. check-in: 346de5d122 user: drh tags: trunk
2021-09-06
22:26
Internally, use the new DiffConfig object to pass around diff settings, rather than the legacy u64 bit array. This provides increased flexibility to the internals. There should be no user-visible changes (unless I made a mistake). Note that more parameters could be folded into the DiffConfig object. This check-in is just a start. check-in: 1347a1ddb9 user: drh tags: trunk
22:24
For the --json diff output, generate an array of objects, one object per file and the diff array all contained within the object. Closed-Leaf check-in: 4ab3525927 user: drh tags: diff-config
20:51
Begin adding value that used to be function arguments into the DiffConfig object. This check-in deals with the pRe parameter. check-in: bdb4bfaa3a user: drh tags: diff-config
19:24
Futher integration of DiffConfig up and down the diff stack. check-in: 7c1498aeff user: drh tags: diff-config
18:52
Continue integrating DiffConfig up the diff stack. check-in: 153a464dab user: drh tags: diff-config
18:35
Incremental step in integrating DiffConfig. check-in: f7c8416fcd user: drh tags: diff-config
18:14
Create the new DiffConfig object used to pass around information about a file difference computation. Begin integrating this new object into various interfaces. Lots more work to be done. check-in: 8601fb13d6 user: drh tags: diff-config
14:07
Updates the change log to talk briefly about the new diff enhancements. check-in: 68d728867f user: drh tags: trunk
13:35
Improvements to help text for "diff" and "xdiff". check-in: dc757a5d08 user: drh tags: trunk
13:22
Expand the 'fossil wiki export --technote' interface to support technote retrieval via tag name as discussed in the chat. The query looks to match against both 'sym-TAG' and 'TAG' as technote tags are presently prefixed with 'sym-'. This identifier should be reserved for branches, however, so may be removed from technotes, at which point this query... check-in: d71b648c6c user: jamsek tags: trunk
13:06
Update the built-in SQLite to the latest 3.37.0 alpha, for testing. check-in: 04b725d9bf user: drh tags: trunk
12:00
Improvement to the ticket customization documentation suggested by [forum:/forumpost/31e44444cda1a7821912|forum post 31e44444cda1a7821912] check-in: 3fcdfb0cd8 user: drh tags: trunk
01:22
The diff --tk option shows an error message on the display if it encounters an input line that it does not understand. This means that "cannot compute difference between binary files" errors, and similar, are dealt with correctly. check-in: 86f0722e0c user: drh tags: trunk
2021-09-05
22:58
Identical lines in diff output should never use the "|" comparison mark. check-in: 99f93d9231 user: drh tags: trunk
22:11
Improved hyperlinks on the "Fossil Self-Hosting Repositories" page. check-in: 6decc47add user: drh tags: trunk
20:59
Minimum line-number width in --tk output is 3, to accommodate ellipses. check-in: 719498bd5f user: drh tags: trunk
20:54
Further improvements to diff alignment. check-in: e5b1c70e2a user: drh tags: trunk
19:31
Added just a tiny bit of left/right padding on the new diff tables so that the line numbers don't run right up to the edge of the border. check-in: f25a987bae user: stephan tags: trunk
19:16
Add a #define for the diff block alignment algorithm threshold. check-in: 0a4ae4408e user: drh tags: trunk
19:02
Refactor the diff logic for improved modularity and performance. This check-in transitions the diff improvement efforts from a branch to trunk. The effort is not yet complete, but it is stable enough to continue going on trunk. User-visible changes include (1) improved diff display, especially for unified diffs, (2) the new "fossil xdiff" command... check-in: 9e330740cc user: drh tags: trunk
00:33
Fix a harmless compiler warning from previous check-in. Closed-Leaf check-in: bcd3e80f20 user: drh tags: diff-color-enhancements
00:31
A new, faster algorithm for alignment of rows in a change block. check-in: 71759ef5bf user: drh tags: diff-color-enhancements
2021-09-04
19:45
Add the test-line-hash command for use in debugging and analyzing the match_dline() functions. check-in: 6a2bfba43d user: drh tags: diff-color-enhancements
16:51
If unable to get good alignment between two diff block, try merging the current diff block with the subsequent diff block, if it is nearby. check-in: 45c91a6670 user: drh tags: diff-color-enhancements
16:22
Fix incorrect xReplace method in the --tcl formatter. check-in: 2e583d2a2c user: drh tags: diff-color-enhancements
15:00
Fix the SKIP display for --tk diffs. check-in: 581d3f8d88 user: drh tags: diff-color-enhancements
10:38
Fix diff.js so that it does not limit the width of unified diff <pre> elements. check-in: 723ce36ddb user: drh tags: diff-color-enhancements
10:27
Fix the blob_append_tcl_literal() routine to escape carriage-return characters (U+000d). Possible fix for the problem reported at [forum:/forumpost/390440e9793bfef7|forum post 390440e9793bfef7]. check-in: b4c961e8fb user: drh tags: diff-color-enhancements
2021-09-03
23:39
Add chunk numbers to each row of the diff output for HTML diffs. check-in: 8caab6155e user: drh tags: diff-color-enhancements
23:00
Draw a thin box around diffs in the default skin (per [forum:/forumpost/a42aade32dd9d42|forum post a42aade32dd9d42]). Show ellipsis at the tops and bottoms of files, if warranted. Fix a problem with "diff.js" that was failing to link all scrollbars associated with a single diff. check-in: 63a5c754fd user: drh tags: diff-color-enhancements
22:49
Improved alignment of partial line diffs. More work to be done in this area. Also fix a problem in diff.js that was causing problems when comparing two empty files. check-in: 24d28cb7c9 user: drh tags: diff-color-enhancements
18:45
Refactor the name of the sub-line change detection object. check-in: 3e08b15858 user: drh tags: diff-color-enhancements
17:51
Escape [, \, and ] characters when quoting TCL strings. check-in: fd2d27f01b user: drh tags: diff-color-enhancements
14:33
Add the test-line-diff command for testing the oneLineChange() routine of the diff logic. check-in: 0755a81bb5 user: drh tags: diff-color-enhancements
14:05
Adjust CSS to show blue change text for the --by option. check-in: 4381c7ea8c user: drh tags: diff-color-enhancements
13:39
First attempt at documenting the new diff web layout. check-in: 07d28ec886 user: drh tags: diff-color-enhancements
12:33
Restore the blue color for changed text in side-by-side diffs. check-in: 00b5e02ab2 user: drh tags: diff-color-enhancements
12:23
Merge recent trunk enhancements into the diff-color-enhancement branch. check-in: 17dde4c75b user: drh tags: diff-color-enhancements
12:21
Fix to the --ssl-identity issue described at [forum:/forumpost/6e2b2ee5316b7aef|forum post 6e2b2ee5316b7aef]. check-in: 82b42943b1 user: drh tags: trunk
12:07
On windows, make sure temporary pathnames containing non-ASCII characters are handled correctly. Add the fossil_freopen() wrapper around freopen() for portability. check-in: f48e48f664 user: drh tags: trunk
11:51
Adjust diff colors in all skins. check-in: 3910360677 user: drh tags: diff-color-enhancements
2021-09-02
23:43
Delete a bunch of obsolete side-by-side diff code. check-in: 9f3d89612a user: drh tags: diff-color-enhancements
22:44
Delete unused legacy context-diff logic for HTML. check-in: 1fb022ff98 user: drh tags: diff-color-enhancements
22:28
Improved comments on the diff formatter and related logic. check-in: d29ddba321 user: drh tags: diff-color-enhancements
19:38
New format for JSON diff output. Promote the "test-diff" command to "xdiff", retaining the older spelling as a backup for compatibility. check-in: b051102272 user: drh tags: diff-color-enhancements
18:44
Better control over the blue/red/green colors in the --tk TCL code. check-in: 1df8b9d773 user: drh tags: diff-color-enhancements
16:15
Fix line numbers off-by-one in --tk display. check-in: b3e1fd9ff4 user: drh tags: diff-color-enhancements
14:25
Various improvements and bug fixes to the new diff logic. check-in: 10f736f04f user: drh tags: diff-color-enhancements
10:09
Get the --tk option working with the new --tcl format. check-in: 63610f3f27 user: drh tags: diff-color-enhancements
09:19
Add the --tcl format option to the diff commands. The plan is to use this to implement --tk (in place of --html -y) but that part is not yet implemented. check-in: e933d5d731 user: drh tags: diff-color-enhancements
07:56
Half of [d700f5ff4f215c69 | the prior commit] was unnecessary. Backed it out. check-in: 9a4e87a3b6 user: wyoung tags: trunk
07:52
Added db_unprotect/pop wrappers around the "clone --ssh-command" handling to avoid a bogus "unauthorized change to protected setting" error, as reported [forum:/forumpost/29027c6a67c280e7 | on the forum]. check-in: d700f5ff4f user: wyoung tags: trunk
2021-09-01
19:53
First attempt to generate side-by-side diffs using the new formatter. This breaks the --tk option. The "fossil diff -b" and "--by" work, but side-by-side diff on /info pages and similar is currently busted. CSS is simplified, which means that skins will need to be modified. This is an incremental check-in. check-in: 4cd8a743cd user: drh tags: diff-color-enhancements
15:38
Further improvements to unified diff. Simplified CSS that can be used in common with split diff. Separate columns for each line number and the change mark. check-in: ce856a8614 user: drh tags: diff-color-enhancements
2021-08-31
22:43
Tweaks to diff formatting. check-in: 598d7736e7 user: drh tags: diff-color-enhancements
14:13
Removed the link to /setup_smtp from the main /admin page: the backing feature was removed several months ago. Addresses [forum:/forumpost/413e04bba5 | an anonymous forum post]. check-in: 7aaee6fc31 user: wyoung tags: trunk
14:10
Markdown tweak in www/alerts.md to avoid semi-redundant constructs like "[MTA][mta]". check-in: 897bd90b27 user: wyoung tags: trunk
14:03
Fixed several "descendents" typos. (It's "descendants".) There's still one remaining in sqlite3.c, but of course fixing that here won't help. check-in: 85f119dc7d user: wyoung tags: trunk
13:44
Small grammar tweaks to previous check-in: c2f0063f1e user: wyoung tags: trunk
13:33
Improvements to the new unified diff algorithm. check-in: 2a256a4cce user: drh tags: diff-color-enhancements
13:29
Further tweaks to §2.5.1 of the fossil-v-git doc: spelling and grammar fixes, updated references, clarifications... check-in: c00b6a4844 user: wyoung tags: trunk
13:14
Updated the fossil-v-git doc to talk about "fossil patch" in addition to "fossil bundle". check-in: e3e06d31f5 user: wyoung tags: trunk
10:39
Refactor the previous commit by adding a wrapper for `freopen()', and use the Cygwin-aware routines to convert path names to/from UTF-16. Closed-Leaf check-in: 963de841f2 user: florian tags: win32-temppath-mojibake
07:01
On Windows, make sure temporary path names containing non-ASCII characters are accessible, for example if the default temporary path "C:\Users\«Username»\AppData\Local\Temp" contains a user name with extended characters, of if the %TEMP% environment variable points to a directory name with extended characters. check-in: 102339828b user: florian tags: win32-temppath-mojibake
03:00
An attempt to rework HTML unified diff to show partial line matches. Still needs CSS work. check-in: a01e46d85e user: drh tags: diff-color-enhancements
02:56
Fixed a copy/paste typo from [ae28ae82] which broke some JS-using pages. check-in: b22bf1c954 user: stephan tags: trunk
2021-08-30
22:39
Merge fixed from trunk into the diff-color-enhancements branch. check-in: 06a4494e01 user: drh tags: diff-color-enhancements
16:43
Added fossil.dom.ins/del() factory functions in prep for JS-based diff renderer. (Later) This check-in seems to break chat on the server-side. (Later still) fixed in trunk - copy/paste typo. Closed-Leaf check-in: ae28ae8273 user: stephan tags: oops
16:40
Fix handling of backslash and tab in quoted JSON text for the --json option. check-in: 9a30e83d88 user: drh tags: diff-color-enhancements
15:03
Add the experimental JSON diff output format. check-in: 5d759da711 user: drh tags: diff-color-enhancements
14:23
Fix --debug diff output for multi-byte UTF-8. check-in: 9191ea9e63 user: drh tags: diff-color-enhancements
13:55
In the "diff --debug" output show the regions of change. check-in: 4b8f203f5d user: drh tags: diff-color-enhancements
12:00
Code and comment cleanup. Fixes to the new formatDiff() routine related to block alignment. check-in: 16a2364f36 user: drh tags: diff-color-enhancements
02:36
Corrections to line counting in the formatDiff procedure that drives the DiffBuilder object. Remove the test-rawdiff command and substitute and undocumented --raw option on the various diff commands. check-in: 5e70c3ff96 user: drh tags: diff-color-enhancements
2021-08-29
22:55
Demonstrate the concept of a generic DiffBuilder object. check-in: 6e8d87b398 user: drh tags: diff-color-enhancements
12:58
Minor sbsdiff.js tweak to try to avoid unsightly page-level horizontal scrollbars, as reported in [forum:96e40f90db | forum post 96e40f90db]. check-in: fa667a9308 user: stephan tags: trunk
2021-08-28
16:36
Further improvements to fossil_temp_filename() to help ensure that the correct directory separators are used on both unix and windows. check-in: 5434d2e32c user: drh tags: trunk
15:47
Merge trunk fixes into the diff-color-enhancements branch. check-in: e696aa705c user: drh tags: diff-color-enhancements
15:46
More robust implementation of fossil_temp_filename that does not require an open connection to a real database. check-in: 939696667a user: drh tags: trunk
15:19
Minor legibility improvement for the previous commit [8ad6aa53a4]. check-in: db8c5a9296 user: stephan tags: trunk
15:11
Added missing db_protect() when importing (config export user) data via (config import), as reported in [forum:dea06dd696359a59 | forum post dea06dd696359a59]. check-in: 8ad6aa53a4 user: stephan tags: trunk
00:46
Performance optimization. Now faster than trunk. check-in: 2cb7f2f9d1 user: drh tags: diff-color-enhancements
00:13
Side-by-side diff coloration now appears to be technically correct, though further improves are needed to optimize for human perception, and for performance. check-in: 6ed7541472 user: drh tags: diff-color-enhancements
2021-08-27
21:11
Additional work on improved diff. Incremental check-in. Still not working right. check-in: 4fea7cc0ca user: drh tags: diff-color-enhancements
16:48
Coloring on side-by-side diffs allows up to 8 separate segments of change. Incremental check-in - not everything is working correctly. check-in: 925399da07 user: drh tags: diff-color-enhancements
14:01
Clean up the data structures associated with adding color to diffs in preparation for attempts to improve the coloration. check-in: 8c619bf278 user: drh tags: diff-color-enhancements
12:31
Fix login redirects for the forum. [forum:/forumpost/7663482abad5a3ea|Forum post 7663482abad5a3ea]. check-in: c717d2803e user: drh tags: trunk
12:09
Add a missing #include to diffcmd.c so that the build will work under mingw32. check-in: 00c8622a02 user: drh tags: trunk
11:29
Fix the goofy non-quoting of URL arguments to "start" on windows by including an extra quoted empty term. [forum:/forumpost/9600b10ffd0a7483|Forum post 9600b10ffd0a7483]. check-in: 0d8c92882a user: drh tags: trunk