build error link error

[tortoisegit/TortoiseGitJp.git] / TortoiseShell / ColumnProvider.cpp

diff --git a/TortoiseShell/ColumnProvider.cpp b/TortoiseShell/ColumnProvider.cpp
index b48671a..56c549c 100644 (file)
--- a/TortoiseShell/ColumnProvider.cpp
+++ b/TortoiseShell/ColumnProvider.cpp
@@ -20,11 +20,11 @@
 #include "ShellExt.h"\r
 #include "guids.h"\r
 #include "PreserveChdir.h"\r
-#include "SVNProperties.h"\r
+//#include "SVNProperties.h"\r
 #include "UnicodeUtils.h"\r
-#include "SVNStatus.h"\r
+#include "GitStatus.h"\r
 #include "PathUtils.h"\r
-#include "..\TSVNCache\CacheInterface.h"\r
+//#include "..\TSVNCache\CacheInterface.h"\r
 \r
 \r
 const static int ColumnFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT;\r
@@ -57,7 +57,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 0: // SVN Status\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -72,7 +72,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 1: // SVN Revision\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_I4;\r
                        psci->fmt = LVCFMT_RIGHT;\r
@@ -87,7 +87,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 2: // SVN Url\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -102,7 +102,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 3: // SVN Short Url\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -127,7 +127,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 5: // SVN mime-type\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -142,7 +142,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 6: // SVN Lock Owner\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -157,7 +157,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 7: // SVN eol-style\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -172,7 +172,7 @@ STDMETHODIMP CShellExt::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
                case 8: // SVN Author\r
                        if (cachetype == ShellCache::none)\r
                                return S_FALSE;\r
-                       psci->scid.fmtid = CLSID_TortoiseSVN_UPTODATE;\r
+                       psci->scid.fmtid = CLSID_Tortoisegit_UPTODATE;\r
                        psci->scid.pid = dwIndex;\r
                        psci->vt = VT_BSTR;\r
                        psci->fmt = LVCFMT_LEFT;\r
@@ -198,7 +198,7 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
        }\r
        LoadLangDll();\r
        ShellCache::CacheType cachetype = g_ShellCache.GetCacheType();\r
-       if (pscid->fmtid == CLSID_TortoiseSVN_UPTODATE && pscid->pid < 8) \r
+       if (pscid->fmtid == CLSID_Tortoisegit_UPTODATE && pscid->pid < 8) \r
        {\r
                stdstring szInfo;\r
                const TCHAR * path = (TCHAR *)pscd->wszFile;\r
@@ -211,16 +211,18 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
                {\r
                        case 0: // SVN Status\r
                                GetColumnStatus(path, pscd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);\r
-                               SVNStatus::GetStatusString(g_hResInst, filestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)));\r
+                               GitStatus::GetStatusString(g_hResInst, filestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)));\r
                                szInfo = buf;\r
                                break;\r
                        case 1: // SVN Revision\r
+#if 0\r
                                GetColumnStatus(path, pscd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);\r
                                if (columnrev >= 0)\r
                                {\r
                                        V_VT(pvarData) = VT_I4;\r
                                        V_I4(pvarData) = columnrev;\r
                                }\r
+#endif\r
                                return S_OK;\r
                                break;\r
                        case 2: // SVN Url\r
@@ -232,6 +234,7 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
                                szInfo = itemshorturl;\r
                                break;\r
                        case 5: // SVN mime-type\r
+#if 0\r
                                if (cachetype == ShellCache::none)\r
                                        return S_FALSE;\r
                                if (g_ShellCache.IsPathAllowed(path))\r
@@ -245,12 +248,14 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
                                                }\r
                                        }\r
                                }\r
+#endif\r
                                break;\r
                        case 6: // SVN Lock Owner\r
                                GetColumnStatus(path, pscd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);\r
                                szInfo = owner;\r
                                break;\r
                        case 7: // SVN eol-style\r
+#if 0\r
                                if (cachetype == ShellCache::none)\r
                                        return S_FALSE;\r
                                if (g_ShellCache.IsPathAllowed(path))\r
@@ -264,6 +269,7 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
                                                }\r
                                        }\r
                                }\r
+#endif\r
                                break;\r
                        default:\r
                                return S_FALSE;\r
@@ -319,6 +325,7 @@ STDMETHODIMP CShellExt::Initialize(LPCSHCOLUMNINIT psci)
 \r
 void CShellExt::GetColumnStatus(const TCHAR * path, BOOL bIsDir)\r
 {\r
+#if 0\r
        PreserveChdir preserveChdir;\r
        if (_tcscmp(path, columnfilepath.c_str())==0)\r
                return;\r
@@ -341,7 +348,7 @@ void CShellExt::GetColumnStatus(const TCHAR * path, BOOL bIsDir)
                        }\r
                        else\r
                        {\r
-                               filestatus = svn_wc_status_none;\r
+                               filestatus = git_wc_status_none;\r
                                columnauthor.clear();\r
                                columnrev = 0;\r
                                itemurl.clear();\r
@@ -361,9 +368,9 @@ void CShellExt::GetColumnStatus(const TCHAR * path, BOOL bIsDir)
        case ShellCache::none:\r
                {\r
                        if (g_ShellCache.HasSVNAdminDir(path, bIsDir))\r
-                               filestatus = svn_wc_status_normal;\r
+                               filestatus = git_wc_status_normal;\r
                        else\r
-                               filestatus = svn_wc_status_none;\r
+                               filestatus = git_wc_status_none;\r
                        columnauthor.clear();\r
                        columnrev = 0;\r
                        itemurl.clear();\r
@@ -457,5 +464,6 @@ void CShellExt::GetColumnStatus(const TCHAR * path, BOOL bIsDir)
                CPathUtils::Unescape(url);\r
                itemurl = UTF8ToWide(url);\r
        }\r
+#endif\r
 }\r
 \r