{ ShellMenuPrevDiff, MENUPREVDIFF, IDI_DIFF, IDS_MENUPREVDIFF, IDS_MENUDESCPREVDIFF,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_FOLDER, 0, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuUrlDiff, MENUURLDIFF, IDI_DIFF, IDS_MENUURLDIFF, IDS_MENUDESCURLDIFF,\r
- ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, 0, ITEMIS_FOLDERINSVN|ITEMIS_EXTENDED|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
+// { ShellMenuUrlDiff, MENUURLDIFF, IDI_DIFF, IDS_MENUURLDIFF, IDS_MENUDESCURLDIFF,\r
+// ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_EXTENDED, 0, ITEMIS_FOLDERINSVN|ITEMIS_EXTENDED|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuLog, MENULOG, IDI_LOG, IDS_MENULOG, IDS_MENUDESCLOG,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, 0, 0 },\r
\r
- { ShellMenuRepoBrowse, MENUREPOBROWSE, IDI_REPOBROWSE, IDS_MENUREPOBROWSE, IDS_MENUDESCREPOBROWSE,\r
- ITEMIS_ONLYONE, 0, ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
+// { ShellMenuRepoBrowse, MENUREPOBROWSE, IDI_REPOBROWSE, IDS_MENUREPOBROWSE, IDS_MENUDESCREPOBROWSE,\r
+// ITEMIS_ONLYONE, 0, ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuShowChanged, MENUSHOWCHANGED, IDI_SHOWCHANGED, IDS_MENUSHOWCHANGED, IDS_MENUDESCSHOWCHANGED,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, 0, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0},\r
{ ShellMenuResolve, MENURESOLVE, IDI_RESOLVE, IDS_MENURESOLVE, IDS_MENUDESCRESOLVE,\r
ITEMIS_INSVN|ITEMIS_CONFLICTED, 0, ITEMIS_INSVN|ITEMIS_FOLDER, 0, ITEMIS_FOLDERINSVN, 0, 0, 0 },\r
\r
- { ShellMenuUpdateExt, MENUUPDATEEXT, IDI_UPDATE, IDS_MENUUPDATEEXT, IDS_MENUDESCUPDATEEXT,\r
- ITEMIS_INSVN, ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_ADDED, 0, 0, 0, 0 },\r
+// { ShellMenuUpdateExt, MENUUPDATEEXT, IDI_UPDATE, IDS_MENUUPDATEEXT, IDS_MENUDESCUPDATEEXT,\r
+// ITEMIS_INSVN, ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_ADDED, 0, 0, 0, 0 },\r
\r
{ ShellMenuRename, MENURENAME, IDI_RENAME, IDS_MENURENAME, IDS_MENUDESCRENAME,\r
ITEMIS_INSVN|ITEMIS_ONLYONE|ITEMIS_INVERSIONEDFOLDER, 0, 0, 0, 0, 0, 0, 0 },\r
{ ShellMenuCleanup, MENUCLEANUP, IDI_CLEANUP, IDS_MENUCLEANUP, IDS_MENUDESCCLEANUP,\r
ITEMIS_INSVN|ITEMIS_FOLDER, 0, ITEMIS_FOLDERINSVN|ITEMIS_FOLDER, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuLock, MENULOCK, IDI_LOCK, IDS_MENU_LOCK, IDS_MENUDESC_LOCK,\r
- ITEMIS_INSVN, ITEMIS_LOCKED|ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_LOCKED|ITEMIS_ADDED, 0, 0, 0, 0 },\r
+// { ShellMenuLock, MENULOCK, IDI_LOCK, IDS_MENU_LOCK, IDS_MENUDESC_LOCK,\r
+// ITEMIS_INSVN, ITEMIS_LOCKED|ITEMIS_ADDED, ITEMIS_FOLDERINSVN, ITEMIS_LOCKED|ITEMIS_ADDED, 0, 0, 0, 0 },\r
\r
- { ShellMenuUnlock, MENUUNLOCK, IDI_UNLOCK, IDS_MENU_UNLOCK, IDS_MENUDESC_UNLOCK,\r
- ITEMIS_INSVN|ITEMIS_LOCKED, 0, ITEMIS_FOLDER|ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0 },\r
+// { ShellMenuUnlock, MENUUNLOCK, IDI_UNLOCK, IDS_MENU_UNLOCK, IDS_MENUDESC_UNLOCK,\r
+// ITEMIS_INSVN|ITEMIS_LOCKED, 0, ITEMIS_FOLDER|ITEMIS_INSVN, 0, ITEMIS_FOLDERINSVN, 0, 0, 0 },\r
\r
- { ShellMenuUnlockForce, MENUUNLOCK, IDI_UNLOCK, IDS_MENU_UNLOCKFORCE, IDS_MENUDESC_UNLOCKFORCE,\r
- ITEMIS_INSVN|ITEMIS_LOCKED, 0, ITEMIS_FOLDER|ITEMIS_INSVN|ITEMIS_EXTENDED, 0, 0, 0, 0, 0 },\r
+// { ShellMenuUnlockForce, MENUUNLOCK, IDI_UNLOCK, IDS_MENU_UNLOCKFORCE, IDS_MENUDESC_UNLOCKFORCE,\r
+// ITEMIS_INSVN|ITEMIS_LOCKED, 0, ITEMIS_FOLDER|ITEMIS_INSVN|ITEMIS_EXTENDED, 0, 0, 0, 0, 0 },\r
\r
{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
\r
- { ShellMenuCopy, MENUCOPY, IDI_COPY, IDS_MENUBRANCH, IDS_MENUDESCCOPY,\r
- ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
+// { ShellMenuCopy, MENUCOPY, IDI_COPY, IDS_MENUBRANCH, IDS_MENUDESCCOPY,\r
+// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuSwitch, MENUSWITCH, IDI_SWITCH, IDS_MENUSWITCH, IDS_MENUDESCSWITCH,\r
- ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
+// { ShellMenuSwitch, MENUSWITCH, IDI_SWITCH, IDS_MENUSWITCH, IDS_MENUDESCSWITCH,\r
+// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuMerge, MENUMERGE, IDI_MERGE, IDS_MENUMERGE, IDS_MENUDESCMERGE,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
{ ShellMenuAddAsReplacement, MENUADD, IDI_ADD, IDS_MENUADDASREPLACEMENT, IDS_MENUADDASREPLACEMENT,\r
ITEMIS_DELETED|ITEMIS_ONLYONE, ITEMIS_FOLDER, 0, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuImport, MENUIMPORT, IDI_IMPORT, IDS_MENUIMPORT, IDS_MENUDESCIMPORT,\r
- ITEMIS_FOLDER, ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r
+// { ShellMenuImport, MENUIMPORT, IDI_IMPORT, IDS_MENUIMPORT, IDS_MENUDESCIMPORT,\r
+// ITEMIS_FOLDER, ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuBlame, MENUBLAME, IDI_BLAME, IDS_MENUBLAME, IDS_MENUDESCBLAME,\r
- ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_FOLDER|ITEMIS_ADDED, 0, 0, 0, 0, 0, 0 },\r
+// { ShellMenuBlame, MENUBLAME, IDI_BLAME, IDS_MENUBLAME, IDS_MENUDESCBLAME,\r
+// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_FOLDER|ITEMIS_ADDED, 0, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuIgnoreSub, MENUIGNORE, IDI_IGNORE, IDS_MENUIGNORE, IDS_MENUDESCIGNORE,\r
- ITEMIS_INVERSIONEDFOLDER, ITEMIS_IGNORED|ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r
+// { ShellMenuIgnoreSub, MENUIGNORE, IDI_IGNORE, IDS_MENUIGNORE, IDS_MENUDESCIGNORE,\r
+// ITEMIS_INVERSIONEDFOLDER, ITEMIS_IGNORED|ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r
\r
- { ShellMenuUnIgnoreSub, MENUIGNORE, IDI_IGNORE, IDS_MENUUNIGNORE, IDS_MENUDESCUNIGNORE,\r
- ITEMIS_IGNORED, 0, 0, 0, 0, 0, 0, 0 },\r
+// { ShellMenuUnIgnoreSub, MENUIGNORE, IDI_IGNORE, IDS_MENUUNIGNORE, IDS_MENUDESCUNIGNORE,\r
+// ITEMIS_IGNORED, 0, 0, 0, 0, 0, 0, 0 },\r
\r
{ ShellSeparator, 0, 0, 0, 0, 0, 0, 0, 0},\r
\r
LPDATAOBJECT pDataObj,\r
HKEY /* hRegKey */)\r
{\r
-#if 0\r
+\r
ATLTRACE("Shell :: Initialize\n");\r
PreserveChdir preserveChdir;\r
files_.clear();\r
{\r
if (m_State == FileStateDropHandler)\r
{\r
+\r
FORMATETC etc = { CF_HDROP, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };\r
STGMEDIUM stg = { TYMED_HGLOBAL };\r
if ( FAILED( pDataObj->GetData ( &etc, &stg )))\r
try\r
{\r
GitStatus stat;\r
- //stat.GetStatus(CTGitPath(str.c_str()), false, true, true);\r
+ stat.GetStatus(CTGitPath(str.c_str()), false, true, true);\r
if (stat.status)\r
{\r
statuspath = str;\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 == git_node_dir))\r
- {\r
- itemStates |= ITEMIS_FOLDER;\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
- if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
- itemStates |= ITEMIS_NEEDSLOCK;\r
- }\r
- if ((stat.status->entry)&&(stat.status->entry->uuid))\r
- uuidSource = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\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 == git_node_dir))\r
+ //{\r
+ // itemStates |= ITEMIS_FOLDER;\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
+ // if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
+ // itemStates |= ITEMIS_NEEDSLOCK;\r
+ //}\r
+ //if ((stat.status->entry)&&(stat.status->entry->uuid))\r
+ // uuidSource = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\r
}\r
else\r
{\r
ATLTRACE2(_T("Exception in GitStatus::GetAllStatus()\n"));\r
}\r
if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
- itemStates |= ITEMIS_INGit;\r
+ itemStates |= ITEMIS_INSVN;\r
if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r
if (status == git_wc_status_normal)\r
} // for (int i = 0; i < count; i++)\r
GlobalUnlock ( drop );\r
ReleaseStgMedium ( &stg );\r
+\r
} // if (m_State == FileStateDropHandler) \r
else\r
{\r
+\r
//Enumerate PIDLs which the user has selected\r
CIDA* cida = (CIDA*)GlobalLock(medium.hGlobal);\r
ItemIDList parent( GetPIDLFolder (cida));\r
{\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 == git_node_dir))\r
- {\r
- itemStates |= ITEMIS_FOLDER;\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
- if ((stat.status->entry)&&(stat.status->entry->present_props))\r
- {\r
- if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
- itemStates |= ITEMIS_NEEDSLOCK;\r
- }\r
- if ((stat.status->entry)&&(stat.status->entry->uuid))\r
- uuidSource = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\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 == git_node_dir))\r
+ //{\r
+ // itemStates |= ITEMIS_FOLDER;\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
+ //if ((stat.status->entry)&&(stat.status->entry->present_props))\r
+ //{\r
+ // if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
+ // itemStates |= ITEMIS_NEEDSLOCK;\r
+ //}\r
+ //if ((stat.status->entry)&&(stat.status->entry->uuid))\r
+ // uuidSource = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\r
} \r
else\r
{\r
}\r
}\r
if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
- itemStates |= ITEMIS_INGit;\r
+ itemStates |= ITEMIS_INSVN;\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
- GitProperties props(strpath.GetContainingDirectory(), false);\r
- ignoredprops.empty();\r
-
for (int p=0; p<props.GetCount(); ++p)
\r- {\r
- if (props.GetItemName(p).compare(stdstring(_T("svn:ignore")))==0)\r
- {\r
- std::string st = props.GetItemValue(p);\r
- ignoredprops = MultibyteToWide(st.c_str());\r
- // remove all escape chars ('\\')\r
- std::remove(ignoredprops.begin(), ignoredprops.end(), '\\');\r
- break;\r
- }\r
- }\r
+// GitProperties props(strpath.GetContainingDirectory(), false);\r
+// ignoredprops.empty();\r
+
// for (int p=0; p<props.GetCount(); ++p)
\r+// {\r
+// if (props.GetItemName(p).compare(stdstring(_T("svn:ignore")))==0)\r
+// {\r
+// std::string st = props.GetItemValue(p);\r
+// ignoredprops = MultibyteToWide(st.c_str());\r
+// // remove all escape chars ('\\')\r
+// std::remove(ignoredprops.begin(), ignoredprops.end(), '\\');\r
+// break;\r
+// }\r
+// }\r
}\r
if (status == git_wc_status_normal)\r
itemStates |= ITEMIS_NORMAL;\r
}\r
} // for (int i = 0; i < count; ++i)\r
ItemIDList child (GetPIDLItem (cida, 0), &parent);\r
- if (g_ShellCache.HasGitAdminDir(child.toString().c_str(), FALSE))\r
- itemStates |= ITEMIS_INVERSIONEDFOLDER;\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
}\r
if (IsClipboardFormatAvailable(CF_HDROP)) \r
itemStates |= ITEMIS_PATHINCLIPBOARD;\r
+\r
}\r
\r
ReleaseStgMedium ( &medium );\r
// get folder background\r
if (pIDFolder)\r
{\r
+\r
ItemIDList list(pIDFolder);\r
folder_ = list.toString();\r
git_wc_status_kind status = git_wc_status_none;\r
if (stat.status)\r
{\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 (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
- itemStatesFolder |= ITEMIS_NEEDSLOCK;\r
- }\r
- if ((stat.status->entry)&&(stat.status->entry->uuid))\r
- uuidTarget = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\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 (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
+// itemStatesFolder |= ITEMIS_NEEDSLOCK;\r
+// }\r
+// if ((stat.status->entry)&&(stat.status->entry->uuid))\r
+// uuidTarget = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\r
if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
- itemStatesFolder |= ITEMIS_INGit;\r
+ itemStatesFolder |= ITEMIS_INSVN;\r
if (status == git_wc_status_normal)\r
itemStatesFolder |= ITEMIS_NORMAL;\r
if (status == git_wc_status_conflicted)\r
}\r
if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
{\r
- itemStatesFolder |= ITEMIS_FOLDERINGit;\r
+ itemStatesFolder |= ITEMIS_FOLDERINSVN;\r
}\r
if (status == git_wc_status_ignored)\r
itemStatesFolder |= ITEMIS_IGNORED;\r
itemStates |= ITEMIS_ONLYONE;\r
if (m_State != FileStateDropHandler)\r
itemStates |= itemStatesFolder;\r
+\r
}\r
if (files_.size() == 2)\r
itemStates |= ITEMIS_TWO;\r
if ((files_.size() == 1)&&(g_ShellCache.IsContextPathAllowed(files_.front().c_str())))\r
{\r
+\r
itemStates |= ITEMIS_ONLYONE;\r
if (m_State != FileStateDropHandler)\r
{\r
if (stat.status)\r
{\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
- if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
- itemStates |= ITEMIS_NEEDSLOCK;\r
- }\r
- if ((stat.status->entry)&&(stat.status->entry->uuid))\r
- uuidTarget = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\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
+// if (strstr(stat.status->entry->present_props, "svn:needs-lock"))\r
+// itemStates |= ITEMIS_NEEDSLOCK;\r
+// }\r
+// if ((stat.status->entry)&&(stat.status->entry->uuid))\r
+// uuidTarget = CUnicodeUtils::StdGetUnicode(stat.status->entry->uuid);\r
}\r
}\r
catch ( ... )\r
status = fetchedstatus;\r
}\r
if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
- itemStates |= ITEMIS_FOLDERINGit;\r
+ itemStates |= ITEMIS_FOLDERINSVN;\r
if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r
itemStates |= ITEMIS_FOLDER;\r
itemStates |= ITEMIS_DELETED;\r
}\r
}\r
+ \r
}\r
-#endif \r
+ \r
return NOERROR;\r
}\r
\r
OSDN Git Service
