Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
History of file src/diffcmd.c at check-in e1b51150afaf13a4
|
2026-01-10
| ||
| 14:10 | Sync with trunk. file: [418693432c] check-in: [e4556126da] user: florian branch: diff-word-wrap, size: 48070 | |
|
2026-01-04
| ||
| 10:59 | Fix minor formatting problem in the gdiff documentation. file: [f529b1130c] check-in: [77642871e0] user: drh branch: trunk, size: 48682 | |
|
2026-01-03
| ||
| 16:51 | Minimal fix to "fossil diff" command which outputs a tab after the filenames so that the patch(1) command can figure out how to patch filenames that have spaces in them. file: [9282bd0571] check-in: [c6715ca6a0] user: andybradford branch: trunk, size: 48684 | |
|
2025-12-27
| ||
| 12:21 | Spelling fixes in docs/comments. file: [4f775c00ce] check-in: [33d3bf3edb] user: km branch: trunk, size: 48680 | |
|
2025-12-23
| ||
| 16:06 | Assorted fixes of typos and grammar in code comments. No functional changes. file: [8744744d34] check-in: [e2bdc10572] user: danield branch: trunk, size: 48679 | |
|
2025-11-06
| ||
| 16:21 | When showing diff statistics in brief mode (only the total line), also omit the header line. file: [a50c8f7473] check-in: [c14f217df4] user: danield branch: trunk, size: 48679 | |
| 16:04 | Add short option '-s' for '--numstat' in the diff command. file: [759cbab3dd] check-in: [df119a35bb] user: danield branch: trunk, size: 48643 | |
|
2025-08-21
| ||
| 12:07 | Sync with trunk. file: [5a0fd89ce6] check-in: [a0377ebb9d] user: florian branch: diff-word-wrap, size: 48031 | |
|
2025-08-15
| ||
| 23:18 | Simplifications to the logic that tries to keep robots out. file: [97270991bd] check-in: [02adced1c1] user: drh branch: robot-restrict-simplified, size: 48643 | |
| 13:55 | Prototyping new defenses against bot-nets file: [ba28732664] check-in: [3f4885a983] user: drh branch: robot-squelch, size: 48639 | |
|
2025-07-21
| ||
| 12:20 | Sync with trunk. file: [351cc56943] check-in: [931e7065bb] user: florian branch: diff-word-wrap, size: 47992 | |
|
2025-06-22
| ||
| 10:35 | (Grammar) Correction for diffcmd help text. file: [387c4b714b] check-in: [e879d1ef2c] user: brickviking branch: trunk, size: 48604 | |
|
2025-05-31
| ||
| 15:08 | Backout recent changes which was reporting error when external diff command exit with non 0 value. It's common for cli diff programs (e.g. gnu-diff and bsd-diff) to return 1 when files differ. Looking for a more "generic" solution. file: [c071d8b030] check-in: [9b04150885] user: mgagnon branch: trunk, size: 48607 | |
|
2025-03-27
| ||
| 12:42 | Merge trunk into the merge-info-html branch. file: [041e36147c] check-in: [1014ffb553] user: stephan branch: merge-info-html, size: 49292 | |
|
2025-03-18
| ||
| 15:49 | On Windows, do not emit warnings when external tools exit with non-zero codes, since those are unreliable at best. file: [30179ce219] check-in: [43ee0921ec] user: danield branch: trunk, size: 48790 | |
| 11:04 | Improved rounding behavior for timestamp identifiers on object where the timestamp has less then millisecond precision. file: [bea5054ffb] check-in: [633ea7343f] user: drh branch: trunk, size: 48706 | |
|
2025-03-17
| ||
| 17:13 | Do not allow the (undocumented) --debug option to mess up --tk output. file: [293099fec0] check-in: [d7cf189344] user: drh branch: trunk, size: 48700 | |
| 16:41 | Backout the prior change that hunts for third-party apps to use for gdiff if the gdiff-command setting is undefined. Instead, first try to use the --tk option, and if that doesn't work use the --by option. file: [a265315e9d] check-in: [8c4c93b215] user: drh branch: trunk, size: 48666 | |
| 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: [a3e6e0a0a0] check-in: [5bec7a698e] user: drh branch: trunk, size: 49136 | |
| 14:56 | Previous check-in incorrect for "fossil diff". Fixed here. file: [5bc80af72e] check-in: [766380a9d6] user: drh branch: trunk, size: 48275 | |
| 14:02 | If the "gdiff-command" setting is not defined when the "fossil gdiff" command is run, go on a search for a suitable replacement. file: [f7215faeaa] check-in: [954fb421e1] user: drh branch: trunk, size: 48239 | |
| 12:21 | When an external diff fails with non-0 fossil_system(), emit a warning which shows the external command it tried to invoke. This addressed [forum:4bad60805bfb2397|forum post 4bad60805bfb2397]. file: [cef3a74f5c] check-in: [45da184c1b] user: stephan branch: trunk, size: 47969 | |
|
2025-03-12
| ||
| 14:56 | Always puts "{...}" around the action of an if() statement when the action is on a separate line. Add column labels on the output of "--numstat". file: [321901d1eb] check-in: [7bcd6626bd] user: drh branch: trunk, size: 47870 | |
| 13:35 | For 'fossil diff', when --numstat is combined with --brief, show only the total row. file: [9afc8a1fbf] check-in: [37327906e7] user: danield branch: trunk, size: 47750 | |
|
2025-02-20
| ||
| 14:46 | Bring the merge-info-html branch up to date with trunk, step 2 of 2. file: [c3ec9fc21b] check-in: [c2b1c2c9fa] user: stephan branch: merge-info-html, size: 47817 | |
| 14:32 | Bring the merge-info-html branch up to date with trunk, step 1 of 2. file: [915909b85c] check-in: [1140b020de] user: stephan branch: merge-info-html, size: 47234 | |
| 11:13 | Add the --tkdebug command-line option to commands that support --tk. Change the --debug option on merge-info into --tkdebug for consistency. file: [cec6c9f654] check-in: [5548a91116] user: drh branch: merge-info, size: 47315 | |
| 02:46 | New mechanism for doing 2-way diffs in merge-info that does not require the new "fdiff" command - though the fdiff command is retained for now as it might be useful separately. Still has issues with column names. file: [47c6f9cedb] check-in: [3f3e301956] user: drh branch: merge-info, size: 47218 | |
|
2025-02-19
| ||
| 21:47 | Improve the "fossil merge-info --tk" GUI by adding a new menu to show two-way diffs between selected columns. This enhancement required other diff-related enhancements: (1) add the --label option to all diff commands. (2) Add the new "fossil fdiff" command. file: [698e149574] check-in: [e54a4b5fa9] user: drh branch: merge-info, size: 46835 | |
|
2024-12-17
| ||
| 06:56 | Sync with trunk. file: [8ae78f7401] check-in: [5fbb14f73a] user: florian branch: diff-word-wrap, size: 46120 | |
|
2024-12-15
| ||
| 15:57 | Change the --external-baseline option on "diff" and "ui" to be just --from. See [forum:/forumpost/91ce9dd9f9afa7fe|forum thread 91ce9dd9f9afa7fe]. file: [e49987d600] check-in: [763758db16] user: drh branch: trunk, size: 46732 | |
|
2024-12-14
| ||
| 21:51 | Corrected method comment to make some more sense, from forum post [fdf29398a6d45] file: [c10918f198] check-in: [36f354927b] user: brickviking branch: trunk, size: 46471 | |
| 20:40 | Change the name of the --tree option to --external-baseline. file: [8dc77a2484] check-in: [356163b05d] user: drh branch: diff-tree, size: 46469 | |
| 19:57 | Fix the new --tree option so that it only shows diffs of files that prefix match arguments on the command-line. file: [e54da15e30] check-in: [df94a3538e] user: drh branch: diff-tree, size: 46392 | |
| 19:52 | Add the "--tree DIRECTORY" option to the "fossil diff" command. file: [130a793aff] check-in: [07a699738a] user: drh branch: diff-tree, size: 46115 | |
| 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. file: [b800cfe1f9] check-in: [28197b28c2] user: drh branch: diff-two-ckouts, size: 45963 | |
|
2024-12-13
| ||
| 21:37 | Begin making infrastructure changes to support doing a diff between two independently edited check-outs. file: [51a22627f7] check-in: [b10cb2b536] user: drh branch: diff-two-ckouts, size: 44841 | |
|
2024-12-12
| ||
| 17:07 | Sync with trunk. file: [11ca0d4a17] check-in: [878a56bc98] user: florian branch: diff-word-wrap, size: 43467 | |
|
2024-12-10
| ||
| 13:58 | If the "fossil diff" command has a directory argument, then run a "fossil ui" diff on that check-out. file: [560d4e33cf] check-in: [099ed5b97b] user: drh branch: diff-remote, size: 44696 | |
| 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. file: [de8cb5b0f1] check-in: [a2a0390cbf] user: drh branch: trunk, size: 44079 | |
|
2024-12-09
| ||
| 07:10 | Change width:1px sizes to width:fit-content on diff line-number and change-type cols for diff --browser and friends. file: [0ccc6443c4] check-in: [8c6dddc6d0] user: stephan branch: trunk, size: 44079 | |
| 07:05 | Fix width:1px sizes on diff line-number and change-type cols for diff --browser and friends. file: [56694cf022] check-in: [d2d01d3eb7] user: stephan branch: merge-info-html, size: 44581 | |
|
2024-12-07
| ||
| 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. file: [dfac6270a2] check-in: [e76aceba7c] user: stephan branch: merge-info-html, size: 44549 | |
| 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. file: [5e4a76a6ba] check-in: [5eac2b1ba1] user: stephan branch: merge-info-html, size: 44513 | |
|
2024-11-11
| ||
| 12:10 | src/diffcmd.c change. file: [af3389fee6] check-in: [59d97d2859] user: brickviking branch: bv-corrections01, size: 44047 | |
|
2024-09-20
| ||
| 03:57 | Try dynamic calculation of the top and bottom paddings of inserted and deleted text so that the background color extends exactly to the line height (using the `calc()' CSS function). In Chromium, `overflow-y: hidden' is required so that the table cell containing the diff line doesn't display vertical scrollbars (without otherwise changing the visual result). file: [c1df73ca1e] check-in: [db04882760] user: florian branch: diff-word-wrap, size: 43466 | |
|
2024-09-06
| ||
| 10:58 | Add 'overflow-x: hidden' to the table cells containing the diff text to ensure "unbreakable" text (like long runs of spaces) is truncated. file: [4f7e85991f] check-in: [ddf26dd3ff] user: florian branch: diff-word-wrap, size: 43402 | |
|
2024-08-23
| ||
| 06:02 | Remove 'display: inline-block' from insertion and deletion marks to get more natural word-wrapping. Try whether the previous, precisely calculated line height and padding values also work to extend the background color to the entire line height. file: [0f6484d4d2] check-in: [b912690fc4] user: florian branch: diff-word-wrap, size: 43354 | |
|
2024-08-17
| ||
| 16:03 | First draft to implement word-wrap for web UI diffs. The list of TODO items can be found on the branch wiki page. file: [8aa4598f4b] check-in: [faf4b4718d] user: florian branch: diff-word-wrap, size: 43350 | |
|
2024-02-02
| ||
| 22:18 | Remove trailing whitespace from non-external C files. file: [e11ab5f28e] check-in: [7db0a2d910] user: danield branch: fix-overlength-lines, size: 44046 | |
| 16:26 | Fix lines over 80 characters long, excluding external source files and @-lines. file: [15cf7b495c] check-in: [942f691b39] user: danield branch: fix-overlength-lines, size: 44062 | |
|
2024-01-18
| ||
| 15:20 | Document the --linenum and --invert command-line options to 'fossil diff'. file: [c2a405ed5d] check-in: [eb4efc8ccd] user: danield branch: trunk, size: 44062 | |
|
2023-12-31
| ||
| 18:23 | Text diff output is now more like other common unix tools in its handling of missing files. file: [3bfc32c93b] check-in: [caa6ad39db] user: drh branch: trunk, size: 43962 | |
|
2023-12-13
| ||
| 07:49 | Use the official spelling of Tcl/Tk in the help texts for the diff commands. file: [554be58608] check-in: [b89f4cdb69] user: florian branch: trunk, size: 42531 | |
|
2023-12-08
| ||
| 10:20 | In the HTML diff output, honour the user's light/dark mode browser setting. file: [bd1abd359a] check-in: [a2e6b31aa1] user: danield branch: trunk, size: 42525 | |
|
2023-12-07
| ||
| 10:39 | Make the dark mode also available for the diff HTML output (--webpage, -b). file: [9b50de69a6] check-in: [6b7fe7fa95] user: danield branch: tk-diff-darkmode, size: 41927 | |
|
2023-12-05
| ||
| 16:02 | Provide a dark mode for the TCL/TK-based diff GUI. file: [fba62b6cd6] check-in: [b59a42f1f6] user: danield branch: tk-diff-darkmode, size: 39833 | |
|
2023-10-06
| ||
| 10:41 | Simplify handling of /dev/null with external diff commands in [fd359387ca], reveting to using existing temp file naming convention. Also avoids attempting to remove non-temporary files. file: [f9e08e100a] check-in: [be3eb3b85d] user: preben branch: diff-deleted-files, size: 41049 | |
|
2023-10-05
| ||
| 13:26 | With external diff command, use /dev/null for added or deleted files. Implemented for Unix as I am unsure how Windows diff tools would deal with NUL. file: [c98f338f50] check-in: [fd359387ca] user: preben branch: diff-deleted-files, size: 41622 | |
| 12:17 | After fossil rm, do not read content from disk with fossil diff. This way, fossil diff output reflects what would be committed. file: [cb1b710968] check-in: [e93797317d] user: preben branch: diff-deleted-files, size: 40247 | |
| 11:57 | Consistently use /dev/null in diff output for added and deleted files. file: [4a39940463] check-in: [200dcdcd37] user: preben branch: diff-deleted-files, size: 40149 | |
|
2023-07-16
| ||
| 20:47 | Add calls to cgi_check_for_malice() on many more web pages. Log all 418 responses to the error log. file: [de1bf3168a] check-in: [40266bf9b2] user: drh branch: verify-options-cgi, size: 39618 | |
|
2023-03-15
| ||
| 10:40 | (x)diff --context N, where N is a negative value, is now treated as infinite, per off-list feature request. file: [a163407d4c] check-in: [16d3d8b05e] user: stephan branch: trunk, size: 39592 | |
|
2023-01-21
| ||
| 11:40 | Make diff --checkin VERSION capable for working from outside of a checkout. file: [45781568b5] check-in: [8e8e0269a9] user: stephan branch: trunk, size: 39518 | |
|
2023-01-09
| ||
| 13:25 | Help text improvements for diffcmd.c. file: [b0f163e99d] check-in: [e1b51150af] user: danield branch: trunk, size: 39431 | |
|
2022-12-20
| ||
| 09:46 | Change spelling for check-in and similar file: [32fa64a4ef] check-in: [d9c4321e7a] user: danield branch: check-in-spelling, size: 39430 | |
|
2022-04-19
| ||
| 14:48 | Add '--versions' option to 'fossil diff' to display details about the compared versions. file: [82ad4626b2] check-in: [49ef1b574e] user: danield branch: diff-show-versions, size: 39429 | |
|
2022-04-14
| ||
| 17:03 | Added a fossil_nice() call to /vpatch. file: [ceb1de38c3] check-in: [1cc86c16a2] user: stephan branch: load-control-rework, size: 37879 | |
|
2022-01-19
| ||
| 14:42 | Add short option -ci for --checkin in 'fossil diff'. file: [c2d2deb134] check-in: [c8a7ee7e4c] user: danield branch: trunk, size: 37854 | |
|
2022-01-16
| ||
| 10:09 | Implement -p|--prototype option for diff command. This commit introduces support for displaying in the chunk header which C function each change is in. Tested on OpenBSD, Ubuntu, and macOS. <b>[closed: feature rejected]</b> file: [c08ba01a11] check-in: [792674372e] user: jamsek branch: diff-show-func, size: 38202 | |
|
2021-12-30
| ||
| 19:14 | Force inheritance of the HTML-mode diff font-size and line-height attributes to fix misalignment in some browsers. file: [5e177e6858] check-in: [cf911e4425] user: stephan branch: chat-attachment-iframe, size: 37851 | |
| 17:43 | For diff --webpage output, style body to background-color white, primarily so that embedding in chat does not lead to unreadable diffs for certain user colors. file: [62a08f5f15] check-in: [41767a2e5f] user: stephan branch: chat-attachment-iframe, size: 37378 | |
|
2021-12-04
| ||
| 13:23 | diffcmd.c: Fix a typo in comment for file_same_as_blob() file: [b0720c2b74] check-in: [fb2d6374f5] user: js branch: trunk, size: 37335 | |
|
2021-10-19
| ||
| 19:25 | Better fix for the case of doing a "fossil diff" on a checkout that includes a merge and specifying a --from clause that is the branch that was merged from. file: [cfd548b3f9] check-in: [960c9e8bd6] user: drh branch: trunk, size: 37332 | |
| 17:46 | This fix does not work for the case of a branch merge followed by "fossil diff --tk". file: [cc25fb612a] check-in: [edb3a3a063] user: drh branch: mistake, size: 36876 | |
|
2021-09-17
| ||
| 19:32 | Update the changes log. Fix a minor typo in the help text for "diff". file: [1fd7ae8862] check-in: [5839abaee4] user: drh branch: trunk, size: 36734 | |
|
2021-09-08
| ||
| 02:43 | Minor tweaks in the diff-related JS and CSS. file: [d28081165a] check-in: [fd7d2557aa] user: stephan branch: diff-js-refactoring, size: 36735 | |
|
2021-09-07
| ||
| 13:29 | Take advantage of the new pBlob==NULL capabilities in blob_appendf() to simplify some of the diff logic. file: [72bcccf711] check-in: [590e01dbdd] user: drh branch: trunk, size: 36734 | |
| 12:18 | Simplify the interface to the internal diff_file() routine. file: [54200dbc11] check-in: [db034a5a6c] user: drh branch: trunk, size: 37422 | |
| 00:18 | Move more diff parameters into the DiffConfig object. file: [8e6a61709f] check-in: [346de5d122] user: drh branch: trunk, size: 38013 | |
|
2021-09-06
| ||
| 22:24 | For the --json diff output, generate an array of objects, one object per file and the diff array all contained within the object. file: [8ed6e41c8a] check-in: [4ab3525927] user: drh branch: diff-config, size: 41172 | |
| 20:51 | Begin adding value that used to be function arguments into the DiffConfig object. This check-in deals with the pRe parameter. file: [cb4d268eb6] check-in: [bdb4bfaa3a] user: drh branch: diff-config, size: 40633 | |
| 19:24 | Futher integration of DiffConfig up and down the diff stack. file: [8e71646355] check-in: [7c1498aeff] user: drh branch: diff-config, size: 40642 | |
| 18:52 | Continue integrating DiffConfig up the diff stack. file: [c905689051] check-in: [153a464dab] user: drh branch: diff-config, size: 40437 | |
| 18:35 | Incremental step in integrating DiffConfig. file: [878d6226be] check-in: [f7c8416fcd] user: drh branch: diff-config, size: 40443 | |
| 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: [1fdb2d61c8] check-in: [8601fb13d6] user: drh branch: diff-config, size: 40467 | |
| 13:35 | Improvements to help text for "diff" and "xdiff". file: [631e8d4bde] check-in: [dc757a5d08] user: drh branch: trunk, size: 40242 | |
|
2021-09-03
| ||
| 23:00 | Draw a thin box around diffs in the default skin (per [forum:/forumpost/a42aade32dd9d42|forum post a42aade32dd9d42]). Show ellipsis at the tops and bottoms of files, if warranted. Fix a problem with "diff.js" that was failing to link all scrollbars associated with a single diff. file: [5cc2ba3e3c] check-in: [63a5c754fd] user: drh branch: diff-color-enhancements, size: 39475 | |
| 17:51 | Escape [, \, and ] characters when quoting TCL strings. file: [fb610b4c94] check-in: [fd2d27f01b] user: drh branch: diff-color-enhancements, size: 39446 | |
| 14:05 | Adjust CSS to show blue change text for the --by option. file: [6576131d8f] check-in: [4381c7ea8c] user: drh branch: diff-color-enhancements, size: 39452 | |
| 12:23 | Merge recent trunk enhancements into the diff-color-enhancement branch. file: [2cfa86731c] check-in: [17dde4c75b] user: drh branch: diff-color-enhancements, size: 39440 | |
|
2021-09-02
| ||
| 19:38 | New format for JSON diff output. Promote the "test-diff" command to "xdiff", retaining the older spelling as a backup for compatibility. file: [9a9e9d7809] check-in: [b051102272] user: drh branch: diff-color-enhancements, size: 39426 | |
| 14:25 | Various improvements and bug fixes to the new diff logic. file: [69cb9c8df6] check-in: [10f736f04f] user: drh branch: diff-color-enhancements, size: 39398 | |
| 10:09 | Get the --tk option working with the new --tcl format. file: [39e30d173b] check-in: [63610f3f27] user: drh branch: diff-color-enhancements, size: 39348 | |
| 09:19 | Add the --tcl format option to the diff commands. The plan is to use this to implement --tk (in place of --html -y) but that part is not yet implemented. file: [98c71fad88] check-in: [e933d5d731] user: drh branch: diff-color-enhancements, size: 39327 | |
|
2021-09-01
| ||
| 19:53 | First attempt to generate side-by-side diffs using the new formatter. This breaks the --tk option. The "fossil diff -b" and "--by" work, but side-by-side diff on /info pages and similar is currently busted. CSS is simplified, which means that skins will need to be modified. This is an incremental check-in. file: [ee11ba8f4a] check-in: [4cd8a743cd] user: drh branch: diff-color-enhancements, size: 38800 | |
| 15:38 | Further improvements to unified diff. Simplified CSS that can be used in common with split diff. Separate columns for each line number and the change mark. file: [227acb34cf] check-in: [ce856a8614] user: drh branch: diff-color-enhancements, size: 40015 | |
|
2021-08-31
| ||
| 22:43 | Tweaks to diff formatting. file: [3925b5a2ca] check-in: [598d7736e7] user: drh branch: diff-color-enhancements, size: 39057 | |
| 10:39 | Refactor the previous commit by adding a wrapper for `freopen()', and use the Cygwin-aware routines to convert path names to/from UTF-16. file: [0eb855514d] check-in: [963de841f2] user: florian branch: win32-temppath-mojibake, size: 38447 | |
| 07:01 | On Windows, make sure temporary path names containing non-ASCII characters are accessible, for example if the default temporary path "C:\Users\«Username»\AppData\Local\Temp" contains a user name with extended characters, of if the %TEMP% environment variable points to a directory name with extended characters. file: [1bac3a47fc] check-in: [102339828b] user: florian branch: win32-temppath-mojibake, size: 38679 | |
| 03:00 | An attempt to rework HTML unified diff to show partial line matches. Still needs CSS work. file: [3ac6478abc] check-in: [a01e46d85e] user: drh branch: diff-color-enhancements, size: 38964 | |
|
2021-08-30
| ||
| 02:36 | Corrections to line counting in the formatDiff procedure that drives the DiffBuilder object. Remove the test-rawdiff command and substitute and undocumented --raw option on the various diff commands. file: [e50091fcb8] check-in: [5e70c3ff96] user: drh branch: diff-color-enhancements, size: 38567 | |
|
2021-08-29
| ||
| 22:55 | Demonstrate the concept of a generic DiffBuilder object. file: [d8aef3fb70] check-in: [6e8d87b398] user: drh branch: diff-color-enhancements, size: 38456 | |
|
2021-08-27
| ||
| 12:09 | Add a missing #include to diffcmd.c so that the build will work under mingw32. file: [f8f64fa183] check-in: [00c8622a02] user: drh branch: trunk, size: 38433 | |
| 07:54 | Attempt to fix quoting issues with the browser launch command on windows. file: [2a539dfb2d] check-in: [c72c6df465] user: drh branch: trunk, size: 38413 | |
| 00:33 | Do not use an external diff command to generate HTML for --tk or --webpage or --browser. file: [802820ff71] check-in: [83feccc291] user: drh branch: trunk, size: 38413 | |
|
2021-08-26
| ||
| 15:12 | CSS adjustments for the --browser option on diff commands. file: [aef19547ce] check-in: [de2d0054a7] user: drh branch: trunk, size: 38318 | |
| 14:01 | Rename the new --www option (check-in [f3961f453aee1ef5]) to --browser and -b. Add the --by option as shorthand for --browser --sidebyside, as that is expected to be a common usage pattern. file: [61a74c1fcb] check-in: [9a3372eec5] user: drh branch: trunk, size: 38357 | |
|
2021-08-25
| ||
| 23:17 | Fix a harmless compiler warning in the previous check-in. file: [04153c826e] check-in: [4291b9c87f] user: drh branch: trunk, size: 38243 | |
| 23:08 | Add the --www option to the various "diff" commands. file: [66430b541e] check-in: [f3961f453a] user: drh branch: trunk, size: 38216 | |
| 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: [58aacd2f21] check-in: [eb6611c4dc] user: drh branch: trunk, size: 35783 | |
| 18:26 | Enhance the sbsdiff.js script to do the diff-column width expansion and constraction as the browser width chagnes. Add the complete sbsdiff.js script text to the end of --webpage diff output, but only when the -y option is also used. file: [075cedb823] check-in: [5380333f63] user: drh branch: trunk, size: 35915 | |
| 18:00 | For the --webpage output, use javascript to resize all side-by-side diff columns so that they completely fill the available screen width. file: [82212cc9a2] check-in: [571dd613ac] user: drh branch: trunk, size: 36411 | |
| 17:18 | Fix the --webpage option so that it correctly generates the HTML closing tags for the "fossil test-diff" command. file: [791cceeab1] check-in: [7e37ae9549] user: drh branch: trunk, size: 35628 | |
| 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: [7c9d00f085] check-in: [ea52b7d06c] user: drh branch: trunk, size: 35395 | |
|
2021-06-30
| ||
| 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: [14b4629103] check-in: [4f83d06275] user: drh branch: trunk, size: 33654 | |
|
2021-06-22
| ||
| 16:36 | Initialized a pointer to 0 to squish a bogus complaint from GCC 11 on MinGW 9. The code passes ASAN on macOS Clang without this, so I believe GCC is just doing over-eager static analysis across function calls, not realizing that the pointer *will* be initialized before it's used. file: [979f5af041] check-in: [54febc1f72] user: wyoung branch: fossil-spawn, size: 38095 | |
| 08:45 | Comment clarification file: [9fbcf080d3] check-in: [c625c259a1] user: wyoung branch: fossil-spawn, size: 38095 | |
| 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: [ef267f9092] check-in: [68055fd3ed] user: wyoung branch: fossil-spawn, size: 37882 | |
|
2021-06-17
| ||
| 10:32 | Replaced a couple of blob_append() with blob_append_escaped_arg() so that a diff-command setting with spaces in the path will work, as discussed in [forum:/forumpost/29e7250723461d18 | forum post 29e7250723461d18]. (Bug: this would include any flags to the diff-command as part of the include, which obviously won't work.) file: [219893ceab] check-in: [dcbc8ba9fc] user: stephan branch: mistake, size: 33652 | |
|
2021-02-05
| ||
| 09:32 | Amend 'fossil help' output for all commands to make options conform to GNU 'short|long' convention (e.g., -v|--verbose). file: [3d52fe7c64] check-in: [7f3c728db3] user: jamsek branch: trunk, size: 33636 | |
| 03:51 | Minor reordering of diff command help, per forum suggestion. file: [9751970733] check-in: [dd13191359] user: stephan branch: trunk, size: 33636 | |
|
2021-02-04
| ||
| 04:11 | diff help text: noted that -N is just an alias for --verbose, to help avoid confusion reported in [forum:/forumpost/e7311328be | /forumpost/e7311328be]. file: [a68e4b40ff] check-in: [bfd1a682f3] user: stephan branch: trunk, size: 33586 | |
|
2021-01-30
| ||
| 03:40 | Make new --verbose commit option code compliant with Fossil style, and minor refactoring of the verboseFlag logic to cohere related global aCommitFile memory (de)allocation and make more readable. file: [09eee5e823] check-in: [8f41701eb0] user: jamsek branch: dev-ci-verbose, size: 33612 | |
|
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: [192e34c9d7] check-in: [a713e1e6c2] user: jamsek branch: dev-ci-verbose, size: 33580 | |
|
2021-01-07
| ||
| 16:21 | The --numstat option to "fossil diff" now shows a total at the end. file: [4c30386954] check-in: [9bb61a420b] user: drh branch: trunk, size: 32945 | |
|
2020-12-18
| ||
| 15:30 | Enhance "fossil diff --numstat" to print a grand total line, and not display statistics for non-modified files. file: [a0b19ea48e] check-in: [f8a5a6a716] user: danield branch: diff-numstat-total, size: 32948 | |
|
2020-08-25
| ||
| 06:32 | Fix HTML formatting issues with a few built-in help pages. file: [f9768b2a69] check-in: [11384f1874] user: drh branch: trunk, size: 32735 | |
|
2020-06-09
| ||
| 00:27 | Add the new "%$" conversion specifier in mprintf(), for escaping filenames for use in shell commands. Use this feature for added system() security whereever appropriate. file: [ec3070c8ef] check-in: [2209f55323] user: drh branch: trunk, size: 32691 | |
|
2019-09-30
| ||
| 16:11 | Add 'binary' query parameter to the 'vpatch' web page. file: [614c248606] check-in: [39d146166a] user: mistachkin branch: vpatch-binary, size: 32846 | |
|
2019-09-27
| ||
| 22:51 | Added -- support to (diff, finfo, grep, new). We can now grep for patterns which start with a dash. file: [2fad83213f] check-in: [639b2c183e] user: stephan branch: double-dash-flag, size: 32839 | |
|
2019-09-19
| ||
| 14:14 | In the db_get(N,D) function, if N is setting, then always leave D as NULL so that we use the published default value for that setting. file: [323e1cef53] check-in: [eb804dc674] user: drh branch: trunk, size: 32699 | |
|
2019-06-30
| ||
| 03:38 | In the "fossil diff" command, the use of --tclsh implies --tk. file: [1a7dd8eea6] check-in: [2655a2d405] user: drh branch: trunk, size: 32705 | |
|
2019-06-29
| ||
| 10:21 | Add the --tclsh command to "fossil diff" in order to specify an alternative TCL interpreter. file: [e179b8ff8b] check-in: [9fc945c056] user: drh branch: trunk, size: 32682 | |
|
2019-04-25
| ||
| 14:28 | Make full use of the new file_tempname() in "fossil diff" with both --from and --to options. Improve file_tempname() to allow for a suggested differentiator tag. file: [0e59c8c48f] check-in: [1dd2527f2a] user: drh branch: trunk, size: 32476 | |
|
2019-04-24
| ||
| 12:59 | Preserve the basis-file suffix when generating temporary file names. file: [b6fefdda62] check-in: [a072be1eaf] user: drh branch: trunk, size: 32760 | |
|
2019-01-22
| ||
| 23:19 | Experimental changes to unified diff output to 'ignore' sections that are purely additions. Still needs SBS support and tests. file: [de7511fc99] check-in: [6e3f354de1] user: mistachkin branch: ignorePureAdds, size: 33074 | |
|
2018-07-14
| ||
| 16:22 | Add missing option to diff option summary file: [8f8dafbd7b] check-in: [9b7332766f] user: andygoth branch: trunk, size: 32916 | |
|
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: [5ccaa1ef9e] check-in: [e7767de263] user: drh branch: symlink-refactor, size: 32838 | |
|
2017-08-12
| ||
| 18:15 | Change the shell_escape() procedure into blob_append_escaped_arg(). Have that procedure raise a fatal error if the argument to be appended contains dodgy characters that might pose a security risk. Also, prepend "./" in front of arguments that begin with "-" to prevent them from looking like switches. file: [ed71745041] check-in: [3b191c984b] user: drh branch: trunk, size: 33001 | |
|
2017-07-03
| ||
| 09:31 | Update changes.wiki. Some eol-spacing file: [36f42230cd] check-in: [86d4754a7a] user: jan.nijtmans branch: trunk, size: 33040 | |
|
2017-06-30
| ||
| 19:59 | Add the --numstat option to the diff command. file: [032e6da78a] check-in: [3d6cf6a722] user: drh branch: trunk, size: 33044 | |
|
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: [9a88f3a351] check-in: [9a6256cf08] user: jan.nijtmans branch: trunk, size: 32368 | |
|
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: [cc4771920b] check-in: [06b167526b] user: mgagnon branch: stash-gdiff-improvement, size: 32369 | |
|
2017-02-24
| ||
| 14:52 | Fix MD5 function (actually: byteReverse) for ARM processors. If OpenSSL is available, use their MD5 impl. Exchange SHA1Final() method parameters, being compatible with OpenSSL. file: [819b07b59f] check-in: [b88ef030a6] user: jan.nijtmans branch: trunk, size: 31934 | |
|
2017-02-03
| ||
| 15:13 | On diff/gdiff command, override "diff-binary" setting when argument "--diff-binary off" command line option is specified, not only with "--diff-binary on". file: [1d392a936c] check-in: [f62c247083] user: mgagnon branch: trunk, size: 31936 | |
|
2017-01-06
| ||
| 15:28 | Upgrade dirent.h to version 1.22. Minor spacing changes. file: [0725db4249] check-in: [b66b99cde9] user: jan.nijtmans branch: trunk, size: 31826 | |
|
2016-12-21
| ||
| 17:50 | When calling gdiff (or stash gdiff) command between 2 versions, use the filename to prefix the temporary random filename so once inside the external diff program we know what file is being compared. (pending-review) file: [6ac75f308c] check-in: [856ca01b13] user: mgagnon branch: gdiff-tmpfilename-prefix, size: 31830 | |
|
2016-10-31
| ||
| 12:41 | Fix harmless memory leaks. file: [9615037758] check-in: [36babe0ce1] user: drh branch: trunk, size: 31436 | |
|
2016-10-25
| ||
| 20:25 | Add the --command option to "fossil diff". file: [7a5ead4ed6] check-in: [eb67f09c9a] user: drh branch: trunk, size: 31416 | |
|
2016-10-01
| ||
| 03:39 | Merge updates from trunk. file: [701f6a25d4] check-in: [3e4eba78f0] user: mistachkin branch: dirSymlinks, size: 31272 | |
| 03:38 | The 'diff' command operates on files within the repository; therefore, it should use the directory symlinks. file: [2ff4e67d87] check-in: [9a99389680] user: mistachkin branch: dirSymlinks, size: 31274 | |
| 02:23 | Minor correction to text in usage help/comment in new --checkin option. file: [9a7f1a6ef0] check-in: [5aacaba35f] user: andybradford branch: trunk, size: 31269 | |
|
2016-09-30
| ||
| 15:22 | Fix a bug in the error message when the --checkin argument of fossil diff has no parent. file: [2d1eeca32c] check-in: [38daa9aa75] user: drh branch: diff-show-changes, size: 31271 | |
| 15:18 | Change the name of the --changes option on "fossil diff" to --checkin. file: [e2e37cc69b] check-in: [65724af1ce] user: drh branch: diff-show-changes, size: 31271 | |
| 03:49 | Add the "fossil diff --changes" option to show the changes made by a specific checkin UUID. file: [8cb2d1c5cc] check-in: [4556962ded] user: andybradford branch: diff-show-changes, size: 31265 | |
|
2016-06-25
| ||
| 03:56 | Full-text search for check-in diffs. This works, but it creates a huge index (2x the size of the BLOB table) in spite of being a contentless index. The index is slow to build because of all the diffs that must be computed. Because the index is contentless, the snippet generator runs very slowly on queries - a typical query with a couple hundred hits takes several minutes. file: [151a9d67ec] check-in: [68194175fb] user: drh branch: diff-search, size: 32709 | |
|
2016-04-02
| ||
| 00:00 | Add a plain-text equivalent of the /test-all-help page to the CLI. Complete a first pass for spelling and minor grammar over all command and page help text. file: [3759afcedb] check-in: [f070ec99ae] user: rberteig branch: ross-spellcheck, size: 30472 | |
|
2016-04-01
| ||
| 13:37 | Fix typos in comments. No changes to code. file: [55034d59bb] check-in: [b6b50b1244] user: mistachkin branch: trunk, size: 30472 | |
|
2015-12-24
| ||
| 13:28 | Fix a harmless compiler warning and several over-length source code lines. file: [6ccec8e05d] check-in: [d94362b6ae] user: drh branch: trunk, size: 30472 | |
|
2015-12-17
| ||
| 02:02 | Remove stale code accidently left in an earlier commit. file: [7d153a7ca8] check-in: [61c8d41872] user: drh branch: trunk, size: 30485 | |
|
2015-12-15
| ||
| 20:18 | Minor fix to the previous "fossil diff" enhancement to avoid unnecessary warnings about directories not being found if the directory does not contain any files that were changed. file: [c6fd421716] check-in: [b789df4bb6] user: drh branch: trunk, size: 31887 | |
| 20:07 | Enhance the "fossil diff" command so that it accepts directories as arguments and shows diffs on all files contained within those directories. file: [8d92202aa1] check-in: [c46f98055c] user: drh branch: trunk, size: 31839 | |
|
2015-10-27
| ||
| 01:21 | Add the 'exec-rel-paths' setting and its machinery to permit relative paths to be used when calling external diffing tools. file: [aafa5bbc29] check-in: [825d78b6f7] user: mistachkin branch: trunk, size: 32755 | |
|
2015-10-26
| ||
| 01:18 | Skip diff for files that are ADDED_BY_INTEGRATE. file: [82f3f7bdfb] check-in: [a6b999ce13] user: mistachkin branch: trunk, size: 31614 | |
|
2015-10-22
| ||
| 11:30 | Merge trunk. Almost forgot about this one. Please review. file: [6b649555af] check-in: [af7de966ff] user: jan.nijtmans branch: exec-rel-paths, size: 32611 | |
|
2015-09-16
| ||
| 10:49 | eliminate many unnessary type-casts file: [f8c56e25d8] check-in: [5b456cfa6b] user: jan.nijtmans branch: trunk, size: 31470 | |
| 09:18 | Add some "const" keywords in appropriate places. No change in functionality. Eliminates some compiler warnings. file: [40be8a875e] check-in: [a6fd491d3a] user: jan.nijtmans branch: trunk, size: 31464 | |
|
2015-09-12
| ||
| 19:18 | Fix the "fossil diff --undo" option so that it works even when called from a subdirectory of the project. file: [439d09a3bc] check-in: [f6c13632bb] user: drh branch: trunk, size: 31465 | |
|
2015-09-11
| ||
| 13:53 | Add support for the --undo option to the "fossil diff" command. file: [e925bc1561] check-in: [485aa80625] user: drh branch: trunk, size: 31216 | |
| 13:14 | Fix some commenting and variable naming convensions in the diff code. No logical changes. file: [186b3f54e6] check-in: [4140eb3575] user: drh branch: trunk, size: 28452 | |
|
2015-06-12
| ||
| 08:30 | "./configure --with-exec-rel-paths" now enables the use of windiff.exe as external diff utility by default. Recommended for cygwin builds. file: [2043d6ba9b] check-in: [44d0a0993c] user: jan.nijtmans branch: exec-rel-paths, size: 29213 | |
|
2015-06-11
| ||
| 21:50 | merge trunk file: [0dd960c5e4] check-in: [5e9253da21] user: jan.nijtmans branch: exec-rel-paths, size: 29101 | |
| 21:25 | Further improvements to the Tcl integration subsystem. file: [2e7b17d1cd] check-in: [18fc492a95] user: mistachkin branch: trunk, size: 28070 | |
| 16:33 | Prevent calls to find_option() from being skipped when they might be needed (i.e. if both options are specified). file: [54795417b1] check-in: [ddfb285cf8] user: mistachkin branch: exec-rel-paths, size: 29098 | |
| 08:41 | Slight optimization: don't bother checking the options, when either --exec-abs-paths or --exec-rel-paths is specified. file: [9981c88922] check-in: [e86aafedca] user: jan.nijtmans branch: exec-rel-paths, size: 29035 | |
| 08:33 | Make option --exec-rel-paths actually work, in stead of just giving: "unrecognized command-line option, or missing argument: --exec-rel-paths" file: [bd00591456] check-in: [c8a8827309] user: jan.nijtmans branch: exec-rel-paths, size: 29002 | |
|
2015-06-10
| ||
| 04:04 | Add help text for the new setting. file: [45c8c2c311] check-in: [2369a92fb6] user: mistachkin branch: exec-rel-paths, size: 28970 | |
| 03:22 | Revise the changes on this branch to favor the current default behavior. Also, make it possible to override the new setting with a command line option. file: [1d0d7e0aec] check-in: [2036eef767] user: mistachkin branch: exec-rel-paths, size: 28980 | |
|
2015-06-09
| ||
| 10:56 | Add "diff-cmd-abs-paths" setting, controlling whether "fossil diff/gdiff" provide absolute paths to the external diff tool or not. file: [fe10eeb803] check-in: [55b4a751c8] user: jan.nijtmans branch: exec-rel-paths, size: 28270 | |
|
2015-06-05
| ||
| 11:46 | Only use relative paths on win32 and cygwin, not on other platforms: external tools which buggy interpretation of relative paths don't exist on win32/cygwin. This allows a win32 diff tool (like winmerge) to be used in cygwin fossil, or a cygwin diff tool in a win32 fossil, no matter if the current directory is C:\Users\foo or /cygdrive/c/Users/foo. file: [5bfd5bee28] check-in: [c9f3266836] user: jan.nijtmans branch: exec-rel-paths, size: 28252 | |
|
2015-06-03
| ||
| 14:21 | Using relative paths with external tools may be problematic and is technically a breaking change. Use relative paths in paths used by fossil gdiff, as suggested by Ron W: [http://lists.fossil-scm.org:8080/pipermail/fossil-users/2015-April/021015.html] file: [8439ce17da] check-in: [3ffb6a3e62] user: jan.nijtmans branch: exec-rel-paths, size: 28120 | |
|
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: [e85b2ef610] check-in: [c2df31dae8] user: mistachkin branch: mvRmHardFix, size: 28067 | |
|
2015-04-27
| ||
| 13:19 | Provide help text for all commands and webpages. file: [e3a5ca38f5] check-in: [7ab03289ee] user: drh branch: trunk, size: 28061 | |
|
2015-02-14
| ||
| 12:24 | When the user is "nobody", make the g.anon permission vector for "anonymous" available in addition to g.perm. Hyperlinks to pages that would be available to anonymous are shown rather than suppressed. When permission is denied and control jumps to login_needed() a new flag shows whether or not logging in as "anonymous" would help. Work in progress. file: [45fd9167cd] check-in: [2f50d427a9] user: drh branch: login-enhancements, size: 27997 | |
|
2015-02-10
| ||
| 08:24 | Speedup handling of checked-out files: When multiple information about a file is requested (size, mtime, permission flags) only call stat() once. file: [66ebc18943] check-in: [dd94e596f4] user: jan.nijtmans branch: trunk, size: 27986 | |
|
2014-12-09
| ||
| 16:25 | Improvements to timeline submenu and title generation. Faster ambiguous name detection query. file: [9391a8baf1] check-in: [421c9eee0a] user: drh branch: trunk, size: 27996 | |
|
2014-10-27
| ||
| 15:41 | Add a mechanism to allow resource files (such as the TCL script used to implement the --tk option) to be stored separately in the source tree but then automatically compiled into byte-arrays in the executable. file: [3a9853d70f] check-in: [d93d92eb5a] user: drh branch: separate-resource-files, size: 27978 | |
|
2014-10-22
| ||
| 13:54 | Proposed enhancements to the --tk diff viewer from Ramon Ribó. file: [e8720d4828] check-in: [cbd4dca680] user: drh branch: tk-diff-viewer, size: 49366 | |
|
2014-10-20
| ||
| 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: [60038f4639] check-in: [0a7e326fa4] user: drh branch: compile-time-print-checking, size: 38348 | |
|
2014-09-07
| ||
| 19:50 | More proposed fixes to the issues pointed out by Edward Berner. file: [5456dfddc2] check-in: [4429a4c3cc] user: mistachkin branch: warningFixes, size: 38291 | |
|
2014-09-05
| ||
| 06:23 | Minor enhancements to the Tcl integration subsystem. file: [ddd84312a8] check-in: [946c3eb640] user: mistachkin branch: trunk, size: 38117 | |
|
2014-08-14
| ||
| 10:30 | diff: when --to is provided but --from is not, default to --from current, per ML suggestion. file: [bd43f732a5] check-in: [d5a8940431] user: stephan branch: pending-review, size: 38199 | |
|
2014-06-06
| ||
| 07:19 | A few additions of "const" keyword, reducing the number of compiler warnings when compiling with -Wwrite-strings file: [673923119b] check-in: [0a754750ef] user: jan.nijtmans branch: trunk, size: 38114 | |
|
2014-05-19
| ||
| 09:56 | Fix a compiler warning. file: [f80e129296] check-in: [c543079b87] user: drh branch: trunk, size: 38110 | |
| 09:16 | Prevent error-message for "fossil diff --tk" in combination with -v/--verbose/--interactive/--side-by-side (which are already implied by --tk) file: [47bd95a62f] check-in: [c060947196] user: jan.nijtmans branch: trunk, size: 38104 | |
|
2014-04-28
| ||
| 10:26 | Use file_access(..., F_OK) in stead of file_access(..., 0) everywhere, in case some platforms exist where F_OK != 0. Remove a few end-of-line spaces. file: [28c75dcb48] check-in: [9df71fe36c] user: jan.nijtmans branch: trunk, size: 38212 | |
|
2014-04-22
| ||
| 12:07 | Fix the "SaveAs" button on the "diff --tk" viewer so that the "Cancel" button works. file: [5e69ba76ee] check-in: [7440633e81] user: drh branch: trunk, size: 38206 | |
|
2014-04-03
| ||
| 13:37 | Enhance the --tk option on diff so that it works with special characters (like "\" and "}") in the filename. file: [30f5f896c0] check-in: [544d22139d] user: drh branch: trunk, size: 38182 | |
|
2014-04-01
| ||
| 19:52 | Add the "Invert" button to the --tk diff display. file: [4a4c0644ec] check-in: [cf52a9ab7b] user: drh branch: trunk, size: 38023 | |
|
2014-03-17
| ||
| 11:34 | Make -w|--ignore-all-space option work the same as the GNU diff option with the same name. file: [2d45ccdf5f] check-in: [a7a61cdd6f] user: jan.nijtmans branch: strip-trailing-cr, size: 37107 | |
|
2014-03-13
| ||
| 12:55 | merge trunk (ongoing) file: [9d2006acab] check-in: [2e45fb7b39] user: jan.nijtmans branch: strip-trailing-cr, size: 37187 | |
|
2014-03-07
| ||
| 15:49 | Rename the options for whitespace handling in annotate/blame/diff following GNU diff, not following GIT. So whether your diff tool is configured being internal or external, the same options can be used. file: [a755f77452] check-in: [28234db8bc] user: jan.nijtmans branch: trunk, size: 37108 | |
| 14:38 | Implement -b|--ignore-space-change. Doesn't work right yet (needs better hash function)! file: [7cfee8311f] check-in: [c0d1ed927e] user: jan.nijtmans branch: strip-trailing-cr, size: 37176 | |
| 09:01 | Rename --ignore-space-at-eol (from Git) to -Z|--ignore-trailing-space (gnu diff). Add --ignore-all-space as well (doesn't behave exactly like GNU's option yet) file: [1c671582ac] check-in: [d9e79f685b] user: jan.nijtmans branch: strip-trailing-cr, size: 37096 | |
|
2014-03-05
| ||
| 22:54 | Implement --strip-trailing-cr option file: [c8dd3a63bc] check-in: [4e6cfaf8f8] user: jan.nijtmans branch: strip-trailing-cr, size: 37161 | |
|
2014-03-04
| ||
| 08:21 | Don't ignore whitespace by default, except in annotations/blames. Add new "w" option to some Web UI pages, allowing to ignore whitespace (no buttons yet). file: [b795911273] check-in: [28b39cc516] user: jan.nijtmans branch: diff-eolws, size: 37115 | |
| 00:42 | Show "error" messages in Tk diff. file: [acd8da4ad0] check-in: [d4fea96ad8] user: joel branch: diff-eolws, size: 37157 | |
|
2014-03-03
| ||
| 11:55 | Make option --ignore-space-at-sol work correctly with side-by-side diff as well. file: [77a17b682d] check-in: [7763b2e64c] user: jan.nijtmans branch: diff-eolws, size: 36805 | |
| 10:50 | Implement new --ignore-space-at-sol option for all diff variants. And "-w" which means (for now) both --ignore-space-at-sol and --ignore-space-at-eol. Problem: diffs using --ignore-space-at-sol don't indent any more. to be solved. file: [54a67c011e] check-in: [6392c032ce] user: jan.nijtmans branch: diff-eolws, size: 36803 | |
| 10:15 | Rename --ignore-eolws back to --ignore-space-at-eol. Change last parameter of break_into_lines() to hold multiple flags. This opens the way to implement --ignore-all-space" and "--ignore-space-at-sol" as well. file: [d307ff3dfc] check-in: [2dffb0e026] user: jan.nijtmans branch: diff-eolws, size: 36617 | |
| 09:31 | Rename --ignore-space-at-eol to --ignore-eolws|-w, make it work with "fossil stash diff" as well, and make it the default with "fossil diff --tk". Remark: renaming probably was a bad idea, and "-w" should correspond with git's "--ignore-all-space". This would suggest implementing a "--ignore-space-at-sol" options as well, even though I doubt anyone would use that. file: [e7a846c81c] check-in: [31d25923bd] user: jan.nijtmans branch: diff-eolws, size: 36617 | |
| 08:22 | Try to fix it more better so it'll work with CLI diffs. Add --ignore-space-at-eol option (name taken from Git) to diff cmd. file: [7d340b5f90] check-in: [554607d35b] user: joel branch: diff-eolws, size: 36668 | |
|
2014-02-28
| ||
| 17:42 | Fix harmless compiler warning. file: [9ad41c4b04] check-in: [fade0558f3] user: mistachkin branch: trunk, size: 36468 | |
| 10:34 | Remove unnecessary spaces at end-of-lines. No change in functionality. file: [dafbc64f5b] check-in: [3df526ca41] user: jan.nijtmans branch: trunk, size: 36472 | |
|
2014-02-27
| ||
| 18:34 | When using "fossil test-diff" with -y or --tk, show the names of both input files above their respective columns. file: [de5913c30c] check-in: [1e0e0753f6] user: drh branch: trunk, size: 36504 | |
| 17:51 | Add a shebang and an introductory comment to the script generated by the SaveAs button in the graphical diff. Update the change log to mention the SaveAs button. file: [8743e12ad1] check-in: [8f65d49c25] user: drh branch: trunk, size: 35987 | |
| 16:40 | Make the graphical-diff "SaveAs" output a little more readable by putting each line of the raw diff source on a separate source line. file: [03f223a01c] check-in: [9dca00425e] user: drh branch: trunk, size: 35838 | |
| 16:21 | Add "Quit" and "Save As.." buttons to the "diff --tk" command. file: [dc6ff48c15] check-in: [29d80dd2f5] user: drh branch: trunk, size: 35783 | |
|
2014-02-14
| ||
| 13:37 | Cherrypick [252aff3e62] and related clean-ups: Use built-in Tcl for "diff --tk" implementation if possible. Fallback is to spawn an external "tclsh" as before. This makes "fossil diff --tk" work with ActiveState Tcl on Win32 out-of-the-box. file: [52e90239c9] check-in: [f325b2343e] user: jan.nijtmans branch: branch-1.28, size: 34967 | |
|
2014-02-04
| ||
| 20:52 | Give window a chance to finish handling <Destroy> event. file: [ba2fe70949] check-in: [d7b0617cb5] user: jan.nijtmans branch: trunk, size: 34906 | |
| 20:40 | Improve some comments and whitespace. file: [4c1361a1bf] check-in: [be267722ce] user: mistachkin branch: trunk, size: 34896 | |
| 20:30 | Cleanup use of Tcl integration for launching the Tk diff viewer internally. file: [54a76b7723] check-in: [fe9990adc7] user: mistachkin branch: trunk, size: 34870 | |
| 09:34 | Use built-in Tcl for "diff --tk" implementation if possible. Fallback is to spawn an external "tclsh" as before. file: [67a05613b8] check-in: [252aff3e62] user: jan.nijtmans branch: trunk, size: 34847 | |
|
2014-02-03
| ||
| 12:39 | Make sure that the close-button of tk's "diff" window ends the main-loop in all circumstances. Remove unnecessary space. file: [4399d15536] check-in: [c275d8ddbb] user: jan.nijtmans branch: trunk, size: 34208 | |
|
2014-01-28
| ||
| 08:20 | More removals of unnecessary end-of-line spaces. No change in code. file: [aa3441ac15] check-in: [45f35169f2] user: jan.nijtmans branch: trunk, size: 34185 | |
|
2014-01-05
| ||
| 11:03 | styling file: [45a870552e] check-in: [0c1a116791] user: jan.nijtmans branch: sqlite-min-to-3.7.17, size: 34290 | |
|
2014-01-04
| ||
| 23:00 | Fix use of sqlite3_strglob: 0 means there is a match file: [13fd70029e] check-in: [70a374d9a3] user: jan.nijtmans branch: sqlite-min-to-3.7.17, size: 34282 | |
| 20:51 | Increase minimum SQLite requirement to 3.7.17, and make efficient use of the function sqlite3_strglob. This eliminates unnecessand sqlite file: [4f78422b19] check-in: [c8c5646879] user: jan.nijtmans branch: sqlite-min-to-3.7.17, size: 34278 | |
|
2013-10-08
| ||
| 13:11 | Add the undocumented --script FILENAME option to all diff operations that make use of the --tk option. The --script FILENAME option is used for testing and debugging only. file: [45ed873a19] check-in: [cee30a34d8] user: drh branch: trunk, size: 34246 | |
|
2013-09-27
| ||
| 14:41 | The various "diff --tk" commands now take an optional, undocumented option "--script FILENAME" that causes the Tk script to be written into FILENAME rather than to be run. One use for this is to get a copy of the diff script in a form were it can be easily edited and enhanced before being moved back into Fossil. file: [e8aab26368] check-in: [326a736493] user: drh branch: tkdiff-enhancements, size: 34058 | |
|
2013-09-06
| ||
| 14:18 | Change internal $cmd Tcl variable in $fossilcmd. One of the Tcl packages in my environment (not written by me) defines this variable, which breaks "fossil diff --tk". Still investigating, but this is a harmless workaround. Addendum: Found the cause of this problem: [http://core.tcl.tk/tcl/info/f031beec9a] This change came after Tcl 8.6, and was never in any released version of Tcl, so it should be fixed before 8.6.1 file: [7cd89a5a7a] check-in: [f92d80d42a] user: jan.nijtmans branch: trunk, size: 33761 | |
|
2013-08-22
| ||
| 03:04 | Tcl script code style fix. file: [148961929c] check-in: [41dbd44b12] user: mistachkin branch: trunk, size: 33737 | |
|
2013-08-21
| ||
| 07:09 | On Cygwin $tcl_platform(platform) is "unix", but we want the same font as on win32 if the "win32" mode is used. file: [fd73f095b2] check-in: [09c2cf3e58] user: jan.nijtmans branch: trunk, size: 33735 | |
| 02:26 | Tk diff: Just stick with default fonts (with an exception for Windows). file: [452ee6bd8f] check-in: [7e9c7c0454] user: joel branch: trunk, size: 33740 | |
|
2013-07-18
| ||
| 23:01 | Assume input is UTF-8. Remove unnecessary font. file: [05606b2eeb] check-in: [431b4575f8] user: joel branch: trunk, size: 33949 | |
| 21:11 | Retain tab characters in HTML side-by-side diffs. Display should be unchanged (still mod-8 indentation). file: [0be4d549fe] check-in: [f341072453] user: joel branch: trunk, size: 33920 | |
| 20:21 | Tk diff: Fix a couple scrollbar issues. file: [0c48825591] check-in: [a6c96aea6b] user: joel branch: trunk, size: 33848 | |
|
2013-07-17
| ||
| 12:04 | merge trunk file: [4d85b8cfed] check-in: [5d8551bfa1] user: jan.nijtmans branch: ui-no-utf8, size: 35142 | |
|
2013-07-15
| ||
| 03:05 | Tk diff: New "Files" menu implementation to better handle long file lists. file: [5d9b7a358e] check-in: [af9bda81e4] user: joel branch: sbsreloaded, size: 33783 | |
|
2013-07-13
| ||
| 23:10 | Tk diff: Fix up scrolling code that previously assumed equal line lengths. file: [e9a66b63b7] check-in: [2e7b57fabd] user: joel branch: sbsreloaded, size: 32834 | |
|
2013-07-11
| ||
| 02:39 | Remove (again) the hack of adding tabs to the end of every line in the --tk display in order to make the horizontal scrollbars prettier. The extra tab is removed when copying the text from the selection into the clipboard, but many applications (ex: xterm and the editor that I use daily) paste out of the PRIMARY selection (when available) rather than the CLIPBOARD and thus retain the tabs, which is unacceptable. Better to have jumpy horizontal scrollbars than extra end-of-line whitespace accidently inserted into files due to a paste that bypassed the tab removal. file: [83ecd2f57c] check-in: [6b59760e23] user: drh branch: sbsreloaded, size: 31964 | |
| 00:37 | Tk diff: Cycle through diffs based on current location rather than the last one you selected in the menu. Menu button now has generic "Files" label. file: [abac5f41c3] check-in: [90fa060178] user: joel branch: sbsreloaded, size: 32737 | |
|
2013-07-10
| ||
| 21:41 | Set text widgets to "-state disabled" after loading data. file: [c11cc788c6] check-in: [302ab3a4e8] user: joel branch: sbsreloaded, size: 32536 | |
| 18:06 | Combine all diffs into a single display in Tk diff. file: [294cb0efc2] check-in: [0a41e2b3dc] user: joel branch: sbsreloaded, size: 32488 | |
| 05:27 | Use tab stops instead of spaces to equalize line lengths in Tk diff. file: [a0354ab40c] check-in: [695156c100] user: joel branch: sbsreloaded, size: 32434 | |
|
2013-07-09
| ||
| 20:51 | Add better comment explaining why .txtA/.txtB lines are padded with spaces. file: [d0b104ee46] check-in: [2d8f2b4e24] user: joel branch: sbsreloaded, size: 32588 | |
| 12:05 | [Backed out: see next commit in sbsreloaded branch.] Do not pad lines of the Tk diff view with spaces. file: [61267a69a9] check-in: [0a869bebc2] user: drh branch: backed-out, size: 31552 | |
|
2013-07-06
| ||
| 02:35 | Support arbitrary line lengths with synced horizontal scrolling in side-by-side diffs. file: [52afbf24f7] check-in: [4081a91c84] user: joel branch: sbsreloaded, size: 32284 | |
|
2013-06-22
| ||
| 21:45 | Press "q" to exit the --tk diff window. file: [c8fbbadd99] check-in: [8db6f9877f] user: drh branch: trunk, size: 27344 | |
|
2013-05-15
| ||
| 08:13 | Some more -v|--verbose additions. Old options names are deprecated, but still work. file: [9c14d774f5] check-in: [e3f7ba556b] user: jan.nijtmans branch: trunk, size: 27326 | |
|
2013-04-26
| ||
| 09:29 | One more: --new-file makes the diff command much more verbose. Fix /event?v= file: [2dae314d5a] check-in: [0a5abbee92] user: jan.nijtmans branch: verbose, size: 27307 | |
|
2013-04-17
| ||
| 09:19 | Cygwin: the default value of the "case-sensitive" setting now depends on the case-sensitive setting of the windows kernel. See: [http://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-casesensitive]. Alphabetize some command documentation. file: [18f0957e6f] check-in: [9359b41fd5] user: jan.nijtmans branch: trunk, size: 27228 | |
|
2013-04-08
| ||
| 10:42 | Consistant use of DIFF_CANNOT_COMPUTE_??? messages file: [efa89b05bd] check-in: [b18276cbde] user: jan.nijtmans branch: ui-no-utf8, size: 28587 | |
| 09:03 | Implement LOOK_INVALID for utf-16, and use it to detect UTF-16 without BOM in network byte order file: [8c0a563baf] check-in: [2d14d82c6b] user: jan.nijtmans branch: ui-no-utf8, size: 27837 | |
|
2013-04-05
| ||
| 07:44 | Branches "use-blob_strip_bom" and "improve_commit_warning" go together in a single new (experimental) branch file: [f7dd634fbe] check-in: [a7e77a66b0] user: jan.nijtmans branch: ui-no-utf8, size: 27777 | |
|
2013-03-19
| ||
| 10:06 | merge trunk (still experimental) file: [5795727f5f] check-in: [af4d780446] user: jan.nijtmans branch: use-blob_strip_bom, size: 27772 | |
|
2013-02-27
| ||
| 11:26 | merge trunk file: [d5784e2d80] check-in: [d085eb9aca] user: jan.nijtmans branch: use-blob_strip_bom, size: 27773 | |
|
2013-01-03
| ||
| 10:31 | Updating from trunk. I've left some merge conflicts to solve (annotate, diff) file: [300318ae7d] check-in: [b5b8448ece] user: viriketo branch: annotate_links, size: 27425 | |
|
2013-01-02
| ||
| 00:58 | Enhance the diff logic so that it can suppress differences that do not match a regular expression. This capability is so far only exposed on the test-diff command. file: [bb11b3f9fb] check-in: [97a7b924c0] user: drh branch: trunk, size: 27228 | |
|
2012-12-15
| ||
| 14:25 | Add robustness to the handling of command-line options in the "diff" and "test-diff" commands. file: [e2ac6b17d7] check-in: [60d5b1f5a2] user: drh branch: trunk, size: 27222 | |
|
2012-11-05
| ||
| 13:56 | merge trunk file: [8d86e3c6d2] check-in: [b0e05a90b6] user: jan.nijtmans branch: use-blob_strip_bom, size: 27577 | |
|
2012-11-01
| ||
| 14:02 | bug-fix: Before preparing a diff, BOM's should not be removed. It might result in a BOM in the middle of UTF-8, which is invalid, but that's how diff works. file: [c41bc308ac] check-in: [cd06b7d8af] user: jan.nijtmans branch: use-blob_strip_bom, size: 27587 | |
|
2012-10-30
| ||
| 15:18 | working utf-16 diff, still being tested file: [a34ab4c2c5] check-in: [879d1e2405] user: jan.nijtmans branch: use-blob_strip_bom, size: 27611 | |
|
2012-10-16
| ||
| 12:19 | Updating from trunk. file: [2af60ea20d] check-in: [3cdf9480dd] user: viriketo branch: annotate_links, size: 27249 | |
|
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: [3acaaa547b] check-in: [773c6c5f2c] user: drh branch: branch-1.19, size: 15485 | |
| 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: [ddb31a0297] check-in: [ae092ec605] user: drh branch: trunk, size: 27052 | |
|
2012-10-09
| ||
| 13:48 | Updating from trunk. I solved some merge conflicts: 1) the checkin info in the vdiff page, taking that from trunk, and 2) the vdiff menu options, which I tried to get similar to what I had in the branch. file: [1baa500578] check-in: [f4b082d464] user: viriketo branch: annotate_links, size: 27239 | |
|
2012-10-05
| ||
| 20:39 | Add the "stash show" command. Simplifications to the diff code, and especially the looks_like_binary() function. file: [160d2565ec] check-in: [4e0e69f691] user: drh branch: trunk, size: 27042 | |
| 12:38 | Get the --tk option working for "fossil stash diff". file: [28669a1d82] check-in: [2ed8cdc518] user: drh branch: trunk, size: 27307 | |
|
2012-09-30
| ||
| 07:39 | Make sure the new command line options are always processed; however, wait until after the settings are available. file: [6a041e2e32] check-in: [064afb225a] user: mistachkin branch: diffBinExternal, size: 27189 | |
| 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: [1bdabe4a1e] check-in: [c50eb50718] user: mistachkin branch: diffBinExternal, size: 27299 | |
|
2012-09-29
| ||
| 14:08 | Make the "--tk" option to the "diff" command also imply the "-i" option to force the use of the internal diff engine. file: [1c03b610d4] check-in: [5a4fbb0a28] user: drh branch: trunk, size: 20357 | |
|
2012-09-27
| ||
| 01:38 | Fixes to the --tk diff option to support unified diff on Windows. file: [91114bf6ed] check-in: [1048bccf14] user: mistachkin branch: trunk, size: 20354 | |
| 00:37 | Allow unified diff for the --tk diff option. file: [982c85b5e6] check-in: [5be507df71] user: mistachkin branch: trunk, size: 20349 | |
|
2012-09-26
| ||
| 14:11 | merge file: [66b1321860] check-in: [84f1b5b37f] user: jan.nijtmans branch: trunk, size: 20285 | |
| 14:10 | Make "fossil diff --tk" work on Windows as well. file: [ef548f9b0b] check-in: [b836ec8a35] user: jan.nijtmans branch: trunk, size: 20263 | |
| 13:52 | For the --tk option to the diff command, invoke "tclsh" instead of "wish" and invoke "package require Tk" at the beginning of the script. file: [f88066a5ae] check-in: [aba451e9d5] user: drh branch: trunk, size: 20283 | |
| 12:55 | Add the --tk option to "fossil diff" in order to launch a Tcl/Tk GUI display of colorized side-by-side diffs. file: [71b39dcf56] check-in: [22e5d711e5] user: drh branch: trunk, size: 20261 | |
|
2012-09-08
| ||
| 13:13 | Fix a harmless compiler warning. file: [4b1879686e] check-in: [c42408e15b] user: drh branch: trunk, size: 17971 | |
|
2012-09-07
| ||
| 21:12 | On windows, make "gdiff" default to using WinDiff.exe. file: [f70e6d0dd7] check-in: [cad57bf65d] user: drh branch: trunk, size: 17977 | |
|
2012-09-05
| ||
| 12:55 | const-qualification file: [67ffee66cf] check-in: [645f34834d] user: jan.nijtmans branch: eclipse-project, size: 17597 | |
|
2012-08-29
| ||
| 13:57 | Allow UTF-8 characters in sources. translate.exe will translate it to ASCII file: [647e0fef4a] check-in: [9f6abc5968] user: jan.nijtmans branch: msvc-broken, size: 17592 | |
|
2012-08-20
| ||
| 19:01 | Expand the "diffFlags" variable to 64-bits in order to accommodate new options to the various "diff" commands. file: [9bdfa7b5cc] check-in: [2b1767500e] user: drh branch: trunk, size: 17593 | |
|
2012-08-08
| ||
| 13:46 | Updating from trunk. I solved three merge conflicts about hyperlinks. file: [04d87d43ec] check-in: [08db320464] user: viriketo branch: annotate_links, size: 17790 | |
|
2012-07-14
| ||
| 11:40 | Changes to the root-tag processing to provide better error messages. file: [2fa9b1c34d] check-in: [36134ce275] user: drh branch: root-tag, size: 17593 | |
| 04:59 | Add the --branch option to the "diff" command, for showing all changes in a particular branch. file: [a516b3bdfc] check-in: [f06e492ad8] user: drh branch: root-tag, size: 17612 | |
|
2012-06-29
| ||
| 15:59 | Update to the latest SQLite4 that requires converting preprocessor macro prefixes from "SQLITE_" to "SQLITE4_". file: [67ba6621e3] check-in: [0328d68181] user: drh branch: sqlite4, size: 17269 | |
|
2012-06-11
| ||
| 17:33 | merge trunk again... (previous merge was not from latest trunk from fossil-scm.org) file: [323be07777] check-in: [7a57ab6465] user: mgagnon branch: mgagnon_fix, size: 17310 | |
|
2012-04-28
| ||
| 08:03 | Refinements to the new hyperlink logic and spider defense. file: [ced292ca31] check-in: [d9c8a7dd73] user: drh branch: spider-defense, size: 17268 | |
|
2012-04-04
| ||
| 16:20 | Updating from trunk to get the latest trunk fixes. file: [cbd521dd04] check-in: [b7f3a32d4e] user: viriketo branch: annotate_links, size: 17469 | |
|
2012-03-29
| ||
| 14:54 | Add vim modline everywhere file: [f7bcca866d] check-in: [a496d8e88d] user: mgagnon branch: mgagnon_fix, size: 17314 | |
|
2012-03-19
| ||
| 04:48 | In file_tree_name, since the file name argument is converted to its canonical form prior to the memcmp, the local root must be as well. On Windows, normalize drive letters to uppercase when converting a file name to its canonical form and fix construction of temporary file names used with the gdiff command when the --from and --to options are present. file: [64a0e95082] check-in: [6be0898b2c] user: mistachkin branch: winFiles, size: 17272 | |
|
2012-03-18
| ||
| 14:53 | Making the side-by-side diffs autocalculate the width, by default. file: [9a0cd0d1a0] check-in: [16397d8625] user: viriketo branch: annotate_links, size: 17320 | |
|
2012-02-08
| ||
| 00:34 | Fix issues with the --brief option to the diff command. file: [313e3cafca] check-in: [fbaa7ca99f] user: drh branch: trunk, size: 17123 | |
|
2012-02-07
| ||
| 15:38 | Add the --brief option to the "diff" command. file: [c1b9dfbaa7] check-in: [e0565d4351] user: drh branch: trunk, size: 17143 | |
|
2012-02-04
| ||
| 14:58 | Make sure diff output is flushed to screen in a timely manner. file: [6d4a016d37] check-in: [dc96d73dd0] user: drh branch: trunk, size: 16678 | |
|
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: [2fd32d95b6] check-in: [ab47cc73d7] user: drh branch: trunk, size: 16926 | |
| 21:31 | Add support for side-by-side diff from the command-line "diff" command. file: [ad9668750d] check-in: [ac81759f65] user: drh branch: diff-enhancements, size: 16692 | |
| 20:24 | Begin improvement efforts on the "diff" functions by adding the --context option to the "diff" command. file: [84e3e30c70] check-in: [3bbbbdfd7d] user: drh branch: diff-enhancements, size: 16448 | |
|
2011-10-12
| ||
| 17:41 | Adding a more options at naming commits for diff and update commands. I wrote a new function that allows more kind of specifications for a checkin uuid: checkout, parent and pivot:id1:id2. If there was a way to discover the 'parent branch' of the current checkout, there could be a 'parentbranch' naming too. I think this makes the life easier, specially for the pivot:id1:id2 case, about seeing the difference between a branch and its parent branch. I find myself using often the test-find-pivot command just to get that diff or update to the pivot, to check changes between the current branch and the parent branch. file: [3111a4c6e1] check-in: [9fe787ec03] user: viriketo branch: extended_ci_names, size: 16592 | |
|
2011-09-14
| ||
| 17:45 | Refactored g.okXXX perms flags to g.perm.XXX. file: [57e9384f54] check-in: [34b4dec0bc] user: stephan branch: stephan-hack, size: 16559 | |
| 00:32 | Begin streamline the online documentation to: * always include a short overview of the options supported by a given command, alphabetically sorted * reference similar/related commands with a final See also: section * Use ?x? for optional arguments * collapse supported options into ?OPTIONS? This is commit #1/n. file: [3bb0066da9] check-in: [3fbf8caa87] user: martin.weber branch: msw-docco, size: 16556 | |
|
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: [f3d982433d] check-in: [8a0c546990] user: dmitry branch: symlinks, size: 16294 | |
|
2011-08-27
| ||
| 18:12 | Fix a C89 error specific to the symlinks branch and also pull in the C89 fix and the versionable settings fix from trunk. file: [d02f0bfc1c] check-in: [4778edd3f2] user: drh branch: symlinks, size: 16282 | |
|
2011-08-22
| ||
| 22:20 | Merge trunk. file: [08d7421998] check-in: [c57830bec2] user: dmitry branch: symlinks, size: 16282 | |
|
2011-07-30
| ||
| 10:10 | Allow more than one file to be specified to the diff command. file: [39a79a4745] check-in: [3cdcb51573] user: ben branch: ben-minorchanges, size: 15475 | |
|
2011-06-01
| ||
| 22:32 | In contexts where only a check-out makes since, only resolve tags or branch names into check-outs, not events or other artifacts. Ticket [5f611295e3c2a8]. file: [f9bf7dd972] check-in: [2a013f0228] user: drh branch: trunk, size: 15281 | |
|
2011-05-30
| ||
| 06:55 | Online help for several more commands adapted file: [ba37ca8283] check-in: [d23f98877d] user: Arjen Markus branch: arjen-doc-updates, size: 15420 | |
|
2011-05-04
| ||
| 11:13 | Add a wrapper around all calls to access() that translates UTF8 to MBCS. file: [2e2140e0a8] check-in: [850d3df44e] user: drh branch: windows-i18n, size: 15269 | |
|
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: [821169967d] check-in: [eea6449098] user: drh branch: windows-i18n, size: 15259 | |
|
2011-02-27
| ||
| 21:45 | Fix the "revert" command so that it restores the correct execute permission to the file. Ticket [baf9b6b11e08c1] file: [1c57ba9993] check-in: [3c39caac39] user: drh branch: trunk, size: 15244 | |
|
2011-02-20
| ||
| 21:24 | Suppress unnecessary "CHANGED" lines in diff output. file: [3a20b0054c] check-in: [1d49c2f65c] user: drh branch: trunk, size: 15235 | |
|
2011-02-19
| ||
| 16:14 | Add the "vpatch" web method that returns the difference between two checkins as text/plain and a a "patch" hyperlink on the checkin information page that jumps to the appropriate vpatch page. file: [73fa1c05af] check-in: [4bdf71b1ce] user: drh branch: trunk, size: 15229 | |
|
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: [4b058a8fcc] check-in: [a1814d5015] user: drh branch: file-safety, size: 14484 | |
|
2011-02-07
| ||
| 17:51 | Merge latest trunk. file: [0abb088ed9] check-in: [d7d335a692] user: dmitry branch: symlinks, size: 15251 | |
|
2011-02-04
| ||
| 03:21 | Do not show blank changes when doing a diff. file: [3539b639d8] check-in: [d5729c31b5] user: drh branch: trunk, size: 14469 | |
|
2011-01-28
| ||
| 19:04 | Add symlink support for Unix. New settings flag "allow-symlinks" controls this (off by default). file: [3977bc87ae] check-in: [ed2ef7e9a3] user: dmitry branch: symlinks, size: 15214 | |
|
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: [420250ebf2] check-in: [31c52c7b3e] user: drh branch: trunk, size: 14432 | |
|
2010-12-21
| ||
| 20:35 | Back out check-in [34341a10b45c9ff1] which was incorrect. That check-in was causing incorrect results to display on the diff of an uncommitted merge. Ticket [47d4e76139fd63f2a] is still open. file: [f9857e685b] check-in: [1bea7f6959] user: drh branch: trunk, size: 14418 | |
|
2010-12-18
| ||
| 21:22 | Add the "stash diff" and "stash gdiff" commands. file: [64e57185cb] check-in: [987e0ff78d] user: drh branch: experimental, size: 14420 | |
|
2010-12-10
| ||
| 18:57 | Take care not to show null-diffs with the "diff" command when the checkout contains the results of a merge. Ticket [47d4e76139fd63] file: [8fd73518ef] check-in: [34341a10b4] user: drh branch: trunk, size: 14390 | |
|
2010-12-08
| ||
| 21:00 | Add the --sha1sum option to the "status" and "changes" commands to force a detailed (but slow) SHA1 checksum verification that files have not changed. file: [3814403040] check-in: [e154a4386b] user: drh branch: trunk, size: 14387 | |
|
2010-11-26
| ||
| 18:37 | Report an error if the repository schema version does not match what the fossil executable expects. file: [0eff3efa8e] check-in: [c0c3d92340] user: drh branch: trunk, size: 14384 | |
|
2010-11-07
| ||
| 10:13 | merge from trunk file: [ffb54245bc] check-in: [8050311dd5] user: wolfgang branch: StvPrivateHook2, size: 14592 | |
|
2010-11-06
| ||
| 21:04 | Rename the "portable_system()" function to "fossil_system()" and move it from diffcmd.c into main.c. file: [c91aeb545d] check-in: [d9880a8003] user: drh branch: trunk, size: 14381 | |
|
2010-11-02
| ||
| 18:23 | merge from trunk file: [6ad6cc7d47] check-in: [cb75de51b5] user: wolfgang branch: StvPrivateHook2, size: 15084 | |
|
2010-11-01
| ||
| 23:45 | Mention the -N and --new-file command-line options on the "diff" command. Ticket [926a1b1639a1ee3739]. file: [03c15793a0] check-in: [bd68e4172d] user: drh branch: trunk, size: 14860 | |
|
2010-10-26
| ||
| 19:01 | merge from trunk file: [a44194e1b2] check-in: [4260bc6a22] user: wolfgang branch: StvPrivateHook2 , size: 14975 | |
|
2010-10-19
| ||
| 14:55 | adding flush to system-command, windows needs all buffers flushed before system execution file: [922d7c87be] check-in: [a64b48cb29] user: wolfgang branch: StvPrivateHook2 , size: 14768 | |
|
2010-10-17
| ||
| 17:25 | Add the ability to parse and use manifests with the B-card. Add documentation for the B-card. file: [2f2fbc7074] check-in: [ec56d8ff58] user: drh branch: experimental, size: 14751 | |
|
2010-10-16
| ||
| 17:33 | merge from trunk file: [d66250dc8f] check-in: [586b0eb144] user: wolfgang branch: wolfgangHelpCmd, size: 14755 | |
| 16:32 | Bring over the latest bug fixes from trunk. file: [8a61057036] check-in: [b2175857cc] user: drh branch: experimental, size: 14741 | |
| 12:13 | Do not free memory not obtained from malloc in the "fossil diff" command. Ticket [38d7bb8cf044219c2eff8]. file: [8e871d9e28] check-in: [ddb975e2be] user: drh branch: trunk, size: 14544 | |
|
2010-10-15
| ||
| 20:37 | Refactor the control-artifact parser. file: [129f214c67] check-in: [da9fcdc95a] user: drh branch: experimental, size: 14712 | |
| 16:11 | merge from trunk file: [6288aedae9] check-in: [c127179362] user: wolfgang branch: wolfgangHelpCmd, size: 14726 | |
|
2010-10-14
| ||
| 20:28 | Always show diffs for added and deleted files in the web UI. Show added and deleted files in diffs with -N and the --from and --to options to the command-line diff command. Ticket [e90d38c2054e9b44792] file: [54cf2d377b] check-in: [703653489e] user: drh branch: trunk, size: 14515 | |
| 18:38 | Work towards including full text of deleted and added files in a diff when the -N or --new-file option is used. Ticket [e90d38c2054e9b44792eb] file: [ee8f1418ea] check-in: [585360b47d] user: drh branch: trunk, size: 13936 | |
|
2010-10-09
| ||
| 15:34 | link the command line help to the gui pages, where appropriate file: [6b0632cb85] check-in: [a5cd79272f] user: wolfgang branch: wolfgangHelpCmd, size: 12865 | |
|
2010-10-08
| ||
| 15:05 | fine tuning the layout of the command line help strings file: [2e13f08d2f] check-in: [c6d1879069] user: wolfgang branch: wolfgangHelpCmd, size: 12661 | |
| 12:18 | removed quotes from command cross references and add them in help command file: [bb4684c3c9] check-in: [b3bf08cc84] user: wolfgang branch: wolfgangHelpCmd, size: 12658 | |
| 12:10 | shorten command lines to 80 char file: [90e653a49d] check-in: [ad29dc1132] user: wolfgang branch: wolfgangHelpCmd, size: 12660 | |
| 12:02 | added cross reference links to command line help in the gui file: [f96792a648] check-in: [b76a547f1a] user: wolfgang branch: wolfgangHelpCmd, size: 12661 | |
|
2010-09-17
| ||
| 06:04 | removed dupe block in if() statement file: [6e48d3292a] check-in: [63dc0641ac] user: bharder branch: trunk, size: 12654 | |
| 06:02 | less threatening desc. for removing an artifact from repo file: [0ad0d3fa2a] check-in: [6938d5fe80] user: bharder branch: lang, size: 12658 | |
|
2010-08-31
| ||
| 01:53 | Merge the changes from the windowscompilers branch into the trunk. file: [23ac471ebf] check-in: [3564af0f7a] user: drh branch: trunk, size: 12723 | |
|
2010-08-28
| ||
| 06:59 | This is the first check-in on the windowscompilers branch and it adds the <a href="http://www.digitalmars.com/">Digital Mars C compiler</a> The user should have dmc installed in c:\DM with zlib in c:\DM\extra\lib and c:\DM\extra\include. typing c:\DM\bin\make -f win\Makefile.dmc builds fossil.exe in dmcobj The following files were edited or added: <p>Checks if one of the windows compilers is used. If so we define _WIN32. Defining _WIN32 is normally done by<br>#include <windows.h><br> However most of the time we don't use windows.h. </p> <p>Adding an other windows compiler is done by adding<br> "|| defined(__COMPILER_IDENTIFIER__)"<br> and maybe some special things in the files below. Like <pre> </pre> </p> <p>These have all __MINGW32__ replaced by _WIN32. And in some places special processing for either MINGW32 or DMC <p>In popen2 the _open_osfHandle call first parameter is cast to a long. DMC refused to compile without the cast.</p> <p>DMC complained that it didn't knew of time_t in rss.h. time.h came after rss.h. Switching the two solved it! </p> <p>added tcl code to generate Makefile.dmc. tclsh src/makemake.tcl dmc prints to stdout the makefile. As a convienience to the end-user I added the win/Makefile.dmc to the repository. There are few changeable variables in there for adjusting path, CFLAGS LIBS etc. </p> <p>These are needed because DMC and MSVC doesn't provided them. dirent.h is copied verbatim from the net. unistd.h I found on the net too, but added some defines. <p>The problem with windows it doesn't have AWK standard installed. version.c creates VERSION.h. It is a very simple C-program and doesn't do a lot of checking. </p> file: [ecd24a9c44] check-in: [f66f414fd3] user: renez branch: windowscompilers, size: 13215 | |
|
2010-08-27
| ||
| 20:40 | The ssh:// method on windows is now working well with plink. It will even prompt for passwords if the URL contains a "*" password. file: [208cf1c120] check-in: [0cdb6403cb] user: drh branch: trunk, size: 12722 | |
|
2010-08-26
| ||
| 11:27 | Fix buffering issues with ssh://. The ssh:// sync method now works with older, unmodified servers. Added the "?fossil=exe" option to URL processing. file: [5101c22e09] check-in: [af97726337] user: drh branch: experimental, size: 13214 | |
|
2010-08-21
| ||
| 17:32 | Use a more precise (though slower) diff algorithm when working with small strings whose differences are hard to detect. file: [893876aab7] check-in: [1e08452c65] user: drh branch: trunk, size: 13221 | |
| 04:06 | The command-line "diff" does not ignore whitespace at the end of lines and it generates a well-formed patch file that can be fed directly into "patch -p 0". Ticket [a9f7b23c2e376af]. GUI diffs and the merge commands do ignore end-of-line whitespace. file: [5202ea28a4] check-in: [5ef7435ac0] user: drh branch: trunk, size: 13234 | |
|
2010-08-07
| ||
| 16:10 | The "fossil diff" command now accepts options --from and --to in order to do a diff between two arbitrary check-ins. file: [2e327ef793] check-in: [296b90a25b] user: drh branch: trunk, size: 12517 | |
|
2010-05-16
| ||
| 19:08 | Change from GPL to the Simplified BSD License. file: [7ea735bdb4] check-in: [c06edd231f] user: drh branch: clear-title, size: 11435 | |
|
2010-03-18
| ||
| 14:20 | Fix some compiler warnings on windows. file: [f20bad14b4] check-in: [73c24ae363] user: drh branch: trunk, size: 11710 | |
|
2009-12-18
| ||
| 00:29 | Detect when the check-out contains missing files and filesystem objects that ought to be files but are not. Issue reasonable warnings. file: [6b2be81037] check-in: [76f169fca6] user: drh branch: trunk, size: 11704 | |
|
2009-12-17
| ||
| 21:22 | Remove the --yes option from the "revert" command. In its place, make the "revert" opration undoable. file: [88a94ee318] check-in: [7b82a73bd3] user: drh branch: trunk, size: 11701 | |
|
2009-11-06
| ||
| 14:00 | Add the ability to diff to arbitrary versions of a single file. file: [20363d7b42] check-in: [fe8bb01d38] user: drh branch: trunk, size: 11692 | |
| 04:05 | Because the "vfile" signatures are now used by "diff", be sure to recompute them before running the diff. file: [5083153aee] check-in: [149945beea] user: drh branch: trunk, size: 9428 | |
| 02:47 | Continuing work on the "diff" command. file: [4a3e578a59] check-in: [db608ee72f] user: drh branch: trunk, size: 9398 | |
| 01:59 | Work toward improving the "diff" command. Get the "-r" or "--from" option working. file: [7503ab8fa5] check-in: [a51808c0a5] user: drh branch: trunk, size: 9367 | |
|
2009-10-01
| ||
| 17:22 | Fix the "gdiff" command so that it accepts commands with arguments. This will require users to put double-quotes around program pathnames that contain spaces. file: [a53a1db3ef] check-in: [b2fdf4fe14] user: drh branch: trunk, size: 6865 | |
|
2009-09-16
| ||
| 21:29 | Change more system() calls into portable_system() in an effort to fix path quoting problems on windows. file: [4832395b8a] check-in: [0eb08b860c] user: drh branch: trunk, size: 6915 | |
|
2009-09-11
| ||
| 15:06 | Update to the latest SQLite. Fix a bug in the "diff" and "gdiff" commands. Fix a bug that prevented "fossil config pull" from working. file: [d11c5b0707] check-in: [129edda98e] user: drh branch: trunk, size: 6874 | |
|
2009-09-10
| ||
| 23:00 | Add extra quoted to system() calls on windows. Ticket [8d073be8808b]. Also update to the latest SQLite. file: [5229e8f323] check-in: [aeaee1f385] user: drh branch: trunk, size: 6857 | |
|
2008-10-24
| ||
| 10:56 | Improvements to the output of the "diff" command so that it is closer to standards. file: [38b20f8775] check-in: [85670cfcc8] user: drh branch: trunk, size: 6388 | |
|
2008-10-21
| ||
| 06:52 | The "diff" command with no arguments now does a diff on all files in the checkout which have been edited. file: [74bdae74dd] check-in: [c863ec1a98] user: drh branch: trunk, size: 5864 | |
|
2008-07-23
| ||
| 13:01 | The "extra" and "clean" commands ignore the repository file if the repository happens to be within the check-out. Ticket [c7b35be88]. file: [bf0ebffd4d] check-in: [2ecc407d9b] user: drh branch: trunk, size: 4020 | |
|
2008-02-08
| ||
| 16:24 | Fail with an error if a file is outside the checkout tree. file: [4f6e43e19f] check-in: [b3ec774ab7] user: drh branch: trunk, size: 4017 | |
|
2007-12-04
| ||
| 01:26 | Fix the revert command so that it works from subdirectories. Other minor comment and help-text changes. file: [a54672e2c8] check-in: [371dd6574c] user: drh branch: trunk, size: 4073 | |
|
2007-11-15
| ||
| 21:49 | Enhanced text diff subroutine uses Myers enhancements to Wagners minimum edit distance algorithm. White space at the end of lines is ignored. file: [dfc5dfd350] check-in: [57b2735ebd] user: drh branch: trunk, size: 4065 | |
|
2007-10-10
| ||
| 03:39 | Added diff-command and gdiff-command to the valid settings file: [637be09787] check-in: [29bc8da1d9] user: jnc branch: trunk, size: 4068 | |
|
2007-09-28
| ||
| 20:08 | Combine the "config" and "setting" commands into a single "settings" command. file: [4cfcd3d811] check-in: [134e2aeccc] user: drh branch: trunk, size: 4079 | |
|
2007-09-26
| ||
| 03:37 | Added revision support to diff and revert file: [e546baef8b] check-in: [574763bab9] user: jnc branch: trunk, size: 4093 | |
|
2007-09-24
| ||
| 14:02 | Added a gdiff command. diff command now runs config diff-command, gdiff command (graphical diff) now runs config gdiff-command. With both, if -i is supplied, internal diff is used. With both, if they are not configured, internal diff is used. Fixed bug with internal diff giving files in reverse order. Also put div id="sub-menu" inside of submenu if, as to not display the sub menu if no sub menu items exist file: [4af4f0ff55] check-in: [01ce2cf3dc] user: jnc branch: trunk, size: 4464 | |
| 06:53 | Added support for a user defined diff command, which if set (fossil config diff-command), is run by default. The user can give a -i flag to run the internal diff command regardless of user defined diff command setting. Removed command tkdiff, no longer needed. Made the config remove message a bit more clear, when removing a config setting, it states it has been removed instead of telling you it's undefined. file: [a106583630] check-in: [c82fb61775] user: jnc branch: trunk, size: 4063 | |
|
2007-08-18
| ||
| 02:45 | Add the "help" command and the "clean" command. More work is needed on the text for various help messages. file: [16a1f70543] check-in: [c9fdb846fb] user: drh branch: trunk, size: 3063 | |
|
2007-07-21
| ||
| 14:10 | Added: Initial check-in of m1 sources. file: [42f780093c] check-in: [dbda8d6ce9] user: drh branch: trunk, size: 2855 | |