#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
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
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
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
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
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
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
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
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
}\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
{\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
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
}\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
}\r
}\r
}\r
+#endif\r
break;\r
default:\r
return S_FALSE;\r
\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
}\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
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
CPathUtils::Unescape(url);\r
itemurl = UTF8ToWide(url);\r
}\r
+#endif\r
}\r
\r
-// TortoiseSVN - a Windows shell extension for easy version control\r
+// TortoiseGit - a Windows shell extension for easy version control\r
\r
-// Copyright (C) 2003-2008 - TortoiseSVN\r
+// Copyright (C) 2003-2008 - TortoiseGit\r
\r
// This program is free software; you can redistribute it and/or\r
// modify it under the terms of the GNU General Public License\r
#include "ItemIDList.h"\r
#include "PreserveChdir.h"\r
#include "UnicodeUtils.h"\r
-#include "SVNProperties.h"\r
-#include "SVNStatus.h"\r
+//#include "GitProperties.h"\r
+#include "GitStatus.h"\r
+#include "TGitPath.h"\r
\r
#define GetPIDLFolder(pida) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[0])\r
#define GetPIDLItem(pida, i) (LPCITEMIDLIST)(((LPBYTE)pida)+(pida)->aoffset[i+1])\r
LPDATAOBJECT pDataObj,\r
HKEY /* hRegKey */)\r
{\r
+#if 0\r
ATLTRACE("Shell :: Initialize\n");\r
PreserveChdir preserveChdir;\r
files_.clear();\r
itemStates = 0;\r
itemStatesFolder = 0;\r
stdstring statuspath;\r
- svn_wc_status_kind fetchedstatus = svn_wc_status_none;\r
+ git_wc_status_kind fetchedstatus = git_wc_status_none;\r
// get selected files/folders\r
if (pDataObj)\r
{\r
{\r
if (itemStates & ITEMIS_ONLYONE)\r
{\r
- CTSVNPath strpath;\r
+ CTGitPath strpath;\r
strpath.SetFromWin(str.c_str());\r
itemStates |= (strpath.GetFileExtension().CompareNoCase(_T(".diff"))==0) ? ITEMIS_PATCHFILE : 0;\r
itemStates |= (strpath.GetFileExtension().CompareNoCase(_T(".patch"))==0) ? ITEMIS_PATCHFILE : 0;\r
if (i == 0)\r
{\r
//get the Subversion status of the item\r
- svn_wc_status_kind status = svn_wc_status_none;\r
- CTSVNPath askedpath;\r
+ git_wc_status_kind status = git_wc_status_none;\r
+ CTGitPath askedpath;\r
askedpath.SetFromWin(str.c_str());\r
try\r
{\r
- SVNStatus stat;\r
- stat.GetStatus(CTSVNPath(str.c_str()), false, true, true);\r
+ GitStatus stat;\r
+ //stat.GetStatus(CTGitPath(str.c_str()), false, true, true);\r
if (stat.status)\r
{\r
statuspath = str;\r
- status = SVNStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
+ status = GitStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
fetchedstatus = status;\r
if ((stat.status->entry)&&(stat.status->entry->lock_token))\r
itemStates |= (stat.status->entry->lock_token[0] != 0) ? ITEMIS_LOCKED : 0;\r
- if ((stat.status->entry)&&(stat.status->entry->kind == svn_node_dir))\r
+ if ((stat.status->entry)&&(stat.status->entry->kind == git_node_dir))\r
{\r
itemStates |= ITEMIS_FOLDER;\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStates |= ITEMIS_FOLDERINSVN;\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStates |= ITEMIS_FOLDERINGit;\r
}\r
if ((stat.status->entry)&&(stat.status->entry->present_props))\r
{\r
}\r
else\r
{\r
- // sometimes, svn_client_status() returns with an error.\r
+ // sometimes, git_client_status() returns with an error.\r
// in that case, we have to check if the working copy is versioned\r
// anyway to show the 'correct' context menu\r
if (askedpath.HasAdminDir())\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
}\r
}\r
catch ( ... )\r
{\r
- ATLTRACE2(_T("Exception in SVNStatus::GetAllStatus()\n"));\r
+ ATLTRACE2(_T("Exception in GitStatus::GetAllStatus()\n"));\r
}\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStates |= ITEMIS_INSVN;\r
- if (status == svn_wc_status_ignored)\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStates |= ITEMIS_INGit;\r
+ if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r
- if (status == svn_wc_status_normal)\r
+ if (status == git_wc_status_normal)\r
itemStates |= ITEMIS_NORMAL;\r
- if (status == svn_wc_status_conflicted)\r
+ if (status == git_wc_status_conflicted)\r
itemStates |= ITEMIS_CONFLICTED;\r
- if (status == svn_wc_status_added)\r
+ if (status == git_wc_status_added)\r
itemStates |= ITEMIS_ADDED;\r
- if (status == svn_wc_status_deleted)\r
+ if (status == git_wc_status_deleted)\r
itemStates |= ITEMIS_DELETED;\r
}\r
}\r
if ((str.empty() == false)&&(g_ShellCache.IsContextPathAllowed(str.c_str())))\r
{\r
//check if our menu is requested for a subversion admin directory\r
- if (g_SVNAdminDir.IsAdminDirPath(str.c_str()))\r
+ if (g_GitAdminDir.IsAdminDirPath(str.c_str()))\r
continue;\r
\r
files_.push_back(str);\r
- CTSVNPath strpath;\r
+ CTGitPath strpath;\r
strpath.SetFromWin(str.c_str());\r
itemStates |= (strpath.GetFileExtension().CompareNoCase(_T(".diff"))==0) ? ITEMIS_PATCHFILE : 0;\r
itemStates |= (strpath.GetFileExtension().CompareNoCase(_T(".patch"))==0) ? ITEMIS_PATCHFILE : 0;\r
if (!statfetched)\r
{\r
//get the Subversion status of the item\r
- svn_wc_status_kind status = svn_wc_status_none;\r
+ git_wc_status_kind status = git_wc_status_none;\r
if ((g_ShellCache.IsSimpleContext())&&(strpath.IsDirectory()))\r
{\r
if (strpath.HasAdminDir())\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
}\r
else\r
{\r
try\r
{\r
- SVNStatus stat;\r
+ GitStatus stat;\r
if (strpath.HasAdminDir())\r
stat.GetStatus(strpath, false, true, true);\r
statuspath = str;\r
if (stat.status)\r
{\r
- status = SVNStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
+ status = GitStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
fetchedstatus = status;\r
if ((stat.status->entry)&&(stat.status->entry->lock_token))\r
itemStates |= (stat.status->entry->lock_token[0] != 0) ? ITEMIS_LOCKED : 0;\r
- if ((stat.status->entry)&&(stat.status->entry->kind == svn_node_dir))\r
+ if ((stat.status->entry)&&(stat.status->entry->kind == git_node_dir))\r
{\r
itemStates |= ITEMIS_FOLDER;\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStates |= ITEMIS_FOLDERINSVN;\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStates |= ITEMIS_FOLDERINGit;\r
}\r
if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))\r
itemStates |= ITEMIS_CONFLICTED;\r
} \r
else\r
{\r
- // sometimes, svn_client_status() returns with an error.\r
+ // sometimes, git_client_status() returns with an error.\r
// in that case, we have to check if the working copy is versioned\r
// anyway to show the 'correct' context menu\r
if (strpath.HasAdminDir())\r
{\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
fetchedstatus = status;\r
}\r
}\r
}\r
catch ( ... )\r
{\r
- ATLTRACE2(_T("Exception in SVNStatus::GetAllStatus()\n"));\r
+ ATLTRACE2(_T("Exception in GitStatus::GetAllStatus()\n"));\r
}\r
}\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStates |= ITEMIS_INSVN;\r
- if (status == svn_wc_status_ignored)\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStates |= ITEMIS_INGit;\r
+ if (status == git_wc_status_ignored)\r
{\r
itemStates |= ITEMIS_IGNORED;\r
// the item is ignored. Get the svn:ignored properties so we can (maybe) later\r
// offer a 'remove from ignored list' entry\r
- SVNProperties props(strpath.GetContainingDirectory(), false);\r
+ GitProperties props(strpath.GetContainingDirectory(), false);\r
ignoredprops.empty();\r
for (int p=0; p<props.GetCount(); ++p)\r
{\r
}\r
}\r
}\r
- if (status == svn_wc_status_normal)\r
+ if (status == git_wc_status_normal)\r
itemStates |= ITEMIS_NORMAL;\r
- if (status == svn_wc_status_conflicted)\r
+ if (status == git_wc_status_conflicted)\r
itemStates |= ITEMIS_CONFLICTED;\r
- if (status == svn_wc_status_added)\r
+ if (status == git_wc_status_added)\r
itemStates |= ITEMIS_ADDED;\r
- if (status == svn_wc_status_deleted)\r
+ if (status == git_wc_status_deleted)\r
itemStates |= ITEMIS_DELETED;\r
}\r
}\r
} // for (int i = 0; i < count; ++i)\r
ItemIDList child (GetPIDLItem (cida, 0), &parent);\r
- if (g_ShellCache.HasSVNAdminDir(child.toString().c_str(), FALSE))\r
+ if (g_ShellCache.HasGitAdminDir(child.toString().c_str(), FALSE))\r
itemStates |= ITEMIS_INVERSIONEDFOLDER;\r
GlobalUnlock(medium.hGlobal);\r
\r
// if the item is a versioned folder, check if there's a patch file\r
// in the clipboard to be used in "Apply Patch"\r
- UINT cFormatDiff = RegisterClipboardFormat(_T("TSVN_UNIFIEDDIFF"));\r
+ UINT cFormatDiff = RegisterClipboardFormat(_T("Tgit_UNIFIEDDIFF"));\r
if (cFormatDiff)\r
{\r
if (IsClipboardFormatAvailable(cFormatDiff)) \r
{\r
ItemIDList list(pIDFolder);\r
folder_ = list.toString();\r
- svn_wc_status_kind status = svn_wc_status_none;\r
+ git_wc_status_kind status = git_wc_status_none;\r
if (IsClipboardFormatAvailable(CF_HDROP)) \r
itemStatesFolder |= ITEMIS_PATHINCLIPBOARD;\r
if ((folder_.compare(statuspath)!=0)&&(g_ShellCache.IsContextPathAllowed(folder_.c_str())))\r
{\r
- CTSVNPath askedpath;\r
+ CTGitPath askedpath;\r
askedpath.SetFromWin(folder_.c_str());\r
try\r
{\r
- SVNStatus stat;\r
- stat.GetStatus(CTSVNPath(folder_.c_str()), false, true, true);\r
+ GitStatus stat;\r
+ stat.GetStatus(CTGitPath(folder_.c_str()), false, true, true);\r
if (stat.status)\r
{\r
- status = SVNStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
+ status = GitStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
if ((stat.status->entry)&&(stat.status->entry->lock_token))\r
itemStatesFolder |= (stat.status->entry->lock_token[0] != 0) ? ITEMIS_LOCKED : 0;\r
if ((stat.status->entry)&&(stat.status->entry->present_props))\r
}\r
if ((stat.status->entry)&&(stat.status->entry->uuid))\r
uuidTarget = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStatesFolder |= ITEMIS_INSVN;\r
- if (status == svn_wc_status_normal)\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStatesFolder |= ITEMIS_INGit;\r
+ if (status == git_wc_status_normal)\r
itemStatesFolder |= ITEMIS_NORMAL;\r
- if (status == svn_wc_status_conflicted)\r
+ if (status == git_wc_status_conflicted)\r
itemStatesFolder |= ITEMIS_CONFLICTED;\r
- if (status == svn_wc_status_added)\r
+ if (status == git_wc_status_added)\r
itemStatesFolder |= ITEMIS_ADDED;\r
- if (status == svn_wc_status_deleted)\r
+ if (status == git_wc_status_deleted)\r
itemStatesFolder |= ITEMIS_DELETED;\r
}\r
else\r
{\r
- // sometimes, svn_client_status() returns with an error.\r
+ // sometimes, git_client_status() returns with an error.\r
// in that case, we have to check if the working copy is versioned\r
// anyway to show the 'correct' context menu\r
if (askedpath.HasAdminDir())\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
}\r
}\r
catch ( ... )\r
{\r
- ATLTRACE2(_T("Exception in SVNStatus::GetAllStatus()\n"));\r
+ ATLTRACE2(_T("Exception in GitStatus::GetAllStatus()\n"));\r
}\r
}\r
else\r
{\r
status = fetchedstatus;\r
}\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
{\r
- itemStatesFolder |= ITEMIS_FOLDERINSVN;\r
+ itemStatesFolder |= ITEMIS_FOLDERINGit;\r
}\r
- if (status == svn_wc_status_ignored)\r
+ if (status == git_wc_status_ignored)\r
itemStatesFolder |= ITEMIS_IGNORED;\r
itemStatesFolder |= ITEMIS_FOLDER;\r
if (files_.size() == 0)\r
if (PathIsDirectory(files_.front().c_str()))\r
{\r
folder_ = files_.front();\r
- svn_wc_status_kind status = svn_wc_status_none;\r
+ git_wc_status_kind status = git_wc_status_none;\r
if (folder_.compare(statuspath)!=0)\r
{\r
- CTSVNPath askedpath;\r
+ CTGitPath askedpath;\r
askedpath.SetFromWin(folder_.c_str());\r
try\r
{\r
- SVNStatus stat;\r
- stat.GetStatus(CTSVNPath(folder_.c_str()), false, true, true);\r
+ GitStatus stat;\r
+ stat.GetStatus(CTGitPath(folder_.c_str()), false, true, true);\r
if (stat.status)\r
{\r
- status = SVNStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
+ status = GitStatus::GetMoreImportant(stat.status->text_status, stat.status->prop_status);\r
if ((stat.status->entry)&&(stat.status->entry->lock_token))\r
itemStates |= (stat.status->entry->lock_token[0] != 0) ? ITEMIS_LOCKED : 0;\r
if ((stat.status->entry)&&(stat.status->entry->present_props))\r
}\r
catch ( ... )\r
{\r
- ATLTRACE2(_T("Exception in SVNStatus::GetAllStatus()\n"));\r
+ ATLTRACE2(_T("Exception in GitStatus::GetAllStatus()\n"));\r
}\r
}\r
else\r
{\r
status = fetchedstatus;\r
}\r
- if ((status != svn_wc_status_unversioned)&&(status != svn_wc_status_ignored)&&(status != svn_wc_status_none))\r
- itemStates |= ITEMIS_FOLDERINSVN;\r
- if (status == svn_wc_status_ignored)\r
+ if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ itemStates |= ITEMIS_FOLDERINGit;\r
+ if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r
itemStates |= ITEMIS_FOLDER;\r
- if (status == svn_wc_status_added)\r
+ if (status == git_wc_status_added)\r
itemStates |= ITEMIS_ADDED;\r
- if (status == svn_wc_status_deleted)\r
+ if (status == git_wc_status_deleted)\r
itemStates |= ITEMIS_DELETED;\r
}\r
}\r
}\r
- \r
+#endif \r
return NOERROR;\r
}\r
\r
-void CShellExt::InsertSVNMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, SVNCommands com, UINT uFlags)\r
+void CShellExt::InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags)\r
{\r
TCHAR menutextbuffer[255] = {0};\r
TCHAR verbsbuffer[255] = {0};\r
\r
if (istop)\r
{\r
- //menu entry for the top context menu, so append an "SVN " before\r
+ //menu entry for the top context menu, so append an "Git " before\r
//the menu text to indicate where the entry comes from\r
- _tcscpy_s(menutextbuffer, 255, _T("SVN "));\r
+ _tcscpy_s(menutextbuffer, 255, _T("Git "));\r
}\r
_tcscat_s(menutextbuffer, 255, stringtablebuffer);\r
if ((fullver < 0x500)||(fullver == 0x500 && !uFlags))\r
\r
if (istop)\r
{\r
- //menu entry for the top context menu, so append an "SVN " before\r
+ //menu entry for the top context menu, so append an "Git " before\r
//the menu text to indicate where the entry comes from\r
- _tcscpy_s(menutextbuffer, 255, _T("SVN "));\r
+ _tcscpy_s(menutextbuffer, 255, _T("Git "));\r
}\r
LoadString(g_hResInst, stringid, verbsbuffer, sizeof(verbsbuffer));\r
_tcscat_s(menutextbuffer, 255, verbsbuffer);\r
//if they are versioned, they also can be exported to an unversioned location\r
UINT idCmd = idCmdFirst;\r
\r
- // SVN move here\r
+ // Git move here\r
// available if source is versioned but not added, target is versioned, source and target from same repository or target folder is added\r
if ((bSourceAndTargetFromSameRepository||(itemStatesFolder & ITEMIS_ADDED))&&(itemStatesFolder & ITEMIS_FOLDERINSVN)&&((itemStates & ITEMIS_INSVN)&&((~itemStates) & ITEMIS_ADDED)))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPMOVEMENU, 0, idCmdFirst, ShellMenuDropMove, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPMOVEMENU, 0, idCmdFirst, ShellMenuDropMove, uFlags);\r
\r
- // SVN move and rename here\r
+ // Git move and rename here\r
// available if source is a single, versioned but not added item, target is versioned, source and target from same repository or target folder is added\r
if ((bSourceAndTargetFromSameRepository||(itemStatesFolder & ITEMIS_ADDED))&&(itemStatesFolder & ITEMIS_FOLDERINSVN)&&(itemStates & ITEMIS_INSVN)&&(itemStates & ITEMIS_ONLYONE)&&((~itemStates) & ITEMIS_ADDED))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPMOVERENAMEMENU, 0, idCmdFirst, ShellMenuDropMoveRename, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPMOVERENAMEMENU, 0, idCmdFirst, ShellMenuDropMoveRename, uFlags);\r
\r
- // SVN copy here\r
+ // Git copy here\r
// available if source is versioned but not added, target is versioned, source and target from same repository or target folder is added\r
if ((bSourceAndTargetFromSameRepository||(itemStatesFolder & ITEMIS_ADDED))&&(itemStatesFolder & ITEMIS_FOLDERINSVN)&&(itemStates & ITEMIS_INSVN)&&((~itemStates) & ITEMIS_ADDED))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYMENU, 0, idCmdFirst, ShellMenuDropCopy, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYMENU, 0, idCmdFirst, ShellMenuDropCopy, uFlags);\r
\r
- // SVN copy and rename here, source and target from same repository\r
+ // Git copy and rename here, source and target from same repository\r
// available if source is a single, versioned but not added item, target is versioned or target folder is added\r
if ((bSourceAndTargetFromSameRepository||(itemStatesFolder & ITEMIS_ADDED))&&(itemStatesFolder & ITEMIS_FOLDERINSVN)&&(itemStates & ITEMIS_INSVN)&&(itemStates & ITEMIS_ONLYONE)&&((~itemStates) & ITEMIS_ADDED))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYRENAMEMENU, 0, idCmdFirst, ShellMenuDropCopyRename, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYRENAMEMENU, 0, idCmdFirst, ShellMenuDropCopyRename, uFlags);\r
\r
- // SVN add here\r
+ // Git add here\r
// available if target is versioned and source is either unversioned or from another repository\r
if ((itemStatesFolder & ITEMIS_FOLDERINSVN)&&(((~itemStates) & ITEMIS_INSVN)||!bSourceAndTargetFromSameRepository))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYADDMENU, 0, idCmdFirst, ShellMenuDropCopyAdd, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPCOPYADDMENU, 0, idCmdFirst, ShellMenuDropCopyAdd, uFlags);\r
\r
- // SVN export here\r
+ // Git export here\r
// available if source is versioned and a folder\r
if ((itemStates & ITEMIS_INSVN)&&(itemStates & ITEMIS_FOLDER))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPEXPORTMENU, 0, idCmdFirst, ShellMenuDropExport, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPEXPORTMENU, 0, idCmdFirst, ShellMenuDropExport, uFlags);\r
\r
- // SVN export all here\r
+ // Git export all here\r
// available if source is versioned and a folder\r
if ((itemStates & ITEMIS_INSVN)&&(itemStates & ITEMIS_FOLDER))\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPEXPORTEXTENDEDMENU, 0, idCmdFirst, ShellMenuDropExportExtended, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_DROPEXPORTEXTENDEDMENU, 0, idCmdFirst, ShellMenuDropExportExtended, uFlags);\r
\r
// apply patch\r
// available if source is a patchfile\r
if (itemStates & ITEMIS_PATCHFILE)\r
- InsertSVNMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_MENUAPPLYPATCH, 0, idCmdFirst, ShellMenuApplyPatch, uFlags);\r
+ InsertGitMenu(FALSE, hMenu, indexMenu++, idCmd++, IDS_MENUAPPLYPATCH, 0, idCmdFirst, ShellMenuApplyPatch, uFlags);\r
\r
// separator\r
if (idCmd != idCmdFirst)\r
}\r
\r
//check if our menu is requested for a subversion admin directory\r
- if (g_SVNAdminDir.IsAdminDirPath(folder_.c_str()))\r
+ if (g_GitAdminDir.IsAdminDirPath(folder_.c_str()))\r
return NOERROR;\r
\r
if (uFlags & CMF_EXTENDEDVERBS)\r
// It would only show the standard menu items\r
// which are already shown for the lnk-file.\r
CString path = files_.front().c_str();\r
- if ( !g_SVNAdminDir.HasAdminDir(path) )\r
+ if ( !g_GitAdminDir.HasAdminDir(path) )\r
{\r
return NOERROR;\r
}\r
bool bMenuEntryAdded = false;\r
// insert separator at start\r
InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL); idCmd++;\r
- bool bShowIcons = !!DWORD(CRegStdWORD(_T("Software\\TortoiseSVN\\ShowContextMenuIcons"), TRUE));\r
+ bool bShowIcons = !!DWORD(CRegStdWORD(_T("Software\\TortoiseGit\\ShowContextMenuIcons"), TRUE));\r
if (fullver <= 0x0500)\r
bShowIcons = false;\r
while (menuInfo[menuIndex].command != ShellMenuLastEntry)\r
bIsTop = true;\r
}\r
// insert the menu entry\r
- InsertSVNMenu( bIsTop,\r
+ InsertGitMenu( bIsTop,\r
bIsTop ? hMenu : subMenu,\r
bIsTop ? indexMenu++ : indexSubMenu++,\r
idCmd++,\r
memset(&startup, 0, sizeof(startup));\r
startup.cb = sizeof(startup);\r
memset(&process, 0, sizeof(process));\r
- CRegStdString tortoiseProcPath(_T("Software\\TortoiseSVN\\ProcPath"), _T("TortoiseProc.exe"), false, HKEY_LOCAL_MACHINE);\r
- CRegStdString tortoiseMergePath(_T("Software\\TortoiseSVN\\TMergePath"), _T("TortoiseMerge.exe"), false, HKEY_LOCAL_MACHINE);\r
+ CRegStdString tortoiseProcPath(_T("Software\\TortoiseGit\\ProcPath"), _T("TortoiseProc.exe"), false, HKEY_LOCAL_MACHINE);\r
+ CRegStdString tortoiseMergePath(_T("Software\\TortoiseGit\\TMergePath"), _T("TortoiseMerge.exe"), false, HKEY_LOCAL_MACHINE);\r
\r
//TortoiseProc expects a command line of the form:\r
//"/command:<commandname> /pathfile:<path> /startrev:<startrevision> /endrev:<endrevision> /deletepathfile\r
{\r
// if there's a patch file in the clipboard, we save it\r
// to a temporary file and tell TortoiseMerge to use that one\r
- UINT cFormat = RegisterClipboardFormat(_T("TSVN_UNIFIEDDIFF"));\r
+ UINT cFormat = RegisterClipboardFormat(_T("Tgit_UNIFIEDDIFF"));\r
if ((cFormat)&&(OpenClipboard(NULL)))\r
{ \r
HGLOBAL hglb = GetClipboardData(cFormat); \r
int menuIndex = 0;\r
while (menuInfo[menuIndex].command != ShellMenuLastEntry)\r
{\r
- if (menuInfo[menuIndex].command == (SVNCommands)id_it->second)\r
+ if (menuInfo[menuIndex].command == (GitCommands)id_it->second)\r
{\r
MAKESTRING(menuInfo[menuIndex].menuDescID);\r
break;\r
space = ((layout & MENULOCK) || ((itemStates & ITEMIS_NEEDSLOCK) && g_ShellCache.IsGetLockTop())) ? 0 : 6;\r
if ((layout & MENULOCK) || ((itemStates & ITEMIS_NEEDSLOCK) && g_ShellCache.IsGetLockTop()))\r
{\r
- _tcscpy_s(textbuf, 255, _T("SVN "));\r
+ _tcscpy_s(textbuf, 255, _T("Git "));\r
_tcscat_s(textbuf, 255, stringtablebuffer);\r
_tcscpy_s(stringtablebuffer, 255, textbuf);\r
}\r
space = layout & menuInfo[menuIndex].menuID ? 0 : 6;\r
if (layout & (menuInfo[menuIndex].menuID)) \r
{\r
- _tcscpy_s(textbuf, 255, _T("SVN "));\r
+ _tcscpy_s(textbuf, 255, _T("Git "));\r
_tcscat_s(textbuf, 255, stringtablebuffer);\r
_tcscpy_s(stringtablebuffer, 255, textbuf);\r
}\r
// to generate a new GUID.\r
//\r
\r
-DEFINE_GUID(CLSID_TortoiseSVN_UPTODATE,0x30351346, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_MODIFIED,0x30351347, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_CONFLICTING,0x30351348, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_UNCONTROLLED,0x30351349, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_DROPHANDLER,0x3035134a, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_READONLY,0x3035134b, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_DELETED,0x3035134c, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_LOCKED,0x3035134d, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_ADDED,0x3035134e, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_IGNORED,0x3035134f, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
-DEFINE_GUID(CLSID_TortoiseSVN_UNVERSIONED,0x30351350, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_UPTODATE,0x30351346, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_MODIFIED,0x30351347, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_CONFLICTING,0x30351348, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_UNCONTROLLED,0x30351349, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_DROPHANDLER,0x3035134a, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_READONLY,0x3035134b, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_DELETED,0x3035134c, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_LOCKED,0x3035134d, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_ADDED,0x3035134e, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_IGNORED,0x3035134f, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
+DEFINE_GUID(CLSID_Tortoisegit_UNVERSIONED,0x30351350, 0x7b7d, 0x4fcc, 0x81, 0xb4, 0x1e, 0x39, 0x4c, 0xa2, 0x67, 0xeb);\r
\r
\r
#include "Guids.h"\r
#include "PreserveChdir.h"\r
#include "UnicodeUtils.h"\r
-#include "SVNStatus.h"\r
-#include "..\TSVNCache\CacheInterface.h"\r
+#include "GitStatus.h"\r
+//#include "..\TSVNCache\CacheInterface.h"\r
\r
// "The Shell calls IShellIconOverlayIdentifier::GetOverlayInfo to request the\r
// location of the handler's icon overlay. The icon overlay handler returns\r
STDMETHODIMP CShellExt::IsMemberOf(LPCWSTR pwszPath, DWORD /*dwAttrib*/)\r
{\r
PreserveChdir preserveChdir;\r
- svn_wc_status_kind status = svn_wc_status_none;\r
+ git_wc_status_kind status = git_wc_status_none;\r
bool readonlyoverlay = false;\r
bool lockedoverlay = false;\r
if (pwszPath == NULL)\r
{\r
case ShellCache::exe:\r
{\r
+#if 0\r
TSVNCacheResponse itemStatus;\r
SecureZeroMemory(&itemStatus, sizeof(itemStatus));\r
if (m_remoteCacheLink.GetStatusFromRemoteCache(CTSVNPath(pPath), &itemStatus, true))\r
{\r
status = SVNStatus::GetMoreImportant(itemStatus.m_status.text_status, itemStatus.m_status.prop_status);\r
- if ((itemStatus.m_kind == svn_node_file)&&(status == svn_wc_status_normal)&&((itemStatus.m_needslock && itemStatus.m_owner[0]==0)||(itemStatus.m_readonly)))\r
+ if ((itemStatus.m_kind == git_node_file)&&(status == git_wc_status_normal)&&((itemStatus.m_needslock && itemStatus.m_owner[0]==0)||(itemStatus.m_readonly)))\r
readonlyoverlay = true;\r
if (itemStatus.m_owner[0]!=0)\r
lockedoverlay = true;\r
}\r
+#endif \r
}\r
break;\r
case ShellCache::dll:\r
{\r
// Look in our caches for this item \r
+#if 0\r
const FileStatusCacheEntry * s = m_CachedStatus.GetCachedItem(CTSVNPath(pPath));\r
if (s)\r
{\r
{\r
if ((!g_ShellCache.IsRecursive()) && (!g_ShellCache.IsFolderOverlay()))\r
{\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
}\r
else\r
{\r
const FileStatusCacheEntry * s = m_CachedStatus.GetFullStatus(CTSVNPath(pPath), TRUE);\r
status = s->status;\r
- status = SVNStatus::GetMoreImportant(svn_wc_status_normal, status);\r
+ status = SVNStatus::GetMoreImportant(git_wc_status_normal, status);\r
}\r
}\r
else\r
{\r
- status = svn_wc_status_none;\r
+ status = git_wc_status_none;\r
}\r
}\r
else\r
status = s->status;\r
}\r
}\r
- if ((s)&&(status == svn_wc_status_normal)&&(s->needslock)&&(s->owner[0]==0))\r
+ if ((s)&&(status == git_wc_status_normal)&&(s->needslock)&&(s->owner[0]==0))\r
readonlyoverlay = true;\r
if ((s)&&(s->owner[0]!=0))\r
lockedoverlay = true;\r
-\r
+#endif\r
}\r
+\r
break;\r
default:\r
case ShellCache::none:\r
{\r
if (g_ShellCache.HasSVNAdminDir(pPath, TRUE))\r
{\r
- status = svn_wc_status_normal;\r
+ status = git_wc_status_normal;\r
}\r
else\r
{\r
- status = svn_wc_status_none;\r
+ status = git_wc_status_none;\r
}\r
}\r
else\r
{\r
- status = svn_wc_status_none;\r
+ status = git_wc_status_none;\r
}\r
}\r
break;\r
// note: we can show other overlays if due to lack of enough free overlay\r
// slots some of our overlays aren't loaded. But we assume that\r
// at least the 'normal' and 'modified' overlay are available.\r
- case svn_wc_status_none:\r
+ case git_wc_status_none:\r
return S_FALSE;\r
- case svn_wc_status_unversioned:\r
+ case git_wc_status_unversioned:\r
if (g_ShellCache.ShowUnversionedOverlay() && g_unversionedovlloaded && (m_State == FileStateUnversionedOverlay))\r
{\r
g_filepath.clear();\r
return S_OK;\r
}\r
return S_FALSE;\r
- case svn_wc_status_ignored:\r
+ case git_wc_status_ignored:\r
if (g_ShellCache.ShowIgnoredOverlay() && g_ignoredovlloaded && (m_State == FileStateIgnoredOverlay))\r
{\r
g_filepath.clear();\r
return S_OK;\r
}\r
return S_FALSE;\r
- case svn_wc_status_normal:\r
- case svn_wc_status_external:\r
- case svn_wc_status_incomplete:\r
+ case git_wc_status_normal:\r
+ case git_wc_status_external:\r
+ case git_wc_status_incomplete:\r
if ((readonlyoverlay)&&(g_readonlyovlloaded))\r
{\r
if (m_State == FileStateReadOnly)\r
}\r
else\r
return S_FALSE;\r
- case svn_wc_status_missing:\r
- case svn_wc_status_deleted:\r
+ case git_wc_status_missing:\r
+ case git_wc_status_deleted:\r
if (g_deletedovlloaded)\r
{\r
if (m_State == FileStateDeleted)\r
else\r
return S_FALSE;\r
}\r
- case svn_wc_status_replaced:\r
- case svn_wc_status_modified:\r
- case svn_wc_status_merged:\r
+ case git_wc_status_replaced:\r
+ case git_wc_status_modified:\r
+ case git_wc_status_merged:\r
if (m_State == FileStateModified)\r
{\r
g_filepath.clear();\r
}\r
else\r
return S_FALSE;\r
- case svn_wc_status_added:\r
+ case git_wc_status_added:\r
if (g_addedovlloaded)\r
{\r
if (m_State== FileStateAddedOverlay)\r
else\r
return S_FALSE;\r
}\r
- case svn_wc_status_conflicted:\r
- case svn_wc_status_obstructed:\r
+ case git_wc_status_conflicted:\r
+ case git_wc_status_obstructed:\r
if (g_conflictedovlloaded)\r
{\r
if (m_State == FileStateConflict)\r
#include "StdAfx.h"\r
#include "Remotecachelink.h"\r
#include "ShellExt.h"\r
-#include "..\TSVNCache\CacheInterface.h"\r
-#include "TSVNPath.h"\r
+//#include "..\TSVNCache\CacheInterface.h"\r
+//#include "TSVNPath.h"\r
+#define GetCachePipeName() _T("HH")\r
+#define GetCacheCommandPipeName() _T("CC")\r
\r
CRemoteCacheLink::CRemoteCacheLink(void) \r
: m_hPipe(INVALID_HANDLE_VALUE)\r
, m_hCommandPipe(INVALID_HANDLE_VALUE)\r
{\r
- SecureZeroMemory(&m_dummyStatus, sizeof(m_dummyStatus));\r
- m_dummyStatus.text_status = svn_wc_status_none;\r
- m_dummyStatus.prop_status = svn_wc_status_none;\r
- m_dummyStatus.repos_text_status = svn_wc_status_none;\r
- m_dummyStatus.repos_prop_status = svn_wc_status_none;\r
+// SecureZeroMemory(&m_dummyStatus, sizeof(m_dummyStatus));\r
+// m_dummyStatus.text_status = svn_wc_status_none;\r
+// m_dummyStatus.prop_status = svn_wc_status_none;\r
+// m_dummyStatus.repos_text_status = svn_wc_status_none;\r
+// m_dummyStatus.repos_prop_status = svn_wc_status_none;\r
m_lastTimeout = 0;\r
m_critSec.Init();\r
}\r
{\r
// now tell the cache we don't need it's command thread anymore\r
DWORD cbWritten; \r
- TSVNCacheCommand cmd;\r
+/* TSVNCacheCommand cmd;\r
SecureZeroMemory(&cmd, sizeof(TSVNCacheCommand));\r
cmd.command = TSVNCACHECOMMAND_END;\r
WriteFile( \r
DisconnectNamedPipe(m_hCommandPipe); \r
CloseHandle(m_hCommandPipe); \r
m_hCommandPipe = INVALID_HANDLE_VALUE;\r
+*/\r
}\r
}\r
\r
\r
\r
CComCriticalSection m_critSec;\r
- svn_wc_status2_t m_dummyStatus;\r
+// git_wc_status2_t m_dummyStatus;\r
long m_lastTimeout;\r
\r
};\r
-// TortoiseSVN - a Windows shell extension for easy version control\r
+// ToroiseGit - a Windows shell extension for easy version control\r
\r
// Copyright (C) 2003-2008 - Stefan Kueng\r
\r
#pragma once\r
#include "registry.h"\r
#include "Globals.h"\r
-#include "SVNAdminDir.h"\r
+#include "GitAdminDir.h"\r
\r
#define REGISTRYTIMEOUT 2000\r
#define EXCLUDELISTTIMEOUT 5000\r
};\r
ShellCache()\r
{\r
- cachetype = CRegStdWORD(_T("Software\\TortoiseSVN\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? dll : exe);\r
- showrecursive = CRegStdWORD(_T("Software\\TortoiseSVN\\RecursiveOverlay"), TRUE);\r
- folderoverlay = CRegStdWORD(_T("Software\\TortoiseSVN\\FolderOverlay"), TRUE);\r
- driveremote = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskRemote"));\r
- drivefixed = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskFixed"), TRUE);\r
- drivecdrom = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskCDROM"));\r
- driveremove = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskRemovable"));\r
- drivefloppy = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskFloppy"));\r
- driveram = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskRAM"));\r
- driveunknown = CRegStdWORD(_T("Software\\TortoiseSVN\\DriveMaskUnknown"));\r
- excludelist = CRegStdString(_T("Software\\TortoiseSVN\\OverlayExcludeList"));\r
- includelist = CRegStdString(_T("Software\\TortoiseSVN\\OverlayIncludeList"));\r
- simplecontext = CRegStdWORD(_T("Software\\TortoiseSVN\\SimpleContext"), FALSE);\r
- unversionedasmodified = CRegStdWORD(_T("Software\\TortoiseSVN\\UnversionedAsModified"), FALSE);\r
- showunversionedoverlay = CRegStdWORD(_T("Software\\TortoiseSVN\\ShowUnversionedOverlay"), TRUE);\r
- showignoredoverlay = CRegStdWORD(_T("Software\\TortoiseSVN\\ShowIgnoredOverlay"), TRUE);\r
- getlocktop = CRegStdWORD(_T("Software\\TortoiseSVN\\GetLockTop"), TRUE);\r
- excludedasnormal = CRegStdWORD(_T("Software\\TortoiseSVN\\ShowExcludedAsNormal"), TRUE);\r
+ cachetype = CRegStdWORD(_T("Software\\ToroiseGit\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? dll : exe);\r
+ showrecursive = CRegStdWORD(_T("Software\\ToroiseGit\\RecursiveOverlay"), TRUE);\r
+ folderoverlay = CRegStdWORD(_T("Software\\ToroiseGit\\FolderOverlay"), TRUE);\r
+ driveremote = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskRemote"));\r
+ drivefixed = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskFixed"), TRUE);\r
+ drivecdrom = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskCDROM"));\r
+ driveremove = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskRemovable"));\r
+ drivefloppy = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskFloppy"));\r
+ driveram = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskRAM"));\r
+ driveunknown = CRegStdWORD(_T("Software\\ToroiseGit\\DriveMaskUnknown"));\r
+ excludelist = CRegStdString(_T("Software\\ToroiseGit\\OverlayExcludeList"));\r
+ includelist = CRegStdString(_T("Software\\ToroiseGit\\OverlayIncludeList"));\r
+ simplecontext = CRegStdWORD(_T("Software\\ToroiseGit\\SimpleContext"), FALSE);\r
+ unversionedasmodified = CRegStdWORD(_T("Software\\ToroiseGit\\UnversionedAsModified"), FALSE);\r
+ showunversionedoverlay = CRegStdWORD(_T("Software\\ToroiseGit\\ShowUnversionedOverlay"), TRUE);\r
+ showignoredoverlay = CRegStdWORD(_T("Software\\ToroiseGit\\ShowIgnoredOverlay"), TRUE);\r
+ getlocktop = CRegStdWORD(_T("Software\\ToroiseGit\\GetLockTop"), TRUE);\r
+ excludedasnormal = CRegStdWORD(_T("Software\\ToroiseGit\\ShowExcludedAsNormal"), TRUE);\r
cachetypeticker = GetTickCount();\r
recursiveticker = cachetypeticker;\r
folderoverlayticker = cachetypeticker;\r
getlocktopticker = cachetypeticker;\r
excludedasnormalticker = cachetypeticker;\r
excontextticker = cachetypeticker;\r
- menulayoutlow = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntries"), MENUCHECKOUT | MENUUPDATE | MENUCOMMIT);\r
- menulayouthigh = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntrieshigh"), 0);\r
- menumasklow_lm = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntriesMaskLow"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
- menumaskhigh_lm = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
- menumasklow_cu = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntriesMaskLow"), 0);\r
- menumaskhigh_cu = CRegStdWORD(_T("Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh"), 0);\r
- langid = CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033);\r
- blockstatus = CRegStdWORD(_T("Software\\TortoiseSVN\\BlockStatus"), 0);\r
- columnseverywhere = CRegStdWORD(_T("Software\\TortoiseSVN\\ColumnsEveryWhere"), FALSE);\r
+ menulayoutlow = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntries"), MENUCHECKOUT | MENUUPDATE | MENUCOMMIT);\r
+ menulayouthigh = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntrieshigh"), 0);\r
+ menumasklow_lm = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntriesMaskLow"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
+ menumaskhigh_lm = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntriesMaskHigh"), 0, FALSE, HKEY_LOCAL_MACHINE);\r
+ menumasklow_cu = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntriesMaskLow"), 0);\r
+ menumaskhigh_cu = CRegStdWORD(_T("Software\\ToroiseGit\\ContextMenuEntriesMaskHigh"), 0);\r
+ langid = CRegStdWORD(_T("Software\\ToroiseGit\\LanguageID"), 1033);\r
+ blockstatus = CRegStdWORD(_T("Software\\ToroiseGit\\BlockStatus"), 0);\r
+ columnseverywhere = CRegStdWORD(_T("Software\\ToroiseGit\\ColumnsEveryWhere"), FALSE);\r
for (int i=0; i<27; i++)\r
{\r
drivetypecache[i] = (UINT)-1;\r
GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER, &szBuffer[0], sizeof(szBuffer));\r
columnrevformat.NegativeOrder = _ttoi(szBuffer);\r
sAdminDirCacheKey.reserve(MAX_PATH); // MAX_PATH as buffer reservation ok.\r
- nocontextpaths = CRegStdString(_T("Software\\TortoiseSVN\\NoContextPaths"), _T(""));\r
+ nocontextpaths = CRegStdString(_T("Software\\ToroiseGit\\NoContextPaths"), _T(""));\r
m_critSec.Init();\r
}\r
void ForceRefresh()\r
return iter->second;\r
}\r
}\r
- BOOL hasAdminDir = g_SVNAdminDir.HasAdminDir(buf, true);\r
+ BOOL hasAdminDir = g_GitAdminDir.HasAdminDir(buf, true);\r
admindirticker = GetTickCount();\r
Locker lock(m_critSec);\r
admindircache[buf] = hasAdminDir;\r
#include "Guids.h"\r
\r
#include "ShellExt.h"\r
-#include "..\version.h"\r
-#include "libintl.h"\r
+//#include "..\version.h"\r
+//#include "libintl.h"\r
#undef swprintf\r
\r
std::set<CShellExt *> g_exts;\r
if (dirpointA)\r
*dirpointA = 0;\r
strcat_s(langdirA, MAX_PATH, "\\Languages");\r
- bindtextdomain ("subversion", langdirA);\r
+// bindtextdomain ("subversion", langdirA);\r
\r
do\r
{\r
(LPVOID *)&lpVersion,\r
&nInfoSize))\r
{\r
- versionmatch = (_tcscmp((LPCTSTR)lpVersion, _T(STRPRODUCTVER)) == 0);\r
+// versionmatch = (_tcscmp((LPCTSTR)lpVersion, _T(STRPRODUCTVER)) == 0);\r
}\r
\r
}\r
// IPersistFile members\r
STDMETHODIMP CShellExt::GetClassID(CLSID *pclsid) \r
{\r
- *pclsid = CLSID_TortoiseSVN_UNCONTROLLED;\r
+ *pclsid = CLSID_Tortoisegit_UNCONTROLLED;\r
return S_OK;\r
}\r
\r
if (wFunc == FO_COPY)\r
return IDYES; // copying is not a problem for us\r
\r
- m_remoteCacheLink.ReleaseLockForPath(CTSVNPath(pszSrcFile));\r
+// m_remoteCacheLink.ReleaseLockForPath(CTSVNPath(pszSrcFile));\r
// we could now wait a little bit to give the cache time to release the handles.\r
// but the explorer/shell already retries any action for about two seconds\r
// if it first fails. So if the cache hasn't released the handle yet, the explorer\r
#include "resource.h"\r
#include "ShellCache.h"\r
#include "RemoteCacheLink.h"\r
-#include "SVNFolderStatus.h"\r
+#include "GitStatus.h"\r
+//#include "SVNFolderStatus.h"\r
#include "uxtheme.h"\r
\r
extern UINT g_cRefThisDll; // Reference count of this DLL.\r
extern DWORD g_langTimeout;\r
extern HINSTANCE g_hResInst;\r
extern stdstring g_filepath;\r
-extern svn_wc_status_kind g_filestatus; ///< holds the corresponding status to the file/dir above\r
+extern git_wc_status_kind g_filestatus; ///< holds the corresponding status to the file/dir above\r
extern bool g_readonlyoverlay; ///< whether to show the read only overlay or not\r
extern bool g_lockedoverlay; ///< whether to show the locked overlay or not\r
\r
{\r
protected:\r
\r
- enum SVNCommands\r
+ enum GitCommands\r
{\r
ShellSeparator = 0,\r
ShellSubMenu = 1,\r
// helper struct for context menu entries\r
typedef struct MenuInfo\r
{\r
- SVNCommands command; ///< the command which gets executed for this menu entry\r
+ GitCommands command; ///< the command which gets executed for this menu entry\r
unsigned __int64 menuID; ///< the menu ID to recognize the entry. NULL if it shouldn't be added to the context menu automatically\r
UINT iconID; ///< the icon to show for the menu entry\r
UINT menuTextID; ///< the text of the menu entry\r
stdstring itemshorturl;\r
stdstring ignoredprops;\r
stdstring owner;\r
- svn_revnum_t columnrev; ///< holds the corresponding revision to the file/dir above\r
- svn_wc_status_kind filestatus;\r
+// git_revnum_t columnrev; ///< holds the corresponding revision to the file/dir above\r
+ git_wc_status_kind filestatus;\r
std::map<UINT, HBITMAP> bitmaps;\r
\r
- SVNFolderStatus m_CachedStatus; // status cache\r
+// SVNFolderStatus m_CachedStatus; // status cache\r
CRemoteCacheLink m_remoteCacheLink;\r
\r
FN_GetBufferedPaintBits pfnGetBufferedPaintBits;\r
\r
#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))\r
private:\r
- void InsertSVNMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, SVNCommands com, UINT uFlags);\r
+ void InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags);\r
void InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons);\r
stdstring WriteFileListToTempFile();\r
bool WriteClipboardPathsToTempFile(stdstring& tempfile);\r
#include "ShellExt.h"\r
#include "Guids.h"\r
#include "ShellExtClassFactory.h"\r
-#include "svn_dso.h"\r
+//#include "git_dso.h"\r
\r
UINT g_cRefThisDll = 0; ///< reference count of this DLL.\r
HINSTANCE g_hmodThisDll = NULL; ///< handle to this DLL itself.\r
DWORD g_langTimeout = 0;\r
HINSTANCE g_hResInst = NULL;\r
stdstring g_filepath;\r
-svn_wc_status_kind g_filestatus = svn_wc_status_none; ///< holds the corresponding status to the file/dir above\r
+//git_wc_status_kind g_filestatus = git_wc_status_none; ///< holds the corresponding status to the file/dir above\r
bool g_readonlyoverlay = false;\r
bool g_lockedoverlay = false;\r
\r
}\r
while (g_cAprInit--)\r
{\r
- g_SVNAdminDir.Close();\r
- apr_terminate();\r
+ g_GitAdminDir.Close();\r
+// apr_terminate();\r
}\r
}\r
g_csGlobalCOMGuard.Term();\r
*ppvOut = NULL;\r
\r
FileState state = FileStateInvalid;\r
- if (IsEqualIID(rclsid, CLSID_TortoiseSVN_UPTODATE))\r
+ if (IsEqualIID(rclsid, CLSID_Tortoisegit_UPTODATE))\r
state = FileStateVersioned;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_MODIFIED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_MODIFIED))\r
state = FileStateModified;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_CONFLICTING))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_CONFLICTING))\r
state = FileStateConflict;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_UNCONTROLLED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_UNCONTROLLED))\r
state = FileStateUncontrolled;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_DROPHANDLER))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_DROPHANDLER))\r
state = FileStateDropHandler;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_DELETED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_DELETED))\r
state = FileStateDeleted;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_READONLY))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_READONLY))\r
state = FileStateReadOnly;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_LOCKED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_LOCKED))\r
state = FileStateLockedOverlay;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_ADDED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_ADDED))\r
state = FileStateAddedOverlay;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_IGNORED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_IGNORED))\r
state = FileStateIgnoredOverlay;\r
- else if (IsEqualIID(rclsid, CLSID_TortoiseSVN_UNVERSIONED))\r
+ else if (IsEqualIID(rclsid, CLSID_Tortoisegit_UNVERSIONED))\r
state = FileStateUnversionedOverlay;\r
\r
if (state != FileStateInvalid)\r
{\r
- apr_initialize();\r
- svn_dso_initialize2();\r
- g_SVNAdminDir.Init();\r
+// apr_initialize();\r
+// git_dso_initialize2();\r
+// g_SVNAdminDir.Init();\r
g_cAprInit++;\r
\r
CShellExtClassFactory *pcf = new CShellExtClassFactory(state);\r
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"\r
>\r
<File\r
- RelativePath="..\TSVNCache\CacheInterface.cpp"\r
+ RelativePath="ColumnProvider.cpp"\r
>\r
</File>\r
<File\r
- RelativePath="ColumnProvider.cpp"\r
+ RelativePath=".\ContextMenu.cpp"\r
>\r
</File>\r
<File\r
- RelativePath=".\ContextMenu.cpp"\r
+ RelativePath=".\GitAdminDir.cpp"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath=".\RemoteCacheLink.cpp"\r
- >\r
- </File>\r
- <File\r
RelativePath=".\ShellExt.cpp"\r
>\r
</File>\r
</FileConfiguration>\r
</File>\r
<File\r
- RelativePath="..\Svn\SVNAdminDir.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNFolderStatus.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNGlobal.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\Svn\SVNHelpers.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNProperties.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="SVNPropertyPage.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNRev.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNStatus.cpp"\r
+ RelativePath=".\TGitPath.cpp"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Svn\TSVNPath.cpp"\r
- >\r
- </File>\r
- <File\r
RelativePath="..\Utils\UnicodeUtils.cpp"\r
>\r
</File>\r
Filter="h;hpp;hxx;hm;inl;inc"\r
>\r
<File\r
+ RelativePath=".\GitAdminDir.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\GitStatus.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\Globals.h"\r
>\r
</File>\r
>\r
</File>\r
<File\r
- RelativePath="..\Svn\SVNAdminDir.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNFolderStatus.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNGlobal.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\Svn\SVNHelpers.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNProperties.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="SVNPropertyPage.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNRev.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\SVN\SVNStatus.h"\r
- >\r
- </File>\r
- <File\r
- RelativePath="..\Svn\TSVNPath.h"\r
+ RelativePath=".\TGitPath.h"\r
>\r
</File>\r
<File\r
>\r
</File>\r
</Filter>\r
+ <File\r
+ RelativePath=".\ClassDiagram1.cd"\r
+ >\r
+ </File>\r
</Files>\r
<Globals>\r
<Global\r
#define IDS_MENUDESCREMOVEKEEP 272\r
#define IDS_YES 273\r
#define IDS_NO 274\r
-#define IDS_SVN_DEPTH_INFINITE 300\r
-#define IDS_SVN_DEPTH_IMMEDIATE 301\r
-#define IDS_SVN_DEPTH_FILES 302\r
-#define IDS_SVN_DEPTH_EMPTY 303\r
-#define IDS_SVN_DEPTH_EXCLUDE 304\r
-#define IDS_SVN_DEPTH_UNKNOWN 305\r
-#define IDS_SVN_DEPTH_WORKING 306\r
+#define IDS_git_DEPTH_INFINITE 300\r
+#define IDS_git_DEPTH_IMMEDIATE 301\r
+#define IDS_git_DEPTH_FILES 302\r
+#define IDS_git_DEPTH_EMPTY 303\r
+#define IDS_git_DEPTH_EXCLUDE 304\r
+#define IDS_git_DEPTH_UNKNOWN 305\r
+#define IDS_git_DEPTH_WORKING 306\r
#define IDC_REVISION 1001\r
#define IDC_LOCKED 1002\r
#define IDC_REPOURL 1003\r
#define IDC_EDITVALUE 1015\r
#define IDC_SHOWLOG 1016\r
#define IDC_RECURSIVE 1018\r
-#define IDS_SVN_USERCANCELLED 1181\r
+#define IDS_git_USERCANCELLED 1181\r
#define IDI_REPOBROWSE 5145\r
#define IDI_BLAME 5146\r
#define IDI_PATCH 5147\r
\r
STRINGTABLE \r
BEGIN\r
- IDS_SVN_DEPTH_INFINITE "Fully recursive"\r
- IDS_SVN_DEPTH_IMMEDIATE "Immediate children, including folders"\r
- IDS_SVN_DEPTH_FILES "Only file children"\r
- IDS_SVN_DEPTH_EMPTY "Only this item"\r
+ IDS_git_DEPTH_INFINITE "Fully recursive"\r
+ IDS_git_DEPTH_IMMEDIATE "Immediate children, including folders"\r
+ IDS_git_DEPTH_FILES "Only file children"\r
+ IDS_git_DEPTH_EMPTY "Only this item"\r
END\r
\r
STRINGTABLE \r
BEGIN\r
- IDS_SVN_DEPTH_UNKNOWN "Unknown depth"\r
- IDS_SVN_DEPTH_WORKING "Working copy"\r
+ IDS_git_DEPTH_UNKNOWN "Unknown depth"\r
+ IDS_git_DEPTH_WORKING "Working copy"\r
END\r
\r
#endif // English (U.S.) resources\r
#pragma warning(pop)\r
\r
#pragma warning(push)\r
-#include "apr_general.h"\r
-#include "svn_pools.h"\r
-#include "svn_client.h"\r
-#include "svn_path.h"\r
-#include "svn_wc.h"\r
-#include "svn_utf.h"\r
-#include "svn_config.h"\r
-#include "svn_subst.h"\r
+//#include "apr_general.h"\r
+//#include "git_pools.h"\r
+//#include "git_client.h"\r
+//#include "git_path.h"\r
+//#include "git_wc.h"\r
+//#include "git_utf.h"\r
+//#include "git_config.h"\r
+//#include "git_subst.h"\r
#pragma warning(pop)\r
\r
#define CSTRING_AVAILABLE\r
OSDN Git Service
