Fossil

File History
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

History of src/diffcmd.c

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: [0e59c8c4] check-in: [1dd2527f] user: drh branch: trunk, size: 32476
2019-04-24
12:59
Preserve the basis-file suffix when generating temporary file names. file: [b6fefdda] check-in: [a072be1e] 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: [de7511fc] check-in: [6e3f354d] user: mistachkin branch: ignorePureAdds, size: 33074
2018-07-14
16:22
Add missing option to diff option summary file: [8f8dafbd] check-in: [9b733276] 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: [5ccaa1ef] check-in: [e7767de2] 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: [ed717450] check-in: [3b191c98] user: drh branch: trunk, size: 33001
2017-07-03
09:31
Update changes.wiki. Some eol-spacing file: [36f42230] check-in: [86d4754a] user: jan.nijtmans branch: trunk, size: 33040
2017-06-30
19:59
Add the --numstat option to the diff command. file: [032e6da7] check-in: [3d6cf6a7] 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: [9a88f3a3] check-in: [9a6256cf] 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: [cc477192] check-in: [06b16752] 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: [819b07b5] check-in: [b88ef030] 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: [1d392a93] check-in: [f62c2470] user: mgagnon branch: trunk, size: 31936
2017-01-06
15:28
Upgrade dirent.h to version 1.22. Minor spacing changes. file: [0725db42] check-in: [b66b99cd] 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: [6ac75f30] check-in: [856ca01b] user: mgagnon branch: gdiff-tmpfilename-prefix, size: 31830
2016-10-31
12:41
Fix harmless memory leaks. file: [96150377] check-in: [36babe0c] user: drh branch: trunk, size: 31436
2016-10-25
20:25
Add the --command option to "fossil diff". file: [7a5ead4e] check-in: [eb67f09c] user: drh branch: trunk, size: 31416
2016-10-01
03:39
Merge updates from trunk. file: [701f6a25] check-in: [3e4eba78] 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: [2ff4e67d] check-in: [9a993896] user: mistachkin branch: dirSymlinks, size: 31274
02:23
Minor correction to text in usage help/comment in new --checkin option. file: [9a7f1a6e] check-in: [5aacaba3] 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: [2d1eeca3] check-in: [38daa9aa] user: drh branch: diff-show-changes, size: 31271
15:18
Change the name of the --changes option on "fossil diff" to --checkin. file: [e2e37cc6] check-in: [65724af1] 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: [8cb2d1c5] check-in: [4556962d] 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: [151a9d67] check-in: [68194175] 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: [3759afce] check-in: [f070ec99] user: rberteig branch: ross-spellcheck, size: 30472
2016-04-01
13:37
Fix typos in comments. No changes to code. file: [55034d59] check-in: [b6b50b12] user: mistachkin branch: trunk, size: 30472
2015-12-24
13:28
Fix a harmless compiler warning and several over-length source code lines. file: [6ccec8e0] check-in: [d94362b6] user: drh branch: trunk, size: 30472
2015-12-17
02:02
Remove stale code accidently left in an earlier commit. file: [7d153a7c] check-in: [61c8d418] 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: [c6fd4217] check-in: [b789df4b] 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: [8d92202a] check-in: [c46f9805] 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: [aafa5bbc] check-in: [825d78b6] user: mistachkin branch: trunk, size: 32755
2015-10-26
01:18
Skip diff for files that are ADDED_BY_INTEGRATE. file: [82f3f7bd] check-in: [a6b999ce] user: mistachkin branch: trunk, size: 31614
2015-10-22
11:30
Merge trunk. Almost forgot about this one. Please review. file: [6b649555] check-in: [af7de966] user: jan.nijtmans branch: exec-rel-paths, size: 32611
2015-09-16
10:49
eliminate many unnessary type-casts file: [f8c56e25] check-in: [5b456cfa] 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: [40be8a87] check-in: [a6fd491d] 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: [439d09a3] check-in: [f6c13632] user: drh branch: trunk, size: 31465
2015-09-11
13:53
Add support for the --undo option to the "fossil diff" command. file: [e925bc15] check-in: [485aa806] user: drh branch: trunk, size: 31216
13:14
Fix some commenting and variable naming convensions in the diff code. No logical changes. file: [186b3f54] check-in: [4140eb35] 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: [2043d6ba] check-in: [44d0a099] user: jan.nijtmans branch: exec-rel-paths, size: 29213
2015-06-11
21:50
merge trunk file: [0dd960c5] check-in: [5e9253da] user: jan.nijtmans branch: exec-rel-paths, size: 29101
21:25
Further improvements to the Tcl integration subsystem. file: [2e7b17d1] check-in: [18fc492a] 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: [54795417] check-in: [ddfb285c] 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: [9981c889] check-in: [e86aafed] 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: [bd005914] check-in: [c8a88273] user: jan.nijtmans branch: exec-rel-paths, size: 29002
2015-06-10
04:04
Add help text for the new setting. file: [45c8c2c3] check-in: [2369a92f] 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: [1d0d7e0a] check-in: [2036eef7] 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: [fe10eeb8] check-in: [55b4a751] 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: [5bfd5bee] check-in: [c9f32668] 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: [8439ce17] check-in: [3ffb6a3e] 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: [e85b2ef6] check-in: [c2df31da] user: mistachkin branch: mvRmHardFix, size: 28067
2015-04-27
13:19
Provide help text for all commands and webpages. file: [e3a5ca38] check-in: [7ab03289] 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: [45fd9167] check-in: [2f50d427] 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: [66ebc189] check-in: [dd94e596] 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: [9391a8ba] check-in: [421c9eee] 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: [3a9853d7] check-in: [d93d92eb] user: drh branch: separate-resource-files, size: 27978
2014-10-22
13:54
Proposed enhancements to the --tk diff viewer from Ramon Ribó. file: [e8720d48] check-in: [cbd4dca6] 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: [60038f46] check-in: [0a7e326f] 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: [5456dfdd] check-in: [4429a4c3] user: mistachkin branch: warningFixes, size: 38291
2014-09-05
06:23
Minor enhancements to the Tcl integration subsystem. file: [ddd84312] check-in: [946c3eb6] 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: [bd43f732] check-in: [d5a89404] 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: [67392311] check-in: [0a754750] user: jan.nijtmans branch: trunk, size: 38114
2014-05-19
09:56
Fix a compiler warning. file: [f80e1292] check-in: [c543079b] 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: [47bd95a6] check-in: [c0609471] 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: [28c75dcb] check-in: [9df71fe3] 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: [5e69ba76] check-in: [7440633e] 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: [30f5f896] check-in: [544d2213] user: drh branch: trunk, size: 38182
2014-04-01
19:52
Add the "Invert" button to the --tk diff display. file: [4a4c0644] check-in: [cf52a9ab] 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: [2d45ccdf] check-in: [a7a61cdd] user: jan.nijtmans branch: strip-trailing-cr, size: 37107
2014-03-13
12:55
merge trunk (ongoing) file: [9d2006ac] check-in: [2e45fb7b] 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: [a755f774] check-in: [28234db8] user: jan.nijtmans branch: trunk, size: 37108
14:38
Implement -b|--ignore-space-change. Doesn't work right yet (needs better hash function)! file: [7cfee831] check-in: [c0d1ed92] 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: [1c671582] check-in: [d9e79f68] user: jan.nijtmans branch: strip-trailing-cr, size: 37096
2014-03-05
22:54
Implement --strip-trailing-cr option file: [c8dd3a63] check-in: [4e6cfaf8] 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: [b7959112] check-in: [28b39cc5] user: jan.nijtmans branch: diff-eolws, size: 37115
00:42
Show "error" messages in Tk diff. file: [acd8da4a] check-in: [d4fea96a] 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: [77a17b68] check-in: [7763b2e6] 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: [54a67c01] check-in: [6392c032] 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: [d307ff3d] check-in: [2dffb0e0] 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: [e7a846c8] check-in: [31d25923] 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: [7d340b5f] check-in: [554607d3] user: joel branch: diff-eolws, size: 36668
2014-02-28
17:42
Fix harmless compiler warning. file: [9ad41c4b] check-in: [fade0558] user: mistachkin branch: trunk, size: 36468
10:34
Remove unnecessary spaces at end-of-lines. No change in functionality. file: [dafbc64f] check-in: [3df526ca] 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: [de5913c3] check-in: [1e0e0753] 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: [8743e12a] check-in: [8f65d49c] 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: [03f223a0] check-in: [9dca0042] user: drh branch: trunk, size: 35838
16:21
Add "Quit" and "Save As.." buttons to the "diff --tk" command. file: [dc6ff48c] check-in: [29d80dd2] 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: [52e90239] check-in: [f325b234] user: jan.nijtmans branch: branch-1.28, size: 34967
2014-02-04
20:52
Give window a chance to finish handling <Destroy> event. file: [ba2fe709] check-in: [d7b0617c] user: jan.nijtmans branch: trunk, size: 34906
20:40
Improve some comments and whitespace. file: [4c1361a1] check-in: [be267722] user: mistachkin branch: trunk, size: 34896
20:30
Cleanup use of Tcl integration for launching the Tk diff viewer internally. file: [54a76b77] check-in: [fe9990ad] 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: [67a05613] check-in: [252aff3e] 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: [4399d155] check-in: [c275d8dd] 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: [aa3441ac] check-in: [45f35169] user: jan.nijtmans branch: trunk, size: 34185
2014-01-05
11:03
styling file: [45a87055] check-in: [0c1a1167] 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: [13fd7002] check-in: [70a374d9] 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: [4f78422b] check-in: [c8c56468] 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: [45ed873a] check-in: [cee30a34] 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: [e8aab263] check-in: [326a7364] 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: [7cd89a5a] check-in: [f92d80d4] user: jan.nijtmans branch: trunk, size: 33761
2013-08-22
03:04
Tcl script code style fix. file: [14896192] check-in: [41dbd44b] 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: [fd73f095] check-in: [09c2cf3e] user: jan.nijtmans branch: trunk, size: 33735
02:26
Tk diff: Just stick with default fonts (with an exception for Windows). file: [452ee6bd] check-in: [7e9c7c04] user: joel branch: trunk, size: 33740
2013-07-18
23:01
Assume input is UTF-8. Remove unnecessary font. file: [05606b2e] check-in: [431b4575] 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: [0be4d549] check-in: [f3410724] user: joel branch: trunk, size: 33920
20:21
Tk diff: Fix a couple scrollbar issues. file: [0c488255] check-in: [a6c96aea] user: joel branch: trunk, size: 33848
2013-07-17
12:04
merge trunk file: [4d85b8cf] check-in: [5d8551bf] 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: [5d9b7a35] check-in: [af9bda81] user: joel branch: sbsreloaded, size: 33783
2013-07-13
23:10
Tk diff: Fix up scrolling code that previously assumed equal line lengths. file: [e9a66b63] check-in: [2e7b57fa] 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: [83ecd2f5] check-in: [6b59760e] 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: [abac5f41] check-in: [90fa0601] user: joel branch: sbsreloaded, size: 32737
2013-07-10
21:41
Set text widgets to "-state disabled" after loading data. file: [c11cc788] check-in: [302ab3a4] user: joel branch: sbsreloaded, size: 32536
18:06
Combine all diffs into a single display in Tk diff. file: [294cb0ef] check-in: [0a41e2b3] user: joel branch: sbsreloaded, size: 32488
05:27
Use tab stops instead of spaces to equalize line lengths in Tk diff. file: [a0354ab4] check-in: [695156c1] user: joel branch: sbsreloaded, size: 32434
2013-07-09
20:51
Add better comment explaining why .txtA/.txtB lines are padded with spaces. file: [d0b104ee] check-in: [2d8f2b4e] 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: [61267a69] check-in: [0a869beb] 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: [52afbf24] check-in: [4081a91c] user: joel branch: sbsreloaded, size: 32284
2013-06-22
21:45
Press "q" to exit the --tk diff window. file: [c8fbbadd] check-in: [8db6f987] 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: [9c14d774] check-in: [e3f7ba55] 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: [2dae314d] check-in: [0a5abbee] 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: [18f0957e] check-in: [9359b41f] user: jan.nijtmans branch: trunk, size: 27228
2013-04-08
10:42
Consistant use of DIFF_CANNOT_COMPUTE_??? messages file: [efa89b05] check-in: [b18276cb] 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: [8c0a563b] check-in: [2d14d82c] 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: [f7dd634f] check-in: [a7e77a66] user: jan.nijtmans branch: ui-no-utf8, size: 27777
2013-03-19
10:06
merge trunk (still experimental) file: [5795727f] check-in: [af4d7804] user: jan.nijtmans branch: use-blob_strip_bom, size: 27772
2013-02-27
11:26
merge trunk file: [d5784e2d] check-in: [d085eb9a] 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: [300318ae] check-in: [b5b8448e] 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: [bb11b3f9] check-in: [97a7b924] 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: [e2ac6b17] check-in: [60d5b1f5] user: drh branch: trunk, size: 27222
2012-11-05
13:56
merge trunk file: [8d86e3c6] check-in: [b0e05a90] 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: [c41bc308] check-in: [cd06b7d8] user: jan.nijtmans branch: use-blob_strip_bom, size: 27587
2012-10-30
15:18
working utf-16 diff, still being tested file: [a34ab4c2] check-in: [879d1e24] user: jan.nijtmans branch: use-blob_strip_bom, size: 27611
2012-10-16
12:19
Updating from trunk. file: [2af60ea2] check-in: [3cdf9480] 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: [3acaaa54] check-in: [773c6c5f] 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: [ddb31a02] check-in: [ae092ec6] 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: [1baa5005] check-in: [f4b082d4] 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: [160d2565] check-in: [4e0e69f6] user: drh branch: trunk, size: 27042
12:38
Get the --tk option working for "fossil stash diff". file: [28669a1d] check-in: [2ed8cdc5] 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: [6a041e2e] check-in: [064afb22] 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: [1bdabe4a] check-in: [c50eb507] 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: [1c03b610] check-in: [5a4fbb0a] user: drh branch: trunk, size: 20357
2012-09-27
01:38
Fixes to the --tk diff option to support unified diff on Windows. file: [91114bf6] check-in: [1048bccf] user: mistachkin branch: trunk, size: 20354
00:37
Allow unified diff for the --tk diff option. file: [982c85b5] check-in: [5be507df] user: mistachkin branch: trunk, size: 20349
2012-09-26
14:11
merge file: [66b13218] check-in: [84f1b5b3] user: jan.nijtmans branch: trunk, size: 20285
14:10
Make "fossil diff --tk" work on Windows as well. file: [ef548f9b] check-in: [b836ec8a] 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: [f88066a5] check-in: [aba451e9] 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: [71b39dcf] check-in: [22e5d711] user: drh branch: trunk, size: 20261
2012-09-08
13:13
Fix a harmless compiler warning. file: [4b187968] check-in: [c42408e1] user: drh branch: trunk, size: 17971
2012-09-07
21:12
On windows, make "gdiff" default to using WinDiff.exe. file: [f70e6d0d] check-in: [cad57bf6] user: drh branch: trunk, size: 17977
2012-09-05
12:55
const-qualification file: [67ffee66] check-in: [645f3483] 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: [647e0fef] check-in: [9f6abc59] 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: [9bdfa7b5] check-in: [2b176750] user: drh branch: trunk, size: 17593
2012-08-08
13:46
Updating from trunk. I solved three merge conflicts about hyperlinks. file: [04d87d43] check-in: [08db3204] user: viriketo branch: annotate_links, size: 17790
2012-07-14
11:40
Changes to the root-tag processing to provide better error messages. file: [2fa9b1c3] check-in: [36134ce2] 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: [a516b3bd] check-in: [f06e492a] 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: [67ba6621] check-in: [0328d681] 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: [323be077] check-in: [7a57ab64] user: mgagnon branch: mgagnon_fix, size: 17310
2012-04-28
08:03
Refinements to the new hyperlink logic and spider defense. file: [ced292ca] check-in: [d9c8a7dd] user: drh branch: spider-defense, size: 17268
2012-04-04
16:20
Updating from trunk to get the latest trunk fixes. file: [cbd521dd] check-in: [b7f3a32d] user: viriketo branch: annotate_links, size: 17469
2012-03-29
14:54
Add vim modline everywhere file: [f7bcca86] check-in: [a496d8e8] 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: [64a0e950] check-in: [6be0898b] user: mistachkin branch: winFiles, size: 17272
2012-03-18
14:53
Making the side-by-side diffs autocalculate the width, by default. file: [9a0cd0d1] check-in: [16397d86] user: viriketo branch: annotate_links, size: 17320
2012-02-08
00:34
Fix issues with the --brief option to the diff command. file: [313e3caf] check-in: [fbaa7ca9] user: drh branch: trunk, size: 17123
2012-02-07
15:38
Add the --brief option to the "diff" command. file: [c1b9dfba] check-in: [e0565d43] user: drh branch: trunk, size: 17143
2012-02-04
14:58
Make sure diff output is flushed to screen in a timely manner. file: [6d4a016d] check-in: [dc96d73d] 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: [2fd32d95] check-in: [ab47cc73] user: drh branch: trunk, size: 16926
21:31
Add support for side-by-side diff from the command-line "diff" command. file: [ad966875] check-in: [ac81759f] 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: [84e3e30c] check-in: [3bbbbdfd] 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: [3111a4c6] check-in: [9fe787ec] user: viriketo branch: extended_ci_names, size: 16592
2011-09-14
17:45
Refactored g.okXXX perms flags to g.perm.XXX. file: [57e9384f] check-in: [34b4dec0] 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: [3bb0066d] check-in: [3fbf8caa] 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: [f3d98243] check-in: [8a0c5469] 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: [d02f0bfc] check-in: [4778edd3] user: drh branch: symlinks, size: 16282
2011-08-22
22:20
Merge trunk. file: [08d74219] check-in: [c57830be] user: dmitry branch: symlinks, size: 16282
2011-07-30
10:10
Allow more than one file to be specified to the diff command. file: [39a79a47] check-in: [3cdcb515] 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: [f9bf7dd9] check-in: [2a013f02] user: drh branch: trunk, size: 15281
2011-05-30
06:55
Online help for several more commands adapted file: [ba37ca82] check-in: [d23f9887] 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: [2e2140e0] check-in: [850d3df4] 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: [82116996] check-in: [eea64490] 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: [1c57ba99] check-in: [3c39caac] user: drh branch: trunk, size: 15244
2011-02-20
21:24
Suppress unnecessary "CHANGED" lines in diff output. file: [3a20b005] check-in: [1d49c2f6] 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: [73fa1c05] check-in: [4bdf71b1] 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: [4b058a8f] check-in: [a1814d50] user: drh branch: file-safety, size: 14484
2011-02-07
17:51
Merge latest trunk. file: [0abb088e] check-in: [d7d335a6] user: dmitry branch: symlinks, size: 15251
2011-02-04
03:21
Do not show blank changes when doing a diff. file: [3539b639] check-in: [d5729c31] 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: [3977bc87] check-in: [ed2ef7e9] 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: [420250eb] check-in: [31c52c7b] 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: [f9857e68] check-in: [1bea7f69] user: drh branch: trunk, size: 14418
2010-12-18
21:22
Add the "stash diff" and "stash gdiff" commands. file: [64e57185] check-in: [987e0ff7] 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: [8fd73518] check-in: [34341a10] 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: [38144030] check-in: [e154a438] 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: [0eff3efa] check-in: [c0c3d923] user: drh branch: trunk, size: 14384
2010-11-07
10:13
merge from trunk file: [ffb54245] check-in: [8050311d] 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: [c91aeb54] check-in: [d9880a80] user: drh branch: trunk, size: 14381
2010-11-02
18:23
merge from trunk file: [6ad6cc7d] check-in: [cb75de51] 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: [03c15793] check-in: [bd68e417] user: drh branch: trunk, size: 14860
2010-10-26
19:01
merge from trunk file: [a44194e1] check-in: [4260bc6a] 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: [922d7c87] check-in: [a64b48cb] 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: [2f2fbc70] check-in: [ec56d8ff] user: drh branch: experimental, size: 14751
2010-10-16
17:33
merge from trunk file: [d66250dc] check-in: [586b0eb1] user: wolfgang branch: wolfgangHelpCmd, size: 14755
16:32
Bring over the latest bug fixes from trunk. file: [8a610570] check-in: [b2175857] user: drh branch: experimental, size: 14741
12:13
Do not free memory not obtained from malloc in the "fossil diff" command. Ticket [38d7bb8cf044219c2eff8]. file: [8e871d9e] check-in: [ddb975e2] user: drh branch: trunk, size: 14544
2010-10-15
20:37
Refactor the control-artifact parser. file: [129f214c] check-in: [da9fcdc9] user: drh branch: experimental, size: 14712
16:11
merge from trunk file: [6288aeda] check-in: [c1271793] 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: [54cf2d37] check-in: [70365348] 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: [ee8f1418] check-in: [585360b4] user: drh branch: trunk, size: 13936
2010-10-09
15:34
link the command line help to the gui pages, where appropriate file: [6b0632cb] check-in: [a5cd7927] user: wolfgang branch: wolfgangHelpCmd, size: 12865
2010-10-08
15:05
fine tuning the layout of the command line help strings file: [2e13f08d] check-in: [c6d18790] user: wolfgang branch: wolfgangHelpCmd, size: 12661
12:18
removed quotes from command cross references and add them in help command file: [bb4684c3] check-in: [b3bf08cc] user: wolfgang branch: wolfgangHelpCmd, size: 12658
12:10
shorten command lines to 80 char file: [90e653a4] check-in: [ad29dc11] user: wolfgang branch: wolfgangHelpCmd, size: 12660
12:02
added cross reference links to command line help in the gui file: [f96792a6] check-in: [b76a547f] user: wolfgang branch: wolfgangHelpCmd, size: 12661
2010-09-17
06:04
removed dupe block in if() statement file: [6e48d329] check-in: [63dc0641] user: bharder branch: trunk, size: 12654
06:02
less threatening desc. for removing an artifact from repo file: [0ad0d3fa] check-in: [6938d5fe] user: bharder branch: lang, size: 12658
2010-08-31
01:53
Merge the changes from the windowscompilers branch into the trunk. file: [23ac471e] check-in: [3564af0f] 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 Digital Mars C compiler    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: Checks if one of the windows compilers is used. If so we define _WIN32. Defining _WIN32 is normally done by#include <windows.h> However most of the time we don't use windows.h. Adding an other windows compiler is done by adding "|| defined(__COMPILER_IDENTIFIER__)" and maybe some special things in the files below. Like These have all __MINGW32__ replaced by _WIN32. And in some places special processing for either MINGW32 or DMC In popen2 the _open_osfHandle call first parameter is cast to a long. DMC refused to compile without the cast. DMC complained that it didn't knew of time_t in rss.h. time.h came after rss.h. Switching the two solved it! 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. 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. 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. file: [ecd24a9c] check-in: [f66f414f] 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: [208cf1c1] check-in: [0cdb6403] 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: [5101c22e] check-in: [af977263] 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: [893876aa] check-in: [1e08452c] 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: [5202ea28] check-in: [5ef7435a] 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: [2e327ef7] check-in: [296b90a2] user: drh branch: trunk, size: 12517
2010-05-16
19:08
Change from GPL to the Simplified BSD License. file: [7ea735bd] check-in: [c06edd23] user: drh branch: clear-title, size: 11435
2010-03-18
14:20
Fix some compiler warnings on windows. file: [f20bad14] check-in: [73c24ae3] 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: [6b2be810] check-in: [76f169fc] 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: [88a94ee3] check-in: [7b82a73b] user: drh branch: trunk, size: 11701
2009-11-06
14:00
Add the ability to diff to arbitrary versions of a single file. file: [20363d7b] check-in: [fe8bb01d] 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: [5083153a] check-in: [149945be] user: drh branch: trunk, size: 9428
02:47
Continuing work on the "diff" command. file: [4a3e578a] check-in: [db608ee7] user: drh branch: trunk, size: 9398
01:59
Work toward improving the "diff" command. Get the "-r" or "--from" option working. file: [7503ab8f] check-in: [a51808c0] 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: [a53a1db3] check-in: [b2fdf4fe] 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: [4832395b] check-in: [0eb08b86] 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: [d11c5b07] check-in: [129edda9] 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: [5229e8f3] check-in: [aeaee1f3] 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: [38b20f87] check-in: [85670cfc] 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: [74bdae74] check-in: [c863ec1a] 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: [bf0ebffd] check-in: [2ecc407d] user: drh branch: trunk, size: 4020
2008-02-08
16:24
Fail with an error if a file is outside the checkout tree. file: [4f6e43e1] check-in: [b3ec774a] 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: [a54672e2] check-in: [371dd657] 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: [dfc5dfd3] check-in: [57b2735e] user: drh branch: trunk, size: 4065
2007-10-10
03:39
Added diff-command and gdiff-command to the valid settings file: [637be097] check-in: [29bc8da1] user: jnc branch: trunk, size: 4068
2007-09-28
20:08
Combine the "config" and "setting" commands into a single "settings" command. file: [4cfcd3d8] check-in: [134e2aec] user: drh branch: trunk, size: 4079
2007-09-26
03:37
Added revision support to diff and revert file: [e546baef] check-in: [574763ba] 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: [4af4f0ff] check-in: [01ce2cf3] 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: [a1065836] check-in: [c82fb617] 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: [16a1f705] check-in: [c9fdb846] user: drh branch: trunk, size: 3063
2007-07-21
14:10
Initial check-in of m1 sources. file: [42f78009] check-in: [dbda8d6c] user: drh branch: trunk, size: 2855 Added