Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/stash.c at check-in 12a2a5eaf20f2d24
|
2024-05-02
| ||
| 10:03 | When (stash save) is given no valid file names, fail loudly rather than silently, as the latter emits only a message about an uncommitted transaction. Reported in [forum:747f0c32aa]. ... (file: [63cef80d37] check-in: [85a7d82e94] user: stephan branch: trunk, size: 26313) | |
|
2023-12-31
| ||
| 18:23 | Text diff output is now more like other common unix tools in its handling of missing files. ... (file: [fbf8f1df39] check-in: [caa6ad39db] user: drh branch: trunk, size: 26226) | |
|
2023-12-12
| ||
| 22:15 | Found the same misuse of memcmp() in the "stash" subcommand matcher. ... (file: [00eaaffcb2] check-in: [2a8551762d] user: wyoung branch: trunk, size: 26098) | |
|
2023-10-05
| ||
| 11:57 | Consistently use /dev/null in diff output for added and deleted files. ... (file: [5a95789632] check-in: [200dcdcd37] user: preben branch: diff-deleted-files, size: 26210) | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar ... (file: [f4b160ea4d] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 26082) | |
|
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: [91dac5976d] check-in: [1f231db380] user: ericwikman branch: wcag-2.1, size: 26035) | |
|
2022-09-27
| ||
| 11:11 | print stash metadata when popping or applying stash Feature request from Alfred M. Szmidt in [forum:ae3ad9c69f]. Minor tweak of original patch by stephan@ ... (file: [92fcee0e9d] check-in: [1392710fb4] user: mark branch: trunk, size: 26077) | |
|
2022-04-26
| ||
| 23:45 | Provide a little more output in stash command so when someone successfully finishes the stash command they don't think content has been lost. ... (file: [ebcb9bb2de] check-in: [d08d7b872d] user: andybradford branch: stash-success, size: 25456) | |
|
2021-10-21
| ||
| 08:42 | stash patch from [forum:5e6c3e3b78112df3|forum post 5e6c3e3b78112df3] which updates it to handle the NULL stashfile.hash case introduced in [ed06585f41]. This resolves the 11 failing stash tests. ... (file: [7f881485f1] check-in: [4531bcd497] user: stephan branch: trunk, size: 25409) | |
|
2021-09-07
| ||
| 12:18 | Simplify the interface to the internal diff_file() routine. ... (file: [7f0b31cfa6] check-in: [db034a5a6c] user: drh branch: trunk, size: 25095) | |
| 00:18 | Move more diff parameters into the DiffConfig object. ... (file: [eb13d5fa16] check-in: [346de5d122] user: drh branch: trunk, size: 25139) | |
|
2021-09-06
| ||
| 19:24 | Futher integration of DiffConfig up and down the diff stack. ... (file: [5c67a49665] check-in: [7c1498aeff] user: drh branch: diff-config, size: 26427) | |
| 18:52 | Continue integrating DiffConfig up the diff stack. ... (file: [8b9c00519a] check-in: [153a464dab] user: drh branch: diff-config, size: 26493) | |
| 18:35 | Incremental step in integrating DiffConfig. ... (file: [ca0bbc266c] check-in: [f7c8416fcd] user: drh branch: diff-config, size: 26537) | |
| 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: [a3eefde636] check-in: [8601fb13d6] user: drh branch: diff-config, size: 26490) | |
|
2021-08-27
| ||
| 00:33 | Do not use an external diff command to generate HTML for --tk or --webpage or --browser. ... (file: [38ed7ebf83] check-in: [83feccc291] user: drh branch: trunk, size: 26464) | |
|
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: [c239ba9c42] check-in: [eb6611c4dc] user: drh branch: trunk, size: 26425) | |
| 17:18 | Fix the --webpage option so that it correctly generates the HTML closing tags for the "fossil test-diff" command. ... (file: [6e1c124562] check-in: [7e37ae9549] user: drh branch: trunk, size: 26432) | |
| 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: [1f4fe590b7] check-in: [ea52b7d06c] user: drh branch: trunk, size: 26426) | |
|
2021-06-23
| ||
| 18:25 | Add the "fossil patch diff" command. ... (file: [46c32865c3] check-in: [72d07a52c3] user: drh branch: trunk, size: 26279) | |
|
2021-06-22
| ||
| 08:34 | Converted "fossil diff" and "fossil gdiff" to the new array-based setting mechanism. The legacy system(3) style shell command string methods are still available for use with --command and legacy single-string settings, but if you pass 2+ values to "fossil setting diff-command VALUES..." (ditto gdiff-command) it's now stored as an array, triggering this new mechanism. This permits old settings to continue working, letting you upgrade to the new mechanism at will. ... (file: [5b457f01f4] check-in: [68055fd3ed] user: wyoung branch: fossil-spawn, size: 26519) | |
|
2021-01-29
| ||
| 16:10 | Add new --verbose option to 'fossil commit' to display a unified diff of all changes to be committed in the editor. Only tested on OpenBSD 6.8 and preliminary testing on macOS 10.15.7 (Catalina); needs to be tested on Linux and Windows. ... (file: [ecadfa6243] check-in: [a713e1e6c2] user: jamsek branch: dev-ci-verbose, size: 26291) | |
|
2020-08-25
| ||
| 06:32 | Fix HTML formatting issues with a few built-in help pages. ... (file: [19d4a0990f] check-in: [11384f1874] user: drh branch: trunk, size: 26276) | |
|
2020-08-20
| ||
| 13:24 | Version 2.11.2 ... (file: [1946ce52ed] check-in: [c58877d6f2] user: drh branch: branch-2.11, size: 26753) | |
| 13:18 | Version 2.10.2 ... (file: [ef93728953] check-in: [12d2ad00de] user: drh branch: branch-2.10, size: 26738) | |
|
2020-08-19
| ||
| 12:08 | Improved detection of attempts to write through a symlink. Now also works for "revert", "stash", and "undo/redo". ... (file: [463f90800d] check-in: [f63297b2c5] user: drh branch: sec2020, size: 26278) | |
|
2020-08-08
| ||
| 23:51 | Many updates to built-in help pages. No changes to code. ... (file: [43c525c5c2] check-in: [c965636958] user: drh branch: trunk, size: 26193) | |
|
2020-06-25
| ||
| 00:16 | Adjust help text to work better with the new formatter. ... (file: [465e0e9806] check-in: [a8a606996b] user: drh branch: formatted-online-help, size: 26726) | |
|
2020-02-26
| ||
| 14:07 | The stash now uses the legacy behaviour for merge conflicts, always keeping the baseline/original/merge files, because there's otherwise a potential for undo suffering when stash pop has a conflict. (Thanks to Florian for pointing that out.) ... (file: [dfe68ec788] check-in: [31dc956dfa] user: stephan branch: merge-remove-temp-files, size: 26668) | |
|
2019-09-27
| ||
| 23:56 | Added -- support to (3-way-merge, open, sqlar, stash save|snapshot, tarball, touch, undo/redo, update, zip). ... (file: [1def48b1c8] check-in: [52ae3288ab] user: stephan branch: double-dash-flag, size: 26844) | |
|
2019-09-03
| ||
| 20:22 | Make calls to db_begin_write() instead of db_begin_transaction() where appropriate. ... (file: [05ee3753fe] check-in: [3ad81c3c49] user: drh branch: trunk, size: 26647) | |
|
2019-08-31
| ||
| 18:09 | Avoid warning about extra call to db_end_transaction() by returning at the end of a complete block. ... (file: [c541e3bb52] check-in: [7b2350a86b] user: andybradford branch: trunk, size: 26653) | |
| 17:09 | If there is nothing to stash, issue an error. ... (file: [b9741441af] check-in: [d959c48ac6] user: andybradford branch: trunk, size: 26641) | |
|
2019-03-19
| ||
| 14:09 | Replace most calls to db_begin_transaction() with db_begin_write() to avoid having a reader locking during a COMMIT. ... (file: [ad1100f2f8] check-in: [6cc5354821] user: andybradford branch: db-begin-txn-updates, size: 26556) | |
|
2019-03-18
| ||
| 11:48 | Fix a minor typo in a comment used to generate "stash" documentation. ... (file: [bdf6fa8dc4] check-in: [aaa726e191] user: drh branch: trunk, size: 26562) | |
|
2019-03-14
| ||
| 13:52 | When doing a "fossil stash" make sure that the stash has committed before deleting changes from disk, so that the changes can be recovered if something goes wrong. ... (file: [d0ac4642b6] check-in: [60af514d13] user: drh branch: trunk, size: 26561) | |
|
2019-01-27
| ||
| 15:35 | Add the "comment-format" setting to set the default options for printing timeline comments to the console, as discussed here: [https://fossil-scm.org/forum/forumpost/d9954370c7]. ... (file: [69ff714f40] check-in: [bc62fa1710] user: florian branch: comment-format-setting, size: 26394) | |
|
2019-01-19
| ||
| 21:03 | Remove unused variable ... (file: [97f9f93b1d] check-in: [302ce43947] user: andygoth branch: trunk, size: 26387) | |
| 18:29 | Enhance the stash so that it stores hashes and no long depends on RID value. Do this is a way that is backwards compatible and transparent to the user. After running any "stash" command using this version of Fossil or later, the schema will automatically update and the stash should survive a subsequent RID renumbering event in the repository without damage. ... (file: [34be0ec40c] check-in: [ed06585f41] user: drh branch: trunk, size: 26397) | |
|
2017-11-30
| ||
| 17:58 | Refactor the symlink processing logic so that most of the file access routines take a new parameter indicating the conditions under which symlinks should and should not be followed. This should fix a few bugs related to symlink processing. Lots of testing required before merging to trunk. ... (file: [8f0bc283ba] check-in: [e7767de263] user: drh branch: symlink-refactor, size: 22445) | |
|
2017-08-24
| ||
| 14:20 | Typo fixes thanks to rosscanning, ref [http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg25775.html] ... (file: [a6bb018a38] check-in: [f98852a0df] user: andygoth branch: trunk, size: 22720) | |
|
2017-04-23
| ||
| 13:08 | merge trunk. Use new Win10 flag: SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE. See: [https://blogs.windows.com/buildingapps/2016/12/02/symlinks-windows-10/#Y9sMOye6Y8vVYmDx.97] for why this might make this branch work better. ... (file: [5512ef2579] check-in: [2999c7dc8a] user: jan.nijtmans branch: winsymlink, size: 22574) | |
|
2017-03-06
| ||
| 12:48 | For new Docker-generated repositories, use "auto" hash-policy as default: They might be synced with "sha1"-type repositories, this would render those repositories useless. ... (file: [dc0263e11e] check-in: [9a6256cf08] user: jan.nijtmans branch: trunk, size: 22721) | |
|
2017-03-03
| ||
| 14:31 | Add gshow and gcat command to allow to use gdiff-command when diffing the stash against baseline. When using gdiff, call external tool directly with the file from the checkout, it's usefull when merging change manually using the external tool. ... (file: [f79f603f69] check-in: [06b167526b] user: mgagnon branch: stash-gdiff-improvement, size: 22724) | |
|
2016-11-06
| ||
| 06:39 | Rename sfile x column to pathname to match vfile and to make room for new columns I plan to add ... (file: [ac247e5b71] check-in: [ec9480fcba] user: andygoth branch: andygoth-changes, size: 22446) | |
|
2016-10-20
| ||
| 16:53 | Revert unintended change to stash usage summary ... (file: [99687142f3] check-in: [63ac71e571] user: andygoth branch: trunk, size: 22432) | |
| 16:13 | "stash cat" worked the same as "stash diff", yet "stash cat -tk" worked the same as "stash show -tk". Make "stash cat" behave like "stash show" which matches the -tk case and also the documentation. Also add mention of DIFF-OPTIONS to the stash show|cat|diff|gdiff usage text. Remove unnecessary variable initialization in stash_get_id(), plus show the bad stash ID string rather than "0" if a non-numeric was used. ... (file: [6b3a07e484] check-in: [48ecfe6645] user: andygoth branch: trunk, size: 22432) | |
|
2016-10-16
| ||
| 00:22 | Merge updates from trunk. ... (file: [69ef78c620] check-in: [5634375d0b] user: mistachkin branch: stash-fixes, size: 22492) | |
|
2016-10-12
| ||
| 13:31 | Tweak stash help text for internal consistency ... (file: [eb408a325d] check-in: [de4e4e2a30] user: andygoth branch: trunk, size: 21820) | |
|
2016-09-26
| ||
| 21:16 | Fix some compilation issues, related to merging. ... (file: [d5773164ea] check-in: [2f07c443fb] user: mistachkin branch: stash-fixes, size: 22500) | |
|
2016-09-08
| ||
| 02:09 | Merge in latest changes from trunk. ... (file: [f42baa6fdd] check-in: [1912b2f864] user: andybradford branch: stash-fixes-openssl-1.1.0, size: 22519) | |
|
2016-08-19
| ||
| 00:13 | Use the new SQLITE_DBCONFIG_MAINDBNAME feature of SQLite to eliminate the need for the db_name() hack. ... (file: [ced32acae9] check-in: [d858f3da52] user: drh branch: omit-db_name, size: 21828) | |
|
2016-07-04
| ||
| 22:08 | Detect old stashfile schema and recreate to allow file renames to be stashed in existing checkout databases. ... (file: [319802c9cf] check-in: [a13217b897] user: andybradford branch: stash-fixes, size: 22575) | |
|
2016-05-31
| ||
| 08:17 | merge from trunk with a few tweaks for merge conflicts ... (file: [bfa1e41548] check-in: [598b58a5ee] user: sdr branch: winsymlink, size: 21737) | |
|
2016-03-06
| ||
| 06:38 | Merge updates from trunk. ... (file: [0c4aba4b06] check-in: [ccf01b243f] user: mistachkin branch: stash-fixes, size: 22069) | |
|
2016-03-02
| ||
| 02:10 | Permit the TH1 hooks subsystem to check for the configuration without raising a 'fatal' error. ... (file: [ccb0d94252] check-in: [b06cd631f1] user: mistachkin branch: trunk, size: 21884) | |
|
2016-02-17
| ||
| 04:49 | Given that both origname and newname are always provided when stashing a file, allow both a rename and an add by changing the PRIMARY KEY for stashfile. This does mean the schema for stashfile has changed and to take advantage it will be necessary to close and open the repository again (or update manually with SQL). ... (file: [7b5b1006cd] check-in: [ca574f818a] user: andybradford branch: stash-fixes, size: 22066) | |
|
2016-02-13
| ||
| 05:00 | If a file has been renamed in a stash, restore this information also in the vfile table so it doesn't show up as MISSING. ... (file: [5afbb7b7aa] check-in: [fea4d80ee7] user: andybradford branch: stash-fixes, size: 22067) | |
|
2015-09-15
| ||
| 19:11 | "cat" synonym for "stash show" ... (file: [0d91aa426c] check-in: [533f8b6aea] user: bch branch: stash-cat, size: 21881) | |
|
2015-09-03
| ||
| 23:15 | Merged from trunk with a few tiny edits to make new functionality work on Windows ... (file: [68173393ad] check-in: [8f33e49dd4] user: sdr branch: winsymlink, size: 21575) | |
|
2015-07-15
| ||
| 20:15 | Further enhancements to the 'undo' subsystem integration. ... (file: [c8b20236b7] check-in: [a50be7b87a] user: mistachkin branch: trunk, size: 21722) | |
|
2015-06-26
| ||
| 18:48 | Merge trunk. ... (file: [10c84610c5] check-in: [f3daf39355] user: andygoth branch: undo-clean, size: 21708) | |
|
2015-05-26
| ||
| 21:46 | Enhance file_tree_name() to be capable of producing absolute paths within the local tree. Fix --hard option to mv/rm to enable it to work properly with relative paths. ... (file: [e12e4a6e5b] check-in: [c2df31dae8] user: mistachkin branch: mvRmHardFix, size: 21700) | |
|
2014-10-21
| ||
| 15:25 | merge trunk ... (file: [083f988796] check-in: [44a160a341] user: jan.nijtmans branch: winsymlink, size: 21550) | |
| 02:52 | Add the codecheck1 program to the build tools. This program validates the format strings on printf-style internal interfaces, verifying that the correct number of arguments follow and that SQL is protected from injection attacks. ... (file: [18214fe824] check-in: [49b0ff1592] user: drh branch: trunk, size: 21697) | |
|
2014-10-20
| ||
| 16:31 | Reverse the output order for the "fossil stash list" command so that the most resent stashes are near the bottom, rather than scrolling off the top of the screen. ... (file: [129fbd2efe] check-in: [cf9eac3929] user: drh branch: trunk, size: 21653) | |
| 15:01 | Add a custom static analysis program that verifies the arguments to printf-style varargs routines used in Fossil. Adjust the source code to be more robust for printf format errors and to fix a few minor problems found by the static checker. ... (file: [8547808aca] check-in: [0a7e326fa4] user: drh branch: compile-time-print-checking, size: 21702) | |
|
2014-09-20
| ||
| 18:41 | Changed name of checked_symlink_create to create_symlink_or_file as it is more accurate / descriptive. Also changed some parameter names, and fixed a couple spelling errors (accidentally typed blog instead of blob and never compiled; oops). ... (file: [6b9d52bece] check-in: [31b0a9d737] user: sdr branch: bad-winsymlink, size: 21511) | |
| 18:32 | Refactored symlink_create repeated block of code into a checked_symlink_create function. ... (file: [4bb5b5405e] check-in: [2d3ff7bd23] user: sdr branch: bad-winsymlink, size: 21511) | |
| 18:11 | Modified revert to always process symbolic links. Also added link_delete to complement file_delete, as windows needs special delete handling for symbolic links as they might be directory symlinks. ... (file: [afe7068093] check-in: [9e0ba1215d] user: sdr branch: bad-winsymlink, size: 21658) | |
|
2014-07-23
| ||
| 21:37 | When available, pass the original comment text as well as the (possibly prefixed) comment into comment_print(). Add COMMENT_PRINT_ORIG_BREAK flag to the new comment printing algorithm. Change the width argument for the test-comment-format command into an option. Add --origbreak option to the test-comment-format command. ... (file: [4fcd200867] check-in: [0d0b80fd1c] user: mistachkin branch: trunk, size: 21658) | |
|
2014-07-20
| ||
| 02:35 | Add -comfmtflags command line option to set the comment printing flags, defaulting to the legacy comment printing algorithm. ... (file: [5fdf0e70db] check-in: [18a97b3a8f] user: mistachkin branch: experimental, size: 21655) | |
|
2014-07-10
| ||
| 09:25 | merge trunk ... (file: [e08fb1ce77] check-in: [a44b4aa5ac] user: jan.nijtmans branch: undo-clean, size: 21648) | |
|
2014-06-20
| ||
| 03:56 | Initial draft of the ability to break a multi-line comment on word boundaries using the new algorithm. ... (file: [60a3a6268e] check-in: [10b47cc350] user: mistachkin branch: experimental, size: 21663) | |
|
2014-06-16
| ||
| 20:28 | Improvements to error handling and code formatting. ... (file: [0b086a867b] check-in: [9270ae240d] user: mistachkin branch: autoadjust, size: 21640) | |
| 09:05 | Merge trunk. Make it work on Windows too. Variable width output on more commands. ... (file: [c4f5eac867] check-in: [40710b7a05] user: jan.nijtmans branch: autoadjust, size: 21638) | |
|
2014-06-13
| ||
| 14:21 | Auto-adjust the width of timeline (and various other output places) according to real terminal width. Suggested by Baptiste Daroussin. ... (file: [6137a287e6] check-in: [c4891e24af] user: jan.nijtmans branch: autoadjust, size: 21743) | |
|
2014-05-09
| ||
| 09:34 | [/help/stash|stash gdiff] now honors the "g" in gdiff. ... (file: [f26f656267] check-in: [cd5a7e1290] user: stephan branch: trunk, size: 21640) | |
|
2014-04-23
| ||
| 14:14 | Add option -W|--width to "[/help?cmd=stash|fossil stash ls]" and "[/help?cmd=leaves|fossil leaves]" commands. ... (file: [a57e9f1d0b] check-in: [fa6ece72b6] user: jan.nijtmans branch: trunk, size: 21613) | |
|
2014-03-12
| ||
| 04:12 | Accidentally removed a newline with vi's shift-j. No change in functionality. ... (file: [28c6feb8ff] check-in: [ef27b0059a] user: andybradford branch: stash_add, size: 21343) | |
| 04:08 | Make stash_apply handle new files and put them in an ADDED state. ... (file: [4fb419180e] check-in: [c2d748ae2c] user: andybradford branch: stash_add, size: 21337) | |
|
2014-02-20
| ||
| 10:03 | Cherrypick [1c39f113d1], Fix [a56db55924]: Crash on STASH DIFF command ... (file: [97d39961d0] check-in: [cba5a0b988] user: jan.nijtmans branch: branch-1.28, size: 21149) | |
| 10:01 | Fix [a56db55924]: Crash on STASH DIFF command ... (file: [a6388394ee] check-in: [1c39f113d1] user: jan.nijtmans branch: trunk, size: 21125) | |
| 09:42 | Unnecessary blob_zero() calls: the following prompt_user() call already does a blob_zero() call internally. ... (file: [1909646c7e] check-in: [14768c24e5] user: jan.nijtmans branch: trunk, size: 21112) | |
|
2014-02-01
| ||
| 19:24 | Remove malplaced period from the middle of a sentence. ... (file: [43c6eeceba] check-in: [4c8a3fb2b7] user: andybradford branch: trunk, size: 21135) | |
|
2013-09-06
| ||
| 22:18 | On Cygwin, when editing with Notepad, make sure it starts with the UTF-8 BOM. ... (file: [5f639f8cf7] check-in: [3e90ef61f3] user: jan.nijtmans branch: trunk, size: 21136) | |
| 14:19 | Fix "fossil stash diff --tk" ... (file: [233a0ab956] check-in: [1b0a259301] user: jan.nijtmans branch: trunk, size: 21107) | |
|
2013-07-17
| ||
| 12:04 | merge trunk ... (file: [4a258a4618] check-in: [5d8551bfa1] user: jan.nijtmans branch: ui-no-utf8, size: 21510) | |
|
2013-05-03
| ||
| 13:50 | Prompt before cleaning files > 10M. Those file deletions are not undo-able. ... (file: [dc54d4ce62] check-in: [8e74f0fe40] user: jan.nijtmans branch: undo-clean, size: 21046) | |
|
2013-05-01
| ||
| 09:42 | Add -v|--verbose as alternative to "-l|--detail" everywhere. And "v=" and "verbose=" as alternative to the "detail=" URL parameter. ... (file: [6b83b48b00] check-in: [5214a2a8b8] user: jan.nijtmans branch: trunk, size: 21038) | |
|
2013-04-26
| ||
| 08:28 | Rename --detail, --showfiles, --files to -v|--verbose (but keep original as deprecated) ... (file: [05154f7754] check-in: [34ed0afc8a] user: jan.nijtmans branch: verbose, size: 21021) | |
|
2013-04-23
| ||
| 08:40 | Add --limit as alias to --count in "fossil timeline" for consistancy with other commands. Add many short options, like "-a" for "--all" and "-c" for "--closed" (The JSON part already had those) ... (file: [fc70e6d897] check-in: [8b17c2360a] user: jan.nijtmans branch: trunk, size: 20918) | |
|
2013-04-08
| ||
| 10:42 | Consistant use of DIFF_CANNOT_COMPUTE_??? messages ... (file: [43f73e4a6f] check-in: [b18276cbde] user: jan.nijtmans branch: ui-no-utf8, size: 21316) | |
| 09:03 | Implement LOOK_INVALID for utf-16, and use it to detect UTF-16 without BOM in network byte order ... (file: [06e5d6c181] check-in: [2d14d82c6b] user: jan.nijtmans branch: ui-no-utf8, size: 20994) | |
|
2013-03-19
| ||
| 10:06 | merge trunk (still experimental) ... (file: [1ff285972c] check-in: [af4d780446] user: jan.nijtmans branch: use-blob_strip_bom, size: 20970) | |
|
2013-02-27
| ||
| 11:26 | merge trunk ... (file: [db86f7df88] check-in: [d085eb9aca] user: jan.nijtmans branch: use-blob_strip_bom, size: 20974) | |
|
2012-11-19
| ||
| 20:39 | Allow the get_utf8_bom function to return the size as well. ... (file: [14ea4bd430] check-in: [d857d20bef] user: mistachkin branch: convert_before_commit_v2, size: 20844) | |
| 04:39 | Modularize byte-order-mark and blob UTF-8 conversion handling. ... (file: [5920b94323] check-in: [d29dd5449c] user: mistachkin branch: convert_before_commit_v2, size: 20813) | |
|
2012-11-05
| ||
| 21:10 | Do not run the graphical merging tool nor leave merge-droppings after a dry-run merge. Also improve the merge summary message at the end of a merge. ... (file: [13e964f3fc] check-in: [cd2c0e4cb5] user: drh branch: trunk, size: 20827) | |
| 13:56 | merge trunk ... (file: [1526d92bda] check-in: [b0e05a90b6] user: jan.nijtmans branch: use-blob_strip_bom, size: 20954) | |
|
2012-10-30
| ||
| 15:18 | working utf-16 diff, still being tested ... (file: [e111d5bade] check-in: [879d1e2405] user: jan.nijtmans branch: use-blob_strip_bom, size: 20962) | |
|
2012-10-28
| ||
| 21:38 | - finally, do the ++j update in looks_like_text() right - More consistancy in prompt handling: accept Capitals everywhere, use '(' not '[', and abbreviate yes/no to y/N everywhere ... (file: [a4330d6337] check-in: [7c527165a6] user: jan.nijtmans branch: trunk, size: 20824) | |
|
2012-10-26
| ||
| 12:28 | <pre>src/stash.c: In function ‘stash_cmd’: src/stash.c:377:16: warning: ‘stashid’ may be used uninitialized in this function src/stash.c:472:7: note: ‘stashid’ was declared here</pre> ... (file: [07a3bc6c6a] check-in: [10e0d0b256] user: jan.nijtmans branch: trunk, size: 20767) | |
|
2012-10-25
| ||
| 13:59 | Allow the deletion of multiple stash entries using "fossil stash rm" with multiple arguments. Multi-stash deletion is undoable. ... (file: [a5f9f7e28b] check-in: [f41308d780] user: drh branch: trunk, size: 20800) | |
| 10:27 | use utf8 in stash comment editor on Windows, just like the commit comment editor ... (file: [af61ca8245] check-in: [fb565614db] user: jan.nijtmans branch: trunk, size: 20679) | |
|
2012-10-11
| ||
| 19:45 | Cherrypick changes [0c37874941c8972], [9ba8a393fcc569b], and [ae092ec605eed11] in order to backport the --setmtime option of "fossil update" and the --age and -t options of "fossil ls" to version 1.19. ... (file: [638591b3e9] check-in: [773c6c5f2c] user: drh branch: branch-1.19, size: 15440) | |
| 19:22 | Add the --setmtime command-line option to "fossil update". When this option is used, the mtime of all unmodified managed files is set to the time when that file was originally checked in. ... (file: [01021834bc] check-in: [ae092ec605] user: drh branch: trunk, size: 20544) | |
|
2012-10-05
| ||
| 20:39 | Add the "stash show" command. Simplifications to the diff code, and especially the looks_like_binary() function. ... (file: [2e20506ef6] check-in: [4e0e69f691] user: drh branch: trunk, size: 20547) | |
| 16:36 | Fix a couple of C99-isms in the recent stash changes. ... (file: [bb98ece4d5] check-in: [f378800aed] user: drh branch: trunk, size: 20971) | |
| 13:10 | Update the "fossil stash" command so that it always prompts for a comment if the -m option is omitted. ... (file: [fd839e731f] check-in: [16371dcb1b] user: drh branch: trunk, size: 20940) | |
| 12:38 | Get the --tk option working for "fossil stash diff". ... (file: [a3df29891f] check-in: [2ed8cdc518] user: drh branch: trunk, size: 20406) | |
|
2012-09-30
| ||
| 06:25 | Add support for skipping binary files when using an external diff program. The existing 'binary-glob' setting and new 'diff-binary' boolean setting control this feature. ... (file: [05790c6224] check-in: [c50eb50718] user: mistachkin branch: diffBinExternal, size: 19809) | |
|
2012-09-07
| ||
| 21:12 | On windows, make "gdiff" default to using WinDiff.exe. ... (file: [f12cfed0fa] check-in: [cad57bf65d] user: drh branch: trunk, size: 18277) | |
|
2012-08-29
| ||
| 13:57 | Allow UTF-8 characters in sources. translate.exe will translate it to ASCII ... (file: [f19944790e] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 18278) | |
|
2012-08-20
| ||
| 19:01 | Expand the "diffFlags" variable to 64-bits in order to accommodate new options to the various "diff" commands. ... (file: [64b6f74856] check-in: [2b1767500e] user: drh branch: trunk, size: 18279) | |
|
2012-07-03
| ||
| 21:10 | Minor optimization in stash_create to bypass an unneeded blob_compare() when (isLink!=isNewLink). ... (file: [81347a619e] check-in: [75461b993e] user: stephan branch: trunk, size: 18279) | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". ... (file: [8a4b4ba71a] check-in: [0328d68181] user: drh branch: sqlite4, size: 18285) | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere ... (file: [eb08d85a6b] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 18321) | |
|
2011-11-03
| ||
| 13:16 | Improvements to the "stash" command: (1) Stash all files, not just those below the working directory. (2) Add the --detail option to "list". (3) Confirm before "drop --all". (4) Add the "help" subcommand. ... (file: [29ea798383] check-in: [966ae9a942] user: drh branch: trunk, size: 18279) | |
|
2011-10-21
| ||
| 23:44 | Improved formatting for command-line side-by-side diff. Extend command-line side-by-side diff to all diff operations, including stash diffs. ... (file: [3891017d65] check-in: [ab47cc73d7] user: drh branch: trunk, size: 17147) | |
|
2011-10-13
| ||
| 12:56 | Fixing the usage() calls in stash.c, as it duplicated the word stash; it was giving messags like "Usage: fossil stash stash pop". ... (file: [7b6b458d5d] check-in: [399c0ddae4] user: viriketo branch: trunk, size: 16976) | |
|
2011-09-08
| ||
| 11:59 | Introduce new file_wd_* functions that use stat() or lstat() depending on 'allow-symlinks' setting, and use them when dealing with files inside the working directory. Make file_* functions always use stat() as before merging symlink support. Fix renaming of symlinks when merging (via new function symlink_copy()). Rename create_symlink() to symlink_create(). ... (file: [bcfdf0313e] check-in: [8a0c546990] user: dmitry branch: symlinks, size: 17012) | |
|
2011-09-02
| ||
| 10:34 | Print description of conflict when 'stash apply' cannot merge a symlink and a regular file. ... (file: [08614580aa] check-in: [bca6924e5f] user: dmitry branch: symlinks, size: 16991) | |
|
2011-09-01
| ||
| 23:55 | Change a couple of unlink()'s to file_delete(). ... (file: [d291e082ef] check-in: [61d49d92bb] user: dmitry branch: symlinks, size: 17003) | |
|
2011-08-27
| ||
| 09:44 | Fix reading delta from wrong column in stash. ... (file: [169edd677f] check-in: [0317a929cb] user: dmitry branch: symlinks, size: 16998) | |
|
2011-08-26
| ||
| 14:59 | Merge the latest trunk changes into the symlinks branch. ... (file: [fa9bde94a1] check-in: [24c16584cc] user: drh branch: symlinks, size: 17055) | |
|
2011-08-24
| ||
| 21:45 | Fix code stylistic issues with the "stash rm" patch. Also document the new stash verb. ... (file: [a2b7fa2b83] check-in: [d2c4a24275] user: drh branch: stash_rm, size: 15443) | |
| 20:05 | "rm" subcmd to stash, "drop"-alike functionality ... (file: [b473f01d76] check-in: [1f4e6cf1ae] user: bch branch: stash_rm, size: 15409) | |
|
2011-08-22
| ||
| 22:20 | Merge trunk. ... (file: [dd6035eb49] check-in: [c57830bec2] user: dmitry branch: symlinks, size: 16984) | |
|
2011-07-13
| ||
| 21:15 | Fix an assert() that fires if the "stash" command is used after having done an "rm". Ticket [3ce0ea97522581] ... (file: [a5de7f84ca] check-in: [336e194c4d] user: drh branch: trunk, size: 15372) | |
|
2011-05-02
| ||
| 13:31 | Change calls to unlink() into file_delete(). The file_delete() routine converts filenames to MBCS from UTF if necessary. ... (file: [4f9de15613] check-in: [eea6449098] user: drh branch: windows-i18n, size: 15345) | |
|
2011-04-27
| ||
| 18:21 | Attempt to get Fossil working on windows systems that do not use UTF8 in the shell. ... (file: [78c431bee3] check-in: [e805fa8db9] user: drh branch: windows-i18n, size: 15335) | |
|
2011-03-16
| ||
| 02:28 | Make "fossil stash" and "fossil stash save" work the same. Ticket [58290cd2975f5f2] ... (file: [f5765c7bb2] check-in: [18575b14ac] user: drh branch: trunk, size: 15263) | |
|
2011-03-14
| ||
| 12:18 | Fix typos in comments and error messages. Ticket [d38c2c8795181] ... (file: [5db67a3ee4] check-in: [c5f7ab040a] user: drh branch: trunk, size: 15263) | |
|
2011-02-28
| ||
| 03:26 | Try to get the "stash" command using execute permission bits correctly. Continuing work on the "revert" command - but it is still not working quite right. Ticket [baf9b6b11e08c1d0b]. ... (file: [601b766bf4] check-in: [ae3409bf49] user: drh branch: exe-permission-fix, size: 15262) | |
|
2011-02-21
| ||
| 14:21 | Infrastructure changes toward adding graphical merging options. ... (file: [92bb250c5d] check-in: [b9abb86798] user: drh branch: trunk, size: 15135) | |
|
2011-02-17
| ||
| 08:15 | Enable a “stash make” subcommand as an alias for “stash snapshot” ... (file: [c3a8240637] check-in: [4e0274bbc3] user: BM branch: stash_mk, size: 15213) | |
| 00:05 | Merge in Brad Harder's "stash ls" command. ... (file: [411ca6ee97] check-in: [ae73c07be0] user: drh branch: trunk, size: 15134) | |
|
2011-02-15
| ||
| 05:19 | "stash ls", in addition to "stash list" ... (file: [c4efefafad] check-in: [9abf05437b] user: bharder branch: bch, size: 15140) | |
|
2011-02-12
| ||
| 13:38 | This branch contains experimental changes attempting to address complaints that Fossil sometimes overwrites unmanaged files. In this checkin: Use file_delete() instead of unlink() everywhere. Add interfaces file_move() and file_dont_overwrite() but do not use those interfaces yet. ... (file: [b534735e8a] check-in: [a1814d5015] user: drh branch: file-safety, size: 15093) | |
|
2011-01-28
| ||
| 19:04 | Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). ... (file: [13832766e9] check-in: [ed2ef7e9a3] user: dmitry branch: symlinks, size: 16630) | |
|
2011-01-25
| ||
| 23:17 | For the "stash save" command, take care to avoid reverting everything if no files were stashed. Ticket [fbfe43e153ee0e1d]. ... (file: [7797f22924] check-in: [2dd7b4b500] user: drh branch: trunk, size: 15083) | |
|
2011-01-18
| ||
| 18:36 | Call vfile_check_signature before creating a stash, to make sure that all changed files have been stashed. Ticket [bfef8e4f89cd4b161a584] ... (file: [8423568c07] check-in: [a435ae67a9] user: drh branch: trunk, size: 15054) | |
|
2011-01-17
| ||
| 23:49 | Fix an off-by-one error in stash_add_file_or_dir. Windows only. Ticket [d6132e4d66a7c994f9]. ... (file: [3cfbb30d8f] check-in: [abdedb21da] user: drh branch: trunk, size: 15018) | |
|
2010-12-23
| ||
| 02:22 | Add new function fossil_strcmp() that works like strcmp() except that it handles NULL arguments correctly. Use fossil_strcmp() in place of strcmp() in many places in the code. ... (file: [aa4da54db8] check-in: [31c52c7b3e] user: drh branch: trunk, size: 15018) | |
|
2010-12-21
| ||
| 16:30 | Corrected help message for the <tt>stash</tt> command ... (file: [de68197785] check-in: [fbddb08908] user: BM branch: trunk, size: 15004) | |
|
2010-12-18
| ||
| 22:25 | Get the "stash save" command working for the case when a directory is specified as an argument. ... (file: [6a6e3afe7b] check-in: [fc6aea52ba] user: drh branch: trunk, size: 14998) | |
| 21:22 | Add the "stash diff" and "stash gdiff" commands. ... (file: [db091f15db] check-in: [987e0ff78d] user: drh branch: experimental, size: 14187) | |
| 20:54 | Fix a couple of out-of-order variable declarations. ... (file: [e9bdcedebb] check-in: [4a8b4210f7] user: drh branch: experimental, size: 12237) | |
| 20:39 | Many bug fixes while testing stash: Fix "revert" so that it updates the file status correctly. Fix several cases of "//" being used as a file separator instead of just "/". Fix undo on stash apply. Make "stash drop" undoable. Update documentation for undo and stash. ... (file: [51b883b5f6] check-in: [8a6aa0a13f] user: drh branch: experimental, size: 12237) | |
| 18:56 | The "stash" functionality is now in place. Need to test more prior to merging into trunk. ... (file: [45ab33f629] check-in: [22aa74dcdf] user: drh branch: experimental, size: 11709) | |
| 17:24 | Begin adding code to implement the "stash" command. The code compiles and runs but is currently incomplete. This is an incremental check-in to preserve state. (Ironically, if "stash" were working, I'd have probably just done a "stash snapshot" to capture this state, rather than an experimental branch.) ... (file: [01c6fc8534] check-in: [b3dadcc4a6] user: drh branch: experimental, size: 8318) | |