Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
100 most recent check-ins
|
2024-12-13
| ||
| 23:46 | Avoid use of %R in /ckout redirect for a non-checkout to avoid the problem reported in forum post a0ecb34145. (Edit: already resolved in [02eb97d801a899ff].) ... (Closed-Leaf check-in: 7d6f6b09 user: stephan tags: mistake) | |
| 23:40 | Update the all-diffs-toggle button's label dynamically to clarify whether it will show or hide the diffs on its next click, per request in forum post 516f1ba3d82ed249. The semantics haven't changed: if any are hidden, its action will be to reveal them, else it will be to hide them. ... (Leaf check-in: 903142fe user: stephan tags: trunk) | |
| 21:37 | Begin making infrastructure changes to support doing a diff between two independently edited check-outs. ... (Leaf check-in: b10cb2b5 user: drh tags: diff-two-ckouts) | |
| 17:42 | Missed help screen update. ... (Leaf check-in: e5093a9c user: florian tags: diff-keyboard-navigation) | |
| 17:11 | Sync with trunk. ... (Leaf check-in: 4d727776 user: florian tags: diff-word-wrap) | |
| 17:07 | Enable keyboard navigation for web UI diffs on the new /ckout page. Restore the "Hide Diff" links (at least temporarily), so the keyboard handler can access the URLs. ... (check-in: 9e216433 user: florian tags: diff-keyboard-navigation) | |
| 17:01 | Sync with trunk. ... (check-in: edda30c6 user: florian tags: diff-keyboard-navigation) | |
| 15:36 | Fix redirect for the misuse of /ckout. ... (check-in: 02eb97d8 user: drh tags: trunk) | |
| 13:52 | Change the "sectionmenu" for the diffs on the /ckout page to be just a <hr>. ... (check-in: 8b06e7c0 user: drh tags: trunk) | |
| 13:29 | Attempts at beautification: (1) Simplify names of some links/buttons in diff pages. (2) Omit the "Hide Diffs" links, as those are now redundant. (3) Remove the accordion menu from the /ckout page. ... (check-in: 4d2d62d0 user: drh tags: trunk) | |
| 12:50 | Add the info-changes-menu to the "Uncommitted Changes" section of the /ckout page. ... (check-in: 7cf712af user: drh tags: trunk) | |
| 12:19 | Add accordion panels to the /ckout page. ... (check-in: 4af5cde6 user: drh tags: trunk) | |
| 12:00 | Fix the /ckout page so that it works correctly even when invoked from a subdirectory of the checkout root. Forum post af6086e46b. ... (check-in: 242c2d18 user: drh tags: trunk) | |
| 10:53 | Reworded section introductions, tidying up some of my writing. ... (Leaf check-in: e9b7d3f5 user: brickviking tags: bv-infotool) | |
| 10:01 | Corrected dir entry (again) in emitted header. ... (check-in: e8de1b3e user: brickviking tags: bv-infotool) | |
| 09:17 | Corrected dir entry in emitted header. ... (check-in: ac92f9d6 user: brickviking tags: bv-infotool) | |
| 09:09 | Add fossil to system-wide dir file when running install-info. ... (check-in: d78a077a user: brickviking tags: bv-infotool) | |
| 08:47 | Sync with trunk. ... (check-in: a1f60bee user: florian tags: diff-word-wrap) | |
| 04:03 | Tidied up language in add.c. ... (check-in: 3d2f1886 user: brickviking tags: trunk) | |
| 00:41 | Diff toggles: move the toggle-all button into the page-level diff UI controls (and add that area to the /ckout page) and only show the toggle-all option if more than one diff is being shown. Only show the Sync-sbs-diff preference checkbox when rendering sbs diffs. There is some slight visual inconsistency across various pages in how the toggle-all button is rendered, so there's still opportunity for some polishing-up. ... (check-in: a718a768 user: stephan tags: trunk) | |
|
2024-12-12
| ||
| 17:07 | Sync with trunk. ... (check-in: 878a56bc user: florian tags: diff-word-wrap) | |
| 17:00 | Sync with trunk. ... (check-in: 6599ed91 user: florian tags: diff-keyboard-navigation) | |
| 16:58 | Sync with trunk. ... (Leaf check-in: 611f20e8 user: florian tags: timeline-keyboard-navigation) | |
| 11:36 | On the /ckout page, omit the diff if the diff parameter is 0 or smaller. ... (check-in: 0654e845 user: drh tags: trunk) | |
| 08:16 | Rename of infoscript to fossil-makeinfo. ... (check-in: 4c006c97 user: brickviking tags: bv-infotool) | |
| 07:42 | Changes to infoscript necessary for OpenBSD's makeinfo, which dates to 2004. A rename is coming. ... (check-in: a28bcf55 user: brickviking tags: bv-infotool) | |
| 06:48 | Fix of file-change-line button. ... (check-in: 8e3e57b3 user: brickviking tags: trunk) | |
| 06:33 | Widen the scope for a button's visibility in darkmode. ... (check-in: 19da71c5 user: brickviking tags: trunk) | |
| 04:49 | Increase contrast of button for file-change-line. ... (check-in: 426dd8d3 user: brickviking tags: trunk) | |
| 03:37 | Fix DOM element pairing when diff=0 is used in /vdiff and friends. Problem introduced in [a11d2454782]. ... (check-in: d463c7ee user: stephan tags: trunk) | |
|
2024-12-11
| ||
| 23:09 | Diff toggles: add a label to the checkbox to make it easier to click, add an 'all' button which toggles all diffs, and remove the toggle from the /fdiff page because it only has a single diff block. ... (check-in: a11d2454 user: stephan tags: trunk) | |
| 23:02 | Diff toggles: add a label to the checkbox to make it easier to click, add an 'all' button which toggles all diffs, and remove the toggle from the /fdiff page because it only has a single diff block. ... (Closed-Leaf check-in: 419756c6 user: stephan tags: diff-toggle-all) | |
| 20:52 | Tweaked language a bit. ... (check-in: 2c0714f8 user: brickviking tags: trunk) | |
| 11:41 | Record the name of the branch for a checkout when the checkout is first opened. Possible use later to warn about branch name changes at check-in time. ... (Leaf check-in: 706a10d0 user: drh tags: safe-checkout-branch) | |
| 07:41 | (Spell) Correct spelling in branch.c. ... (check-in: 4bb718a8 user: brickviking tags: trunk) | |
| 00:32 | More robust detection of top of a checkout in the dir_has_ckout_db() function. ... (check-in: 36f916c5 user: drh tags: trunk) | |
|
2024-12-10
| ||
| 21:30 | (Grammar) Correct sense of word. ... (check-in: c7bfa963 user: brickviking tags: trunk) | |
| 20:56 | Add an optional REMOTE:PATH term on the "fossil bisect ui" command that runs the UI on the specified remote check-out. ... (check-in: a865c62a user: drh tags: trunk) | |
| 20:44 | More improvements to the title of the /ckout page. Add a link to the /ckout page from the /sitemap, when the /ckout page is valid. ... (check-in: 3f6a7e51 user: drh tags: trunk) | |
| 20:28 | Update the change log. ... (check-in: e850ce1c user: drh tags: trunk) | |
| 19:18 | Further improvements to the title of the ckout page. ... (check-in: 726709d9 user: drh tags: trunk) | |
| 18:24 | Improved title on the /ckout page. ... (check-in: 842daebb user: drh tags: trunk) | |
| 18:18 | Try to always use /ckout as the start page for "fossil ui" invocations, even on remote hosts, unless something else is specified by the user. ... (check-in: 58849c40 user: drh tags: trunk) | |
| 16:57 | Change the default page for the "fossil ui" command to the new /ckout page. ... (check-in: db2f3097 user: drh tags: trunk) | |
| 13:58 | If the "fossil diff" command has a directory argument, then run a "fossil ui" diff on that check-out. ... (Closed-Leaf check-in: 099ed5b9 user: drh tags: diff-remote) | |
| 13:13 | Add an "unprotect()" call to /ckout so that it can see that files have changed and update the vfile table appropriately. Updates to diff command-line parser comments to mention all the latest options. ... (check-in: a2a0390c user: drh tags: trunk) | |
| 12:53 | Add the /ckout page. ... (check-in: d35d2018 user: drh tags: trunk) | |
| 12:52 | Update the help message for the /ckout page. ... (Closed-Leaf check-in: 5ba44a13 user: drh tags: ckout-page) | |
| 12:38 | Be sure to call vfile_check_signature() so that edits are detected prior to generating diffs on the /ckout page. ... (check-in: 6affaac9 user: drh tags: ckout-page) | |
| 12:16 | Add diffs to the /ckout page. ... (check-in: 2578684c user: drh tags: ckout-page) | |
| 06:25 | Merge trunk into merge-info-html branch for mergestat improvements. ... (Leaf check-in: f0a48c8f user: stephan tags: merge-info-html) | |
| 00:36 | Begin adding the infrastructure for a /ckout webpage. ... (check-in: c620a8c7 user: drh tags: ckout-page) | |
| 00:09 | Fix an obscure possible bug in "fossil ui DIR" if there are 96 or more additional arguments. ... (check-in: de6f88a6 user: drh tags: trunk) | |
|
2024-12-09
| ||
| 23:03 | Update the built-in SQLite to the latests trunk version, which includes fixes found in 3.47.2, plus other enhancements. ... (check-in: 077e53a3 user: drh tags: trunk) | |
| 22:51 | Fix a bug in text-merge for the case when the same change occurs along both branches. ... (check-in: 58c74fc5 user: drh tags: trunk) | |
| 22:45 | Gather more transformations for merge-info in a "fossil update". ... (check-in: 565a4906 user: drh tags: trunk) | |
| 17:38 | Record merge-info information for the "fossil update" command. ... (check-in: 3a18c95d user: drh tags: trunk) | |
| 16:47 | The output from "fossil merge-info" appears in priority order: CONFLICT first, then MERGE, then other minor changes. ... (check-in: 0b5dfa9f user: drh tags: trunk) | |
| 08:17 | Move filename info into the corresponding merge-info table. Start adding infrastructure for emitting HTML-mode output to the content columns. ... (check-in: e3a3f0a5 user: stephan tags: merge-info-html) | |
| 07:10 | Change width:1px sizes to width:fit-content on diff line-number and change-type cols for diff --browser and friends. ... (check-in: 8c6dddc6 user: stephan tags: trunk) | |
| 07:08 | Get stub table layout in place for merge-info --html. It's not yet clear whether this will suffice. ... (check-in: 5a1da556 user: stephan tags: merge-info-html) | |
| 07:05 | Fix width:1px sizes on diff line-number and change-type cols for diff --browser and friends. ... (check-in: d2d01d3e user: stephan tags: merge-info-html) | |
|
2024-12-07
| ||
| 20:14 | Plug the debug merge builder into the html builder's as-yet-unimplemented methods to assist in thinking through the next steps. ... (check-in: d18f24e2 user: stephan tags: merge-info-html) | |
| 19:52 | Set up the main file list loop for merge_info_html(). ... (check-in: 81457255 user: stephan tags: merge-info-html) | |
| 18:21 | Use a temp table to consolidate how merge-info --html collects its list of files to process. ... (check-in: 04a868ac user: stephan tags: merge-info-html) | |
| 07:29 | Updated comments, improved output further. More to come. ... (check-in: 6ee05bf6 user: brickviking tags: bv-infotool) | |
| 05:19 | Add skeleton for the MergeBuilderHtml, but it doesn't do anything right now except for fail to outright crash. Add an empty TITLE tag to the diff web page output so that a title can be more easily set via JS. ... (check-in: e76aceba user: stephan tags: merge-info-html) | |
| 03:31 | Add scaffolding for iterating over lists of files for merge-info --html. Simply emit a UL list for the time being. ... (check-in: 8bb036bf user: stephan tags: merge-info-html) | |
| 02:26 | Attempt to get the CSS grid view in place for merge-info --html. It can't be tested until we fill out with content, though. ... (check-in: 5eac2b1b user: stephan tags: merge-info-html) | |
|
2024-12-06
| ||
| 23:46 | Initial empty scaffolding for merge-info --html/--browser options. There is still much to do here. ... (check-in: ca7eceb9 user: stephan tags: merge-info-html) | |
| 19:07 | An improved method for clearing out unwanted table during rebuild. ... (check-in: aeec557e user: drh tags: trunk) | |
| 13:49 | Fix the rebuilder so that it does not try to drop shadow tables, which cannot be dropped in newer versions of SQLite, and thus does not error out for databases that have FTS indexes. ... (check-in: 55f13661 user: drh tags: trunk) | |
| 13:37 | Make more use of WITHOUT ROWID tables in the main schema. ... (check-in: b8011bf5 user: drh tags: trunk) | |
| 10:59 | Automatically shrink the width of the merge-info --tk GUI so that it fits into the available console space. ... (check-in: e7575343 user: drh tags: trunk) | |
| 09:33 | Improvements to pdf-formatted info documentation. ... (check-in: e1b14acf user: brickviking tags: bv-infotool) | |
| 08:31 | Updated version, terminated header sentences. ... (check-in: 03d36f0f user: brickviking tags: bv-infotool) | |
| 06:16 | Put back forgotten @bye, needed for makeinfo --pdf output. ... (check-in: 28656971 user: brickviking tags: bv-infotool) | |
| 06:13 | Merge latest from trunk ... (check-in: f040c11f user: brickviking tags: bv-infotool) | |
| 05:17 | Whitespace removal ... (check-in: bbf6c307 user: brickviking tags: trunk) | |
| 05:07 | (Grammar) Remove duplicate word in comment. ... (check-in: 6ebc9e0e user: brickviking tags: trunk) | |
| 04:07 | Fix a very minor memory leak in the merge logic. ... (check-in: 6ff817d3 user: drh tags: trunk) | |
| 04:03 | Fix a "%d" that ought to be a "%lld" because the argument is a 64-bit integer. This error causes no problems on 64-bit builds, but fails horribly on 32-bit. ... (check-in: 546cbce2 user: drh tags: trunk) | |
| 02:42 | Typo in the previous commit. ... (Closed-Leaf check-in: 383f8ef1 user: drh tags: pi4-fixes) | |
| 02:38 | Correction to the previous check-in. ... (check-in: a24f1490 user: drh tags: pi4-fixes) | |
| 02:26 |
| |
| 01:42 | Merge from trunk ... (check-in: f8263315 user: brickviking tags: bv-infotool) | |
|
2024-12-05
| ||
| 23:36 | Fix a mis-closed blockquote, as reported in forum post 2b17e349f9. ... (check-in: a69823c1 user: stephan tags: trunk) | |
| 23:15 | Fix memory leaks in merge. ... (check-in: 337617ba user: drh tags: trunk) | |
| 20:48 | Minor width adjustment for the merge-info GUI on Windows. ... (check-in: bf1af2e5 user: drh tags: trunk) | |
| 20:12 | When doing a merge, if a merge conflict occurs, a new section appears in the merge conflict markings that shows the suggested resolution. In addition, the "merge-info --tk" GUI is improved so that line numbers in the result column correspond with line numbers in the actual file. ... (check-in: 1cf0d372 user: drh tags: trunk) | |
| 20:08 | Improvements to the file selection option-menu in the merge UI. ... (Closed-Leaf check-in: 4582d69e user: drh tags: better-merge) | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. ... (check-in: 48827897 user: drh tags: better-merge) | |
| 18:56 | Fix horizontal scrolling in the merge UI. ... (check-in: 06df966b user: drh tags: better-merge) | |
| 18:45 | Merge UI menu buttons working on Darwin. ... (check-in: 76b39a2c user: drh tags: better-merge) | |
| 18:00 | Improvements to how resizing works in the merge --tk UI. ... (check-in: e9d1d716 user: drh tags: better-merge) | |
| 17:13 | In the merge engine, make sure V1 is always used for the local copy and V2 is used for the merge-in. ... (check-in: 873b364b user: drh tags: better-merge) | |
| 17:00 | Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. ... (check-in: adf22696 user: drh tags: better-merge) | |
| 13:24 | Reduced memory requirements in merge_try_to_resolve_conflict(). ... (check-in: 16515616 user: drh tags: better-merge) | |
| 13:16 | Bug fixes sufficient to get the automated merge conflict resolution working. ... (check-in: 1174e5f2 user: drh tags: better-merge) | |
| 12:15 | Steps toward doing a better job of automatically resolving merge conflicts. Compiles but does not work. This is an incremental check-in. ... (check-in: 849c7eb6 user: drh tags: better-merge) | |