src/Git/Git.cpp

   1 #include "StdAfx.h"\r
   2 #include "Git.h"\r
   3 #include "atlconv.h"\r
   4 #include "GitRev.h"\r
   5 #include "registry.h"\r
   6 #include "GitConfig.h"\r
   7 #include <map>\r
   8 #include "UnicodeUtils.h"\r
   9 \r
  10 int CGit::m_LogEncode=CP_UTF8;\r
  11 \r
  12 \r
  13 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
  14 {\r
  15         LPCTSTR orgsrc;\r
  16 \r
  17         while (*src == _T(';'))\r
  18                 src++;\r
  19 \r
  20         orgsrc = src;\r
  21 \r
  22         if (!--maxlen)\r
  23                 goto nullterm;\r
  24 \r
  25         while (*src && *src != _T(';'))\r
  26         {\r
  27                 if (*src != _T('"'))\r
  28                 {\r
  29                         *dst++ = *src++;\r
  30                         if (!--maxlen)\r
  31                         {\r
  32                                 orgsrc = src;\r
  33                                 goto nullterm;\r
  34                         }\r
  35                 }\r
  36                 else\r
  37                 {\r
  38                         src++;\r
  39                         while (*src && *src != _T('"'))\r
  40                         {\r
  41                                 *dst++ = *src++;\r
  42                                 if (!--maxlen)\r
  43                                 {\r
  44                                         orgsrc = src;\r
  45                                         goto nullterm;\r
  46                                 }\r
  47                         }\r
  48 \r
  49                         if (*src)\r
  50                                 src++;\r
  51                 }\r
  52         }\r
  53 \r
  54         while (*src == _T(';'))\r
  55                 src++;\r
  56 \r
  57 nullterm:\r
  58 \r
  59         *dst = 0;\r
  60 \r
  61         return (orgsrc != src) ? (LPTSTR)src : NULL;\r
  62 }\r
  63 \r
  64 static inline BOOL FileExists(LPCTSTR lpszFileName)\r
  65 {\r
  66         struct _stat st;\r
  67         return _tstat(lpszFileName, &st) == 0;\r
  68 }\r
  69 \r
  70 static BOOL FindGitPath()\r
  71 {\r
  72         size_t size;\r
  73         _tgetenv_s(&size, NULL, 0, _T("PATH"));\r
  74 \r
  75         if (!size)\r
  76         {\r
  77                 return FALSE;\r
  78         }\r
  79 \r
  80         TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));\r
  81         _tgetenv_s(&size, env, size, _T("PATH"));\r
  82 \r
  83         TCHAR buf[_MAX_PATH];\r
  84 \r
  85         // search in all paths defined in PATH\r
  86         while ((env = nextpath(env, buf, _MAX_PATH-1)) && *buf)\r
  87         {\r
  88                 TCHAR *pfin = buf + _tcslen(buf)-1;\r
  89 \r
  90                 // ensure trailing slash\r
  91                 if (*pfin != _T('/') && *pfin != _T('\\'))\r
  92                         _tcscpy(++pfin, _T("\\"));\r
  93 \r
  94                 const int len = _tcslen(buf);\r
  95 \r
  96                 if ((len + 7) < _MAX_PATH)\r
  97                         _tcscpy(pfin+1, _T("git.exe"));\r
  98                 else\r
  99                         break;\r
 100 \r
 101                 if ( FileExists(buf) )\r
 102                 {\r
 103                         // dir found\r
 104                         pfin[1] = 0;\r
 105                         CGit::ms_LastMsysGitDir = buf;\r
 106                         return TRUE;\r
 107                 }\r
 108         }\r
 109 \r
 110         return FALSE;\r
 111 }\r
 112 \r
 113 \r
 114 #define MAX_DIRBUFFER 1000\r
 115 #define CALL_OUTPUT_READ_CHUNK_SIZE 1024\r
 116 \r
 117 CString CGit::ms_LastMsysGitDir;\r
 118 CGit g_Git;\r
 119 \r
 120 // contains system environment that should be used by child processes (RunAsync)\r
 121 // initialized by CheckMsysGitDir\r
 122 static LPTSTR l_processEnv = NULL;\r
 123 \r
 124 \r
 125 \r
 126 CGit::CGit(void)\r
 127 {\r
 128         GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
 129         m_CurrentDir.ReleaseBuffer();\r
 130         m_IsGitDllInited = false;\r
 131         CheckMsysGitDir();\r
 132 }\r
 133 \r
 134 CGit::~CGit(void)\r
 135 {\r
 136 }\r
 137 \r
 138 static char g_Buffer[4096];\r
 139 \r
 140 int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CString *StdioFile)\r
 141 {\r
 142         SECURITY_ATTRIBUTES sa;\r
 143         HANDLE hRead, hWrite;\r
 144         HANDLE hStdioFile = NULL;\r
 145 \r
 146         sa.nLength = sizeof(SECURITY_ATTRIBUTES);\r
 147         sa.lpSecurityDescriptor=NULL;\r
 148         sa.bInheritHandle=TRUE;\r
 149         if(!CreatePipe(&hRead,&hWrite,&sa,0))\r
 150         {\r
 151                 return GIT_ERROR_OPEN_PIP;\r
 152         }\r
 153         \r
 154         if(StdioFile)\r
 155         {\r
 156                 hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ   |   FILE_SHARE_WRITE,   \r
 157                         &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);  \r
 158         }\r
 159 \r
 160         STARTUPINFO si;\r
 161         PROCESS_INFORMATION pi;\r
 162         si.cb=sizeof(STARTUPINFO);\r
 163         GetStartupInfo(&si);\r
 164 \r
 165         si.hStdError=hWrite;\r
 166         if(StdioFile)\r
 167                 si.hStdOutput=hStdioFile;\r
 168         else\r
 169                 si.hStdOutput=hWrite;\r
 170 \r
 171         si.wShowWindow=SW_HIDE;\r
 172         si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
 173 \r
 174         LPTSTR pEnv = l_processEnv;\r
 175         DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;\r
 176         \r
 177         //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password. \r
 178         dwFlags |= DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP; \r
 179 \r
 180         memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));\r
 181 \r
 182         if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
 183         {\r
 184                 LPVOID lpMsgBuf;\r
 185                 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
 186                         NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\r
 187                         (LPTSTR)&lpMsgBuf,\r
 188                         0,NULL);\r
 189                 return GIT_ERROR_CREATE_PROCESS;\r
 190         }\r
 191         \r
 192         m_CurrentGitPi = pi;\r
 193         \r
 194         CloseHandle(hWrite);\r
 195         if(piOut)\r
 196                 *piOut=pi;\r
 197         if(hReadOut)\r
 198                 *hReadOut=hRead;\r
 199         \r
 200         return 0;\r
 201 \r
 202 }\r
 203 //Must use sperate function to convert ANSI str to union code string\r
 204 //Becuase A2W use stack as internal convert buffer. \r
 205 void CGit::StringAppend(CString *str,BYTE *p,int code,int length)\r
 206 {\r
 207      //USES_CONVERSION;\r
 208          //str->Append(A2W_CP((LPCSTR)p,code));\r
 209         if(str == NULL)\r
 210                 return ;\r
 211 \r
 212         WCHAR * buf;\r
 213 \r
 214         int len ;\r
 215         if(length<0)\r
 216                 len= strlen((const char*)p);\r
 217         else\r
 218                 len=length;\r
 219         //if (len==0)\r
 220         //      return ;\r
 221         //buf = new WCHAR[len*4 + 1];\r
 222         buf = str->GetBuffer(len*4+1+str->GetLength())+str->GetLength();\r
 223         SecureZeroMemory(buf, (len*4 + 1)*sizeof(WCHAR));\r
 224         MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len*4);\r
 225         str->ReleaseBuffer();\r
 226         //str->Append(buf);\r
 227         //delete buf;\r
 228 }       \r
 229 BOOL CGit::IsInitRepos()\r
 230 {\r
 231         CString cmdout;\r
 232         cmdout.Empty();\r
 233         if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout,CP_UTF8))\r
 234         {\r
 235         //      CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);\r
 236                 return TRUE;\r
 237         }\r
 238         if(cmdout.IsEmpty())\r
 239                 return TRUE;\r
 240 \r
 241         return FALSE;\r
 242 }\r
 243 int CGit::Run(CGitCall* pcall)\r
 244 {\r
 245         PROCESS_INFORMATION pi;\r
 246         HANDLE hRead;\r
 247         if(RunAsync(pcall->GetCmd(),&pi,&hRead))\r
 248                 return GIT_ERROR_CREATE_PROCESS;\r
 249 \r
 250         DWORD readnumber;\r
 251         BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];\r
 252         bool bAborted=false;\r
 253         while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))\r
 254         {\r
 255                 //Todo: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?\r
 256                 if(!bAborted)//For now, flush output when command aborted.\r
 257                         if(pcall->OnOutputData(data,readnumber))\r
 258                                 bAborted=true;\r
 259         }\r
 260         if(!bAborted)\r
 261                 pcall->OnEnd();\r
 262 \r
 263         \r
 264         CloseHandle(pi.hThread);\r
 265 \r
 266         WaitForSingleObject(pi.hProcess, INFINITE);\r
 267         DWORD exitcode =0;\r
 268 \r
 269         if(!GetExitCodeProcess(pi.hProcess,&exitcode))\r
 270         {\r
 271                 return GIT_ERROR_GET_EXIT_CODE;\r
 272         }\r
 273 \r
 274         CloseHandle(pi.hProcess);\r
 275 \r
 276         CloseHandle(hRead);\r
 277         return exitcode;\r
 278 }\r
 279 class CGitCall_ByteVector : public CGitCall\r
 280 {\r
 281 public:\r
 282         CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector):CGitCall(cmd),m_pvector(pvector){}\r
 283         virtual bool OnOutputData(const BYTE* data, size_t size)\r
 284         {\r
 285                 size_t oldsize=m_pvector->size();\r
 286                 m_pvector->resize(m_pvector->size()+size);\r
 287                 memcpy(&*(m_pvector->begin()+oldsize),data,size);\r
 288                 return false;\r
 289         }\r
 290         BYTE_VECTOR* m_pvector;\r
 291 \r
 292 };\r
 293 int CGit::Run(CString cmd,BYTE_VECTOR *vector)\r
 294 {\r
 295         CGitCall_ByteVector call(cmd,vector);\r
 296         return Run(&call);\r
 297 }\r
 298 int CGit::Run(CString cmd, CString* output,int code)\r
 299 {\r
 300         BYTE_VECTOR vector;\r
 301         int ret;\r
 302         ret=Run(cmd,&vector);\r
 303 \r
 304         vector.push_back(0);\r
 305         \r
 306         StringAppend(output,&(vector[0]),code);\r
 307         return ret;\r
 308 }\r
 309 \r
 310 CString CGit::GetUserName(void)\r
 311 {\r
 312         return GetConfigValue(L"user.name");\r
 313 }\r
 314 CString CGit::GetUserEmail(void)\r
 315 {\r
 316         return GetConfigValue(L"user.email");\r
 317 }\r
 318 \r
 319 CString CGit::GetConfigValue(CString name)\r
 320 {\r
 321         CString configValue;\r
 322         CString cmd;\r
 323         cmd.Format(L"git.exe config %s", name);\r
 324         Run(cmd,&configValue,CP_UTF8);\r
 325         int start = 0;\r
 326         return configValue.Tokenize(_T("\n"),start);\r
 327 }\r
 328 \r
 329 \r
 330 CString CGit::GetCurrentBranch(void)\r
 331 {\r
 332         CString output;\r
 333         //Run(_T("git.exe branch"),&branch);\r
 334 \r
 335         int ret=g_Git.Run(_T("git.exe branch --no-color"),&output,CP_UTF8);\r
 336         if(!ret)\r
 337         {               \r
 338                 int pos=0;\r
 339                 CString one;\r
 340                 while( pos>=0 )\r
 341                 {\r
 342                         //i++;\r
 343                         one=output.Tokenize(_T("\n"),pos);\r
 344                         //list.push_back(one.Right(one.GetLength()-2));\r
 345                         if(one[0] == _T('*'))\r
 346                                 return one.Right(one.GetLength()-2);\r
 347                 }\r
 348         }\r
 349         return CString("");\r
 350 }\r
 351 \r
 352 CString CGit::GetSymbolicRef(const wchar_t* symbolicRefName, bool bStripRefsHeads)\r
 353 {\r
 354         CString refName;\r
 355         CString cmd;\r
 356         cmd.Format(L"git symbolic-ref %s", symbolicRefName);\r
 357         if(Run(cmd, &refName, CP_UTF8) != 0)\r
 358                 return CString();//Error\r
 359         int iStart = 0;\r
 360         refName = refName.Tokenize(L"\n", iStart);\r
 361         if(bStripRefsHeads)\r
 362                 refName = StripRefName(refName);\r
 363         return refName;\r
 364 }\r
 365 \r
 366 CString CGit::GetFullRefName(CString shortRefName)\r
 367 {\r
 368         CString refName;\r
 369         CString cmd;\r
 370         cmd.Format(L"git rev-parse --symbolic-full-name %s", shortRefName);\r
 371         if(Run(cmd, &refName, CP_UTF8) != 0)\r
 372                 return CString();//Error\r
 373         int iStart = 0;\r
 374         return refName.Tokenize(L"\n", iStart);\r
 375 }\r
 376 \r
 377 CString CGit::StripRefName(CString refName)\r
 378 {\r
 379         if(wcsncmp(refName, L"refs/heads/", 11) == 0)\r
 380                 refName = refName.Mid(11);\r
 381         else if(wcsncmp(refName, L"refs/", 5) == 0)\r
 382                 refName = refName.Mid(5);\r
 383         return refName;\r
 384 }\r
 385 \r
 386 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)\r
 387 {\r
 388         // read current branch name like git-gui does, by parsing the .git/HEAD file directly\r
 389 \r
 390         if ( sProjectRoot.IsEmpty() )\r
 391                 return -1;\r
 392 \r
 393         CString sHeadFile = sProjectRoot + _T("\\") + g_GitAdminDir.GetAdminDirName() + _T("\\HEAD");\r
 394 \r
 395         FILE *pFile;\r
 396         _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));\r
 397 \r
 398         if (!pFile)\r
 399         {\r
 400                 return -1;\r
 401         }\r
 402 \r
 403         char s[256] = {0};\r
 404     fgets(s, sizeof(s), pFile);\r
 405 \r
 406         fclose(pFile);\r
 407 \r
 408         const char *pfx = "ref: refs/heads/";\r
 409         const int len = 16;//strlen(pfx)\r
 410 \r
 411         if ( !strncmp(s, pfx, len) )\r
 412         {\r
 413                 //# We're on a branch.  It might not exist.  But\r
 414                 //# HEAD looks good enough to be a branch.\r
 415                 sBranchOut = s + len;\r
 416                 sBranchOut.TrimRight(_T(" \r\n\t"));\r
 417 \r
 418                 if ( sBranchOut.IsEmpty() )\r
 419                         return -1;\r
 420         }\r
 421         else\r
 422         {\r
 423                 //# Assume this is a detached head.\r
 424                 sBranchOut = "HEAD";\r
 425 \r
 426                 return 1;\r
 427         }\r
 428 \r
 429         return 0;\r
 430 }\r
 431 \r
 432 int CGit::BuildOutputFormat(CString &format,bool IsFull)\r
 433 {\r
 434         CString log;\r
 435         log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);\r
 436         format += log;\r
 437         if(IsFull)\r
 438         {\r
 439                 log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);\r
 440                 format += log;\r
 441                 log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);\r
 442                 format += log;\r
 443                 log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);\r
 444                 format += log;\r
 445                 log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);\r
 446                 format += log;\r
 447                 log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);\r
 448                 format += log;\r
 449                 log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
 450                 format += log;\r
 451                 log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
 452                 format += log;\r
 453         }\r
 454         \r
 455         log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
 456         format += log;\r
 457         log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
 458         format += log;\r
 459         log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
 460         format += log;\r
 461 \r
 462         if(IsFull)\r
 463         {\r
 464                 log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);\r
 465                 format += log;\r
 466         }\r
 467         return 0;\r
 468 }\r
 469 \r
 470 int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count,int mask,CString *from,CString *to)\r
 471 {\r
 472         CGitCall_ByteVector gitCall(CString(),&logOut);\r
 473         return GetLog(&gitCall,hash,path,count,mask,from,to);\r
 474 }\r
 475 \r
 476 CString CGit::GetLogCmd( CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)\r
 477 {\r
 478         CString cmd;\r
 479         CString log;\r
 480         CString num;\r
 481         CString since;\r
 482 \r
 483         CString file;\r
 484 \r
 485         if(path)\r
 486                 file.Format(_T(" -- \"%s\""),path->GetGitPathString());\r
 487         \r
 488         if(count>0)\r
 489                 num.Format(_T("-n%d"),count);\r
 490 \r
 491         CString param;\r
 492 \r
 493         if(mask& LOG_INFO_STAT )\r
 494                 param += _T(" --numstat ");\r
 495         if(mask& LOG_INFO_FILESTATE)\r
 496                 param += _T(" --raw ");\r
 497 \r
 498         if(mask& LOG_INFO_FULLHISTORY)\r
 499                 param += _T(" --full-history ");\r
 500 \r
 501         if(mask& LOG_INFO_BOUNDARY)\r
 502                 param += _T(" --left-right --boundary ");\r
 503 \r
 504         if(mask& CGit::LOG_INFO_ALL_BRANCH)\r
 505                 param += _T(" --all ");\r
 506 \r
 507         if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)\r
 508                 param += _T(" -C ");\r
 509         \r
 510         if(mask& CGit::LOG_INFO_DETECT_RENAME )\r
 511                 param += _T(" -M ");\r
 512 \r
 513         if(mask& CGit::LOG_INFO_FIRST_PARENT )\r
 514                 param += _T(" --first-parent ");\r
 515         \r
 516         if(mask& CGit::LOG_INFO_NO_MERGE )\r
 517                 param += _T(" --no-merges ");\r
 518 \r
 519         if(mask& CGit::LOG_INFO_FOLLOW)\r
 520                 param += _T(" --follow ");\r
 521 \r
 522         if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)\r
 523                 param += _T(" -c ");\r
 524 \r
 525         if(mask& CGit::LOG_INFO_FULL_DIFF)\r
 526                 param += _T(" --full-diff ");\r
 527 \r
 528         if(from != NULL && to != NULL)\r
 529         {\r
 530                 CString range;\r
 531                 range.Format(_T(" %s..%s "),*from,*to);\r
 532                 param += range;\r
 533         }\r
 534         param+=hash;\r
 535 \r
 536         cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),\r
 537                                 num,param);\r
 538 \r
 539         BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));\r
 540 \r
 541         cmd += log;\r
 542         cmd += CString(_T("\"  "))+hash+file;\r
 543 \r
 544         return cmd;\r
 545 }\r
 546 //int CGit::GetLog(CGitCall* pgitCall, CString &hash,  CTGitPath *path ,int count,int mask)\r
 547 int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)\r
 548 {\r
 549         pgitCall->SetCmd( GetLogCmd(hash,path,count,mask,from,to) );\r
 550 \r
 551         return Run(pgitCall);\r
 552 //      return Run(cmd,&logOut);\r
 553 }\r
 554 \r
 555 #define BUFSIZE 512\r
 556 void GetTempPath(CString &path)\r
 557 {\r
 558         TCHAR lpPathBuffer[BUFSIZE];\r
 559         DWORD dwRetVal;\r
 560         DWORD dwBufSize=BUFSIZE;\r
 561         dwRetVal = GetTempPath(dwBufSize,     // length of the buffer\r
 562                            lpPathBuffer); // buffer for path \r
 563     if (dwRetVal > dwBufSize || (dwRetVal == 0))\r
 564     {\r
 565         path=_T("");\r
 566     }\r
 567         path.Format(_T("%s"),lpPathBuffer);\r
 568 }\r
 569 CString GetTempFile()\r
 570 {\r
 571         TCHAR lpPathBuffer[BUFSIZE];\r
 572         DWORD dwRetVal;\r
 573     DWORD dwBufSize=BUFSIZE;\r
 574         TCHAR szTempName[BUFSIZE];  \r
 575         UINT uRetVal;\r
 576 \r
 577         dwRetVal = GetTempPath(dwBufSize,     // length of the buffer\r
 578                            lpPathBuffer); // buffer for path \r
 579     if (dwRetVal > dwBufSize || (dwRetVal == 0))\r
 580     {\r
 581         return _T("");\r
 582     }\r
 583          // Create a temporary file. \r
 584     uRetVal = GetTempFileName(lpPathBuffer, // directory for tmp files\r
 585                               TEXT("Patch"),  // temp file name prefix \r
 586                               0,            // create unique name \r
 587                               szTempName);  // buffer for name \r
 588 \r
 589 \r
 590     if (uRetVal == 0)\r
 591     {\r
 592         return _T("");\r
 593     }\r
 594 \r
 595         return CString(szTempName);\r
 596 \r
 597 }\r
 598 \r
 599 int CGit::RunLogFile(CString cmd,CString &filename)\r
 600 {\r
 601         STARTUPINFO si;\r
 602         PROCESS_INFORMATION pi;\r
 603         si.cb=sizeof(STARTUPINFO);\r
 604         GetStartupInfo(&si);\r
 605 \r
 606         SECURITY_ATTRIBUTES   psa={sizeof(psa),NULL,TRUE};;   \r
 607         psa.bInheritHandle=TRUE;   \r
 608     \r
 609         HANDLE   houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ   |   FILE_SHARE_WRITE,   \r
 610                         &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);   \r
 611 \r
 612 \r
 613         si.wShowWindow=SW_HIDE;\r
 614         si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
 615         si.hStdOutput   =   houtfile; \r
 616         \r
 617         if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
 618         {\r
 619                 LPVOID lpMsgBuf;\r
 620                 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
 621                         NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),\r
 622                         (LPTSTR)&lpMsgBuf,\r
 623                         0,NULL);\r
 624                 return GIT_ERROR_CREATE_PROCESS;\r
 625         }\r
 626         \r
 627         WaitForSingleObject(pi.hProcess,INFINITE);   \r
 628         \r
 629         CloseHandle(pi.hThread);\r
 630         CloseHandle(pi.hProcess);\r
 631         CloseHandle(houtfile);\r
 632         return GIT_SUCCESS;\r
 633 //      return 0;\r
 634 }\r
 635 \r
 636 git_revnum_t CGit::GetHash(const CString &friendname)\r
 637 {\r
 638         CString cmd;\r
 639         CString out;\r
 640         cmd.Format(_T("git.exe rev-parse %s" ),friendname);\r
 641         Run(cmd,&out,CP_UTF8);\r
 642 //      int pos=out.ReverseFind(_T('\n'));\r
 643         int pos=out.FindOneOf(_T("\r\n"));\r
 644         if(pos>0)\r
 645                 return out.Left(pos);\r
 646         return out;\r
 647 }\r
 648 \r
 649 int CGit::GetCommitDiffList(CString &rev1,CString &rev2,CTGitPathList &outputlist)\r
 650 {\r
 651         CString cmd;\r
 652         \r
 653         if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)\r
 654         {\r
 655                 //rev1=+_T("");\r
 656                 if(rev1 == GIT_REV_ZERO)\r
 657                         cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2);\r
 658                 else\r
 659                         cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1);\r
 660         }else\r
 661         {\r
 662                 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2,rev1);\r
 663         }\r
 664 \r
 665         BYTE_VECTOR out;\r
 666         if(g_Git.Run(cmd,&out))\r
 667                 return -1;\r
 668 \r
 669         outputlist.ParserFromLog(out);\r
 670 \r
 671 }\r
 672 \r
 673 int CGit::GetTagList(STRING_VECTOR &list)\r
 674 {\r
 675         int ret;\r
 676         CString cmd,output;\r
 677         cmd=_T("git.exe tag -l");\r
 678         int i=0;\r
 679         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
 680         if(!ret)\r
 681         {               \r
 682                 int pos=0;\r
 683                 CString one;\r
 684                 while( pos>=0 )\r
 685                 {\r
 686                         i++;\r
 687                         one=output.Tokenize(_T("\n"),pos);\r
 688                         list.push_back(one);\r
 689                 }\r
 690         }\r
 691         return ret;\r
 692 }\r
 693 \r
 694 int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)\r
 695 {\r
 696         int ret;\r
 697         CString cmd,output;\r
 698         cmd=_T("git.exe branch --no-color");\r
 699 \r
 700         if(type==(BRANCH_LOCAL|BRANCH_REMOTE))\r
 701                 cmd+=_T(" -a");\r
 702         else if(type==BRANCH_REMOTE)\r
 703                 cmd+=_T(" -r");\r
 704 \r
 705         int i=0;\r
 706         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
 707         if(!ret)\r
 708         {               \r
 709                 int pos=0;\r
 710                 CString one;\r
 711                 while( pos>=0 )\r
 712                 {\r
 713                         one=output.Tokenize(_T("\n"),pos);\r
 714                         one.Trim(L" \r\n\t");\r
 715                         if(one.Find(L" -> ") >= 0 || one.IsEmpty())\r
 716                                 continue; // skip something like: refs/origin/HEAD -> refs/origin/master\r
 717                         if(one[0] == _T('*'))\r
 718                         {\r
 719                                 if(current)\r
 720                                         *current=i;\r
 721                                 one = one.Mid(2);\r
 722                         }\r
 723                         list.push_back(one);\r
 724                         i++;\r
 725                 }\r
 726         }\r
 727         return ret;\r
 728 }\r
 729 \r
 730 int CGit::GetRemoteList(STRING_VECTOR &list)\r
 731 {\r
 732         int ret;\r
 733         CString cmd,output;\r
 734         cmd=_T("git.exe config  --get-regexp \"^^remote[.].*[.]url\"");\r
 735         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
 736         if(!ret)\r
 737         {\r
 738                 int pos=0;\r
 739                 CString one;\r
 740                 while( pos>=0 )\r
 741                 {\r
 742                         one=output.Tokenize(_T("\n"),pos);\r
 743                         int start=one.Find(_T("."),0);\r
 744                         if(start>0)\r
 745                         {\r
 746                                 CString url;\r
 747                                 url=one.Right(one.GetLength()-start-1);\r
 748                                 one=url;\r
 749                                 one=one.Left(one.Find(_T("."),0));\r
 750                                 list.push_back(one);\r
 751                         }\r
 752                 }\r
 753         }\r
 754         return ret;\r
 755 }\r
 756 \r
 757 int CGit::GetRefList(STRING_VECTOR &list)\r
 758 {\r
 759         int ret;\r
 760         CString cmd,output;\r
 761         cmd=_T("git show-ref -d");\r
 762         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
 763         if(!ret)\r
 764         {\r
 765                 int pos=0;\r
 766                 CString one;\r
 767                 while( pos>=0 )\r
 768                 {\r
 769                         one=output.Tokenize(_T("\n"),pos);\r
 770                         int start=one.Find(_T(" "),0);\r
 771                         if(start>0)\r
 772                         {\r
 773                                 CString name;\r
 774                                 name=one.Right(one.GetLength()-start-1);\r
 775                                 list.push_back(name);\r
 776                         }\r
 777                 }\r
 778         }\r
 779         return ret;\r
 780 }\r
 781 int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)\r
 782 {\r
 783         int ret;\r
 784         CString cmd,output;\r
 785         cmd=_T("git show-ref -d");\r
 786         ret=g_Git.Run(cmd,&output,CP_UTF8);\r
 787         if(!ret)\r
 788         {\r
 789                 int pos=0;\r
 790                 CString one;\r
 791                 while( pos>=0 )\r
 792                 {\r
 793                         one=output.Tokenize(_T("\n"),pos);\r
 794                         int start=one.Find(_T(" "),0);\r
 795                         if(start>0)\r
 796                         {\r
 797                                 CString name;\r
 798                                 name=one.Right(one.GetLength()-start-1);\r
 799 \r
 800                                 CString hash;\r
 801                                 hash=one.Left(start);\r
 802 \r
 803                                 map[hash].push_back(name);\r
 804                         }\r
 805                 }\r
 806         }\r
 807         return ret;\r
 808 }\r
 809 \r
 810 BOOL CGit::CheckMsysGitDir()\r
 811 {\r
 812         static BOOL bInitialized = FALSE;\r
 813 \r
 814         if (bInitialized)\r
 815         {\r
 816                 return TRUE;\r
 817         }\r
 818 \r
 819         TCHAR *oldpath,*home;\r
 820         size_t homesize,size,httpsize;\r
 821 \r
 822         // set HOME if not set already\r
 823         _tgetenv_s(&homesize, NULL, 0, _T("HOME"));\r
 824         if (!homesize)\r
 825         {\r
 826                 _tdupenv_s(&home,&size,_T("USERPROFILE")); \r
 827                 _tputenv_s(_T("HOME"),home);\r
 828                 free(home);\r
 829         }\r
 830         CString str;\r
 831 \r
 832 #ifndef _TORTOISESHELL\r
 833         //set http_proxy\r
 834         _tgetenv_s(&httpsize, NULL, 0, _T("http_proxy"));\r
 835         if (!httpsize)\r
 836         {\r
 837                 CString regServeraddress_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-host"), _T(""));\r
 838                 CString regServerport_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-port"), _T(""));\r
 839                 CString regUsername_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-username"), _T(""));\r
 840                 CString regPassword_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-password"), _T(""));\r
 841                 CString regTimeout_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-timeout"), _T(""));\r
 842                 CString regExceptions_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-exceptions"), _T(""));\r
 843 \r
 844                 CString http_proxy;\r
 845                 if(!regServeraddress_copy.IsEmpty())\r
 846                 {\r
 847                         if(regServeraddress_copy.Left(4) != _T("http"))\r
 848                                 http_proxy=_T("http://");\r
 849 \r
 850                         if(!regUsername_copy.IsEmpty())\r
 851                         {\r
 852                                 http_proxy += regUsername_copy;\r
 853                                 http_proxy += _T(":")+regPassword_copy;\r
 854                                 http_proxy += _T("@");\r
 855                         }\r
 856                         http_proxy+=regServeraddress_copy;\r
 857                         if(!regServerport_copy.IsEmpty())\r
 858                         {\r
 859                                 http_proxy +=_T(":")+regServerport_copy;\r
 860                         }\r
 861                         _tputenv_s(_T("http_proxy"),http_proxy);\r
 862                 }\r
 863         }\r
 864         //setup ssh client\r
 865         CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
 866 \r
 867         if(!sshclient.IsEmpty())\r
 868         {\r
 869                 _tputenv_s(_T("GIT_SSH"),sshclient);\r
 870                 \r
 871                 //Setup SVN_SSH\r
 872                 CString ssh=sshclient;\r
 873                 ssh.Replace(_T("/"),_T("\\"));\r
 874                 ssh.Replace(_T("\\"),_T("\\\\"));\r
 875                 ssh=CString(_T("\""))+ssh+_T('\"');\r
 876                 _tputenv_s(_T("SVN_SSH"),ssh);\r
 877 \r
 878         }else\r
 879         {\r
 880                 TCHAR sPlink[MAX_PATH];\r
 881                 GetModuleFileName(NULL, sPlink, _countof(sPlink));\r
 882                 LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));\r
 883                 if (ptr) {\r
 884                         _tcscpy(ptr + 1, _T("TortoisePlink.exe"));\r
 885                         _tputenv_s(_T("GIT_SSH"), sPlink);\r
 886 \r
 887                         //Setup SVN_SSH\r
 888                         CString ssh=sPlink;\r
 889                         ssh.Replace(_T("/"),_T("\\"));\r
 890                         ssh.Replace(_T("\\"),_T("\\\\"));\r
 891                         ssh=CString(_T("\""))+ssh+_T('\"');\r
 892                         _tputenv_s(_T("SVN_SSH"),ssh);\r
 893                 }\r
 894         }\r
 895 \r
 896         {\r
 897                 TCHAR sAskPass[MAX_PATH];\r
 898                 GetModuleFileName(NULL, sAskPass, _countof(sAskPass));\r
 899                 LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));\r
 900                 if (ptr) \r
 901                 {\r
 902                         _tcscpy(ptr + 1, _T("SshAskPass.exe"));\r
 903                         _tputenv_s(_T("DISPLAY"),_T(":9999"));\r
 904                         _tputenv_s(_T("SSH_ASKPASS"),sAskPass);\r
 905                 }\r
 906         }\r
 907         // search PATH if git/bin directory is alredy present\r
 908         if ( FindGitPath() )\r
 909         {\r
 910                 bInitialized = TRUE;\r
 911                 return TRUE;\r
 912         }\r
 913 \r
 914         // add git/bin path to PATH\r
 915 \r
 916         CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
 917         str=msysdir;\r
 918         if(str.IsEmpty())\r
 919         {\r
 920                 CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
 921                 str=msysinstalldir;\r
 922                 if ( !str.IsEmpty() )\r
 923                 {\r
 924                         str += (str[str.GetLength()-1] != '\\') ? "\\bin" : "bin";\r
 925                         msysdir=str;\r
 926                         msysdir.write();\r
 927                 }\r
 928                 else\r
 929                 {\r
 930                         return false;\r
 931                 }\r
 932         }\r
 933 #endif\r
 934         //CGit::m_MsysGitPath=str;\r
 935 \r
 936         //set path\r
 937 \r
 938         _tdupenv_s(&oldpath,&size,_T("PATH")); \r
 939 \r
 940         CString path;\r
 941         path.Format(_T("%s;%s"),oldpath,str);\r
 942 \r
 943         _tputenv_s(_T("PATH"),path);\r
 944 \r
 945         CString sOldPath = oldpath;\r
 946         free(oldpath);\r
 947 \r
 948 \r
 949     if( !FindGitPath() )\r
 950         {\r
 951                 if(!homesize)\r
 952                 {\r
 953                         _tputenv_s(_T("HOME"),_T(""));\r
 954                 }\r
 955                 return false;\r
 956         }\r
 957         else\r
 958         {\r
 959 #ifdef _TORTOISESHELL\r
 960                 l_processEnv = GetEnvironmentStrings();\r
 961                 // updated environment is now duplicated for use in CreateProcess, restore original PATH for current process\r
 962                 _tputenv_s(_T("PATH"),sOldPath);\r
 963                 if(!homesize)\r
 964                 {\r
 965                         _tputenv_s(_T("HOME"),_T(""));\r
 966                 }\r
 967 #endif\r
 968 \r
 969                 bInitialized = TRUE;\r
 970                 return true;\r
 971         }\r
 972 }\r
 973 \r
 974 \r
 975 class CGitCall_EnumFiles : public CGitCall\r
 976 {\r
 977 public:\r
 978         CGitCall_EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
 979         :       m_pszProjectPath(pszProjectPath),\r
 980                 m_pszSubPath(pszSubPath),\r
 981                 m_nFlags(nFlags),\r
 982                 m_pEnumCb(pEnumCb),\r
 983                 m_pUserData(pUserData)\r
 984         {\r
 985         }\r
 986 \r
 987         typedef std::map<CStringA,char> TStrCharMap;\r
 988 \r
 989         const TCHAR *   m_pszProjectPath;\r
 990         const TCHAR *   m_pszSubPath;\r
 991         unsigned int    m_nFlags;\r
 992         WGENUMFILECB *  m_pEnumCb;\r
 993         void *                  m_pUserData;\r
 994 \r
 995         BYTE_VECTOR             m_DataCollector;\r
 996 \r
 997         virtual bool    OnOutputData(const BYTE* data, size_t size)\r
 998         {\r
 999                 m_DataCollector.append(data,size);\r
1000                 while(true)\r
1001                 {\r
1002                         // lines from igit.exe are 0 terminated\r
1003                         int found=m_DataCollector.findData((const BYTE*)"",1);\r
1004                         if(found<0)\r
1005                                 return false;\r
1006                         OnSingleLine( (LPCSTR)&*m_DataCollector.begin() );\r
1007                         m_DataCollector.erase(m_DataCollector.begin(), m_DataCollector.begin()+found+1);\r
1008                 }\r
1009                 return false;//Should never reach this\r
1010         }\r
1011         virtual void    OnEnd()\r
1012         {\r
1013         }\r
1014 \r
1015         BYTE HexChar(char ch)\r
1016         {\r
1017                 if (ch >= '0' && ch <= '9')\r
1018                         return (UINT)(ch - '0');\r
1019                 else if (ch >= 'A' && ch <= 'F')\r
1020                         return (UINT)(ch - 'A') + 10;\r
1021                 else if (ch >= 'a' && ch <= 'f')\r
1022                         return (UINT)(ch - 'a') + 10;\r
1023                 else\r
1024                         return 0;\r
1025         }\r
1026 \r
1027         bool OnSingleLine(LPCSTR line)\r
1028         {\r
1029                 //Parse single line\r
1030 \r
1031                 wgFile_s fileStatus;\r
1032 \r
1033                 // file/dir type\r
1034 \r
1035                 fileStatus.nFlags = 0;\r
1036                 if (*line == 'D')\r
1037                         fileStatus.nFlags |= WGFF_Directory;\r
1038                 else if (*line != 'F')\r
1039                         // parse error\r
1040                         return false;\r
1041                 line += 2;\r
1042 \r
1043                 // status\r
1044 \r
1045                 fileStatus.nStatus = WGFS_Unknown;\r
1046                 switch (*line)\r
1047                 {\r
1048                 case 'N': fileStatus.nStatus = WGFS_Normal; break;\r
1049                 case 'M': fileStatus.nStatus = WGFS_Modified; break;\r
1050                 case 'S': fileStatus.nStatus = WGFS_Staged; break;\r
1051                 case 'A': fileStatus.nStatus = WGFS_Added; break;\r
1052                 case 'C': fileStatus.nStatus = WGFS_Conflicted; break;\r
1053                 case 'D': fileStatus.nStatus = WGFS_Deleted; break;\r
1054                 case 'I': fileStatus.nStatus = WGFS_Ignored; break;\r
1055                 case 'U': fileStatus.nStatus = WGFS_Unversioned; break;\r
1056                 case 'E': fileStatus.nStatus = WGFS_Empty; break;\r
1057                 case '?': fileStatus.nStatus = WGFS_Unknown; break;\r
1058                 default:\r
1059                         // parse error\r
1060                         return false;\r
1061                 }\r
1062                 line += 2;\r
1063 \r
1064                 // file sha1\r
1065 \r
1066                 BYTE sha1[20];\r
1067                 fileStatus.sha1 = NULL;\r
1068                 if ( !(fileStatus.nFlags & WGFF_Directory) )\r
1069                 {\r
1070                         for (int i=0; i<20; i++)\r
1071                         {\r
1072                                 sha1[i]  = (HexChar(line[0])<<4)&0xF0;\r
1073                                 sha1[i] |= HexChar(line[1])&0xF;\r
1074 \r
1075                                 line += 2;\r
1076                         }\r
1077 \r
1078                         line++;\r
1079                 }\r
1080 \r
1081                 // filename\r
1082                 int len = strlen(line);\r
1083                 if (len && len < 2048)\r
1084                 {\r
1085                         WCHAR *buf = (WCHAR*)alloca((len*4+2)*sizeof(WCHAR));\r
1086                         *buf = 0;\r
1087                         MultiByteToWideChar(CP_ACP, 0, line, len+1, buf, len*4+1);\r
1088                         fileStatus.sFileName = buf;\r
1089 \r
1090                         if (*buf && (*m_pEnumCb)(&fileStatus,m_pUserData))\r
1091                                 return false;\r
1092                 }\r
1093 \r
1094                 return true;\r
1095         }\r
1096 };\r
1097 \r
1098 BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData)\r
1099 {\r
1100         if(!pszProjectPath || *pszProjectPath=='\0')\r
1101                 return FALSE;\r
1102 \r
1103         CGitCall_EnumFiles W_GitCall(pszProjectPath,pszSubPath,nFlags,pEnumCb,pUserData);\r
1104         CString cmd;\r
1105 \r
1106 /*      char W_szToDir[MAX_PATH];\r
1107         strncpy(W_szToDir,pszProjectPath,sizeof(W_szToDir)-1);\r
1108         if(W_szToDir[strlen(W_szToDir)-1]!='\\')\r
1109                 strncat(W_szToDir,"\\",sizeof(W_szToDir)-1);\r
1110 \r
1111         SetCurrentDirectoryA(W_szToDir);\r
1112         GetCurrentDirectoryA(sizeof(W_szToDir)-1,W_szToDir);\r
1113 */\r
1114         SetCurrentDir(pszProjectPath);\r
1115 \r
1116         CString sMode;\r
1117         if (nFlags)\r
1118         {\r
1119                 if (nFlags & WGEFF_NoRecurse) sMode += _T("r");\r
1120                 if (nFlags & WGEFF_FullPath) sMode += _T("f");\r
1121                 if (nFlags & WGEFF_DirStatusDelta) sMode += _T("d");\r
1122                 if (nFlags & WGEFF_DirStatusAll) sMode += _T("D");\r
1123                 if (nFlags & WGEFF_EmptyAsNormal) sMode += _T("e");\r
1124                 if (nFlags & WGEFF_SingleFile) sMode += _T("s");\r
1125         }\r
1126         else\r
1127         {\r
1128                 sMode = _T("-");\r
1129         }\r
1130 \r
1131         // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least\r
1132         // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with\r
1133         // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just\r
1134         // use forward slashes for supplied project and sub paths\r
1135 \r
1136         CString sProjectPath = pszProjectPath;\r
1137         sProjectPath.Replace(_T('\\'), _T('/'));\r
1138 \r
1139         if (pszSubPath)\r
1140         {\r
1141                 CString sSubPath = pszSubPath;\r
1142                 sSubPath.Replace(_T('\\'), _T('/'));\r
1143 \r
1144                 cmd.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);\r
1145         }\r
1146         else\r
1147         {\r
1148                 cmd.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath, sMode);\r
1149         }\r
1150 \r
1151         //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");\r
1152 \r
1153         W_GitCall.SetCmd(cmd);\r
1154         // NOTE: should igit get added as a part of msysgit then use below line instead of the above one\r
1155         //W_GitCall.SetCmd(CGit::ms_LastMsysGitDir + cmd);\r
1156 \r
1157         if ( Run(&W_GitCall) )\r
1158                 return FALSE;\r
1159 \r
1160         return TRUE;\r
1161 }\r
1162 \r
1163 BOOL CGit::CheckCleanWorkTree()\r
1164 {\r
1165         CString out;\r
1166         CString cmd;\r
1167         cmd=_T("git.exe rev-parse --verify HEAD");\r
1168 \r
1169         if(g_Git.Run(cmd,&out,CP_UTF8))\r
1170                 return FALSE;\r
1171 \r
1172         cmd=_T("git.exe update-index --ignore-submodules --refresh");\r
1173         if(g_Git.Run(cmd,&out,CP_UTF8))\r
1174                 return FALSE;\r
1175 \r
1176         cmd=_T("git.exe diff-files --quiet --ignore-submodules");\r
1177         if(g_Git.Run(cmd,&out,CP_UTF8))\r
1178                 return FALSE;\r
1179 \r
1180         cmd=_T("git diff-index --cached --quiet HEAD --ignore-submodules");\r
1181         if(g_Git.Run(cmd,&out,CP_UTF8))\r
1182                 return FALSE;\r
1183 \r
1184         return TRUE;\r
1185 }\r
1186 int CGit::Revert(CTGitPathList &list,bool keep)\r
1187 {\r
1188         int ret;\r
1189         for(int i=0;i<list.GetCount();i++)\r
1190         {       \r
1191                 ret = Revert((CTGitPath&)list[i],keep);\r
1192                 if(ret)\r
1193                         return ret;\r
1194         }\r
1195         return 0;\r
1196 }\r
1197 int CGit::Revert(CTGitPath &path,bool keep)\r
1198 {\r
1199         CString cmd, out;\r
1200         if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
1201         {       //To init git repository, there are not HEAD, so we can use git reset command\r
1202                 cmd.Format(_T("git.exe rm --cached -- \"%s\""),path.GetGitPathString());\r
1203 \r
1204                 if(g_Git.Run(cmd,&out,CP_ACP))\r
1205                         return -1;\r
1206         }\r
1207         else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )\r
1208         {\r
1209                 cmd.Format(_T("git.exe mv -- \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());\r
1210                 if(g_Git.Run(cmd,&out,CP_ACP))\r
1211                         return -1;\r
1212                 \r
1213                 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());\r
1214                 if(g_Git.Run(cmd,&out,CP_ACP))\r
1215                         return -1;\r
1216         }\r
1217         else\r
1218         {\r
1219                 cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());\r
1220                 if(g_Git.Run(cmd,&out,CP_ACP))\r
1221                         return -1;\r
1222         }\r
1223         return 0;\r
1224 }\r
1225 \r
1226 int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)\r
1227 {\r
1228         BYTE_VECTOR vector;\r
1229 \r
1230         CString cmd;\r
1231         if(path)\r
1232                 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());\r
1233         else\r
1234                 cmd=_T("git.exe ls-files -u -t -z");\r
1235 \r
1236         if(g_Git.Run(cmd,&vector))\r
1237         {\r
1238                 return -1;\r
1239         }\r
1240 \r
1241         list.ParserFromLsFile(vector);\r
1242 \r
1243         return 0;\r
1244 }\r
1245 \r
1246 bool CGit::IsFastForward(CString &from, CString &to)\r
1247 {\r
1248         CString base,hash;\r
1249         CString cmd;\r
1250         cmd.Format(_T("git.exe merge-base %s %s"), to,from);\r
1251 \r
1252         if(g_Git.Run(cmd,&base,CP_ACP))\r
1253         {\r
1254                 //CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
1255                 return false;\r
1256         }\r
1257         base=base.Left(40);\r
1258 \r
1259         hash=g_Git.GetHash(from);\r
1260 \r
1261         hash=hash.Left(40);\r
1262         \r
1263         return hash == base;\r
1264 }\r
1265 \r
1266 unsigned int CGit::Hash2int(CString &hash)\r
1267 {\r
1268         int ret=0;\r
1269         for(int i=0;i<8;i++)\r
1270         {\r
1271                 ret =ret <<4;\r
1272                 if(hash[i]>=_T('a'))\r
1273                         ret |= (hash[i]-_T('a')+10)&0xFF;\r
1274                 else if(hash[i]>=_T('A'))\r
1275                         ret |= (hash[i]-_T('A')+10)&0xFF;\r
1276                 else\r
1277                         ret |= (hash[i]-_T('0'))&0xFF;          \r
1278                 \r
1279         }\r
1280         return ret;\r
1281 }\r
1282 \r
1283 int CGit::RefreshGitIndex()\r
1284 {\r
1285         CString cmd,output;\r
1286         cmd=_T("git.exe update-index --refresh");\r
1287         return Run(cmd,&output,CP_ACP);\r
1288 }\r
1289 \r