+\r
+BOOL CGit::CheckCleanWorkTree()\r
+{\r
+ CString out;\r
+ CString cmd;\r
+ cmd=_T("git.exe rev-parse --verify HEAD");\r
+\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ return FALSE;\r
+\r
+ cmd=_T("git.exe update-index --ignore-submodules --refresh");\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ return FALSE;\r
+\r
+ cmd=_T("git.exe diff-files --quiet --ignore-submodules");\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ return FALSE;\r
+\r
+ cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ return FALSE;\r
+\r
+ return TRUE;\r
+}\r
+int CGit::Revert(CTGitPathList &list,bool keep)\r
+{\r
+ int ret;\r
+ for(int i=0;i<list.GetCount();i++)\r
+ { \r
+ ret = Revert((CTGitPath&)list[i],keep);\r
+ if(ret)\r
+ return ret;\r
+ }\r
+ return 0;\r
+}\r
+int CGit::Revert(CTGitPath &path,bool keep)\r
+{\r
+ CString cmd, out;\r
+ if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
+ { //To init git repository, there are not HEAD, so we can use git reset command\r
+ cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ return -1;\r
+ }\r
+ else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )\r
+ {\r
+ cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ return -1;\r
+ \r
+ cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitOldPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ return -1;\r
+ }\r
+ else\r
+ {\r
+ cmd.Format(_T("git.exe checkout -f -- \"%s\""),path.GetGitPathString());\r
+ if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ return -1;\r
+ }\r
+ return 0;\r
+}\r
+\r
+int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)\r
+{\r
+ BYTE_VECTOR vector;\r
+\r
+ CString cmd;\r
+ if(path)\r
+ cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());\r
+ else\r
+ cmd=_T("git.exe ls-files -u -t -z");\r
+\r
+ if(g_Git.Run(cmd,&vector))\r
+ {\r
+ return -1;\r
+ }\r
+\r
+ list.ParserFromLsFile(vector);\r
+\r
+ return 0;\r
+}
\ No newline at end of file