Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
287 check-ins using file www/sync.wiki version 376cccf25e
|
2025-01-04
| ||
| 23:18 | More robust test for the ssh case, minor refactoring. check-in: d2bfab5888 user: danield tags: ssh-signing | |
|
2025-01-03
| ||
| 15:57 | Make clear the one can use the Fossil user name in the .allowed_signers file. check-in: b25a0eff1f user: danield tags: ssh-signing | |
| 14:28 | Simplify a test when looking for the command tail. check-in: e1cbb9968d user: danield tags: ssh-signing | |
|
2025-01-02
| ||
| 00:12 | Allow a path to the ssh-keygen in the pgp-command setting. check-in: 121093b835 user: danield tags: ssh-signing | |
|
2024-12-29
| ||
| 01:02 | In the verification recipe for ssh signing, do not silent a possible confirmation. check-in: decad8811e user: danield tags: ssh-signing | |
|
2024-12-25
| ||
| 13:18 | Added web pages to the info file. Only the settings page now missing, however the output is butt-ugly. The .texi will need to be seriously massaged to get good looking info output. check-in: a71499a27f user: brickviking tags: bv-infotool | |
|
2024-12-20
| ||
| 21:16 | Optimize sync of long cluster chains by sending all cluster artifacts on the third client/server round-trip. check-in: 637fcef830 user: drh tags: trunk | |
| 19:50 | Further improvements to /clusterlist and to /info for a cluster. check-in: 9953b16976 user: drh tags: trunk | |
| 19:44 | Edit pass on the www/ssl-server.md to cover some of the details brought up [forum:/forumpost/94c36cf8d2 | on the forum]. This also adds fragment IDs for section heads and improves the discussion generally. check-in: f374a46337 user: wyoung tags: trunk | |
| 19:07 | Add the "unclustered" query parameter to /bloblist. check-in: 9859eb0308 user: drh tags: trunk | |
| 18:55 | Add the "recent" query parameter to the /bloblist page, to show the 250 most recently acquired artifacts. check-in: 64ab7d7f28 user: drh tags: trunk | |
| 16:59 | Install hyperlinks to the /clusterlist page. check-in: 3057775b54 user: drh tags: trunk | |
| 16:50 | Get the /clusterlist working for non-admin users, though omit sensitive information for non-admins. Show the compressed size of clusters on that page. check-in: 90764bd656 user: drh tags: trunk | |
| 15:27 | Fix a typo in a column name for the query that deals with phantom entries in the info page for clusters. check-in: 72a218cecf user: drh tags: trunk | |
| 15:14 | Improvements to the /clusterlist page. check-in: e3ef536c69 user: drh tags: trunk | |
| 15:04 | Add the /clusterlist webpage. check-in: a2ce1f109a user: drh tags: trunk | |
| 14:38 | Improve the /info page to show more detailed information about clusters. check-in: 4170e0bb02 user: drh tags: trunk | |
|
2024-12-19
| ||
| 19:33 | Update the built-in SQLite to the latest trunk version for testing. check-in: 1b55133f9e user: drh tags: trunk | |
| 19:13 | Update to the change log for 2.26. check-in: f4f395b6a4 user: drh tags: trunk | |
| 18:20 | Remove a harmless unused local variable. [forum:/forumpost/1d5c8db08a327fb4|Forum post 1d5c8db08a327fb4]. check-in: 08ea1bd4ab user: drh tags: trunk | |
| 16:46 | Update the tests to reflect the current state of development. check-in: 6aee052f00 user: florian tags: trunk | |
| 11:59 | Comment improvements in the Dockerfile check-in: 693c7b9bd5 user: wyoung tags: trunk | |
| 07:28 | Fix a small inconvenience in the `translate' utility program discovered while working with MSVC debug builds. check-in: 8defefd3ff user: florian tags: trunk | |
|
2024-12-18
| ||
| 18:40 | Fix the previous commit to restore ANSI C-89 conformance. check-in: bee9b30168 user: florian tags: trunk | |
| 18:30 | Fix a problem introduced with [593ceca27d]: the blob resize operation may realloc the buffer, so obtain the pointer to the buffer only after the resize to avoid a "use after free". check-in: 36bcaaeee0 user: florian tags: trunk | |
| 12:51 | Fix additional harmless memory leaks. check-in: d564056cce user: drh tags: trunk | |
| 11:39 | Fix harmless memory leaks. check-in: 37ae94b365 user: drh tags: trunk | |
| 05:06 | Call `cgi_is_loopback()' before `db_open_local()' when checking for a local `fossil ui' session. The former performs simple string comparison, while the latter crawls the file system for multiple (3) check-out database file names at multiple directory hierarchy levels. The main motivation for this change is to reduce "attack surface" of the /jchunk interface, but also to align `cgi_is_loopback()' vs. `db_open_local()' precedence with usage elsewhere in the code base. check-in: 2dda151c40 user: florian tags: trunk | |
|
2024-12-17
| ||
| 12:38 | Send the --from argument of the "fossil ui" command encoded as hexadecimal, to work around quoting problems on Windows. [forum:/forumpost/cfc22d41b19a1a96|Forum post cfc22d41b19a1a96]. check-in: 593ceca27d user: drh tags: trunk | |
| 06:56 | Sync with trunk. check-in: 5fbb14f73a user: florian tags: diff-word-wrap | |
| 06:36 | Sync with trunk. check-in: 361fc76769 user: florian tags: diff-keyboard-navigation | |
| 06:32 | Consistent naming of the "Hide Diff" links to skip server-side diff generation. Note the naming conflict with the scripted link to show and hide the generated diffs. check-in: aa7ddd8094 user: florian tags: diff-keyboard-navigation | |
| 06:26 | Sync with trunk. check-in: 215fc593d0 user: florian tags: timeline-keyboard-navigation | |
| 06:24 | Take note of possibly useful shortcuts. check-in: 88cba5fbfb user: florian tags: timeline-keyboard-navigation | |
| 06:12 | On the new /ckout UI page, output the page footer only once. check-in: 92372ce946 user: florian tags: trunk | |
| 05:38 | Corrected an error, made some more small tweaks. check-in: 728afdb0a3 user: brickviking tags: bv-infotool | |
|
2024-12-16
| ||
| 20:44 | A number of small changes. Output may be minimised in a future update. check-in: 27adc8b0c7 user: brickviking tags: bv-infotool | |
| 20:09 | Merge from trunk. check-in: 704b75e853 user: brickviking tags: bv-infotool | |
| 20:01 | Updated changelog with new version number and text. check-in: f45052a803 user: brickviking tags: bv-infotool | |
| 16:22 | Add missing word in the help text for 'merge'. check-in: bdc6bb1cfb user: danield tags: trunk | |
| 16:17 | Fix a bug in the "fossil patch pull" command that caused "fossil revert" that occurs after a "fossil merge" to be lost. Also, improve "fossil patch pull" so that it does not mess with the undo log and does not do unnecessary syncs. check-in: 3a39ae4c87 user: drh tags: trunk | |
| 16:15 | Do not sync or fill the undo log when running subcommands due to patch. Closed-Leaf check-in: cf8f0e4d35 user: drh tags: patch-pull-fix | |
| 16:06 | Preliminary fix for the issue described at [/forumpost/51a37054|developers forum post 51a37054]. check-in: f381794fd7 user: drh tags: patch-pull-fix | |
| 11:46 | Restore executable bit. check-in: 5fa932fac3 user: brickviking tags: bv-infotool | |
| 11:43 | Added test commands. Do not rely on these commands. check-in: eb116bc353 user: brickviking tags: bv-infotool | |
| 11:09 | Merge from trunk. Sorry if this errors. check-in: 91639f39e2 user: brickviking tags: bv-infotool | |
| 07:40 | Internal tweaks and docs in the diff-toggling code. No visible changes. check-in: 6f26395422 user: stephan tags: trunk | |
| 04:02 | Revert change. I'll have to look into the raw sql data. check-in: 5a2e00424e user: brickviking tags: bv-corrections01 | |
| 03:24 | Change (temporarily) to test <a href="https://fossil-scm.org/forum/forumpost/f8a4d4e1d4">this forum post</a> check-in: 78a28847f3 user: brickviking tags: bv-corrections01 | |
| 03:20 | Merge from trunk check-in: 0fc2f3d95b user: brickviking tags: bv-corrections01 | |
|
2024-12-15
| ||
| 16:30 | Documentation updates to better reflect recent changes. check-in: 7f1958acf8 user: drh tags: trunk | |
| 16:01 | Error checking: The argument to the --from option on the "fossil ui" command must be a pathname (not a tag or version hash). check-in: 5c72725ef5 user: drh tags: trunk | |
| 15:57 | Change the --external-baseline option on "diff" and "ui" to be just --from. See [forum:/forumpost/91ce9dd9f9afa7fe|forum thread 91ce9dd9f9afa7fe]. check-in: 763758db16 user: drh tags: trunk | |
| 00:17 | Add the exbase=PATH query parameter to the /ckout page so that the diff uses an external baseline. Add the --external-baseline option to the "fossil ui" command to force the initial page to be /ckout with the exbase query parameter. check-in: 3807891e62 user: drh tags: trunk | |
| 00:15 | Add the --external-baseline option to the "fossil ui" command, to force the initial page to use the exbase query parameter. Closed-Leaf check-in: 145ca85de9 user: drh tags: ckout-exbase | |
| 00:06 | Improvements to /ckout with the exbase query parameter. check-in: 16799dba71 user: drh tags: ckout-exbase | |
|
2024-12-14
| ||
| 23:42 | Enable diff expansion with the exbase= query parameter on /ckout. check-in: 4ba97a66aa user: drh tags: ckout-exbase | |
| 21:51 | Corrected method comment to make some more sense, from forum post [fdf29398a6d45] check-in: 36f354927b user: brickviking tags: trunk | |
| 21:20 | Attempt to add the exbase=PATH query parameter as an option to the /ckout page. check-in: 700b5031fd user: drh tags: ckout-exbase | |
| 20:41 | Add the --external-baseline option to the "fossil diff" command, plus some minor name refactoring in the diff system. check-in: 99d0baa615 user: drh tags: trunk | |
| 20:40 | Change the name of the --tree option to --external-baseline. Closed-Leaf check-in: 356163b05d user: drh tags: diff-tree | |
| 19:57 | Fix the new --tree option so that it only shows diffs of files that prefix match arguments on the command-line. check-in: df94a3538e user: drh tags: diff-tree | |
| 19:52 | Add the "--tree DIRECTORY" option to the "fossil diff" command. check-in: 07a699738a user: drh tags: diff-tree | |
| 12:00 | Recognize the --from-ckout and --to-ckout options to the "fossil diff" command. UPDATE: Development on this branch abandoned. See the nearby "diff-tree" branch for an alternative idea. Closed-Leaf check-in: 28197b28c2 user: drh tags: diff-two-ckouts | |
|
2024-12-13
| ||
| 23:46 | Avoid use of %R in /ckout redirect for a non-checkout to avoid the problem reported in [forum:a0ecb34145|forum post a0ecb34145]. (Edit: already resolved in [02eb97d801a899ff].) Closed-Leaf check-in: 7d6f6b09c3 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:516f1ba3d82ed249|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. check-in: 903142fef8 user: stephan tags: trunk | |
| 21:37 | Begin making infrastructure changes to support doing a diff between two independently edited check-outs. check-in: b10cb2b536 user: drh tags: diff-two-ckouts | |
| 17:42 | Missed help screen update. check-in: e5093a9c7e user: florian tags: diff-keyboard-navigation | |
| 17:11 | Sync with trunk. check-in: 4d7277762f 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: 9e216433bc user: florian tags: diff-keyboard-navigation | |
| 17:01 | Sync with trunk. check-in: edda30c66d user: florian tags: diff-keyboard-navigation | |
| 15:36 | Fix redirect for the misuse of /ckout. check-in: 02eb97d801 user: drh tags: trunk | |
| 13:52 | Change the "sectionmenu" for the diffs on the /ckout page to be just a <hr>. check-in: 8b06e7c03f 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: 4d2d62d017 user: drh tags: trunk | |
| 12:50 | Add the info-changes-menu to the "Uncommitted Changes" section of the /ckout page. check-in: 7cf712af97 user: drh tags: trunk | |
| 12:19 | Add accordion panels to the /ckout page. check-in: 4af5cde63d 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:/forumpost/af6086e46b|Forum post af6086e46b]. check-in: 242c2d1844 user: drh tags: trunk | |
| 10:53 | Reworded section introductions, tidying up some of my writing. check-in: e9b7d3f557 user: brickviking tags: bv-infotool | |
| 10:01 | Corrected dir entry (again) in emitted header. check-in: e8de1b3eaf user: brickviking tags: bv-infotool | |
| 09:17 | Corrected dir entry in emitted header. check-in: ac92f9d699 user: brickviking tags: bv-infotool | |
| 09:09 | Add fossil to system-wide dir file when running install-info. check-in: d78a077a89 user: brickviking tags: bv-infotool | |
| 08:47 | Sync with trunk. check-in: a1f60bee3c user: florian tags: diff-word-wrap | |
| 04:03 | Tidied up language in add.c. check-in: 3d2f1886a3 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: a718a76894 user: stephan tags: trunk | |
|
2024-12-12
| ||
| 17:07 | Sync with trunk. check-in: 878a56bc98 user: florian tags: diff-word-wrap | |
| 17:00 | Sync with trunk. check-in: 6599ed9127 user: florian tags: diff-keyboard-navigation | |
| 16:58 | Sync with trunk. check-in: 611f20e817 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: 0654e8459a user: drh tags: trunk | |
| 08:16 | Rename of infoscript to fossil-makeinfo. check-in: 4c006c9727 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: a28bcf55b0 user: brickviking tags: bv-infotool | |
| 06:48 | Fix of file-change-line button. check-in: 8e3e57b39a user: brickviking tags: trunk | |
| 06:33 | Widen the scope for a button's visibility in darkmode. check-in: 19da71c5e7 user: brickviking tags: trunk | |
| 04:49 | Increase contrast of button for file-change-line. check-in: 426dd8d352 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: d463c7eea5 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: a11d245478 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: 419756c6fd user: stephan tags: diff-toggle-all | |
| 20:52 | Tweaked language a bit. check-in: 2c0714f8d5 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: 706a10d09e user: drh tags: safe-checkout-branch | |
| 07:41 | (Spell) Correct spelling in branch.c. check-in: 4bb718a882 user: brickviking tags: trunk | |
| 00:32 | More robust detection of top of a checkout in the dir_has_ckout_db() function. check-in: 36f916c504 user: drh tags: trunk | |
|
2024-12-10
| ||
| 21:30 | (Grammar) Correct sense of word. check-in: c7bfa9636a 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: a865c62a16 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: 3f6a7e5113 user: drh tags: trunk | |
| 20:28 | Update the change log. check-in: e850ce1cb2 user: drh tags: trunk | |
| 19:18 | Further improvements to the title of the ckout page. check-in: 726709d92a user: drh tags: trunk | |
| 18:24 | Improved title on the /ckout page. check-in: 842daebb22 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: 58849c4098 user: drh tags: trunk | |
| 16:57 | Change the default page for the "fossil ui" command to the new /ckout page. check-in: db2f309787 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: 099ed5b97b 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: a2a0390cbf user: drh tags: trunk | |
| 12:53 | Add the /ckout page. check-in: d35d201840 user: drh tags: trunk | |
| 12:52 | Update the help message for the /ckout page. Closed-Leaf check-in: 5ba44a134d 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: 6affaac979 user: drh tags: ckout-page | |
| 12:16 | Add diffs to the /ckout page. check-in: 2578684c5c user: drh tags: ckout-page | |
| 06:25 | Merge trunk into merge-info-html branch for mergestat improvements. check-in: f0a48c8faa user: stephan tags: merge-info-html | |
| 00:36 | Begin adding the infrastructure for a /ckout webpage. check-in: c620a8c74c 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: de6f88a6f0 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: 077e53a341 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: 58c74fc5c7 user: drh tags: trunk | |
| 22:45 | Gather more transformations for merge-info in a "fossil update". check-in: 565a49062c user: drh tags: trunk | |
| 17:38 | Record merge-info information for the "fossil update" command. check-in: 3a18c95df4 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: 0b5dfa9f6c 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: e3a3f0a5f2 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: 8c6dddc6d0 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: 5a1da556d6 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: d2d01d3eb7 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: d18f24e2ac user: stephan tags: merge-info-html | |
| 19:52 | Set up the main file list loop for merge_info_html(). check-in: 8145725503 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: 04a868ac21 user: stephan tags: merge-info-html | |
| 07:29 | Updated comments, improved output further. More to come. check-in: 6ee05bf62d 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: e76aceba7c 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: 8bb036bf9a 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: 5eac2b1ba1 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: ca7eceb92c user: stephan tags: merge-info-html | |
| 19:07 | An improved method for clearing out unwanted table during rebuild. check-in: aeec557e89 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: 55f1366100 user: drh tags: trunk | |
| 13:37 | Make more use of WITHOUT ROWID tables in the main schema. check-in: b8011bf508 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: e75753438a user: drh tags: trunk | |
| 09:33 | Improvements to pdf-formatted info documentation. check-in: e1b14acf76 user: brickviking tags: bv-infotool | |
| 08:31 | Updated version, terminated header sentences. check-in: 03d36f0f72 user: brickviking tags: bv-infotool | |
| 06:16 | Put back forgotten @bye, needed for makeinfo --pdf output. check-in: 28656971ac user: brickviking tags: bv-infotool | |
| 06:13 | Merge latest from trunk check-in: f040c11f32 user: brickviking tags: bv-infotool | |
| 05:17 | Whitespace removal check-in: bbf6c30747 user: brickviking tags: trunk | |
| 05:07 | (Grammar) Remove duplicate word in comment. check-in: 6ebc9e0e23 user: brickviking tags: trunk | |
| 04:07 | Fix a very minor memory leak in the merge logic. check-in: 6ff817d3c7 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: 546cbce277 user: drh tags: trunk | |
| 02:42 | Typo in the previous commit. Closed-Leaf check-in: 383f8ef1ee user: drh tags: pi4-fixes | |
| 02:38 | Correction to the previous check-in. check-in: a24f14900d user: drh tags: pi4-fixes | |
| 02:26 | <s>Changes to the "merge" command to work around what appears to be a bug in GCC 10.2.1 on Raspbian 10.2.1-6+rpi1, armv6, 32bit.</s> No. Further analysis shows the exact same malfunction in a 32-bit build on i386 using gcc 5.4.0. So this sequence of changes is now moved to a branch. check-in: 14959bc587 user: drh tags: pi4-fixes | |
| 01:42 | Merge from trunk check-in: f826331554 user: brickviking tags: bv-infotool | |
|
2024-12-05
| ||
| 23:36 | Fix a mis-closed blockquote, as reported in [forum:2b17e349f9|forum post 2b17e349f9]. check-in: a69823c10b user: stephan tags: trunk | |
| 23:15 | Fix memory leaks in merge. check-in: 337617ba19 user: drh tags: trunk | |
| 20:48 | Minor width adjustment for the merge-info GUI on Windows. check-in: bf1af2e546 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: 1cf0d372fa user: drh tags: trunk | |
| 20:08 | Improvements to the file selection option-menu in the merge UI. Closed-Leaf check-in: 4582d69e34 user: drh tags: better-merge | |
| 19:22 | Improvements to the merge UI. Fix a mostly-harmless assertion associated with merge marks. check-in: 48827897cf user: drh tags: better-merge | |
| 18:56 | Fix horizontal scrolling in the merge UI. check-in: 06df966b19 user: drh tags: better-merge | |
| 18:45 | Merge UI menu buttons working on Darwin. check-in: 76b39a2c9f user: drh tags: better-merge | |
| 18:00 | Improvements to how resizing works in the merge --tk UI. check-in: e9d1d71669 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: 873b364b92 user: drh tags: better-merge | |
| 17:00 | Add a new "SUGGESTED CONFLICT RESOLUTION" section to the conflict markings. check-in: adf2269602 user: drh tags: better-merge | |
| 13:24 | Reduced memory requirements in merge_try_to_resolve_conflict(). check-in: 1651561630 user: drh tags: better-merge | |
| 13:16 | Bug fixes sufficient to get the automated merge conflict resolution working. check-in: 1174e5f2fd 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: 849c7eb6ca user: drh tags: better-merge | |
|
2024-12-04
| ||
| 19:25 | Fix rendering of merge information that contains "N" entries followed by "S". check-in: 2ec8a7ae38 user: drh tags: trunk | |
| 18:57 | Bug fix in the previous check-in for the "--tk" option on the "3-way-merge" command. check-in: d6fa91fdc8 user: drh tags: trunk | |
| 18:49 | Improved controls at the top of the --tk merge information GUI. check-in: f8932be5aa user: drh tags: trunk | |
| 17:00 | Wrap the list of attachments displayed on technotes/events, tickets and wiki pages in their own 'section' HTML element with CSS class name 'attachlist'. Inspired by [forum:8da5a5d868 | forum thread 8da5a5d868]. check-in: 4f9ecd0392 user: stephan tags: trunk | |
| 15:59 | Fix a mis-quoted DOM element attribute, as reported in [forum:5bdbb8b949|forum post 5bdbb8b949]. check-in: f96a3ba792 user: stephan tags: trunk | |
| 13:42 | Fix uninitialized variable in the "fossil merge-info --tk" command. check-in: 3165e1bfb3 user: drh tags: trunk | |
| 13:40 | Add the "fossil merge-info" command for improved situational awareness on complex merge operations. check-in: aa829657f0 user: drh tags: trunk | |
| 13:38 | By default, the merge-info command only shows "interesting" change - actual merges, errors, and conflicts. Use the --all option to see everything. Closed-Leaf check-in: b764f2d007 user: drh tags: merge-enhancements | |
| 12:05 | Issue warnings if a user tries to commit a check-in where the branch has changed. See the discussion at [forum:/forumpost/7f5ae505e4144a0c|forum thread 7f5ae505e4144a0c]. check-in: 245371782a user: drh tags: trunk | |
| 11:58 | Minor tweaks to the wording of the warning message that is show when commited to a moved branch. Closed-Leaf check-in: 8cfa177f64 user: drh tags: show-branch-change | |
| 06:32 | Correct a mismatched TD HTML tag, as reported in [forum:5a7ca99ebe|forum post 5a7ca99ebe]. check-in: 11dafcf68d user: stephan tags: trunk | |
|
2024-12-03
| ||
| 20:37 | The "fossil merge-info --tk" command appears to be working. Probably there are still undiscovered bugs. check-in: a199d970a5 user: drh tags: merge-enhancements | |
| 19:20 | The "fossil merge-info --tcl FILE" command generates content for the merge.tcl GUI using MERGESTAT data. Incremental check-in. check-in: cbd24a2594 user: drh tags: merge-enhancements | |
| 18:13 | Record information about merge operations in the localdb.mergestat table. Make that information available using the merge-info command. check-in: 625ff9d574 user: drh tags: merge-enhancements | |
| 13:36 | Add filename labels at the top of each column in the merge display. check-in: 7b8be85206 user: drh tags: merge-enhancements | |
| 12:36 | Improvements to "3-way --tk" check-in: 4a70c64a51 user: drh tags: merge-enhancements | |
| 01:31 | Add the "-c N" option to "fossil 3-way --tk". check-in: c4b68636e2 user: drh tags: merge-enhancements | |
| 01:06 | Improvements to the new merge display. check-in: 7002d98d73 user: drh tags: merge-enhancements | |
|
2024-12-02
| ||
| 21:36 | Continuing work on the --tk option to the 3-way-merge command. check-in: 57ae422a37 user: drh tags: merge-enhancements | |
|
2024-12-01
| ||
| 05:23 | This should just be for propagating tags, not single. check-in: c34cf8352e user: andybradford tags: show-branch-change | |
| 01:44 | Check the tagxref table for changes to branch name before commit and if there exists a change that wasn't made by the current user then prompt. check-in: 0aabb6bcac user: andybradford tags: show-branch-change | |
|
2024-11-30
| ||
| 17:37 | When --no-prompt is being used and there is a branch name change during commit skip the prompt and the condition because it's not a fatal condition. check-in: c552f44058 user: andybradford tags: show-branch-change | |
|
2024-11-29
| ||
| 16:23 | When --force is specified do not treat a branch name change that arrives during autosync as fatal. check-in: 82fee40e14 user: andybradford tags: show-branch-change | |
|
2024-11-28
| ||
| 21:54 | Preliminary implementation of a --tk option to the 3-way-merge command. Lots of work left to do to get this working well. check-in: bdcacd55be user: drh tags: merge-enhancements | |
| 19:13 | Add a --tcl option to the 3-way-merge command. check-in: 97ab5604ea user: drh tags: merge-enhancements | |
| 15:07 | Refactor the 3-way-merge logic to make it easier to extend and enhance. check-in: c4df699fd1 user: drh tags: merge-enhancements | |
|
2024-11-27
| ||
| 20:29 | I think this conveys the message with slightly more clarity. check-in: 4e7e1647de user: andybradford tags: show-branch-change | |
| 19:28 | If the branch name changes during a commit, prompt user to confirm continue (behaves similar to other pre-commit checks). Inspired by [forum:d5a1b209186552dd | forum post d5a1b209186552dd]. check-in: a70f279a1d user: andybradford tags: show-branch-change | |
| 17:07 | Wrap the list of attachments displayed on technotes/events, tickets and wiki pages in their own `section' HTML element with CSS class name 'attachlist'. Inspired by [forum:8da5a5d868 | forum thread 8da5a5d868]. Closed-Leaf check-in: b111adbe35 user: florian tags: attachlist-html-section | |
|
2024-11-26
| ||
| 19:49 | Minor update to conform to style, no change in function. check-in: 8e06863eeb user: andybradford tags: show-branch-change | |
| 19:24 | Only emit the change in branch if there is no VERSION argument to minimize additional output. check-in: 2ef47b81b4 user: andybradford tags: show-branch-change | |
| 05:20 | Implement the equivalent to the `inode' SQL function on Windows. check-in: 5233364196 user: florian tags: trunk | |
| 05:17 | Fix a crash if the test-file-environment command is called from outside a check-out (introduced with [106de276ee]). check-in: 38930fbabe user: florian tags: trunk | |
|
2024-11-24
| ||
| 03:38 | Improve situational awareness with "fossil update" by including a message in the changes: information if the name of the branch changes. See [forum:7f5ae505e4144a0c | forum discussion 7f5ae505e4144a0c] for details. check-in: bb9150c403 user: andybradford tags: show-branch-change | |
|
2024-11-23
| ||
| 21:27 | Improvements to the logic in the "fossil all" command that removes redundant entries for repositories in the global_config table. If two or more entries share the same inode, only use the first one. On Windows (which lacks inodes) determine uniqueness by the full, canonical pathname. check-in: 106de276ee user: drh tags: trunk | |
| 17:22 | Bug fix for allowing SSH command to be overridden once for sync operations. check-in: 4c6e394d1e user: andybradford tags: trunk | |
| 17:19 | Prepare for merge into trunk. Closed-Leaf check-in: c88ed3e191 user: andybradford tags: ssh-command-once | |
| 01:11 | This fixes the logic error introduced in [f019cb5fc3f]. check-in: 25857ebba5 user: andybradford tags: ssh-command-once | |
| 01:08 | This commit had more than I had intended. check-in: 91adccdb7d user: andybradford tags: ssh-command-once | |
| 01:07 | Fix logic error from previous commit. check-in: 3ada7a67ef user: andybradford tags: ssh-command-once | |
|
2024-11-22
| ||
| 15:11 | When using --once with --ssh-command, prefer the command-line argument over the stored option. Addresses [forum:90c1f5fef258c704 | forum post 90c1f5fef258c704]. check-in: f019cb5fc3 user: andybradford tags: ssh-command-once | |
| 14:29 | Provide the ability to make exceptions to maximum number of query parameters on the robot restrictor. check-in: 87368b3efd user: drh tags: trunk | |
|
2024-11-21
| ||
| 13:34 | Strengthen the file_is_canonical() routine so that it returns false on Windows if the pathname does not begin with a drive letter. check-in: f6ff25e1b7 user: drh tags: trunk | |
| 13:06 | Enhance the file_canonical_name() function so that it always includes the drive letter prefix on Windows. check-in: 40376ef892 user: drh tags: trunk | |
|
2024-11-19
| ||
| 14:28 | Fix the /timeline page such that when the rl= query parameter is used, subsequent hyperlinks are correct. check-in: 761c24e7b0 user: drh tags: trunk | |
| 13:08 | Simplifications to the Forum setup page. check-in: 25e4b54238 user: drh tags: trunk | |
| 12:52 | New setting "forum-title" is the title of the Forum. check-in: f646537cb6 user: drh tags: trunk | |
|
2024-11-18
| ||
| 17:50 | Fix the checksum function in the delta logic. check-in: 4862fc5ed0 user: drh tags: trunk | |
| 17:40 | Fix the checksum routine in the delta logic so that it works correctly even if the input size is zero. Closed-Leaf check-in: ec5e2919a7 user: drh tags: delta-fix | |
|
2024-11-15
| ||
| 14:14 | Add the ability to show the difference between two SQLite database files. Closed-Leaf check-in: 27c81f1c22 user: drh tags: sqldiff | |
| 13:51 | Update the built-in SQLite to the latest 3.48.0 alpha - mostly to get rid of the #line macros in sqlite3.c that were somehow introduced in the previous update. check-in: 5493cc7bb5 user: drh tags: trunk | |
|
2024-11-13
| ||
| 11:23 | Change the /setup_ulist page to show the most recently changed users first by default, as that seems to be the most common use case. check-in: 7b0a237895 user: drh tags: trunk | |
| 11:08 | Merge typo fixes and improvements to built-in documentation from the bv-corrections01 branch. check-in: 75c45fd8c3 user: drh tags: trunk | |
| 07:20 | Amend the previous commit not to break (test) builds with SSL/TLS disabled. check-in: aa0b696ea3 user: florian tags: trunk | |
|
2024-11-12
| ||
| 09:27 | Added extra switch parsing. I still need to figure out how to get switches emitted without using '' around. check-in: f127fc531b user: brickviking tags: bv-infotool | |
|
2024-11-11
| ||
| 12:27 | (Typos) src/db.c changes. check-in: 46ec93b6d2 user: brickviking tags: bv-corrections01 | |
| 12:10 | src/diffcmd.c change. check-in: 59d97d2859 user: brickviking tags: bv-corrections01 | |
| 11:55 | src/chat.c change. check-in: 40d3132fce user: brickviking tags: bv-corrections01 | |
| 11:49 | src/checkin.c changes check-in: efdd823f28 user: brickviking tags: bv-corrections01 | |
|
2024-11-07
| ||
| 06:50 | Merge trunk into ui-local-diff branch, resolving one merge conflict in info.c:hexdump_page(). Closed-Leaf check-in: d57463cc00 user: stephan tags: ui-local-diff | |
| 05:41 | Added tool to create preliminary info-formatted file. It needs bash, tail and GNU sed, as well as makeinfo. check-in: 302bf06d89 user: brickviking tags: bv-infotool | |
| 05:39 | Merge from trunk check-in: 26ea82a740 user: brickviking tags: bv-infotool | |
| 01:09 | Added clarification note for merge command. check-in: a35cfda912 user: brickviking tags: bv-corrections01 | |
|
2024-11-06
| ||
| 13:29 | Merge all the latest trunk enhancements and fixes into the bv-corrections01 branch. check-in: c1aefb00c3 user: drh tags: bv-corrections01 | |
| 13:24 | Back out experimental changes that were ultimately rejected. check-in: 00e8c04500 user: drh tags: bv-corrections01 | |
| 13:22 | Add the --no-cert-verify option to the test-httpmsg command. check-in: 3380c7fef1 user: drh tags: trunk | |
| 13:21 | Increase the version number to 2.26 in order to start the next release cycle. Update the built-in SQLite to the latest 3.48.0 pre-release for testing. Add the 2_26 tag to the change log. check-in: 66899f89c6 user: drh tags: trunk | |
| 12:59 | Version 2.25 check-in: 8f798279d5 user: drh tags: trunk, release, version-2.25 | |
| 12:44 | Mention the SQLite and OpenSSL versions in the change log for 2.25. check-in: 5c8b678103 user: drh tags: trunk | |
|
2024-11-05
| ||
| 10:00 | (Grammar) Missing terminating period, one is present in preceding phrase. check-in: 669633dd18 user: brickviking tags: bv-corrections01 | |
| 09:55 | Merge from trunk check-in: e367ca7373 user: brickviking tags: bv-corrections01 | |
| 05:57 | Create new branch named "bv-infotool" check-in: e413dc32f0 user: brickviking tags: bv-infotool | |
|
2024-11-04
| ||
| 13:09 | Fix (harmless) off-by-one error in the new test-trust-store command. Leaf check-in: 735bd3dccb user: drh tags: httpmsg-debug | |
| 12:54 | Improvements to the diagnostic output from the test-trust-store command. check-in: aa5bddda68 user: drh tags: httpmsg-debug | |
| 12:12 | Add the --no-cert-verify option to the test-httpmsg command. check-in: 5a6fd8820c user: drh tags: httpmsg-debug | |
| 11:22 | Add the test-trust-store command for debugging TLS problems. *Updated 2024-11-06:* These changes should not be in a release candidate. Therefore moved into a branch. check-in: 28ea88e770 user: drh tags: httpmsg-debug | |
|
2024-11-01
| ||
| 21:23 | Help edit to tree command. check-in: 6bb5ff4aea user: brickviking tags: trunk | |
| 17:06 | Mention the `fossil status -b|--brief' option in the change log. check-in: 0cf722b5e6 user: florian tags: trunk | |
| 08:18 | Change -DHAVE_LINENOISE to -DHAVE_LINENOISE=2 to account for a pending upstream change in extsrc/shell.c. check-in: be78b70f87 user: stephan tags: trunk | |
| 07:13 | Giving the h1.page-title below the menu bar the same off-black tint as the content body headers (#444) when shown, not full black, giving it an out-of-place appearance. check-in: 7253b15a53 user: wyoung tags: trunk | |
| 07:10 | Added .content CSS selector qualification layer for /artifact, /dir, /fileedit, and /wiki pages to keep the 10px left indent on the h1 layer from affecting the page header h1, causing the repo name at the top of the default skin to shift relative to the menu bar, but only for these pages. check-in: 8e562a0d48 user: wyoung tags: trunk | |
|
2024-10-31
| ||
| 23:09 | Fix the longestCommonSequence() routine so that it works even with very large negative scores that can result from files with hundreds of thousands of lines of text. [forum:27e77558ad21ffed|forum thread 27e77558ad21ffed]. check-in: f214aba4f5 user: drh tags: trunk | |
| 03:40 | (Typo) BUILD.txt small change. check-in: 48d7f4370f user: brickviking tags: trunk | |
| 02:52 | Merge man page from trunk. check-in: f8aa183761 user: brickviking tags: bv-corrections01 | |
| 02:37 | Updated man page. check-in: 18ed5157fc user: brickviking tags: trunk | |
| 02:16 | Merge from trunk check-in: c8967e64dd user: brickviking tags: bv-corrections01 | |
| 02:08 | Update search pattern within man_page_command_list.tcl script check-in: 1995ab123e user: brickviking tags: trunk | |
|
2024-10-30
| ||
| 21:25 | Merge from bv-corrections01 check-in: c0654b13ff user: brickviking tags: trunk | |
| 15:38 | Add documentation on signing check-ins. check-in: 37606a21f2 user: danield tags: ssh-signing | |
| 14:08 | An ssh signature should look like a control artifact. check-in: e5240ec042 user: danield tags: ssh-signing | |
| 13:46 | Remove ssh signature from manifests, when needed. check-in: d346d6d203 user: danield tags: ssh-signing | |
| 13:21 | Add ability to sign check-ins with ssh. check-in: bbed5d8d7e user: danield tags: ssh-signing | |
| 11:05 | Reverted 'a SQLite' to 'an SQLite' on advice. check-in: b0d7fb4ad4 user: brickviking tags: bv-corrections01 | |
| 10:52 | Canonicalize use of SQLite where it makes sense instead of sqlite. Also changed from 'an sqlite' to 'a SQLite', perhaps incorrectly. check-in: b9079597a4 user: brickviking tags: bv-corrections01 | |
| 10:39 | Merge documentation typo fixes by BrickViking. check-in: a3be0b80ce user: drh tags: trunk | |
|
2024-10-29
| ||
| 23:50 | Changes for the following files: www/json-api/api-checkout.md www/json-api/api-finfo.md www/json-api/api-query.md www/json-api/api-tag.md check-in: d12511740f user: brickviking tags: bv-corrections01 | |
| 22:57 | HTML changes for custom_ticket.wiki check-in: 27c2c293a3 user: brickviking tags: bv-corrections01 | |
|
2024-10-28
| ||
| 22:26 | (Typo) www/json-api/api-artifact.md change. check-in: 22f59c1af6 user: brickviking tags: bv-corrections01 | |
| 22:21 | (Typos) www/json/api-auth.md changes. check-in: e5f37387ea user: brickviking tags: bv-corrections01 | |
| 22:00 | Merge from trunk. check-in: c050e96381 user: brickviking tags: bv-corrections01 | |
| 19:17 | Fix an issue with "fossil patch pull" on Windows when multiple files are being deleted by the patch. check-in: 8beffa1eb4 user: drh tags: trunk | |
| 10:44 | (Typos) www/json-api/hacking.md changes. check-in: 203578f710 user: brickviking tags: bv-corrections01 | |
| 09:48 | (Typos) www/json-api/conventions.md - Various fixes. check-in: 9d9193fd4d user: brickviking tags: bv-corrections01 | |
| 09:08 | (Typo) openbsd/fastcgi.md change. check-in: 33771ff04f user: brickviking tags: bv-corrections01 | |
|
2024-10-27
| ||
| 02:08 | Tiny tweak to Windows service.md article. check-in: 7a276195f2 user: brickviking tags: bv-corrections01 | |
| 01:49 | (Typo) www/server/debian/service.md fix spelling. check-in: f73188a5b8 user: brickviking tags: bv-corrections01 | |
|
2024-10-26
| ||
| 11:06 | test1.md tiny trivial text tweak. check-in: e73731ffb7 user: brickviking tags: bv-corrections01 | |
| 10:36 | Merge whyallinone.md from trunk. check-in: 31b8605e08 user: brickviking tags: bv-corrections01 | |
| 10:35 | Change to www/caps/index.md check-in: 0af46e5dc8 user: brickviking tags: bv-corrections01 | |
| 09:10 | Reworked the final paragraph of the whyallinone doc to be clearer in pointing out that external web apps can be linked bidirectionally with Fossil. check-in: 7d50f6142c user: wyoung tags: trunk | |
| 03:34 | (Grammar) wikitheory.wiki tiny tweak. check-in: d1d2298090 user: brickviking tags: bv-corrections01 | |
| 00:19 | webui.wiki tweaks. check-in: 5b2bd1058c user: brickviking tags: bv-corrections01 | |
|
2024-10-25
| ||
| 22:07 | Updated date in userlinks.wiki to reflect still-current practice. check-in: bdab6d6d96 user: brickviking tags: bv-corrections01 | |
| 12:30 | (Typos) unvers.wiki change. check-in: 5ea2cb5b05 user: brickviking tags: bv-corrections01 | |
| 12:16 | (Typos) tickets.wiki changes. check-in: bf5118059b user: brickviking tags: bv-corrections01 | |
| 11:29 | (Grammar) theory1.wiki changes. check-in: e2c79bb90e user: brickviking tags: bv-corrections01 | |
| 11:12 | Merges from trunk. check-in: aa1ea7091c user: brickviking tags: bv-corrections01 | |
| 10:53 | th1.md changes. check-in: 799d65e1a1 user: brickviking tags: bv-corrections01 | |
| 05:38 | Upstream fix to autosetup/autosetup-find-tcl to work around an OpenBSD-ism of emitting noise to stdout at link-time. check-in: ddfc5c4267 user: stephan tags: trunk | |
|
2024-10-23
| ||
| 18:21 | Add support for multiple branch names in the doc-branch setting, as discussed in [forum:520d420d04e482b2 | forum post 520d420d04]. check-in: 40d0b360d2 user: stephan tags: trunk | |
| 12:02 | Merge typo fixes by brickviking into trunk. check-in: af1456ba34 user: drh tags: trunk | |
| 10:56 | (Typos) www/tech_overview.wiki change. check-in: cc233b2fa8 user: brickviking tags: bv-corrections01 | |
| 10:02 | Hopefully the last of the changes for www/sync.wiki check-in: 1db8e43e12 user: brickviking tags: bv-corrections01 | |