From 0b30c255b03bff388c349c01b97edc2e0f3e0af6 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 15 Dec 2008 21:12:22 +0800 Subject: [PATCH] fix some build error --- src/TGitCache/SVNStatusCache.h | 4 +- src/TGitCache/StatusCacheEntry.h | 24 +++--- src/TGitCache/TSVNCache.vcproj | 64 +++++++-------- src/TGitCache/stdafx.h | 8 -- src/TortoiseGit.sln | 140 +++++++++++++++++++++++++++++++++ src/TortoiseMerge/AppUtils.h | 5 +- src/TortoiseMerge/BaseView.cpp | 2 + src/TortoiseMerge/DiffData.cpp | 6 +- src/TortoiseMerge/Patch.cpp | 4 +- src/TortoiseMerge/TortoiseMerge.vcproj | 16 +--- 10 files changed, 201 insertions(+), 72 deletions(-) diff --git a/src/TGitCache/SVNStatusCache.h b/src/TGitCache/SVNStatusCache.h index 1c26454..a8eeece 100644 --- a/src/TGitCache/SVNStatusCache.h +++ b/src/TGitCache/SVNStatusCache.h @@ -18,8 +18,8 @@ // #pragma once -#include "TSVNPath.h" -#include "SVNHelpers.h" +#include "TGitPath.h" +//#include "SVNHelpers.h" #include "StatusCacheEntry.h" #include "CachedDirectory.h" #include "FolderCrawler.h" diff --git a/src/TGitCache/StatusCacheEntry.h b/src/TGitCache/StatusCacheEntry.h index 2a09020..f99f38e 100644 --- a/src/TGitCache/StatusCacheEntry.h +++ b/src/TGitCache/StatusCacheEntry.h @@ -22,6 +22,8 @@ struct TSVNCacheResponse; #define CACHETIMEOUT 0x7FFFFFFF extern DWORD cachetimeout; +#include "GitStatus.h" + /** * \ingroup TSVNCache * Holds all the status data of one file or folder. @@ -30,31 +32,31 @@ class CStatusCacheEntry { public: CStatusCacheEntry(); - CStatusCacheEntry(const svn_wc_status2_t* pSVNStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0); + CStatusCacheEntry(const git_wc_status2_t* pSVNStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0); bool HasExpired(long now) const; void BuildCacheResponse(TSVNCacheResponse& response, DWORD& responseLength) const; bool IsVersioned() const; bool DoesFileTimeMatch(__int64 testTime) const; - bool ForceStatus(svn_wc_status_kind forcedStatus); - svn_wc_status_kind GetEffectiveStatus() const { return m_highestPriorityLocalStatus; } - bool IsKindKnown() const { return ((m_kind != svn_node_none)&&(m_kind != svn_node_unknown)); } - void SetStatus(const svn_wc_status2_t* pSVNStatus); + bool ForceStatus(git_wc_status_kind forcedStatus); + git_wc_status_kind GetEffectiveStatus() const { return m_highestPriorityLocalStatus; } + bool IsKindKnown() const { return ((m_kind != git_node_none)&&(m_kind != git_node_unknown)); } + void SetStatus(const git_wc_status2_t* pSVNStatus); bool HasBeenSet() const; void Invalidate(); - bool IsDirectory() const {return ((m_kind == svn_node_dir)&&(m_highestPriorityLocalStatus != svn_wc_status_ignored));} + bool IsDirectory() const {return ((m_kind == git_node_dir)&&(m_highestPriorityLocalStatus != git_wc_status_ignored));} bool SaveToDisk(FILE * pFile); bool LoadFromDisk(FILE * pFile); - void SetKind(svn_node_kind_t kind) {m_kind = kind;} + void SetKind(git_node_kind_t kind) {m_kind = kind;} private: void SetAsUnversioned(); private: long m_discardAtTime; - svn_wc_status_kind m_highestPriorityLocalStatus; - svn_wc_status2_t m_svnStatus; + git_wc_status_kind m_highestPriorityLocalStatus; + git_wc_status2_t m_svnStatus; __int64 m_lastWriteTime; bool m_bSet; - svn_node_kind_t m_kind; + git_node_kind_t m_kind; bool m_bReadOnly; // Values copied from the 'entries' structure @@ -63,7 +65,7 @@ private: CStringA m_sOwner; CStringA m_sAuthor; CStringA m_sPresentProps; - svn_revnum_t m_commitRevision; + git_revnum_t m_commitRevision; // friend class CSVNStatusCache; }; diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj index 2b3fe8c..0bfdf05 100644 --- a/src/TGitCache/TSVNCache.vcproj +++ b/src/TGitCache/TSVNCache.vcproj @@ -103,12 +103,13 @@ /> #pragma warning(pop) -#pragma warning(push) -#include "svn_wc.h" -#include "svn_client.h" -#include "svn_path.h" -#include "svn_pools.h" -#include "svn_utf.h" -#pragma warning(pop) - typedef CComCritSecLock AutoLocker; diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln index f3002fe..ce2770a 100644 --- a/src/TortoiseGit.sln +++ b/src/TortoiseGit.sln @@ -28,106 +28,246 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciLexer", "..\ext\scintill EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetup\WixSetup.wixproj", "{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TSVNCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseMerge", "TortoiseMerge\TortoiseMerge.vcproj", "{8ABB4F84-891A-4748-8507-F5494842173E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_static|Mixed Platforms = debug_static|Mixed Platforms + debug_static|Win32 = debug_static|Win32 + debug_static|x86 = debug_static|x86 Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x86 = Debug|x86 + release_static|Mixed Platforms = release_static|Mixed Platforms + release_static|Win32 = release_static|Win32 + release_static|x86 = release_static|x86 Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.Build.0 = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x86.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x86.ActiveCfg = Debug|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.Build.0 = Release|Win32 + {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x86.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.Build.0 = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32 {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x86.ActiveCfg = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x86.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x86.ActiveCfg = Debug|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.ActiveCfg = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.Build.0 = Release|Win32 + {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x86.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x86.ActiveCfg = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x86.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x86.ActiveCfg = Debug|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.Build.0 = Release|Win32 + {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x86.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.Build.0 = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32 {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x86.ActiveCfg = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x86.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x86.ActiveCfg = Debug|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.Build.0 = Release|Win32 + {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x86.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.Build.0 = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32 {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x86.ActiveCfg = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x86.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x86.ActiveCfg = Debug|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.ActiveCfg = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.Build.0 = Release|Win32 + {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x86.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32 {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x86.ActiveCfg = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x86.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x86.ActiveCfg = Debug|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.Build.0 = Release|Win32 + {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x86.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.Build.0 = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32 {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x86.ActiveCfg = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x86.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x86.ActiveCfg = Debug|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.Build.0 = Release|Win32 + {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x86.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.Build.0 = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32 {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x86.ActiveCfg = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x86.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x86.ActiveCfg = Debug|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.Build.0 = Release|Win32 + {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x86.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.Build.0 = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32 {A5498556-CE09-4095-8335-08FC8370552D}.Release|x86.ActiveCfg = Release|Win32 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.ActiveCfg = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.Build.0 = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.ActiveCfg = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.Build.0 = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.ActiveCfg = Debug|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.Build.0 = Debug|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.ActiveCfg = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.Build.0 = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Win32.ActiveCfg = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.ActiveCfg = Release|x86 + {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.Build.0 = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.ActiveCfg = Release|x86 {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.Build.0 = Release|x86 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x86.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x86.ActiveCfg = Debug|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.ActiveCfg = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x86.ActiveCfg = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32 + {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.ActiveCfg = debug_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.Build.0 = debug_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.ActiveCfg = debug_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.Build.0 = debug_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|x86.ActiveCfg = debug_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.Build.0 = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|x86.ActiveCfg = Debug|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.ActiveCfg = release_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.Build.0 = release_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.ActiveCfg = release_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.Build.0 = release_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|x86.ActiveCfg = release_static|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.ActiveCfg = Release|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.Build.0 = Release|Win32 + {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x86.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/TortoiseMerge/AppUtils.h b/src/TortoiseMerge/AppUtils.h index 0d89e12..a545cb7 100644 --- a/src/TortoiseMerge/AppUtils.h +++ b/src/TortoiseMerge/AppUtils.h @@ -17,7 +17,8 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #pragma once -#include "svn_types.h" +//#include "svn_types.h" +#include "GitStatus.h" class CProgressDlg; @@ -48,6 +49,6 @@ public: static bool CreateUnifiedDiff(const CString& orig, const CString& modified, const CString& output, bool bShowError); static bool HasClipboardFormat(UINT format); - static CString GetErrorString(svn_error_t * Err); + static CString GetErrorString(git_error_t * Err); }; diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp index f351cd7..76fd3cd 100644 --- a/src/TortoiseMerge/BaseView.cpp +++ b/src/TortoiseMerge/BaseView.cpp @@ -1376,6 +1376,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const int lineoffset = 0; std::deque removedPositions; +#if 0 while (diff) { apr_off_t len = diff->original_length; @@ -1398,6 +1399,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const // Draw vertical bars at removed chunks' positions. for (std::deque::iterator it = removedPositions.begin(); it != removedPositions.end(); ++it) pDC->FillSolidRect(*it, rc.top, 1, rc.Height(), m_InlineRemovedBk); +#endif return true; } diff --git a/src/TortoiseMerge/DiffData.cpp b/src/TortoiseMerge/DiffData.cpp index 149e86d..ed078ec 100644 --- a/src/TortoiseMerge/DiffData.cpp +++ b/src/TortoiseMerge/DiffData.cpp @@ -17,14 +17,14 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // #include "StdAfx.h" -#include "diff.h" +//#include "diff.h" #include "TempFiles.h" #include "registry.h" #include "Resource.h" #include "Diffdata.h" #include "UnicodeUtils.h" -#include "SVNAdminDir.h" -#include "svn_dso.h" +#include "GitAdminDir.h" + #pragma warning(push) #pragma warning(disable: 4702) // unreachable code diff --git a/src/TortoiseMerge/Patch.cpp b/src/TortoiseMerge/Patch.cpp index 1ec32ed..36ad2f4 100644 --- a/src/TortoiseMerge/Patch.cpp +++ b/src/TortoiseMerge/Patch.cpp @@ -21,8 +21,8 @@ #include "UnicodeUtils.h" #include "DirFileEnum.h" #include "TortoiseMerge.h" -#include "svn_wc.h" -#include "SVNAdminDir.h" +//#include "svn_wc.h" +#include "GitAdminDir.h" #include "Patch.h" #ifdef _DEBUG diff --git a/src/TortoiseMerge/TortoiseMerge.vcproj b/src/TortoiseMerge/TortoiseMerge.vcproj index 61fd45c..e3223ba 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcproj +++ b/src/TortoiseMerge/TortoiseMerge.vcproj @@ -47,7 +47,7 @@ - - - - -- 2.11.0