OSDN Git Service
Kimmo Varis [Wed, 8 Apr 2009 19:45:09 +0000 (19:45 +0000)]
PATCH: [
2669526 ] ViewColor
Submitted by Matthias Mayer
Show added/deleted color also in selected difference.
Kimmo Varis [Wed, 8 Apr 2009 19:15:46 +0000 (19:15 +0000)]
Tests: Add test project for OptionsMgr tests.
Kimmo Varis [Wed, 8 Apr 2009 18:55:51 +0000 (18:55 +0000)]
Make CRegOptionsMgr more self-contained by including varprop.h instead of expecting user of the class including it.
Kimmo Varis [Wed, 8 Apr 2009 18:54:31 +0000 (18:54 +0000)]
Remove MFC dependency from varprop class.
Kimmo Varis [Tue, 7 Apr 2009 16:05:41 +0000 (16:05 +0000)]
Tests: Cmdline: add tests for third path.
Kimmo Varis [Tue, 7 Apr 2009 15:44:44 +0000 (15:44 +0000)]
Tests: Cmdline: Move test main function to own file. This makes including test cases easier.
Kimmo Varis [Tue, 7 Apr 2009 15:10:27 +0000 (15:10 +0000)]
PATCH: [
2725549 ] Set a codepage with command-line parameter
Submitted by bulklodd <bulklodd@users.sourceforge.net>
Kimmo Varis [Mon, 6 Apr 2009 20:45:34 +0000 (20:45 +0000)]
Docs: Update URL to SVN page to translation doc.
Tim Gerundt [Sun, 5 Apr 2009 19:35:38 +0000 (19:35 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Don't install plugins by default
Kimmo Varis [Sat, 4 Apr 2009 14:17:42 +0000 (14:17 +0000)]
Fix copy/paste error when renaming _DEBUG to STRINGDIFF_LOGGING in previous commit.
Kimmo Varis [Sat, 4 Apr 2009 13:41:40 +0000 (13:41 +0000)]
Use own #define for stringdiff logging. Stringdiff logging is verbose and slows down debug builds so it should be enabled only when debugging strindiff code.
Idea from Matthias Mayer.
Kimmo Varis [Sat, 4 Apr 2009 11:49:06 +0000 (11:49 +0000)]
Rename variables.
Takashi Sawanaka [Fri, 3 Apr 2009 23:17:42 +0000 (23:17 +0000)]
BUG: [
2550412 ] When conflictfile saved trailing line-ending is lost
Kimmo Varis [Fri, 3 Apr 2009 14:57:23 +0000 (14:57 +0000)]
PATCH: [
2669526 ] ViewColor
Submitted by Matthias Mayer
Show deleted in-line differences with own configurable color.
Kimmo Varis [Fri, 3 Apr 2009 13:43:49 +0000 (13:43 +0000)]
PATCH: [
2727151 ] "Invalid Argument"
Submitted by Matthias Mayer
Kimmo Varis [Thu, 2 Apr 2009 14:55:46 +0000 (14:55 +0000)]
Tests: Cmdline: Add bunch of new tests for second (right-side) path, quoting, linux path separator conversion etc.
Kimmo Varis [Thu, 2 Apr 2009 14:05:21 +0000 (14:05 +0000)]
Add command line path flags in command line parser.
Kimmo Varis [Wed, 1 Apr 2009 20:30:17 +0000 (20:30 +0000)]
Tests: Cmdline: Fix tests to have a executable name in command line. Add tests for left path. Currently left path tests fail since flag is not set in parser class.
Tim Gerundt [Wed, 1 Apr 2009 20:12:51 +0000 (20:12 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add own bitmap files
Tim Gerundt [Wed, 1 Apr 2009 19:49:55 +0000 (19:49 +0000)]
Web: Changes for new stable release 2.12.2
Kimmo Varis [Wed, 1 Apr 2009 19:33:23 +0000 (19:33 +0000)]
Tests: Cmdline: Rename cpp file containing test code to match naming in other test projects.
Kimmo Varis [Wed, 1 Apr 2009 19:28:03 +0000 (19:28 +0000)]
Fix initializing and setting FFILEOPEN_* values for path flags.
Tim Gerundt [Wed, 1 Apr 2009 18:57:37 +0000 (18:57 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add GUI
Kimmo Varis [Tue, 31 Mar 2009 18:23:48 +0000 (18:23 +0000)]
PATCH: [
2720875 ] Polish translation after Q&A
Submitted by Skiff
Kimmo Varis [Tue, 31 Mar 2009 17:47:05 +0000 (17:47 +0000)]
PATCH: [
2717382 ] Polish Update files for Branch+Trunk
Update for installer translation
Submitted by M.T <mtrz@users.sourceforge.net>
Kimmo Varis [Sun, 29 Mar 2009 17:04:31 +0000 (17:04 +0000)]
PATCH: [
2712120 ] patch for Bug#
2622196
Submitted by Matthias Mayer
Kimmo Varis [Sun, 29 Mar 2009 10:28:17 +0000 (10:28 +0000)]
Tests: Stringdiff: Fix more invalid test assumptions. All stringdiff tests pass.
Patch from Matthias Mayer
Kimmo Varis [Sun, 29 Mar 2009 10:04:51 +0000 (10:04 +0000)]
Tests: Stringdiff: Move test main function to own file. This makes including test cases easier.
Kimmo Varis [Sun, 29 Mar 2009 09:59:36 +0000 (09:59 +0000)]
Tests: Stringdiff: Fix wrong assumptions in the test (fixing the test at the same time).
Kimmo Varis [Sun, 29 Mar 2009 09:37:27 +0000 (09:37 +0000)]
PATCH: [
2717382 ] Polish Update files for Branch+Trunk
Submitted by M.T <mtrz@users.sourceforge.net>
Kimmo Varis [Fri, 27 Mar 2009 20:03:56 +0000 (20:03 +0000)]
Docs: Unit-testing: add paragraph about splitting tests to several files/cases.
Kimmo Varis [Fri, 27 Mar 2009 19:20:35 +0000 (19:20 +0000)]
Docs: Add missing end tag for italic text in Unit testing doc.
Kimmo Varis [Fri, 27 Mar 2009 19:12:15 +0000 (19:12 +0000)]
PATCH: [
2714968 ] Disable tree-view by default
Tim Gerundt [Thu, 26 Mar 2009 22:25:06 +0000 (22:25 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add more options to feature table
Kimmo Varis [Thu, 26 Mar 2009 21:44:22 +0000 (21:44 +0000)]
Tests: Add Google Test unit test for command line parsing.
Kimmo Varis [Thu, 26 Mar 2009 21:24:47 +0000 (21:24 +0000)]
Remove MFC dependency from MergeCmdLineInfo. Also comment out code to support some undocumented command line switches. This finally allows us to write unit tests for command line parsing.
Tim Gerundt [Thu, 26 Mar 2009 20:23:43 +0000 (20:23 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add plugins to setup
Kimmo Varis [Thu, 26 Mar 2009 20:06:30 +0000 (20:06 +0000)]
Move FFILEOPEN_* flags to Constants.h so they are available in non-MFC code. Also they aren't property of CMainFrame.
Kimmo Varis [Thu, 26 Mar 2009 16:51:38 +0000 (16:51 +0000)]
Tests: Add StringDiffs tests for empty strings.
Kimmo Varis [Thu, 26 Mar 2009 16:28:42 +0000 (16:28 +0000)]
Tests: Add StringDiffs tests for setting empty custom punctuation list.
Kimmo Varis [Thu, 26 Mar 2009 05:51:06 +0000 (05:51 +0000)]
Tests: Adding more stringdiffs tests from Matthias Mayer.
Kimmo Varis [Wed, 25 Mar 2009 18:59:30 +0000 (18:59 +0000)]
BUG: [
2638045 ] No difference highlighting at the end of the string
Fix submitted by Matthias Mayer
Kimmo Varis [Wed, 25 Mar 2009 08:49:02 +0000 (08:49 +0000)]
Tests: Add more stringdiff unit tests against earlier reported bugs.
Kimmo Varis [Wed, 25 Mar 2009 06:39:09 +0000 (06:39 +0000)]
Tests: Improve existing stringdiff bug tests. Fix one test having wrong assumptions. Now all tests pass again.
Modified from Matthias Mayer's patch.
Kimmo Varis [Tue, 24 Mar 2009 23:17:23 +0000 (23:17 +0000)]
Changelog: Czech translation update.
Kimmo Varis [Tue, 24 Mar 2009 19:13:48 +0000 (19:13 +0000)]
PATCH: [
2710146 ] Diff Pane highlighting bug in 2.6.0 - ID:
1590050
Submitted by Matthias Mayer
Kimmo Varis [Tue, 24 Mar 2009 18:31:27 +0000 (18:31 +0000)]
Tests: Add StringDiffs tests for adding chars at begin and end of the string.
Kimmo Varis [Mon, 23 Mar 2009 22:33:39 +0000 (22:33 +0000)]
Tests: Add stringdiff unit test for highlighting bug #
2638045 No difference highlighting at the end of the string.
Kimmo Varis [Mon, 23 Mar 2009 21:20:32 +0000 (21:20 +0000)]
PATCH: [
2672737 ] Wrong ""The selected files are identical." after F5
Kimmo Varis [Mon, 23 Mar 2009 15:29:39 +0000 (15:29 +0000)]
PATCH: [
2582768 ] Removeing tempfiles from WM
Submitted by Matthias Mayer (and edited by Kimmo)
Enable the feature in startup.
Kimmo Varis [Sun, 22 Mar 2009 15:57:33 +0000 (15:57 +0000)]
Docs: Update readme-developers for new version numbering scheme.
Tim Gerundt [Sun, 22 Mar 2009 12:27:31 +0000 (12:27 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add filters to setup
Kimmo Varis [Sat, 21 Mar 2009 09:41:22 +0000 (09:41 +0000)]
PATCH: [
2636551 ] stringdiffcolor.
Submitted by Matthias Mayer
Kimmo Varis [Sat, 21 Mar 2009 09:20:21 +0000 (09:20 +0000)]
Tests: Fix StringDiffs tests to behave like they really should be - earlier we just tweaked tests to behave like current implementation. Now when we have a patch fixing some bugs (#
2636551).
Kimmo Varis [Fri, 20 Mar 2009 15:07:50 +0000 (15:07 +0000)]
Tests: Use EXPECT_EQ instead of EXPECT_TRUE.
Jan Hryz [Thu, 19 Mar 2009 19:52:48 +0000 (19:52 +0000)]
Update of Czech translation
Kimmo Varis [Thu, 19 Mar 2009 18:18:18 +0000 (18:18 +0000)]
Update PO files from current POT file.
Kimmo Varis [Thu, 19 Mar 2009 18:14:08 +0000 (18:14 +0000)]
WinMerge experimental release 2.13.5 (SVN revision 6579)
Kimmo Varis [Thu, 19 Mar 2009 18:12:09 +0000 (18:12 +0000)]
Update version numbers for 2.13.5 experimental release. Previous commit added wrong version numbers.
Kimmo Varis [Thu, 19 Mar 2009 18:06:13 +0000 (18:06 +0000)]
Update version numbers for 2.15.1 experimental release.
Kimmo Varis [Thu, 19 Mar 2009 18:03:46 +0000 (18:03 +0000)]
Manual: Update WinMerge version number to latest stable release.
Kimmo Varis [Thu, 19 Mar 2009 17:47:33 +0000 (17:47 +0000)]
BUG: [
2661838 ] 2.10.4.0 swap panes should swap stats too
Kimmo Varis [Thu, 19 Mar 2009 16:09:32 +0000 (16:09 +0000)]
RFE: [
2203904 ] "Include Subfolders": Enable Keyboard for Collapse/Expand
Tim Gerundt [Wed, 18 Mar 2009 19:45:22 +0000 (19:45 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup
Kimmo Varis [Wed, 18 Mar 2009 18:51:20 +0000 (18:51 +0000)]
PATCH: [
2687572 ] Add new ShellFileOperations wrapper for ShellFileOp()
Kimmo Varis [Sun, 15 Mar 2009 17:30:19 +0000 (17:30 +0000)]
Initialize folder selection dialog to currently selected folder in options dialog.
Kimmo Varis [Sun, 15 Mar 2009 14:33:03 +0000 (14:33 +0000)]
BUG: [
2686382 ] Trying to set "Global backup folder" option crashes WinMerge
Kimmo Varis [Sat, 14 Mar 2009 09:33:38 +0000 (09:33 +0000)]
Use paths_ConcatPath() to combine paths.
Kimmo Varis [Fri, 13 Mar 2009 15:37:51 +0000 (15:37 +0000)]
PATCH: [
2582768 ] Removeing tempfiles from WM
Fix build and do couple of more code cleanups.
Kimmo Varis [Thu, 12 Mar 2009 18:16:39 +0000 (18:16 +0000)]
PATCH: [
2582768 ] Removeing tempfiles from WM
Applying patch (removetempfiles12.patch) that deleted unused temp folders
Submitted by Matthias Mayer
Kimmo Varis [Wed, 11 Mar 2009 18:00:08 +0000 (18:00 +0000)]
PATCH: [
2559560 ] Keyboard shortcut for Discard All
Kimmo Varis [Wed, 11 Mar 2009 16:01:34 +0000 (16:01 +0000)]
PATCH: [
2679503 ] Fix crash writing a log
Tim Gerundt [Tue, 10 Mar 2009 20:28:05 +0000 (20:28 +0000)]
Web: Use new SF.net logo link
Takashi Sawanaka [Tue, 10 Mar 2009 20:21:41 +0000 (20:21 +0000)]
BUG: [
2670046 ] Extension Column is Empty.(2)
- Extension column was not sortable.
Tim Gerundt [Tue, 10 Mar 2009 20:10:48 +0000 (20:10 +0000)]
Web: Add "feature-requests.winmerge.org" to tracker shortcuts page
Kimmo Varis [Tue, 10 Mar 2009 18:47:04 +0000 (18:47 +0000)]
Write log file to user's My Documents -folder instead of temp folder. This makes the log file easier to find since with default settings the temp file folder in Windows is hidden.
Kimmo Varis [Tue, 10 Mar 2009 15:53:33 +0000 (15:53 +0000)]
Fix crash in log init caused by my previous commit.
Kimmo Varis [Tue, 10 Mar 2009 15:44:49 +0000 (15:44 +0000)]
Use String type for path in CLogFile (instead of CString).
Kimmo Varis [Tue, 10 Mar 2009 15:13:52 +0000 (15:13 +0000)]
Refactor CLogfile class to take full path to the log file as parameter.
Kimmo Varis [Mon, 9 Mar 2009 14:06:45 +0000 (14:06 +0000)]
PATCH: [
2670046 ] Extension Column is Empty.
Kimmo Varis [Sun, 8 Mar 2009 20:50:25 +0000 (20:50 +0000)]
Tests: Improve StringDiffsTest to not crash if tests fail.
Kimmo Varis [Sun, 8 Mar 2009 19:20:56 +0000 (19:20 +0000)]
PATCH: [
2672852 ] Updated dutch translation for trunk (2009-03-08)
Submitted by Thomas De Rocker
Kimmo Varis [Sun, 8 Mar 2009 19:16:03 +0000 (19:16 +0000)]
PATCH: [
2669562 ] Updated Swedish translation for Trunk
Submitted by Hans Eriksson
Kimmo Varis [Sun, 8 Mar 2009 11:23:53 +0000 (11:23 +0000)]
Tests: Fix test description.
Kimmo Varis [Sun, 8 Mar 2009 11:07:32 +0000 (11:07 +0000)]
Tests: Cleanup Stringdiff test assumptions.
From PATCH: [
2636551 ] stringdiffcolor
by Matthias Mayer
Tim Gerundt [Fri, 6 Mar 2009 21:34:27 +0000 (21:34 +0000)]
Web: Move branch name to stable release class
Tim Gerundt [Fri, 6 Mar 2009 19:58:17 +0000 (19:58 +0000)]
Web: Changes for new stable release 2.12.0
Tim Gerundt [Thu, 5 Mar 2009 19:48:04 +0000 (19:48 +0000)]
Web: Add list of subdomains to tracker shortcuts page
Tim Gerundt [Wed, 4 Mar 2009 19:51:53 +0000 (19:51 +0000)]
Web: Fix link in PAD file page
Kimmo Varis [Wed, 4 Mar 2009 17:39:32 +0000 (17:39 +0000)]
Changelog: Czech translation update
Kimmo Varis [Wed, 4 Mar 2009 15:48:21 +0000 (15:48 +0000)]
PATCH: [
2659228 ] Remember last copy/move to -folder
Jan Hryz [Tue, 3 Mar 2009 21:56:54 +0000 (21:56 +0000)]
Update of Czech translation
Kimmo Varis [Tue, 3 Mar 2009 19:44:54 +0000 (19:44 +0000)]
WinMerge experimental release 2.13.4 (SVN revision 6529)
Kimmo Varis [Tue, 3 Mar 2009 19:40:18 +0000 (19:40 +0000)]
Update language PO files from latest POT file.
Kimmo Varis [Tue, 3 Mar 2009 19:20:23 +0000 (19:20 +0000)]
Update version numbers for 2.13.4 experimental release.
Kimmo Varis [Tue, 3 Mar 2009 19:19:16 +0000 (19:19 +0000)]
Docs: Mention in readme.txt (source code one) that Testing folder contains unit tests.
Kimmo Varis [Tue, 3 Mar 2009 19:09:27 +0000 (19:09 +0000)]
Revert PATCH: [
2636551 ] stringdiffcolor.
Revert last commit that caused many unit test failures from StringDiff.
Kimmo Varis [Tue, 3 Mar 2009 17:28:10 +0000 (17:28 +0000)]
PATCH: [
2636551 ] stringdiffcolor.
Submitted by Matthias Mayer
Kimmo Varis [Tue, 3 Mar 2009 16:44:11 +0000 (16:44 +0000)]
PATCH: [
2638608 ] Autoprediff
Submitted by Matthias Mayer
Kimmo Varis [Tue, 3 Mar 2009 16:20:28 +0000 (16:20 +0000)]
PATCH: [
2582768 ] Removeing tempfiles from WM
Fix bug that temp file folder was not removed
Patch EmptyingFolder.patch by Kimmo