#include <map>\r
#include "UnicodeUtils.h"\r
\r
+int CGit::m_LogEncode=CP_UTF8;\r
\r
static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)\r
{\r
\r
LPTSTR pEnv = l_processEnv;\r
DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;\r
+ \r
+ //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password. \r
+ dwFlags |= DETACHED_PROCESS; \r
\r
if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
{\r
{\r
CString UserName;\r
Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
- return UserName;\r
+ int start = 0;\r
+ return UserName.Tokenize(_T("\n"),start);\r
}\r
CString CGit::GetUserEmail(void)\r
{\r
CString UserName;\r
Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
- return UserName;\r
+ int start = 0;\r
+ return UserName.Tokenize(_T("\n"),start);\r
}\r
\r
CString CGit::GetCurrentBranch(void)\r
format += log;\r
log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);\r
format += log;\r
- log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
- format += log;\r
log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);\r
format += log;\r
}\r
+ \r
log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);\r
format += log;\r
log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);\r
format += log;\r
+ log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);\r
+ format += log;\r
\r
if(IsFull)\r
{\r
if(mask& CGit::LOG_INFO_FOLLOW)\r
param += _T(" --follow ");\r
\r
+ if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)\r
+ param += _T(" -c ");\r
+\r
if(from != NULL && to != NULL)\r
{\r
CString range;\r
// return 0;\r
}\r
\r
-git_revnum_t CGit::GetHash(CString &friendname)\r
+git_revnum_t CGit::GetHash(const CString &friendname)\r
{\r
CString cmd;\r
CString out;\r
while( pos>=0 )\r
{\r
one=output.Tokenize(_T("\n"),pos);\r
- list.push_back(one.Right(one.GetLength()-2));\r
+ one.Trim(L" \r\n\t");\r
+ if(one.Find(L" -> ") >= 0 || one.IsEmpty())\r
+ continue; // skip something like: refs/origin/HEAD -> refs/origin/master\r
if(one[0] == _T('*'))\r
+ {\r
if(current)\r
*current=i;\r
+ one = one.Mid(2);\r
+ }\r
+ list.push_back(one);\r
i++;\r
}\r
}\r
return ret;\r
}\r
\r
+int CGit::GetRefList(STRING_VECTOR &list)\r
+{\r
+ int ret;\r
+ CString cmd,output;\r
+ cmd=_T("git show-ref -d");\r
+ ret=g_Git.Run(cmd,&output,CP_UTF8);\r
+ if(!ret)\r
+ {\r
+ int pos=0;\r
+ CString one;\r
+ while( pos>=0 )\r
+ {\r
+ one=output.Tokenize(_T("\n"),pos);\r
+ int start=one.Find(_T(" "),0);\r
+ if(start>0)\r
+ {\r
+ CString name;\r
+ name=one.Right(one.GetLength()-start-1);\r
+ list.push_back(name);\r
+ }\r
+ }\r
+ }\r
+ return ret;\r
+}\r
int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)\r
{\r
int ret;\r
}\r
\r
TCHAR *oldpath,*home;\r
- size_t size;\r
+ size_t homesize,size;\r
\r
// set HOME if not set already\r
- _tgetenv_s(&size, NULL, 0, _T("HOME"));\r
- if (!size)\r
+ _tgetenv_s(&homesize, NULL, 0, _T("HOME"));\r
+ if (!homesize)\r
{\r
_tdupenv_s(&home,&size,_T("USERPROFILE")); \r
_tputenv_s(_T("HOME"),home);\r
free(home);\r
}\r
+ CString str;\r
\r
+#ifndef _TORTOISESHELL\r
//setup ssh client\r
CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));\r
\r
}\r
}\r
\r
+ {\r
+ TCHAR sAskPass[MAX_PATH];\r
+ GetModuleFileName(NULL, sAskPass, _countof(sAskPass));\r
+ LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));\r
+ if (ptr) \r
+ {\r
+ _tcscpy(ptr + 1, _T("SshAskPass.exe"));\r
+ _tputenv_s(_T("DISPLAY"),_T(":9999"));\r
+ _tputenv_s(_T("SSH_ASKPASS"),sAskPass);\r
+ }\r
+ }\r
// search PATH if git/bin directory is alredy present\r
if ( FindGitPath() )\r
{\r
\r
// add git/bin path to PATH\r
\r
- CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
- CString str=msysdir;\r
+ CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);\r
+ str=msysdir;\r
if(str.IsEmpty())\r
{\r
CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);\r
return false;\r
}\r
}\r
+#endif\r
//CGit::m_MsysGitPath=str;\r
\r
//set path\r
l_processEnv = GetEnvironmentStrings();\r
// updated environment is now duplicated for use in CreateProcess, restore original PATH for current process\r
_tputenv_s(_T("PATH"),sOldPath);\r
+ if(!homesize)\r
+ {\r
+ _tputenv_s(_T("HOME"),_T(""));\r
+ }\r
#endif\r
\r
bInitialized = TRUE;\r
{\r
}\r
\r
- UINT HexChar(char ch)\r
+ BYTE HexChar(char ch)\r
{\r
if (ch >= '0' && ch <= '9')\r
return (UINT)(ch - '0');\r
{\r
for (int i=0; i<20; i++)\r
{\r
- sha1[i] = (BYTE)((HexChar(line[0]) << 8) | HexChar(line[1]));\r
+ sha1[i] = (HexChar(line[0])<<4)&0xF0;\r
+ sha1[i] |= HexChar(line[1])&0xF;\r
+\r
line += 2;\r
}\r
\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
+ if(g_Git.Run(cmd,&out,CP_ACP))\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
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
return -1;\r
\r
cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
return -1;\r
}\r
else\r
{\r
cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
return -1;\r
}\r
return 0;\r
OSDN Git Service
