OSDN Git Service

fix some build error
authorFrank Li <lznuaa@gmail.com>
Mon, 15 Dec 2008 13:12:22 +0000 (21:12 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 15 Dec 2008 13:12:22 +0000 (21:12 +0800)
src/TGitCache/SVNStatusCache.h
src/TGitCache/StatusCacheEntry.h
src/TGitCache/TSVNCache.vcproj
src/TGitCache/stdafx.h
src/TortoiseGit.sln
src/TortoiseMerge/AppUtils.h
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/Patch.cpp
src/TortoiseMerge/TortoiseMerge.vcproj

index 1c26454..a8eeece 100644 (file)
@@ -18,8 +18,8 @@
 //\r
 #pragma once\r
 \r
-#include "TSVNPath.h"\r
-#include "SVNHelpers.h"\r
+#include "TGitPath.h"\r
+//#include "SVNHelpers.h"\r
 #include "StatusCacheEntry.h"\r
 #include "CachedDirectory.h"\r
 #include "FolderCrawler.h"\r
index 2a09020..f99f38e 100644 (file)
@@ -22,6 +22,8 @@ struct TSVNCacheResponse;
 #define CACHETIMEOUT   0x7FFFFFFF\r
 extern DWORD cachetimeout;\r
 \r
+#include "GitStatus.h"\r
+\r
 /**\r
  * \ingroup TSVNCache\r
  * Holds all the status data of one file or folder.\r
@@ -30,31 +32,31 @@ class CStatusCacheEntry
 {\r
 public:\r
        CStatusCacheEntry();\r
-       CStatusCacheEntry(const svn_wc_status2_t* pSVNStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0);\r
+       CStatusCacheEntry(const git_wc_status2_t* pSVNStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0);\r
        bool HasExpired(long now) const;\r
        void BuildCacheResponse(TSVNCacheResponse& response, DWORD& responseLength) const;\r
        bool IsVersioned() const;\r
        bool DoesFileTimeMatch(__int64 testTime) const;\r
-       bool ForceStatus(svn_wc_status_kind forcedStatus);\r
-       svn_wc_status_kind GetEffectiveStatus() const { return m_highestPriorityLocalStatus; }\r
-       bool IsKindKnown() const { return ((m_kind != svn_node_none)&&(m_kind != svn_node_unknown)); }\r
-       void SetStatus(const svn_wc_status2_t* pSVNStatus);\r
+       bool ForceStatus(git_wc_status_kind forcedStatus);\r
+       git_wc_status_kind GetEffectiveStatus() const { return m_highestPriorityLocalStatus; }\r
+       bool IsKindKnown() const { return ((m_kind != git_node_none)&&(m_kind != git_node_unknown)); }\r
+       void SetStatus(const git_wc_status2_t* pSVNStatus);\r
        bool HasBeenSet() const;\r
        void Invalidate();\r
-       bool IsDirectory() const {return ((m_kind == svn_node_dir)&&(m_highestPriorityLocalStatus != svn_wc_status_ignored));}\r
+       bool IsDirectory() const {return ((m_kind == git_node_dir)&&(m_highestPriorityLocalStatus != git_wc_status_ignored));}\r
        bool SaveToDisk(FILE * pFile);\r
        bool LoadFromDisk(FILE * pFile);\r
-       void SetKind(svn_node_kind_t kind) {m_kind = kind;}\r
+       void SetKind(git_node_kind_t kind) {m_kind = kind;}\r
 private:\r
        void SetAsUnversioned();\r
 \r
 private:\r
        long                            m_discardAtTime;\r
-       svn_wc_status_kind      m_highestPriorityLocalStatus;\r
-       svn_wc_status2_t        m_svnStatus;\r
+       git_wc_status_kind      m_highestPriorityLocalStatus;\r
+       git_wc_status2_t        m_svnStatus;\r
        __int64                         m_lastWriteTime;\r
        bool                            m_bSet;\r
-       svn_node_kind_t         m_kind;\r
+       git_node_kind_t         m_kind;\r
        bool                            m_bReadOnly;\r
 \r
        // Values copied from the 'entries' structure\r
@@ -63,7 +65,7 @@ private:
        CStringA                        m_sOwner;\r
        CStringA                        m_sAuthor;\r
        CStringA                        m_sPresentProps;\r
-       svn_revnum_t            m_commitRevision;\r
+       git_revnum_t            m_commitRevision;\r
 \r
 //     friend class CSVNStatusCache;\r
 };\r
index 2b3fe8c..0bfdf05 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\Bin\Debug64\Bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\Release\bin"\r
+                       IntermediateDirectory="..\..\obj\TGitCache\Release"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               SmallerTypeCheck="true"\r
+                               InlineFunctionExpansion="2"\r
+                               AdditionalIncludeDirectories="../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
                                RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="true"\r
-                               AdditionalDependencies="Crypt32.lib ../../ext/Subversion\debug_x64\libsvn_diff-nonet.lib ../../ext/Subversion\debug_x64\libsvn_ra-nonet.lib ../../ext/Subversion\debug_x64\libsvn_wc-nonet.lib ../../ext/Subversion\debug_x64\libsvn_subr-nonet.lib ../../ext/Subversion\debug_x64\libsvn_client-nonet.lib ../../ext/Subversion\debug_x64\libsvn_delta-nonet.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib"\r
-                               OutputFile="$(OutDir)/TSVNCache.exe"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               AdditionalDependencies="Crypt32.lib ../../ext/Subversion\release_win32\libsvn_diff-nonet.lib ../../ext/Subversion\release_win32\libsvn_delta-nonet.lib ../../ext/Subversion\release_win32\libsvn_wc-nonet.lib ../../ext/Subversion\release_win32\libsvn_subr-nonet.lib ../../ext/Subversion\release_win32\libsvn_client-nonet.lib ../../ext/Subversion\release_win32\libsvn_ra-nonet.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib"\r
+                               OutputFile="$(OutDir)/TGitCache.exe"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\Release"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\Bin\Debug64\Bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\Debug64"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               SmallerTypeCheck="true"\r
                                RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib ../../ext/Subversion\release_win32\libsvn_diff-nonet.lib ../../ext/Subversion\release_win32\libsvn_delta-nonet.lib ../../ext/Subversion\release_win32\libsvn_wc-nonet.lib ../../ext/Subversion\release_win32\libsvn_subr-nonet.lib ../../ext/Subversion\release_win32\libsvn_client-nonet.lib ../../ext/Subversion\release_win32\libsvn_ra-nonet.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib"\r
+                               IgnoreImportLibrary="true"\r
+                               AdditionalDependencies="Crypt32.lib ../../ext/Subversion\debug_x64\libsvn_diff-nonet.lib ../../ext/Subversion\debug_x64\libsvn_ra-nonet.lib ../../ext/Subversion\debug_x64\libsvn_wc-nonet.lib ../../ext/Subversion\debug_x64\libsvn_subr-nonet.lib ../../ext/Subversion\debug_x64\libsvn_client-nonet.lib ../../ext/Subversion\debug_x64\libsvn_delta-nonet.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib"\r
                                OutputFile="$(OutDir)/TSVNCache.exe"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames="LIBC"\r
                                GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index e553eb1..aadeb13 100644 (file)
@@ -34,14 +34,6 @@ using namespace ATL;
 #include <deque>\r
 #pragma warning(pop)\r
 \r
-#pragma warning(push)\r
-#include "svn_wc.h"\r
-#include "svn_client.h"\r
-#include "svn_path.h"\r
-#include "svn_pools.h"\r
-#include "svn_utf.h"\r
-#pragma warning(pop)\r
-\r
 \r
 typedef CComCritSecLock<CComAutoCriticalSection> AutoLocker;\r
 \r
index f3002fe..ce2770a 100644 (file)
@@ -28,106 +28,246 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciLexer", "..\ext\scintill
 EndProject\r
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetup\WixSetup.wixproj", "{150172A5-8D02-4C00-ABB5-BD99D4B16B4C}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TSVNCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseMerge", "TortoiseMerge\TortoiseMerge.vcproj", "{8ABB4F84-891A-4748-8507-F5494842173E}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
+               debug_static|Win32 = debug_static|Win32\r
+               debug_static|x86 = debug_static|x86\r
                Debug|Mixed Platforms = Debug|Mixed Platforms\r
                Debug|Win32 = Debug|Win32\r
                Debug|x86 = Debug|x86\r
+               release_static|Mixed Platforms = release_static|Mixed Platforms\r
+               release_static|Win32 = release_static|Win32\r
+               release_static|x86 = release_static|x86\r
                Release|Mixed Platforms = Release|Mixed Platforms\r
                Release|Win32 = Release|Win32\r
                Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|Win32.Build.0 = Release|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x86.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x86.ActiveCfg = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|Win32.Build.0 = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x86.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x86.ActiveCfg = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|Win32.Build.0 = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|Win32.Build.0 = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x86.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x86.ActiveCfg = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|Win32.Build.0 = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|Win32.Build.0 = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x86.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x86.ActiveCfg = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|Win32.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|Win32.Build.0 = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x86.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x86.ActiveCfg = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|Win32.Build.0 = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|Win32.Build.0 = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x86.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x86.ActiveCfg = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|Win32.Build.0 = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|Win32.Build.0 = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x86.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x86.ActiveCfg = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x86.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|Win32.Build.0 = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|Win32.Build.0 = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x86.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|x86.ActiveCfg = Release|Win32\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.ActiveCfg = Debug|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Mixed Platforms.Build.0 = Debug|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.ActiveCfg = Debug|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x86.Build.0 = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Mixed Platforms.Build.0 = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|Win32.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Debug|x86.Build.0 = Debug|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.ActiveCfg = Release|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Mixed Platforms.Build.0 = Release|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|Win32.ActiveCfg = Release|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.ActiveCfg = Release|x86\r
+               {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.release_static|x86.Build.0 = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.ActiveCfg = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Mixed Platforms.Build.0 = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|Win32.ActiveCfg = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.ActiveCfg = Release|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.Release|x86.Build.0 = Release|x86\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|Win32.Build.0 = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.debug_static|x86.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|Win32.Build.0 = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x86.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Mixed Platforms.Build.0 = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Mixed Platforms.Build.0 = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|Win32.Build.0 = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.debug_static|x86.ActiveCfg = debug_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|Win32.Build.0 = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Mixed Platforms.Build.0 = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|Win32.Build.0 = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.release_static|x86.ActiveCfg = release_static|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Mixed Platforms.Build.0 = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.ActiveCfg = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|Win32.Build.0 = Release|Win32\r
+               {8ABB4F84-891A-4748-8507-F5494842173E}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 0d89e12..a545cb7 100644 (file)
@@ -17,7 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #pragma once\r
-#include "svn_types.h"\r
+//#include "svn_types.h"\r
+#include "GitStatus.h"\r
 \r
 class CProgressDlg;\r
 \r
@@ -48,6 +49,6 @@ public:
        static bool CreateUnifiedDiff(const CString& orig, const CString& modified, const CString& output, bool bShowError);\r
 \r
        static bool HasClipboardFormat(UINT format);\r
-       static CString GetErrorString(svn_error_t * Err);\r
+       static CString GetErrorString(git_error_t * Err);\r
 \r
 };\r
index f351cd7..76fd3cd 100644 (file)
@@ -1376,6 +1376,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const
 \r
        int lineoffset = 0;\r
        std::deque<int> removedPositions;\r
+#if 0\r
        while (diff)\r
        {\r
                apr_off_t len = diff->original_length;\r
@@ -1398,6 +1399,7 @@ bool CBaseView::DrawInlineDiff(CDC *pDC, const CRect &rc, int nLineIndex, const
        // Draw vertical bars at removed chunks' positions.\r
        for (std::deque<int>::iterator it = removedPositions.begin(); it != removedPositions.end(); ++it)\r
                pDC->FillSolidRect(*it, rc.top, 1, rc.Height(), m_InlineRemovedBk);\r
+#endif\r
        return true;\r
 }\r
 \r
index 149e86d..ed078ec 100644 (file)
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r
-#include "diff.h"\r
+//#include "diff.h"\r
 #include "TempFiles.h"\r
 #include "registry.h"\r
 #include "Resource.h"\r
 #include "Diffdata.h"\r
 #include "UnicodeUtils.h"\r
-#include "SVNAdminDir.h"\r
-#include "svn_dso.h"\r
+#include "GitAdminDir.h"\r
+\r
 \r
 #pragma warning(push)\r
 #pragma warning(disable: 4702) // unreachable code\r
index 1ec32ed..36ad2f4 100644 (file)
@@ -21,8 +21,8 @@
 #include "UnicodeUtils.h"\r
 #include "DirFileEnum.h"\r
 #include "TortoiseMerge.h"\r
-#include "svn_wc.h"\r
-#include "SVNAdminDir.h"\r
+//#include "svn_wc.h"\r
+#include "GitAdminDir.h"\r
 #include "Patch.h"\r
 \r
 #ifdef _DEBUG\r
index 61fd45c..e3223ba 100644 (file)
@@ -47,7 +47,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\ext\apr\include;&quot;..\ext\apr-util\include&quot;;..\ext\SubVersion\subversion\include;..\..\ext\SubVersion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="..\Git"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="..\Utils;..\Git;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="..\Git"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="0"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;..\..\ext\Subversion\subversion\include;..\..\ext\Subversion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="..\Git"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="1"\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Svn\SVNAdminDir.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\SVN\SVNLineDiff.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\TortoiseMerge.cpp"\r
                                >\r
                        </File>\r