Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/patch.c at check-in 764c50aeff3cf7f2
|
2025-03-17
| ||
| 16:53 | Improved error message when --tk fails. file: [594e845647] check-in: [8dcb0b8a59] user: drh branch: trunk, size: 38163 | |
| 16:31 | If the gdiff-command setting is undefined and if "tclsh" and "wish" are on PATH, then the various "gdiff" commands always try to use --tk as the graphical diff, rather than searching for an external diff program. file: [15ec309eb8] check-in: [5bec7a698e] user: drh branch: trunk, size: 38164 | |
|
2025-02-28
| ||
| 21:26 | Replace doc and arg validation pieces which were removed when [a6a679f11e3fd896] was split into a different branch but are still applicable. file: [403626fc5d] check-in: [da172e6ee3] user: stephan branch: patch-alias, size: 38072 | |
| 14:40 | Improvements to "fossil patch alias" help, including putting that subcommand in alphabetical order with the rest. Enhance the patch_resolve_remote() subroutine so that it avoids a full-table scan of CONFIG. file: [f471b04015] check-in: [e74de63bf7] user: drh branch: patch-alias, size: 37974 | |
| 11:18 | Update patch alias docs to reflect that they're stored in the repo.config table, not ckout.vvar. file: [6ad81a1cd1] check-in: [49c35c8caa] user: stephan branch: patch-alias, size: 37970 | |
| 05:44 | Remove the db_protect() handling made unnecessary by moving patch aliases into the vvar table. Fix argc count validation for (patch alias rm). file: [33f835d6bd] check-in: [a6a679f11e] user: stephan branch: mistake, size: 37889 | |
| 01:31 | Place patch aliases in the vvar (checkout) table, not config (repo). (Edit: rolling this back because of request in [forum:8b785d510d|forum post 8b785d510d].) file: [9acb84fc9c] check-in: [a10f55ba3f] user: stephan branch: mistake, size: 37911 | |
|
2025-02-27
| ||
| 22:38 | Add a missing patch_resolve_remote() call in patch_toggle_ssh_needs_path(). Simplify patch_resolve_remote() a bit. file: [8e8c32def3] check-in: [fe74b78eb1] user: stephan branch: patch-alias, size: 37943 | |
| 22:11 | Add a note that patch alias are local to a given checkout. file: [ba55151554] check-in: [b380310558] user: stephan branch: patch-alias, size: 37956 | |
| 22:08 | Resolve patch aliases and add help text. file: [2d4c512135] check-in: [d6ef7ff1f8] user: stephan branch: patch-alias, size: 37917 | |
| 21:51 | Initial impl of (patch alias) subcommand. It currently enables management of aliases but does not yet expand them in other patch commands. file: [dad51d7bcd] check-in: [efe37cf77d] user: stephan branch: patch-alias, size: 37272 | |
|
2024-12-18
| ||
| 12:51 | Fix additional harmless memory leaks. file: [db1ea3f2bc] check-in: [d564056cce] user: drh branch: trunk, size: 34861 | |
|
2024-12-16
| ||
| 16:15 | Do not sync or fill the undo log when running subcommands due to patch. file: [620389eb62] check-in: [cf8f0e4d35] user: drh branch: patch-pull-fix, size: 34944 | |
| 16:06 | Preliminary fix for the issue described at [/forumpost/51a37054|developers forum post 51a37054]. file: [0f15ecec06] check-in: [f381794fd7] user: drh branch: patch-pull-fix, size: 34848 | |
|
2024-10-28
| ||
| 19:17 | Fix an issue with "fossil patch pull" on Windows when multiple files are being deleted by the patch. file: [2ab7db14cf] check-in: [8beffa1eb4] user: drh branch: trunk, size: 33669 | |
|
2024-09-05
| ||
| 09:19 | In the 'unsaved changes' error of the patch command, make it explicit that the patch cannot be applied (because it otherwise comes across as informational, not an error). file: [53be9e0fa4] check-in: [8c5faa368f] user: stephan branch: trunk, size: 33573 | |
|
2024-08-01
| ||
| 13:23 | Fix to "fossil patch apply": When the patch involves an ADDED_BY_MERGE file, take care to not truncate the content of that file. file: [3ead5a8c30] check-in: [764c50aeff] user: drh branch: trunk, size: 33531 | |
|
2024-02-06
| ||
| 23:18 | Fix the "fossil patch push" and "fossil patch pull" commands so that, like "fossil sync", they initial try to run ssh without the PATH= argument, but add in the PATH= argument if the initial attempt does not work. file: [dfdc926e51] check-in: [eb135ef204] user: drh branch: trunk, size: 33515 | |
| 15:32 | Merge commonly used operations associated with the PATH= of a remote fossil run using ssh into subroutines, so that they do not get out of sync with each other. file: [007e39a631] check-in: [efd3a5ec07] user: drh branch: trunk, size: 31818 | |
| 15:03 | Print a diagnostic message if the first attempt to connect to a remote using SSH fails and a retry with or without PATH= is about to commence. See [forum:/forumpost/9584923cf6|forum post 9584923cf6] for an explanation of why this is important. file: [99f3558d7d] check-in: [f80041ebc5] user: drh branch: trunk, size: 31990 | |
| 14:49 | Bring the PATH= arguments for sync and patch into agreement. file: [97831f0a27] check-in: [b2619342c7] user: drh branch: trunk, size: 31990 | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. file: [e2bf324076] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 31847 | |
|
2023-10-05
| ||
| 11:57 | Consistently use /dev/null in diff output for added and deleted files. file: [542479a238] check-in: [200dcdcd37] user: preben branch: diff-deleted-files, size: 31864 | |
|
2023-09-19
| ||
| 22:03 | Correction of simple typos in patch usage text. file: [c1b8761ea4] check-in: [9b10bf4575] user: mgagnon branch: trunk, size: 31736 | |
| 11:41 | Improvements to documentation for the "patch" command. file: [687e1b215c] check-in: [14ebbe9d99] user: drh branch: trunk, size: 31740 | |
|
2023-06-18
| ||
| 23:20 | Update documentation to "fossil patch" and "fossil ui" to talk about the algorithm used for locating the fossil executable on the remote host. file: [2de76810aa] check-in: [d22e2b3817] user: drh branch: trunk, size: 31578 | |
| 19:58 | Omit the PATH= argument to SSH for "fossil patch push/pull" and "fossil ui" when the --fossilcmd option is used. file: [8c9af56c3b] check-in: [a35522f8a4] user: drh branch: trunk, size: 31256 | |
| 00:46 | Always print the SSH command used to implement "fossil patch push/pull". No longer require the -v option to see the ssh command. This is in the interest of full disclosure - letting the operator know what Fossi is doing behind the scenes. file: [6e197c7f6d] check-in: [97ec767f4b] user: drh branch: trunk, size: 31241 | |
| 00:22 | For the "fossil ui remote:/" and the "fossil patch push/pull" commands, when going over SSH, add the argument "PATH=$HOME/bin:$PATH" to the command line so that the "fossil" executable can be found in the users home directory. This is important on system like Mac where the default PATH for SSH consists of only unwritable directories. file: [e641e4b465] check-in: [8cb1164079] user: drh branch: trunk, size: 31283 | |
|
2023-05-13
| ||
| 14:07 | Correct mishandling of -tk, -by, etc. flags to the (patch diff) subcommand. file: [d2702b10c5] check-in: [c55f0d91bb] user: stephan branch: trunk, size: 31221 | |
|
2023-05-09
| ||
| 21:44 | Fix sub-command parsing in order to have the "gdiff" subcommand of the "patch" command working. file: [8e31eb9b99] check-in: [ec78226014] user: mgagnon branch: trunk, size: 31221 | |
|
2023-02-08
| ||
| 13:35 | Fix a couple of -Wextra compiler warnings. file: [eb81cc9bd2] check-in: [3afeef3f9a] user: danield branch: trunk, size: 31059 | |
|
2023-01-09
| ||
| 13:06 | Further consistency improvements in docs for various commands. file: [c8ba79d2f9] check-in: [2512d2d472] user: km branch: trunk, size: 31062 | |
|
2023-01-02
| ||
| 16:12 | When applying a patch, if the file rename fails, make that just a warning not a fatal error, as the warning might be due to file renames on a prior merge. Fix for ticket [21037bfc1296dabc]. file: [0cf177b6b8] check-in: [f013384605] user: drh branch: trunk, size: 31035 | |
|
2022-12-21
| ||
| 09:31 | Improved consistency for --help option descriptions. file: [cc1e5e0a7c] check-in: [2e56ef4e8d] user: km branch: trunk, size: 31013 | |
| 09:00 | Improved consistency for --help option descriptions: begin with uppercase letter; do not use a period at the end of short-ish sentences. file: [d65f4ad767] check-in: [de684083c6] user: km branch: spelling-fixes, size: 31015 | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar file: [e59081ea19] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 31021 | |
|
2022-11-13
| ||
| 16:26 | Apply fixes to all web views to pass WCAG 2.1 tests performed by "axe DevTools" browser extension. Most fixes related to screen reader compatibility, like making sure that form elements have labels. Some color changes to improve contrast on Default skin. Made more HTML5 compliant. Minor improvement to select combo boxes for UX. Improved Search form UX. Two minor bug fixes for malformed HTML. Fixed help pages to resolve issues with non-compliant HTML being generated. Mostly documented at https://fossil-scm.org/forum/forumpost/aafb17a981df4166 file: [6fdd8f5eae] check-in: [1f231db380] user: ericwikman branch: wcag-2.1, size: 30975 | |
|
2022-10-24
| ||
| 14:40 | Fix a comment typo. file: [ccf0aa0f7b] check-in: [db8b14c57a] user: drh branch: trunk, size: 31019 | |
|
2022-07-05
| ||
| 07:38 | Replaced --dryrun with --dry-run in the commands which still used the former, except for two unrelated internal-use/debugging-only flags where the change might have had undesired side effects. Removed the undocumented --dryrun backwards-compatibility flag from a couple commands for consistency's sake (else we need to have that option in all dry-run-capable commands). Discussion is in [forum:d732b4026f44bdba | forum post d732b4026f44bdba]. file: [3fff6004fc] check-in: [360d8652e7] user: stephan branch: dryrun-dry-run, size: 31018 | |
|
2021-09-07
| ||
| 00:18 | Move more diff parameters into the DiffConfig object. file: [06d64bf49e] check-in: [346de5d122] user: drh branch: trunk, size: 31018 | |
|
2021-09-06
| ||
| 19:24 | Futher integration of DiffConfig up and down the diff stack. file: [ee5b1521ab] check-in: [7c1498aeff] user: drh branch: diff-config, size: 32185 | |
| 18:52 | Continue integrating DiffConfig up the diff stack. file: [45113bcb0e] check-in: [153a464dab] user: drh branch: diff-config, size: 32229 | |
| 18:35 | Incremental step in integrating DiffConfig. file: [95688ede28] check-in: [f7c8416fcd] user: drh branch: diff-config, size: 32262 | |
| 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. file: [af1e2bc30b] check-in: [8601fb13d6] user: drh branch: diff-config, size: 32229 | |
|
2021-08-27
| ||
| 00:33 | Do not use an external diff command to generate HTML for --tk or --webpage or --browser. file: [f85babc617] check-in: [83feccc291] user: drh branch: trunk, size: 32203 | |
|
2021-08-25
| ||
| 20:56 | Improved internal interfaces for diff. For --webpage, omit the CSS used only for side-by-side diffs when doing a unified diff. file: [8b2bfe1693] check-in: [eb6611c4dc] user: drh branch: trunk, size: 32164 | |
| 17:18 | Fix the --webpage option so that it correctly generates the HTML closing tags for the "fossil test-diff" command. file: [7f29a9b73b] check-in: [7e37ae9549] user: drh branch: trunk, size: 32170 | |
| 16:22 | Fix a problem in the "fossil patch diff" command introduced by the previous --webpage check-in. file: [67f0aac99c] check-in: [874e7fa7bb] user: drh branch: trunk, size: 32164 | |
| 16:10 | Add the --webpage option to the various "diff" commands. This option causes the diff output to be in the form of a stand-alone webpage that can be sent to a remote collaborator (for example via a chat attachment). file: [e24b2dc87c] check-in: [ea52b7d06c] user: drh branch: trunk, size: 32165 | |
|
2021-08-19
| ||
| 19:38 | Add the --fossilcmd option to the "patch push" and "patch pull" commands. Also improve the "patch" documentation slightly. file: [673196615c] check-in: [280e12a356] user: drh branch: trunk, size: 32032 | |
| 19:21 | Enhancements to "fossil patch". The -f flag now causes a revert prior to applying the patch. The -f, -v and -n flags work with "patch push". file: [ab9e55bc93] check-in: [136d200408] user: drh branch: trunk, size: 31697 | |
| 19:01 | Fix the "fossil patch pull" command so that it works even if the remote has added two or more files. file: [9318fc93b3] check-in: [08be0c75b9] user: drh branch: trunk, size: 30891 | |
|
2021-06-30
| ||
| 19:14 | Initial changes to support HOST: prefixes on the REPOSITORY argument of the "fossil ui" command. file: [dae52e9260] check-in: [cb34f1a8ac] user: drh branch: remote-ui, size: 30884 | |
| 17:39 | Add the new file_skip_userhost() function that will find an skip over a "USER@HOST:" prefix on a filename, if it exists. Use this to extract the USER@HOST prefix from names in the "fossil patch push/pull" commands. file: [ea0e1c5a8f] check-in: [89a8588853] user: drh branch: trunk, size: 31051 | |
| 13:52 | Enhance the blob_append_escaped_args() routine with a new parameter to indicate if the argument is a filename. Only prepend "./" to filename arguments that begin with "-". The "%$" printf conversion assumes a filename, but the "%!$" conversion does not. file: [d0c96e93a9] check-in: [4f83d06275] user: drh branch: trunk, size: 31039 | |
|
2021-06-29
| ||
| 05:05 | Fixed a && which was supposed to be a & in the new patch code. Caught by gcc. file: [e29f43aa6e] check-in: [1fd6961005] user: stephan branch: trunk, size: 31015 | |
|
2021-06-24
| ||
| 15:27 | Minor typo fixes in new patch command help text. No code changes. file: [329f17df4b] check-in: [1190034e37] user: jamsek branch: trunk, size: 31014 | |
|
2021-06-23
| ||
| 20:05 | Add the -f flag to "fossil patch diff". file: [9c7a7944e7] check-in: [5ee62c4033] user: drh branch: trunk, size: 31018 | |
| 19:55 | The "fossil patch diff" command should now emit an error message if there is a repository mismatch or a base artifact is missing. file: [306adc9dce] check-in: [962694ada0] user: drh branch: trunk, size: 30192 | |
| 19:14 | The "-f" flag on "fossil patch create" causes an existing patch with the same name to be overwritten. file: [32f3a48599] check-in: [a332f1a64f] user: drh branch: trunk, size: 28649 | |
| 19:06 | Enhance "fossil patch" to record the project name as part of the patch. Show the project name in "fossil patch view" output, if it exists. Show lots of metadata in "fossil project view" with the -v flag. file: [e711c927ee] check-in: [5a28d7c094] user: drh branch: trunk, size: 28193 | |
| 18:43 | In the "fossil patch" command, miscellaneous code clean-up. Do not require an option check-out to run "fossil patch diff", though a -R REPO option is required if not in an open check-out. No error is given if the repository and the patch do not match - that needs to be fixed. file: [3936c27387] check-in: [2e8c5da0ab] user: drh branch: trunk, size: 27407 | |
| 18:25 | Add the "fossil patch diff" command. file: [687201bac5] check-in: [72d07a52c3] user: drh branch: trunk, size: 27389 | |
| 15:43 | Add additional metadata to patch files. file: [3f34093d7a] check-in: [b9d5fa4d7b] user: drh branch: trunk, size: 22976 | |
|
2021-06-22
| ||
| 13:30 | Add documentation for "fossil patch" file: [69b4e66c12] check-in: [169346a1aa] user: drh branch: patch-cmd, size: 21980 | |
| 13:00 | Get the pipes working on windows. file: [df8fd86e01] check-in: [a534422e89] user: drh branch: patch-cmd, size: 21873 | |
| 12:47 | Help-screen updates for the patch command. file: [728ef66e8d] check-in: [5433a92982] user: drh branch: patch-cmd, size: 21696 | |
| 12:41 | Both push and pull demonstrated, linux-to-linux. file: [63720362d9] check-in: [e60389b0d6] user: drh branch: patch-cmd, size: 21683 | |
| 12:24 | Code in place for "patch pull" and "patch push". file: [42943c44d5] check-in: [ccfdc89c96] user: drh branch: patch-cmd, size: 21581 | |
| 01:32 | Allow patches to be sent and received via standard input and standard output. file: [c8338f69db] check-in: [9180106327] user: drh branch: patch-cmd, size: 18662 | |
| 00:12 | Bug fixes in "fossil patch apply". file: [2ae2833697] check-in: [f5629790cc] user: drh branch: patch-cmd, size: 16840 | |
| 00:04 | First attempt to get "fossil patch apply" working. There are probably still bugs. Certainly much more testing is needed. file: [bba99a08c0] check-in: [5865739195] user: drh branch: patch-cmd, size: 16674 | |
|
2021-06-21
| ||
| 22:43 | Enhanced ability to deal with merges. file: [eb5e14fefa] check-in: [03dca8fca9] user: drh branch: patch-cmd, size: 11117 | |
| 21:20 | Enhance patchfiles to deal with renames. file: [cf5abc2b02] check-in: [4d82a8d1d0] user: drh branch: patch-cmd, size: 10398 | |
| 19:34 | Get the "fossil patch view" command working file: [f65a4851d2] check-in: [b08e8651e4] user: drh branch: patch-cmd, size: 7065 | |
| 19:09 | Code to generate a patchfile. file: [9ca4d48298] check-in: [7333115dc2] user: drh branch: patch-cmd, size: 5719 | |
| 17:15 | Added: Begin adding infrastructure for the new "fossil patch" command. file: [86687bc3ce] check-in: [343745fd36] user: drh branch: patch-cmd, size: 3079 | |