OSDN Git Service
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
sdottaka [Wed, 11 Dec 2013 15:51:53 +0000 (00:51 +0900)]
Added tag 2.14.0+-jp-23 for changeset
461c7b1f6ac8
--HG--
branch : stable
sdottaka [Wed, 11 Dec 2013 15:10:02 +0000 (00:10 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Wed, 11 Dec 2013 15:02:50 +0000 (00:02 +0900)]
Make .sct plugin workable even if the file association is changed by Adobe Photoshop
--HG--
branch : stable
sdottaka [Sun, 8 Dec 2013 14:23:38 +0000 (23:23 +0900)]
Add shortcut key (Alt+S) for "Add Synchronization Point"
--HG--
branch : stable
sdottaka [Wed, 27 Nov 2013 14:11:07 +0000 (23:11 +0900)]
Added tag 2.14.0+-jp-22 for changeset
d1d9f0d98635
--HG--
branch : stable
sdottaka [Wed, 27 Nov 2013 12:44:56 +0000 (21:44 +0900)]
Fix crash when creating an archive file from Folder Compare window at the second time
--HG--
branch : stable
sdottaka [Tue, 26 Nov 2013 21:18:59 +0000 (06:18 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Tue, 26 Nov 2013 21:18:35 +0000 (06:18 +0900)]
Make comparing window closeable
--HG--
branch : stable
sdottaka [Sun, 17 Nov 2013 01:22:31 +0000 (10:22 +0900)]
Added tag 2.14.0+-jp-21 for changeset
b94e77e289e4
--HG--
branch : stable
sdottaka [Sun, 17 Nov 2013 01:22:09 +0000 (10:22 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Sun, 17 Nov 2013 00:23:34 +0000 (09:23 +0900)]
small performance optimization while disabling plugins
--HG--
branch : stable
sdottaka [Sun, 17 Nov 2013 00:17:34 +0000 (09:17 +0900)]
Remove unused function CMergeDoc::ReloadDoc()
--HG--
branch : stable
sdottaka [Sat, 16 Nov 2013 23:59:52 +0000 (08:59 +0900)]
Remove the code that minimizes Folder Compare window on closing
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:43:26 +0000 (00:43 +0900)]
Added tag 2.14.0+-jp-20 for changeset
700767ceb284
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:43:24 +0000 (00:43 +0900)]
Removed tag 2.14.0+-jp-20
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:42:42 +0000 (00:42 +0900)]
forgot to initialize MENUITEMINFO structure
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:28:11 +0000 (00:28 +0900)]
Added tag 2.14.0+-jp-20 for changeset
cd4ac76bf1a2
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:05:58 +0000 (00:05 +0900)]
Exclude *.gcno, *.gcda, *.gcov and *.orig files from source archive
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:01:32 +0000 (00:01 +0900)]
Update revisons
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 15:01:09 +0000 (00:01 +0900)]
Add "Close Other Tabs", "Close Right Tabs" and "Close Left Tabs" menu items to system menu
--HG--
branch : stable
sdottaka [Wed, 6 Nov 2013 14:57:57 +0000 (23:57 +0900)]
small optimization
--HG--
branch : stable
sdottaka [Sun, 27 Oct 2013 14:15:23 +0000 (23:15 +0900)]
Added tag 2.14.0+-jp-19 for changeset
545dc4e7b0c2
--HG--
branch : stable
sdottaka [Sun, 27 Oct 2013 14:12:51 +0000 (23:12 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Sun, 27 Oct 2013 14:10:32 +0000 (23:10 +0900)]
Update .hgignore
--HG--
branch : stable
sdottaka [Sun, 27 Oct 2013 14:09:37 +0000 (23:09 +0900)]
QuickContents Compare: Fix infinite loop when comparing a file with a file that added contents
--HG--
branch : stable
sdottaka [Sat, 26 Oct 2013 12:03:16 +0000 (21:03 +0900)]
Make UnitTests buildable with mingw
--HG--
branch : stable
sdottaka [Sat, 26 Oct 2013 12:01:48 +0000 (21:01 +0900)]
Make FolderCompare.exe buildable again
--HG--
branch : stable
sdottaka [Mon, 21 Oct 2013 14:38:45 +0000 (23:38 +0900)]
Fix assertion failure (dr.begin[0] == dr.begin[file]) when
enabling syncpoint and comparing files that one has EOL before EOF and other not.
--HG--
branch : stable
sdottaka [Sun, 20 Oct 2013 04:11:52 +0000 (13:11 +0900)]
Added tag 2.14.0+-jp-18 for changeset
b7fdb49b470f
--HG--
branch : stable
sdottaka [Sun, 20 Oct 2013 03:59:02 +0000 (12:59 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Wed, 24 Jul 2013 17:13:58 +0000 (02:13 +0900)]
Fix broken unit tests
--HG--
branch : stable
sdottaka [Wed, 24 Jul 2013 15:49:25 +0000 (00:49 +0900)]
Fix crashes in unit tests (built by VC2010)
--HG--
branch : stable
sdottaka [Sat, 20 Jul 2013 08:18:14 +0000 (17:18 +0900)]
Fix compilation error with VS7.1
--HG--
branch : stable
sdottaka [Sat, 20 Jul 2013 08:14:27 +0000 (17:14 +0900)]
* Add UnitTests.vcxproj
* Fix link error of UnitTests
--HG--
branch : stable
sdottaka [Sun, 20 Oct 2013 03:13:27 +0000 (12:13 +0900)]
Add synchronization points UI like meld(meldmerge.org)
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 13:59:16 +0000 (22:59 +0900)]
Fix crash when comparing XML or HTML files on multi-core machine... orz
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 11:26:32 +0000 (20:26 +0900)]
Remove unused function
--HG--
branch : stable
sdottaka [Sat, 19 Oct 2013 08:07:59 +0000 (17:07 +0900)]
Header bar wasn't synchronized with splitter position
--HG--
branch : stable
sdottaka [Sun, 29 Sep 2013 01:00:35 +0000 (10:00 +0900)]
Added tag 2.14.0+-jp-17 for changeset
cea149553222
--HG--
branch : stable
sdottaka [Sun, 29 Sep 2013 00:59:53 +0000 (09:59 +0900)]
HexView: left only file or right only file can be now opened in Hex view
--HG--
branch : stable
sdottaka [Sat, 28 Sep 2013 01:33:35 +0000 (10:33 +0900)]
Update Merge_FC_loose.flt for VS2010
--HG--
branch : stable
sdottaka [Sat, 14 Sep 2013 03:06:12 +0000 (12:06 +0900)]
Disable events when opening Excel workbooks, to avoid VBA macro errors
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 15:06:49 +0000 (00:06 +0900)]
fix mixed eol-style
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 15:06:18 +0000 (00:06 +0900)]
Fix unsynchronized header bar and editor panes while loading large files
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 14:14:23 +0000 (23:14 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Mon, 9 Sep 2013 14:14:05 +0000 (23:14 +0900)]
Include Jochen's version of Frhed (https://bitbucket.org/jtuc/frhed/)
--HG--
branch : stable
sdottaka [Wed, 28 Aug 2013 13:15:42 +0000 (22:15 +0900)]
Added tag 2.14.0+-jp-16 for changeset
79e01f9fe331
--HG--
branch : stable
sdottaka [Wed, 28 Aug 2013 12:41:04 +0000 (21:41 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Tue, 27 Aug 2013 13:35:04 +0000 (22:35 +0900)]
Fix crash when opening directories before completing folder compare
--HG--
branch : stable
sdottaka [Sun, 28 Jul 2013 10:46:56 +0000 (19:46 +0900)]
Added tag 2.14.0+-jp-15 for changeset
37fdc816aa4d
--HG--
branch : stable
sdottaka [Tue, 23 Jul 2013 14:06:44 +0000 (23:06 +0900)]
Update revisions
--HG--
branch : stable
sdottaka [Tue, 23 Jul 2013 13:48:42 +0000 (22:48 +0900)]
Fix: SaveClosingDlg is not shown in the center of the MainFrame
sdottaka [Sun, 14 Jul 2013 08:57:47 +0000 (17:57 +0900)]
Added tag 2.14.0+-jp-14 for changeset
918180abd795
sdottaka [Sun, 14 Jul 2013 07:30:02 +0000 (16:30 +0900)]
Update revisions
sdottaka [Sun, 14 Jul 2013 07:29:48 +0000 (16:29 +0900)]
Add "Close Select Files or Folders Dialog on clicking OK button" option. close #26
sdottaka [Sun, 14 Jul 2013 04:55:56 +0000 (13:55 +0900)]
Make OpenDlg resizable again. close #27
sdottaka [Sat, 6 Jul 2013 14:54:04 +0000 (23:54 +0900)]
Improve startup time
sdottaka [Fri, 28 Jun 2013 23:40:29 +0000 (08:40 +0900)]
Added tag 2.14.0+-jp-13 for changeset
78f2a78ebb20
sdottaka [Fri, 28 Jun 2013 23:40:11 +0000 (08:40 +0900)]
Update revisions
sdottaka [Fri, 28 Jun 2013 23:04:05 +0000 (08:04 +0900)]
Look at "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\SourceSafe\\Databases" for finding VSS databases
sdottaka [Thu, 27 Jun 2013 14:19:43 +0000 (23:19 +0900)]
Install 32-bit ShellExtention for 64-bit Windows
sdottaka [Thu, 27 Jun 2013 14:15:16 +0000 (23:15 +0900)]
Remove unused LogFile.{cpp,h} in vc71 project file
sdottaka [Thu, 27 Jun 2013 14:13:34 +0000 (23:13 +0900)]
Fix: the contents of config log are broken
sdottaka [Sun, 23 Jun 2013 00:29:46 +0000 (09:29 +0900)]
Added tag 2.14.0+-jp-12 for changeset
9226cde7d33e
sdottaka [Sun, 23 Jun 2013 00:29:32 +0000 (09:29 +0900)]
Update revisions
sdottaka [Sun, 23 Jun 2013 00:05:33 +0000 (09:05 +0900)]
Fix: VSS integration does not work
sdottaka [Sat, 15 Jun 2013 01:42:12 +0000 (10:42 +0900)]
Added tag 2.14.0+-jp-11 for changeset
cc1a06ca5c34
sdottaka [Sat, 15 Jun 2013 01:41:40 +0000 (10:41 +0900)]
Update revisions
sdottaka [Sat, 15 Jun 2013 01:25:08 +0000 (10:25 +0900)]
Fix: unable to convert Unicode file to ANSI file for plugins. #22
sdottaka [Sat, 1 Jun 2013 12:51:29 +0000 (21:51 +0900)]
Fix the problem that cannot save font face name setting
sdottaka [Wed, 29 May 2013 14:53:21 +0000 (23:53 +0900)]
Added tag 2.14.0+-jp-10 for changeset
f0d1dec733d0
sdottaka [Wed, 29 May 2013 14:36:36 +0000 (23:36 +0900)]
BuildArc.cmd: create jp_files.txt
OSDN Git Service
