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