Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
103 check-ins using file extsrc/shell.c version bd66edbbf0
|
2024-12-13
| ||
| 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 | |
|
2024-12-12
| ||
| 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 | |
|
2024-12-09
| ||
| 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 | |