OSDN Git Service
sdottaka [Tue, 29 Apr 2014 13:42:52 +0000 (22:42 +0900)]
Added tag 2.14.0+-jp-38 for changeset
7509ff36f229
--HG--
branch : stable
sdottaka [Tue, 29 Apr 2014 08:48:26 +0000 (17:48 +0900)]
DiffContext.cpp: Changes of compare options were ignored when recomparing folders
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 12:11:11 +0000 (21:11 +0900)]
Bump revision to 2.14.0+-jp-38
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 12:08:09 +0000 (21:08 +0900)]
Various optimizations for folder compare
--HG--
branch : stable
sdottaka [Sun, 27 Apr 2014 03:04:00 +0000 (12:04 +0900)]
Even if using Date/time compare method, WinMerge compared files using full content compare method if there are unique files
--HG--
branch : stable
sdottaka [Sun, 20 Apr 2014 04:54:04 +0000 (13:54 +0900)]
DiffFileData.*: remove unused class
--HG--
branch : stable
sdottaka [Sun, 6 Apr 2014 03:06:51 +0000 (12:06 +0900)]
DirTravel.cpp: could not enumerate files in Mac OS X Mavericks shared folders
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 09:13:07 +0000 (18:13 +0900)]
Added tag 2.14.0+-jp-37 for changeset
7d739e2f17d0
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 09:07:44 +0000 (18:07 +0900)]
JumpList.cpp: Fix ansi build
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 06:22:35 +0000 (15:22 +0900)]
Bump revision to 2.14.0+-jp-37
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 06:19:24 +0000 (15:19 +0900)]
Fix build error with VS2003
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 05:54:19 +0000 (14:54 +0900)]
unicoder.cpp maketstring(): Show encoding error dialog instead of debug assertion dialog
--HG--
branch : stable
sdottaka [Sat, 29 Mar 2014 05:46:27 +0000 (14:46 +0900)]
MDITabBar.cpp: fine-tune the position of icons on tabbar
--HG--
branch : stable
sdottaka [Thu, 27 Mar 2014 16:59:28 +0000 (01:59 +0900)]
diffutils/src/util.c: Fix wrong type cast. This bug causes unexpected diff result when ignoring space changes
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:30:13 +0000 (09:30 +0900)]
Bump revision to 2.14.0+-jp-36
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:24:20 +0000 (09:24 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:23:49 +0000 (09:23 +0900)]
Could not open recent files from File menu
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:16:20 +0000 (09:16 +0900)]
Show compare method name at status bar
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:13:08 +0000 (09:13 +0900)]
Fix mixed eol-style
--HG--
branch : stable
sdottaka [Sun, 23 Mar 2014 00:11:03 +0000 (09:11 +0900)]
FindTextDialog:
* Add "Don't close this dialog box" checkbox
* Add "Find Prev" button
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 16:02:49 +0000 (01:02 +0900)]
Bump revision to 2.14.0+-jp-35
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:59:53 +0000 (00:59 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:59:18 +0000 (00:59 +0900)]
Display icons in the MDITabBar
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 15:56:13 +0000 (00:56 +0900)]
Add "Recent Files Or Folders" menu item to [File] menu
--HG--
branch : stable
sdottaka [Sun, 16 Mar 2014 12:48:13 +0000 (21:48 +0900)]
Toolbar: Move "Folder Compare Method" list items to drop down menu
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:29:51 +0000 (11:29 +0900)]
Bump revision to 2.14.0+-jp-34
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:25:53 +0000 (11:25 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:25:21 +0000 (11:25 +0900)]
Toolbar: Add drop down menu beside Options icon
Add "Folder Compare Method" combobox
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 02:21:06 +0000 (11:21 +0900)]
HexView: diff text color became white if selected GitHub/Bitbucket color scheme
--HG--
branch : stable
sdottaka [Sun, 9 Mar 2014 01:16:54 +0000 (10:16 +0900)]
OpenView: Entered text at "Filter:" combobox was inserted not the top of the list but the bottom of the list
--HG--
branch : stable
sdottaka [Sat, 8 Mar 2014 07:40:18 +0000 (16:40 +0900)]
FolderCompare: Compare non-unique files prior to unique files
--HG--
branch : stable
sdottaka [Sat, 8 Mar 2014 07:00:09 +0000 (16:00 +0900)]
Apply also the patch "RFE: [
1646407 ] Use "equal" or "not equal" as file compare icon" for folder window icon
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:29:19 +0000 (23:29 +0900)]
Added tag 2.14.0+-jp-33 for changeset
a60a94ccf09c
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:29:00 +0000 (23:29 +0900)]
Bump revision to 2.14.0+-jp-33
--HG--
branch : stable
sdottaka [Thu, 27 Feb 2014 14:28:47 +0000 (23:28 +0900)]
BitBucket -> Bitbucket
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 03:00:32 +0000 (12:00 +0900)]
Bump revision to 2.14.0+-jp-32
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 02:42:39 +0000 (11:42 +0900)]
Remove some warnings
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 00:18:39 +0000 (09:18 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 23 Feb 2014 00:17:56 +0000 (09:17 +0900)]
* Add checkboxes on Option Dialog for enabling syntax highlighting in difference blocks and so on
* Add "GitHub/BitBucket" button on Option Dialog for setting GitHub/BitBucket-like color scheme
--HG--
branch : stable
sdottaka [Sat, 22 Feb 2014 04:55:12 +0000 (13:55 +0900)]
Even if drag&droped without Ctrl pressed, do recursive compare if checked "Include subfolders" on OpenView
--HG--
branch : stable
sdottaka [Sat, 22 Feb 2014 04:40:09 +0000 (13:40 +0900)]
Fix mixed EOL-style
--HG--
branch : stable
sdottaka [Sun, 16 Feb 2014 01:10:09 +0000 (10:10 +0900)]
Added tag 2.14.0+-jp-31 for changeset
6bf09cc2c586
--HG--
branch : stable
sdottaka [Sun, 16 Feb 2014 01:09:48 +0000 (10:09 +0900)]
Bump revision to 2.14.0+-jp-31
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 17:55:53 +0000 (02:55 +0900)]
OpenView: Improve the performance of opening OpenView
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 15:46:21 +0000 (00:46 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 15:45:52 +0000 (00:45 +0900)]
OpenView: Add "swap paths" button
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 13:37:48 +0000 (22:37 +0900)]
Fix: The icons in OpenViews's ComboBox disappeared after clicking OK button
--HG--
branch : stable
sdottaka [Sat, 15 Feb 2014 11:12:31 +0000 (20:12 +0900)]
CrystalEdit: Implement line cursor
--HG--
branch : stable
sdottaka [Fri, 14 Feb 2014 14:25:58 +0000 (23:25 +0900)]
CrystalEdit: Fix for handling surrogate pair characters
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 04:24:16 +0000 (13:24 +0900)]
Added tag 2.14.0+-jp-30 for changeset
f4bdd91253ee
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 04:24:00 +0000 (13:24 +0900)]
Enable changing save codepage
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 02:29:09 +0000 (11:29 +0900)]
Bump revison to 2.14.0+-jp-30
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 01:43:34 +0000 (10:43 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 01:42:55 +0000 (10:42 +0900)]
Fix: Change of codepage and EOL-style were not 3-way-merged. close #29
--HG--
branch : stable
sdottaka [Sun, 9 Feb 2014 01:24:44 +0000 (10:24 +0900)]
Fix: The access keys (Alt+s, Alt+l ...) on OpenView still didn't work
--HG--
branch : stable
sdottaka [Sat, 8 Feb 2014 14:04:38 +0000 (23:04 +0900)]
Installer: Add TortoiseSVN/GIT integration support as a 3-way merge tool
--HG--
branch : stable
sdottaka [Tue, 28 Jan 2014 13:59:58 +0000 (22:59 +0900)]
Added tag 2.14.0+-jp-29 for changeset
e1caf0b911f5
--HG--
branch : stable
sdottaka [Tue, 28 Jan 2014 13:57:31 +0000 (22:57 +0900)]
Bump revision to 2.14.0+-jp-29
--HG--
branch : stable
sdottaka [Tue, 28 Jan 2014 12:45:42 +0000 (21:45 +0900)]
fix for failure to create a backup file when specifying a relative path as command line argument
--HG--
branch : stable
sdottaka [Sat, 25 Jan 2014 03:54:55 +0000 (12:54 +0900)]
Manual: Add /a*, /f* command line option
--HG--
branch : stable
sdottaka [Thu, 23 Jan 2014 15:06:16 +0000 (00:06 +0900)]
Fix crash in debug build when enabling word-wrap
--HG--
branch : stable
sdottaka [Thu, 23 Jan 2014 14:10:53 +0000 (23:10 +0900)]
3way-diff: Don't highlight the word diff in right pane for visibility if the word diff is OP_1STONLY(center==right)
, and don't highlight the word diff in left pane if the word diff is OP_3RDONLY(left==center)
for
--HG--
branch : stable
sdottaka [Tue, 21 Jan 2014 15:29:47 +0000 (00:29 +0900)]
Fix misdetection of file change when using /o command line option
--HG--
branch : stable
sdottaka [Tue, 21 Jan 2014 15:23:15 +0000 (00:23 +0900)]
Fix: /f* command line option didn't work when the "Automatically scroll to first difference" was enabled
--HG--
branch : stable
sdottaka [Tue, 21 Jan 2014 15:15:02 +0000 (00:15 +0900)]
Fix: access key Alt+1, Alt+2 and Alt+3 on OpenView didn't work
--HG--
branch : stable
sdottaka [Tue, 21 Jan 2014 14:58:27 +0000 (23:58 +0900)]
Retry to fix the bug that was attempted to fix in rev.8261(Fix 3way-diff algorithm that cannot detect conflict state correctly)
--HG--
branch : stable
sdottaka [Mon, 20 Jan 2014 14:25:41 +0000 (23:25 +0900)]
Added tag 2.14.0+-jp-28 for changeset
3910ca7fae7c
--HG--
branch : stable
sdottaka [Mon, 20 Jan 2014 14:25:09 +0000 (23:25 +0900)]
Bump revision to 2.14.0+-jp-28
--HG--
branch : stable
sdottaka [Mon, 20 Jan 2014 14:24:15 +0000 (23:24 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Mon, 20 Jan 2014 13:51:46 +0000 (22:51 +0900)]
Fix that OP_2NDONLY change was not auto-merged to center pane
--HG--
branch : stable
sdottaka [Mon, 20 Jan 2014 13:45:51 +0000 (22:45 +0900)]
Draw 3way-diff state on Location View
--HG--
branch : stable
sdottaka [Sun, 19 Jan 2014 17:06:25 +0000 (02:06 +0900)]
Add Shift+F4 shortcut key for selecting previous word diff
--HG--
branch : stable
sdottaka [Sun, 19 Jan 2014 16:26:59 +0000 (01:26 +0900)]
Fix 3way-diff algorithm that cannot detect conflict state correctly
--HG--
branch : stable
sdottaka [Sat, 18 Jan 2014 15:33:26 +0000 (00:33 +0900)]
* Remove "Copy Left to Middle(Alt+4)" and "Copy Right to Middle(Alt+6)" menu items
* Use Win32 Keyboard Accelerators for Alt+1, Alt+2 ...
--HG--
branch : stable
sdottaka [Sat, 18 Jan 2014 12:33:26 +0000 (21:33 +0900)]
* Use standard order of header files
* Reduce inter-module dependencies. Especially from MainFrm.h
* Move the following variables and functions in CMainFrame class to CMergeApp class:
SyncFileToVCS()
CreateBackup()
HandleReadonlySave()
ShowVSSError()
ShowHelp()
UpdateCodepageModule()
CheckinToClearCase()
OpenFileToExternalEditor()
InitializeSourceControlMembers()
SaveToVersionControl()
GetMainSyntaxColors()
OpenFileOrUrl()
m_strSaveAsPath
m_bEscShutdown
m_vssHelper
m_bClearCaseTool
m_bExitIfNoDiff
m_pLineFilters
m_strVssUser
m_strVssPassword
m_strVssDatabase
m_strCCComment
m_bCheckinVCS
m_CheckOutMulti
m_bVCProjSync
m_bVssSuppressPathCheck
m_strDescriptions
m_pSyntaxColors
* Remove
CMainFrame::CenterToMainFrame()
CMainFrame::SetMainIcon()
CMainFrame::GetMainSyntaxColors()
--HG--
branch : stable
sdottaka [Mon, 13 Jan 2014 20:24:00 +0000 (05:24 +0900)]
Bump revision to 2.14.0+-jp-27
--HG--
branch : stable
sdottaka [Mon, 13 Jan 2014 20:23:36 +0000 (05:23 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Mon, 13 Jan 2014 20:22:58 +0000 (05:22 +0900)]
Add "Copy from Left" and "Copy from Right" menu items
--HG--
branch : stable
sdottaka [Mon, 13 Jan 2014 05:35:55 +0000 (14:35 +0900)]
* Add /fl, /fm, /fr, /al, /am and /ar command line options
/f* : Set focus to the specified pane
/a* : Auto-merge at the specified pane
* Move to first conflict after auto-merge
--HG--
branch : stable
sdottaka [Mon, 13 Jan 2014 02:36:57 +0000 (11:36 +0900)]
Fix compiler warnings
--HG--
branch : stable
sdottaka [Sun, 12 Jan 2014 03:11:27 +0000 (12:11 +0900)]
Update translations
--HG--
branch : stable
sdottaka [Sun, 12 Jan 2014 03:10:51 +0000 (12:10 +0900)]
Add "Next Conflict", "Previous Conflict" and "Auto Merge" menu items
--HG--
branch : stable
sdottaka [Sun, 5 Jan 2014 12:06:49 +0000 (21:06 +0900)]
Fix compilation errors in debug mode
--HG--
branch : stable
sdottaka [Sun, 5 Jan 2014 06:10:31 +0000 (15:10 +0900)]
Reduce the difference between current and 2.14.0+-jp-25
--HG--
branch : stable
sdottaka [Sat, 4 Jan 2014 12:37:57 +0000 (21:37 +0900)]
Added tag 2.14.0+-jp-26 for changeset
545d00866bf6
--HG--
branch : stable
sdottaka [Sat, 4 Jan 2014 12:37:39 +0000 (21:37 +0900)]
Bump revision to 2.14.0+-jp-26
--HG--
branch : stable
sdottaka [Sat, 4 Jan 2014 07:50:01 +0000 (16:50 +0900)]
* Reduce memory usage while comparing folders(3)
(Use boost::flyweight instead of boost::shared_ptr)
--HG--
branch : stable
sdottaka [Sat, 4 Jan 2014 07:46:18 +0000 (16:46 +0900)]
Add boost::flyweight
--HG--
branch : stable
sdottaka [Sat, 4 Jan 2014 05:24:54 +0000 (14:24 +0900)]
Remove conflicting source file 'editlib\splash.cpp' from VC project files
--HG--
branch : stable
sdottaka [Thu, 2 Jan 2014 11:52:42 +0000 (20:52 +0900)]
* Reduce memory usage while comparing folders(2)
(Share the same string data)
--HG--
branch : stable
sdottaka [Thu, 2 Jan 2014 11:51:36 +0000 (20:51 +0900)]
Remove DiffFileInfo::bVersionChecked
--HG--
branch : stable
sdottaka [Thu, 2 Jan 2014 10:00:20 +0000 (19:00 +0900)]
* Reduce memory usage while comparing folders(2)
(Share the same string data)
* Remove unused variable 'errorDesc' from DIFFITEM
--HG--
branch : stable
sdottaka [Mon, 30 Dec 2013 06:28:00 +0000 (15:28 +0900)]
* Reduce memory usage while comparing folders
(remove unused member variables)
* Remove DiffFileFlags class and move DiffFileFlags::ToString() to FileFlags class
--HG--
branch : stable
sdottaka [Sun, 29 Dec 2013 10:07:02 +0000 (19:07 +0900)]
Added tag 2.14.0+-jp-25 for changeset
d1240931ebb2
--HG--
branch : stable
sdottaka [Sun, 29 Dec 2013 10:03:38 +0000 (19:03 +0900)]
Bump revision to 2.14.0+-jp-25
--HG--
branch : stable
sdottaka [Sun, 29 Dec 2013 10:01:52 +0000 (19:01 +0900)]
Revert the stupid change (rev.8235) and retry to fix the crash
--HG--
branch : stable
sdottaka [Sat, 28 Dec 2013 14:10:46 +0000 (23:10 +0900)]
Added tag 2.14.0+-jp-24 for changeset
fae09bcc5bc1
--HG--
branch : stable
sdottaka [Sat, 28 Dec 2013 14:10:27 +0000 (23:10 +0900)]
Bump revision to 2.14.0+-jp-23
--HG--
branch : stable
sdottaka [Sat, 28 Dec 2013 14:01:05 +0000 (23:01 +0900)]
Fix crash when creating Folder Compare Report that includes archive files in the folders
--HG--
branch : stable
sdottaka [Sun, 22 Dec 2013 02:45:49 +0000 (11:45 +0900)]
* Show the name of the applied plugin in the status bar
* Add "Auto/Manual Prediffer" menu item for Folder and File window
--HG--
branch : stable