{\r
ATLTRACE2(_T("Exception in GitStatus::GetStatus()\n"));\r
}\r
- if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ //if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ if (askedpath.HasAdminDir())\r
itemStates |= ITEMIS_INSVN;\r
if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r
ATLTRACE2(_T("Exception in GitStatus::GetStatus()\n"));\r
}\r
}\r
- if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ //if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ if (strpath.HasAdminDir())\r
itemStates |= ITEMIS_INSVN;\r
if (status == git_wc_status_ignored)\r
{\r
git_wc_status_kind status = git_wc_status_none;\r
if (IsClipboardFormatAvailable(CF_HDROP)) \r
itemStatesFolder |= ITEMIS_PATHINCLIPBOARD;\r
+ \r
+ CTGitPath askedpath;\r
+ askedpath.SetFromWin(folder_.c_str());\r
+\r
if ((folder_.compare(statuspath)!=0)&&(g_ShellCache.IsContextPathAllowed(folder_.c_str())))\r
{\r
- CTGitPath askedpath;\r
- askedpath.SetFromWin(folder_.c_str());\r
+ \r
try\r
{\r
GitStatus stat;\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_INSVN;\r
- if (status == git_wc_status_normal)\r
- itemStatesFolder |= ITEMIS_NORMAL;\r
- if (status == git_wc_status_conflicted)\r
- itemStatesFolder |= ITEMIS_CONFLICTED;\r
- if (status == git_wc_status_added)\r
- itemStatesFolder |= ITEMIS_ADDED;\r
- if (status == git_wc_status_deleted)\r
- itemStatesFolder |= ITEMIS_DELETED;\r
+ \r
}\r
else\r
{\r
if (askedpath.HasAdminDir())\r
status = git_wc_status_normal;\r
}\r
+ \r
+ //if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ if (askedpath.HasAdminDir())\r
+ itemStatesFolder |= ITEMIS_INSVN;\r
+ if (status == git_wc_status_normal)\r
+ itemStatesFolder |= ITEMIS_NORMAL;\r
+ if (status == git_wc_status_conflicted)\r
+ itemStatesFolder |= ITEMIS_CONFLICTED;\r
+ if (status == git_wc_status_added)\r
+ itemStatesFolder |= ITEMIS_ADDED;\r
+ if (status == git_wc_status_deleted)\r
+ itemStatesFolder |= ITEMIS_DELETED;\r
+\r
}\r
catch ( ... )\r
{\r
{\r
status = fetchedstatus;\r
}\r
- if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ //if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ if (askedpath.HasAdminDir())\r
{\r
itemStatesFolder |= ITEMIS_FOLDERINSVN;\r
}\r
{\r
folder_ = files_.front();\r
git_wc_status_kind status = git_wc_status_none;\r
+ CTGitPath askedpath;\r
+ askedpath.SetFromWin(folder_.c_str());\r
+\r
if (folder_.compare(statuspath)!=0)\r
- {\r
- CTGitPath askedpath;\r
- askedpath.SetFromWin(folder_.c_str());\r
+ { \r
try\r
{\r
GitStatus stat;\r
{\r
status = fetchedstatus;\r
}\r
- if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ //if ((status != git_wc_status_unversioned)&&(status != git_wc_status_ignored)&&(status != git_wc_status_none))\r
+ if (askedpath.HasAdminDir())\r
itemStates |= ITEMIS_FOLDERINSVN;\r
if (status == git_wc_status_ignored)\r
itemStates |= ITEMIS_IGNORED;\r