OSDN Git Service
bovirus [Mon, 29 Jul 2019 13:17:37 +0000 (15:17 +0200)]
Update Italian Installer language
Please take care that github report the t file is code as ISO8859.
For me should be as UTF-8
Takashi Sawanaka [Sun, 28 Jul 2019 12:42:33 +0000 (21:42 +0900)]
GUITests: Add more tests (5)
Takashi Sawanaka [Sun, 28 Jul 2019 07:02:53 +0000 (16:02 +0900)]
Compare Statistics dialog: The number of diff folders was counted in the number of diff files
Takashi Sawanaka [Sun, 28 Jul 2019 04:17:20 +0000 (13:17 +0900)]
Update release notes and changelog for 2.16.4
Takashi Sawanaka [Sun, 28 Jul 2019 04:15:59 +0000 (13:15 +0900)]
Bump revision to 2.16.4
Takashi Sawanaka [Sat, 27 Jul 2019 11:12:07 +0000 (20:12 +0900)]
FolderCompare: Fix the problem that folders may not be compared correctly when selecting folders and selecting 'View / Refresh Selected' menu item
Takashi Sawanaka [Sat, 27 Jul 2019 05:20:22 +0000 (14:20 +0900)]
GUITests: Add more tests (4)
Takashi Sawanaka [Thu, 25 Jul 2019 23:12:30 +0000 (08:12 +0900)]
GUITests: Take a screenshot after selecting a menu item
Tim Gerundt [Wed, 24 Jul 2019 04:11:07 +0000 (06:11 +0200)]
Drop some unused custom messages from InnoSetup files
Tim Gerundt [Wed, 24 Jul 2019 04:05:13 +0000 (06:05 +0200)]
Backport some InnoSetup translation from InnoSetup itself
Takashi Sawanaka [Wed, 24 Jul 2019 14:47:53 +0000 (23:47 +0900)]
GUITests: Add more tests (3)
Takashi Sawanaka [Tue, 23 Jul 2019 22:29:02 +0000 (07:29 +0900)]
Bitbucket-jp issue #16: PrediffLineFilter.sct: Fix wrong encoding
Takashi Sawanaka [Mon, 22 Jul 2019 23:17:05 +0000 (08:17 +0900)]
GUITests: Add more tests (2)
Takashi Sawanaka [Mon, 22 Jul 2019 13:55:40 +0000 (22:55 +0900)]
GUITests: Add more tests
Takashi Sawanaka [Mon, 22 Jul 2019 13:17:12 +0000 (22:17 +0900)]
Merge.rc: Remove the "Edit with Unpacker ..." menu item in the MainFrame menu that can not be clicked.
Takashi Sawanaka [Sun, 21 Jul 2019 22:31:10 +0000 (07:31 +0900)]
Add GUITests project
Takashi Sawanaka [Sun, 21 Jul 2019 10:24:00 +0000 (19:24 +0900)]
Fix an issue where the Window/Close All menu item is not enabled when only the Open dialog window is open
Takashi Sawanaka [Wed, 17 Jul 2019 22:29:50 +0000 (07:29 +0900)]
BuildManual.cmd: Remove unneccessary mkdir command call
Takashi Sawanaka [Mon, 15 Jul 2019 22:53:02 +0000 (07:53 +0900)]
Manual/build/build*.bat: Make the batch file executable outside of the Manual/build directory
Takashi Sawanaka [Sun, 14 Jul 2019 14:12:36 +0000 (23:12 +0900)]
Update translation
Takashi Sawanaka [Sun, 14 Jul 2019 08:50:54 +0000 (17:50 +0900)]
Installer: Remove ExeName and WinMergeExeName function
Takashi Sawanaka [Sat, 13 Jul 2019 07:50:34 +0000 (16:50 +0900)]
Installer: Avoid requiring a restart of Explorer If the version of ShellExtension has not changed
Takashi Sawanaka [Sat, 13 Jul 2019 02:16:44 +0000 (11:16 +0900)]
Contributors.txt: Replace 'at' in the email address with @
https://bitbucket.org/winmerge/winmerge/commits/
39d00e08f6afc13ab18f79c01f8b33df10579973#comment-
7697152
Takashi Sawanaka [Fri, 12 Jul 2019 21:47:26 +0000 (06:47 +0900)]
Merge
Takashi Sawanaka [Fri, 12 Jul 2019 21:45:50 +0000 (06:45 +0900)]
Update Contributors.txt
Takashi Sawanaka [Fri, 12 Jul 2019 21:41:56 +0000 (21:41 +0000)]
Merged in Michele-Locati/update-italian-translation-
1562942301965 (pull request #52)
Update Italian translation
Michele Locati [Fri, 12 Jul 2019 14:39:07 +0000 (14:39 +0000)]
Update Italian translation
--HG--
branch : Michele-Locati/update-italian-translation-
1562942301965
Takashi Sawanaka [Thu, 11 Jul 2019 12:57:09 +0000 (21:57 +0900)]
Fix bitbucket-jp issue #15:Generating HTML Folder Compare report including File Compare report does not complete
Takashi Sawanaka [Tue, 9 Jul 2019 22:54:48 +0000 (07:54 +0900)]
Remove #ifdef _UNICODE (2)
Takashi Sawanaka [Mon, 8 Jul 2019 22:55:37 +0000 (07:55 +0900)]
Remove #ifdef _UNICODE
Takashi Sawanaka [Mon, 8 Jul 2019 22:47:14 +0000 (07:47 +0900)]
AboutDlg: Remove "Unicode" string from about-info (2)
Takashi Sawanaka [Mon, 8 Jul 2019 22:42:47 +0000 (07:42 +0900)]
xutils.c: Under the following conditions
- Select diff algorithm other than 'default'
- Enable 'Ignore changes' or 'Ignore all' in 'Whitespace' group (XDF_IGNORE_WHITESPACE_CHANGE or XDF_IGNORE_WHITESPACE)
- EOL on the last line of the file does not exist on the other side but has the same content
libxdiff assumes that the last line is not different. However, it is not compatible with WinMerge. So I correct as there is a difference.
Takashi Sawanaka [Mon, 8 Jul 2019 22:37:02 +0000 (07:37 +0900)]
AboutDlg: Remove "Unicode" string from about-info
Takashi Sawanaka [Sun, 7 Jul 2019 12:14:21 +0000 (21:14 +0900)]
Display WinMerge logo beautifully on HiDPI screen
datadiode [Sat, 6 Jul 2019 12:25:45 +0000 (14:25 +0200)]
Avoid an exception in GuessCodepageEncoding() when filepath equals "NUL"
datadiode [Sat, 6 Jul 2019 12:18:44 +0000 (14:18 +0200)]
Consolidate FolderCmp (3)
Have the folder compare threads create a reusable FolderCmp instance in advance rather than repeatedly create dedicated ones for every single file comparison.
Takashi Sawanaka [Sat, 6 Jul 2019 10:49:56 +0000 (19:49 +0900)]
Editlib: Fix auto-indent not work when EOL-style is not CRLF
datadiode [Sat, 6 Jul 2019 06:19:25 +0000 (08:19 +0200)]
Consolidate FolderCmp (2)
Store pointer to CDiffContext as a member in FolderCmp.
Next planned step is to have the folder compare threads create a reusable FolderCmp instance in advance rather than repeatedly create dedicated ones for every single file comparison.
Takashi Sawanaka [Thu, 4 Jul 2019 23:17:55 +0000 (08:17 +0900)]
Reduce the size of the executable file (3)
Takashi Sawanaka [Wed, 3 Jul 2019 22:44:48 +0000 (07:44 +0900)]
Manual: Update Locales.xml
Takashi Sawanaka [Wed, 3 Jul 2019 11:56:33 +0000 (20:56 +0900)]
Fix GitHub issue #159: file compare : right-click doesn't select the diff under the mouse
Takashi Sawanaka [Tue, 2 Jul 2019 23:09:30 +0000 (08:09 +0900)]
xutils.c: Under the following conditions
- Select diff algorithm other than 'default'
- Enable 'Ignore carriage return differences' (XDF_IGNORE_CR_AT_EOL)
- EOL on the last line of the file does not exist on the other side but has the same content
libxdiff assumes that the last line is not different. However, it is not compatible with WinMerge. So I correct as there is a difference.
Takashi Sawanaka [Tue, 2 Jul 2019 12:00:20 +0000 (12:00 +0000)]
Merged in Timon34/russianpo-edited-online-with-bitbucket-f-
1562068444598 (pull request #51)
Russian.po edited online with Bitbucket
Timon34 [Tue, 2 Jul 2019 11:55:19 +0000 (11:55 +0000)]
Russian.po edited online with Bitbucket
Fixed and made new translations introduced in WinMerge 2.16.3
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-f-
1562068444598
datadiode [Sun, 30 Jun 2019 16:25:07 +0000 (18:25 +0200)]
Consolidate FolderCmp (1)
Wondering why we create additional FolderCmp instances inside FolderCmp::prepAndCompareFiles(), from which we only use the m_diffFileData member, leads me to this proposal to convert them to DiffFileData. This is intended as a first step towards some more invasive rework to reduce code duplication and possibly other sorts of mess.
Takashi Sawanaka [Sun, 30 Jun 2019 12:26:48 +0000 (21:26 +0900)]
Merge.*.vcproj: minor optimization
Takashi Sawanaka [Sun, 30 Jun 2019 11:04:19 +0000 (20:04 +0900)]
Change VS Configuration name 'Unicode(Debug|Release)' to 'Debug|Release'
Takashi Sawanaka [Sun, 30 Jun 2019 06:34:04 +0000 (15:34 +0900)]
Remove MergeLang.vs2015.*
Takashi Sawanaka [Sun, 30 Jun 2019 04:57:42 +0000 (13:57 +0900)]
Cppcheck: Local variable '...' shadows outer function
Takashi Sawanaka [Sun, 30 Jun 2019 04:44:04 +0000 (13:44 +0900)]
Cppcheck: The function '...' overrides a function in a base class but is not marked with a 'override' specifier.
Takashi Sawanaka [Sun, 30 Jun 2019 04:08:30 +0000 (13:08 +0900)]
Cppcheck: Class '...' has a constructor with 1 argument that is not explicit.
Takashi Sawanaka [Sun, 30 Jun 2019 03:43:05 +0000 (12:43 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Sun, 30 Jun 2019 03:10:33 +0000 (12:10 +0900)]
Variable '...' in assigned in constructor body. Consider performing initialization in initialization list.
Takashi Sawanaka [Sun, 30 Jun 2019 02:40:07 +0000 (11:40 +0900)]
Cppcheck: The scope of the variable '...' can be reduced
Takashi Sawanaka [Sun, 30 Jun 2019 02:17:42 +0000 (11:17 +0900)]
Cppcheck: Member variable '...' is not initialized in the constructor.
Takashi Sawanaka [Sun, 30 Jun 2019 02:03:55 +0000 (11:03 +0900)]
Cppcheck: The statement 'if (m_base!=nullptr) m_base=nullptr' is logically equivalent to 'm_base=nullptr'.
datadiode [Sat, 29 Jun 2019 08:49:26 +0000 (10:49 +0200)]
Favor PathContext::GetSize() over PathContext::size()
As a side effect, this fixes a few warnings and saves a few typecasts which presumably existed to fix a few warnings.
datadiode [Sat, 29 Jun 2019 05:41:33 +0000 (07:41 +0200)]
coretools.cpp: linelen() should not truncate lines with embedded NULs
The issue with such truncated lines is that line filters are blind for any text to the right of an embedded NUL.
Takashi Sawanaka [Sat, 29 Jun 2019 01:51:31 +0000 (10:51 +0900)]
Manual: Add 'Diff algorithm' and 'Enable indent heuristic' entry
Takashi Sawanaka [Fri, 28 Jun 2019 12:42:22 +0000 (21:42 +0900)]
ReleaseNotes.html: Remove lines unintentionally added
Takashi Sawanaka [Fri, 28 Jun 2019 12:36:44 +0000 (21:36 +0900)]
Fix Bitbucket issue #166: ChangeLog.txt
Takashi Sawanaka [Thu, 27 Jun 2019 23:15:54 +0000 (08:15 +0900)]
OptionsDirColors.cpp: The color of the filtered item and the color of the missing item were reversed from the color of the previous version
Takashi Sawanaka [Thu, 27 Jun 2019 12:16:01 +0000 (21:16 +0900)]
Update release notes and changelog for 2.16.3 (4)
Takashi Sawanaka [Thu, 27 Jun 2019 11:50:10 +0000 (20:50 +0900)]
Update release notes and changelog for 2.16.3 (3)
Tichij [Thu, 27 Jun 2019 05:31:31 +0000 (08:31 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Wed, 26 Jun 2019 15:06:24 +0000 (00:06 +0900)]
OptionsDirColors.cpp: Change default color of identical items to white
Takashi Sawanaka [Wed, 26 Jun 2019 14:39:21 +0000 (23:39 +0900)]
Update release notes and changelog for 2.16.3
Takashi Sawanaka [Tue, 25 Jun 2019 22:54:25 +0000 (07:54 +0900)]
Update translations
Takashi Sawanaka [Tue, 25 Jun 2019 21:38:10 +0000 (06:38 +0900)]
Merge
Takashi Sawanaka [Tue, 25 Jun 2019 21:36:56 +0000 (21:36 +0000)]
Merged in gerundt/winmerge/OwnDirColors (pull request #49)
Use own colors settings for folder compare
Tim Gerundt [Tue, 25 Jun 2019 19:19:46 +0000 (21:19 +0200)]
Use own colors settings for folder compare - Add manual entry
--HG--
branch : OwnDirColors
Takashi Sawanaka [Tue, 25 Jun 2019 14:09:08 +0000 (23:09 +0900)]
xutils.c: Reduce compilation warnings
Takashi Sawanaka [Tue, 25 Jun 2019 13:11:19 +0000 (22:11 +0900)]
Reduce the size of the executable file (2)
Takashi Sawanaka [Mon, 24 Jun 2019 23:14:54 +0000 (08:14 +0900)]
xdiff_gnudiff_compat.cpp: Fix an assertion failure when comparing files without EOL on the last line
Takashi Sawanaka [Mon, 24 Jun 2019 22:51:21 +0000 (07:51 +0900)]
xdiff_gnudiff_compat.cpp: Initialize `ignore` in `struct change`
Tim Gerundt [Mon, 24 Jun 2019 21:40:29 +0000 (23:40 +0200)]
Use own colors settings for folder compare - Add option to disable coloring
--HG--
branch : OwnDirColors
Tim Gerundt [Mon, 24 Jun 2019 19:35:56 +0000 (21:35 +0200)]
Use own colors settings for folder compare - Use color for equal items
--HG--
branch : OwnDirColors
Tim Gerundt [Mon, 24 Jun 2019 19:09:15 +0000 (21:09 +0200)]
Use own colors settings for folder compare - Tweak colors
--HG--
branch : OwnDirColors
Takashi Sawanaka [Mon, 24 Jun 2019 13:33:12 +0000 (22:33 +0900)]
PrediffLineFilter.sct: Fix the problem that double quotation mark in text box disappears when reopening plug-in setting dialog after entering text including double quotation mark into text box.
Tim Gerundt [Mon, 24 Jun 2019 03:57:45 +0000 (05:57 +0200)]
Use own colors settings for folder compare - Add GUI
--HG--
branch : OwnDirColors
Takashi Sawanaka [Sun, 23 Jun 2019 14:06:11 +0000 (23:06 +0900)]
Update release notes and changelog for 2.16.3
Takashi Sawanaka [Sun, 23 Jun 2019 12:41:22 +0000 (21:41 +0900)]
Merge.rc: tweak
Takashi Sawanaka [Sat, 22 Jun 2019 12:21:17 +0000 (21:21 +0900)]
Add date and revision to file names of CI artifacts (5)
Takashi Sawanaka [Sat, 22 Jun 2019 12:06:43 +0000 (21:06 +0900)]
Add date and revision to file names of CI artifacts (4)
Takashi Sawanaka [Sat, 22 Jun 2019 11:52:04 +0000 (20:52 +0900)]
Add date and revision to file names of CI artifacts (3)
Takashi Sawanaka [Sat, 22 Jun 2019 11:22:22 +0000 (20:22 +0900)]
Add date and revision to file names of CI artifacts (2)
Takashi Sawanaka [Sat, 22 Jun 2019 11:03:31 +0000 (20:03 +0900)]
Add date and revision to file names of CI artifacts
Takashi Sawanaka [Sat, 22 Jun 2019 04:29:55 +0000 (13:29 +0900)]
Fix Bitbucket #164: for hiding my mail address
Takashi Sawanaka [Fri, 21 Jun 2019 22:08:17 +0000 (22:08 +0000)]
Merged in Tichij/winmerge (pull request #48)
Update of Lithuanian translation
datadiode [Fri, 21 Jun 2019 15:49:22 +0000 (17:49 +0200)]
Trivial bugfix
Tichij [Fri, 21 Jun 2019 05:18:09 +0000 (08:18 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Thu, 20 Jun 2019 13:26:15 +0000 (22:26 +0900)]
Reduce compilation warnings
Tim Gerundt [Wed, 19 Jun 2019 20:02:45 +0000 (22:02 +0200)]
Use own colors settings for folder compare - Without GUI at the moment
--HG--
branch : OwnDirColors
Takashi Sawanaka [Wed, 19 Jun 2019 14:17:22 +0000 (23:17 +0900)]
Fix GitHub issue #154: WinMerge 3-Way Compare Bugs: Always Shows Unique Items
Takashi Sawanaka [Tue, 18 Jun 2019 13:47:09 +0000 (22:47 +0900)]
Reduce the size of the executable file
Takashi Sawanaka [Tue, 18 Jun 2019 13:31:33 +0000 (22:31 +0900)]
UnicodeString.h: Fix mixed eol-style
Takashi Sawanaka [Mon, 17 Jun 2019 15:27:48 +0000 (00:27 +0900)]
UnicodeString.*: Make format() function callable with String type arguments without .c_str()
https://msdn.microsoft.com/en-us/magazine/dn913181.aspx?f=255&MSPPError=-
2147217396
Takashi Sawanaka [Sun, 16 Jun 2019 16:07:21 +0000 (01:07 +0900)]
Allow multiple <paths> in project file (2)
Takashi Sawanaka [Sun, 16 Jun 2019 16:07:08 +0000 (01:07 +0900)]
Remove unnecessary .c_str() calls
Takashi Sawanaka [Sun, 16 Jun 2019 15:45:24 +0000 (00:45 +0900)]
MergeEditView.cpp: When merging differences in the selected area, if the selected area completely encloses a diff block, do a normal merge instead of a word-level merge. (2)