#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
CString CGit::GetUserName(void)\r
{\r
- CString UserName;\r
- Run(_T("git.exe config user.name"),&UserName,CP_UTF8);\r
- int start = 0;\r
- return UserName.Tokenize(_T("\n"),start);\r
+ return GetConfigValue(L"user.name");\r
}\r
CString CGit::GetUserEmail(void)\r
{\r
- CString UserName;\r
- Run(_T("git.exe config user.email"),&UserName,CP_UTF8);\r
+ return GetConfigValue(L"user.email");\r
+}\r
+\r
+CString CGit::GetConfigValue(CString name)\r
+{\r
+ CString configValue;\r
+ CString cmd;\r
+ cmd.Format(L"git.exe config %s", name);\r
+ Run(cmd,&configValue,CP_UTF8);\r
int start = 0;\r
- return UserName.Tokenize(_T("\n"),start);\r
+ return configValue.Tokenize(_T("\n"),start);\r
}\r
\r
+\r
CString CGit::GetCurrentBranch(void)\r
{\r
CString output;\r
return CString("");\r
}\r
\r
+CString CGit::GetSymbolicRef(const wchar_t* symbolicRefName, bool bStripRefsHeads)\r
+{\r
+ CString refName;\r
+ CString cmd;\r
+ cmd.Format(L"git symbolic-ref %s", symbolicRefName);\r
+ if(Run(cmd, &refName, CP_UTF8) != 0)\r
+ return CString();//Error\r
+ int iStart = 0;\r
+ refName = refName.Tokenize(L"\n", iStart);\r
+ if(bStripRefsHeads)\r
+ refName = StripRefName(refName);\r
+ return refName;\r
+}\r
+\r
+CString CGit::GetFullRefName(CString shortRefName)\r
+{\r
+ CString refName;\r
+ CString cmd;\r
+ cmd.Format(L"git rev-parse --symbolic-full-name %s", shortRefName);\r
+ if(Run(cmd, &refName, CP_UTF8) != 0)\r
+ return CString();//Error\r
+ int iStart = 0;\r
+ return refName.Tokenize(L"\n", iStart);\r
+}\r
+\r
+CString CGit::StripRefName(CString refName)\r
+{\r
+ if(wcsncmp(refName, L"refs/heads/", 11) == 0)\r
+ refName = refName.Mid(11);\r
+ else if(wcsncmp(refName, L"refs/", 5) == 0)\r
+ refName = refName.Mid(5);\r
+ return refName;\r
+}\r
+\r
int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)\r
{\r
// read current branch name like git-gui does, by parsing the .git/HEAD file directly\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
}\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
// 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
sMode = _T("-");\r
}\r
\r
+ // NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least\r
+ // if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with\r
+ // the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just\r
+ // use forward slashes for supplied project and sub paths\r
+\r
+ CString sProjectPath = pszProjectPath;\r
+ sProjectPath.Replace(_T('\\'), _T('/'));\r
+\r
if (pszSubPath)\r
- cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath, sMode, pszSubPath);\r
+ {\r
+ CString sSubPath = pszSubPath;\r
+ sSubPath.Replace(_T('\\'), _T('/'));\r
+\r
+ cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);\r
+ }\r
else\r
- cmd.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath, sMode);\r
+ {\r
+ cmd.Format(_T("igit.exe \"%s\" status %s"), sProjectPath, sMode);\r
+ }\r
+\r
+ //OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");\r
\r
W_GitCall.SetCmd(cmd);\r
// NOTE: should igit get added as a part of msysgit then use below line instead of the above one\r
CString cmd, out;\r
if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
{ //To init git repository, there are not HEAD, so we can use git reset command\r
- cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
+ cmd.Format(_T("git.exe rm --cached \"%s\""),path.GetGitPathString());\r
+\r
if(g_Git.Run(cmd,&out,CP_ACP))\r
return -1;\r
}\r
OSDN Git Service
