Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/stash.c at check-in 773c6c5f2c386031
|
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 | 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 "fossil stash ls" and "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 |
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 herefile: [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 | |
|
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 stash 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 | Added: 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 | |