OSDN Git Service
Kimmo Varis [Thu, 23 Apr 2009 14:14:28 +0000 (14:14 +0000)]
BUG: [
2774677 ] Large Files crash WinMerge...
Limit linebuffer growth speed.
Kimmo Varis [Thu, 23 Apr 2009 13:20:28 +0000 (13:20 +0000)]
Docs: We don't build/install libexpatw.dll.
Kimmo Varis [Thu, 23 Apr 2009 13:10:04 +0000 (13:10 +0000)]
Docs: Fix errors in WIX installer doc as suggested by Tim.
Kimmo Varis [Wed, 22 Apr 2009 19:56:13 +0000 (19:56 +0000)]
Docs: Add documentation for new MSI/WIX installer.
Kimmo Varis [Tue, 21 Apr 2009 15:20:17 +0000 (15:20 +0000)]
PATCH: [
2771123 ] Cleanup spelling
Submitted by Matthias Mayer
Kimmo Varis [Tue, 21 Apr 2009 14:42:36 +0000 (14:42 +0000)]
PATCH: [
2776705 ] Add more types for CPP syntax highlight
Kimmo Varis [Tue, 21 Apr 2009 14:12:15 +0000 (14:12 +0000)]
Couple of type fixes for 64-bit build.
Kimmo Varis [Tue, 21 Apr 2009 14:10:34 +0000 (14:10 +0000)]
Fix const that caused build failure.
Tim Gerundt [Tue, 21 Apr 2009 10:29:06 +0000 (10:29 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Register shell extension
Tim Gerundt [Tue, 21 Apr 2009 10:15:37 +0000 (10:15 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Disallow advertising for features
Tim Gerundt [Tue, 21 Apr 2009 10:05:26 +0000 (10:05 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add shell extension as own feature
Tim Gerundt [Mon, 20 Apr 2009 21:38:30 +0000 (21:38 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Change output path to normal build path and add platform to output name
Kimmo Varis [Mon, 20 Apr 2009 20:49:22 +0000 (20:49 +0000)]
Add couple of missing files to 64-bit build project file.
Kimmo Varis [Mon, 20 Apr 2009 19:52:33 +0000 (19:52 +0000)]
Fix some 64-bit build warnings about type casts.
Tim Gerundt [Mon, 20 Apr 2009 19:43:12 +0000 (19:43 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Build own setups for 32 and 64 bit
Kimmo Varis [Mon, 20 Apr 2009 17:45:33 +0000 (17:45 +0000)]
Couple of 64-bit build fixes. Fix types to use correct pointer types. Fix offset to use 64-bit size.
Tim Gerundt [Mon, 20 Apr 2009 07:02:11 +0000 (07:02 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Mark most components as 32bit
Tim Gerundt [Mon, 20 Apr 2009 06:43:10 +0000 (06:43 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Use auto-generated product id
Kimmo Varis [Sun, 19 Apr 2009 19:36:39 +0000 (19:36 +0000)]
BUG: [
2772646 ] left & right description is the same one
Submitted by black hero <black-hero@users.sourceforge.net>
Kimmo Varis [Sun, 19 Apr 2009 11:04:04 +0000 (11:04 +0000)]
Tests: Cmdline: enable tests that earlier caused a crash when EOL/tab was in command line.
Kimmo Varis [Sun, 19 Apr 2009 11:01:47 +0000 (11:01 +0000)]
Changelog: Bugfix: Crash if tabs or EOLs in command line
Jochen Tucht [Sun, 19 Apr 2009 09:23:58 +0000 (09:23 +0000)]
BUG: [
2726995 ] Crash caused by tabs or EOLs in middle of command line
Kimmo Varis [Sat, 18 Apr 2009 16:57:43 +0000 (16:57 +0000)]
Update 64-bit project/solution files.
Tim Gerundt [Thu, 16 Apr 2009 21:38:09 +0000 (21:38 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Move some properties to own config file
Kimmo Varis [Thu, 16 Apr 2009 21:21:46 +0000 (21:21 +0000)]
Remove Frhed sources from WinMerge source tree. Use stand-alone Frhed and Frhed sources for now on.
Tim Gerundt [Thu, 16 Apr 2009 19:31:02 +0000 (19:31 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add a basic MSBuild script for the setup
Kimmo Varis [Thu, 16 Apr 2009 17:51:43 +0000 (17:51 +0000)]
WinMerge experimental release 2.13.6 (SVN revision 6665)
Kimmo Varis [Thu, 16 Apr 2009 17:50:59 +0000 (17:50 +0000)]
Update POT and PO translation files for WinMerge 2.13.6 experimental release.
Kimmo Varis [Thu, 16 Apr 2009 17:45:19 +0000 (17:45 +0000)]
WinMerge experimental release 2.13.6 (SVN revision 6663)
Kimmo Varis [Thu, 16 Apr 2009 17:26:26 +0000 (17:26 +0000)]
PATCH: [
2669526 ] ViewColor
Set custom colors for new worddiff types.
Kimmo Varis [Thu, 16 Apr 2009 17:09:15 +0000 (17:09 +0000)]
Update versions numbers for 2.13.6 experimental.
Tim Gerundt [Thu, 16 Apr 2009 08:41:58 +0000 (08:41 +0000)]
Installer: Remove heksedit from MSI setup too
Kimmo Varis [Thu, 16 Apr 2009 08:04:19 +0000 (08:04 +0000)]
Installer: Don't install heksedit.
Kimmo Varis [Thu, 16 Apr 2009 07:57:56 +0000 (07:57 +0000)]
Buildscript: Don't build and package heksedit from WinMerge source tree. Heksedit will be used from stand-alone Frhed installation in future releases.
Kimmo Varis [Thu, 16 Apr 2009 07:55:06 +0000 (07:55 +0000)]
Don't build hexedit from WinMerge source tree (it will be used from stand-alone Frhed installation in future releases).
Kimmo Varis [Tue, 14 Apr 2009 20:09:40 +0000 (20:09 +0000)]
Installer: make including heksedit in installer optional
Kimmo Varis [Tue, 14 Apr 2009 19:18:31 +0000 (19:18 +0000)]
PATCH: [
2669526 ] ViewColor
Submitted by Matthias Mayer
Show added/deleted color also in selected difference.
Kimmo Varis [Mon, 13 Apr 2009 11:47:23 +0000 (11:47 +0000)]
PATCH: [
2726531 ] Show XML config files like XML files
Submitted by bulklodd
Jochen Tucht [Sun, 12 Apr 2009 09:30:35 +0000 (09:30 +0000)]
Adapt to heksedit hosting interface version 1; Require heksedit.dll to be regsvr32ed.
Kimmo Varis [Thu, 9 Apr 2009 14:12:16 +0000 (14:12 +0000)]
Tests: Add unit test project for testing ShellFileOperations class.
Kimmo Varis [Wed, 8 Apr 2009 21:48:47 +0000 (21:48 +0000)]
Tests: OptionsMgr: Add tests for VariantValue class.
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.