X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2FGit%2FGit.cpp;h=3353b5442e0c559a7aecacbbcfba26f420853105;hb=588f1a6cb8ca51c1318db041bd0f228c84be313e;hp=0d20a7e37d56116d5f2417266418a2cd0e629b7d;hpb=999aa67a9a64058ec109a31c7cfddd01fc4f619a;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 0d20a7e..3353b54 100644
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -6,6 +6,9 @@
 #include "GitConfig.h"
 #include <map>
 #include "UnicodeUtils.h"
+#include "gitdll.h"
+
+int CGit::m_LogEncode=CP_UTF8;
 
 
 static LPTSTR nextpath(LPCTSTR src, LPTSTR dst, UINT maxlen)
@@ -125,12 +128,18 @@ CGit::CGit(void)
 {
 	GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));
 	m_CurrentDir.ReleaseBuffer();
-
+	m_IsGitDllInited = false;
+	m_GitDiff=0;
 	CheckMsysGitDir();
 }
 
 CGit::~CGit(void)
 {
+	if(this->m_GitDiff)
+	{
+		git_close_diff(m_GitDiff);
+		m_GitDiff=0;
+	}
 }
 
 static char g_Buffer[4096];
@@ -173,7 +182,9 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
 	DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;
 	
 	//DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password. 
-	dwFlags |= DETACHED_PROCESS; 
+	dwFlags |= DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP; 
+
+	memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));
 
 	if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
 	{
@@ -185,6 +196,8 @@ int CGit::RunAsync(CString cmd,PROCESS_INFORMATION *piOut,HANDLE *hReadOut,CStri
 		return GIT_ERROR_CREATE_PROCESS;
 	}
 	
+	m_CurrentGitPi = pi;
+	
 	CloseHandle(hWrite);
 	if(piOut)
 		*piOut=pi;
@@ -303,23 +316,30 @@ int CGit::Run(CString cmd, CString* output,int code)
 
 CString CGit::GetUserName(void)
 {
-	CString UserName;
-	Run(_T("git.exe config user.name"),&UserName,CP_UTF8);
-	return UserName;
+	return GetConfigValue(L"user.name");
 }
 CString CGit::GetUserEmail(void)
 {
-	CString UserName;
-	Run(_T("git.exe config user.email"),&UserName,CP_UTF8);
-	return UserName;
+	return GetConfigValue(L"user.email");
 }
 
+CString CGit::GetConfigValue(CString name)
+{
+	CString configValue;
+	CString cmd;
+	cmd.Format(L"git.exe config %s", name);
+	Run(cmd,&configValue,CP_UTF8);
+	int start = 0;
+	return configValue.Tokenize(_T("\n"),start);
+}
+
+
 CString CGit::GetCurrentBranch(void)
 {
 	CString output;
 	//Run(_T("git.exe branch"),&branch);
 
-	int ret=g_Git.Run(_T("git.exe branch"),&output,CP_UTF8);
+	int ret=g_Git.Run(_T("git.exe branch --no-color"),&output,CP_UTF8);
 	if(!ret)
 	{		
 		int pos=0;
@@ -336,6 +356,40 @@ CString CGit::GetCurrentBranch(void)
 	return CString("");
 }
 
+CString CGit::GetSymbolicRef(const wchar_t* symbolicRefName, bool bStripRefsHeads)
+{
+	CString refName;
+	CString cmd;
+	cmd.Format(L"git symbolic-ref %s", symbolicRefName);
+	if(Run(cmd, &refName, CP_UTF8) != 0)
+		return CString();//Error
+	int iStart = 0;
+	refName = refName.Tokenize(L"\n", iStart);
+	if(bStripRefsHeads)
+		refName = StripRefName(refName);
+	return refName;
+}
+
+CString CGit::GetFullRefName(CString shortRefName)
+{
+	CString refName;
+	CString cmd;
+	cmd.Format(L"git rev-parse --symbolic-full-name %s", shortRefName);
+	if(Run(cmd, &refName, CP_UTF8) != 0)
+		return CString();//Error
+	int iStart = 0;
+	return refName.Tokenize(L"\n", iStart);
+}
+
+CString CGit::StripRefName(CString refName)
+{
+	if(wcsncmp(refName, L"refs/heads/", 11) == 0)
+		refName = refName.Mid(11);
+	else if(wcsncmp(refName, L"refs/", 5) == 0)
+		refName = refName.Mid(5);
+	return refName;
+}
+
 int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut)
 {
 	// read current branch name like git-gui does, by parsing the .git/HEAD file directly
@@ -426,10 +480,8 @@ int CGit::GetLog(BYTE_VECTOR& logOut, CString &hash,  CTGitPath *path ,int count
 	return GetLog(&gitCall,hash,path,count,mask,from,to);
 }
 
-//int CGit::GetLog(CGitCall* pgitCall, CString &hash,  CTGitPath *path ,int count,int mask)
-int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
+CString CGit::GetLogCmd( CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to,bool paramonly)
 {
-
 	CString cmd;
 	CString log;
 	CString num;
@@ -474,6 +526,12 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
 	if(mask& CGit::LOG_INFO_FOLLOW)
 		param += _T(" --follow ");
 
+	if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
+		param += _T(" -c ");
+
+	if(mask& CGit::LOG_INFO_FULL_DIFF)
+		param += _T(" --full-diff ");
+
 	if(from != NULL && to != NULL)
 	{
 		CString range;
@@ -482,40 +540,35 @@ int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count,
 	}
 	param+=hash;
 
-	cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
+	if(paramonly)
+		cmd.Format(_T("%s -z --topo-order %s --parents "),
+				num,param);
+	else
+		cmd.Format(_T("git.exe log %s -z --topo-order %s --parents --pretty=format:\""),
 				num,param);
 
 	BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
 
-	cmd += log;
-	cmd += CString(_T("\"  "))+hash+file;
+	if(paramonly)
+	{
+		cmd += hash+file;
+	}else
+	{
+		cmd += log;
+		cmd += CString(_T("\"  "))+hash+file;
+	}
 
-	pgitCall->SetCmd(cmd);
+	return cmd;
+}
+//int CGit::GetLog(CGitCall* pgitCall, CString &hash,  CTGitPath *path ,int count,int mask)
+int CGit::GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path, int count, int mask,CString *from,CString *to)
+{
+	pgitCall->SetCmd( GetLogCmd(hash,path,count,mask,from,to) );
 
 	return Run(pgitCall);
 //	return Run(cmd,&logOut);
 }
 
-#if 0
-int CGit::GetShortLog(CString &logOut,CTGitPath * path, int count)
-{
-	CString cmd;
-	CString log;
-	int n;
-	if(count<0)
-		n=100;
-	else
-		n=count;
-	cmd.Format(_T("git.exe log --left-right --boundary --topo-order -n%d --pretty=format:\""),n);
-	BuildOutputFormat(log,false);
-	cmd += log+_T("\"");
-	if (path)
-		cmd+= _T("  -- \"")+path->GetGitPathString()+_T("\"");
-	//cmd += CString(_T("\" HEAD~40..HEAD"));
-	return Run(cmd,&logOut);
-}
-#endif
-
 #define BUFSIZE 512
 void GetTempPath(CString &path)
 {
@@ -597,7 +650,7 @@ int CGit::RunLogFile(CString cmd,CString &filename)
 //	return 0;
 }
 
-git_revnum_t CGit::GetHash(CString &friendname)
+git_revnum_t CGit::GetHash(const CString &friendname)
 {
 	CString cmd;
 	CString out;
@@ -610,6 +663,30 @@ git_revnum_t CGit::GetHash(CString &friendname)
 	return out;
 }
 
+int CGit::GetCommitDiffList(CString &rev1,CString &rev2,CTGitPathList &outputlist)
+{
+	CString cmd;
+	
+	if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
+	{
+		//rev1=+_T("");
+		if(rev1 == GIT_REV_ZERO)
+			cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),rev2);
+		else
+			cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),rev1);
+	}else
+	{
+		cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev2,rev1);
+	}
+
+	BYTE_VECTOR out;
+	if(g_Git.Run(cmd,&out))
+		return -1;
+
+	outputlist.ParserFromLog(out);
+
+}
+
 int CGit::GetTagList(STRING_VECTOR &list)
 {
 	int ret;
@@ -635,7 +712,7 @@ int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
 {
 	int ret;
 	CString cmd,output;
-	cmd=_T("git.exe branch");
+	cmd=_T("git.exe branch --no-color");
 
 	if(type==(BRANCH_LOCAL|BRANCH_REMOTE))
 		cmd+=_T(" -a");
@@ -651,10 +728,16 @@ int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
 		while( pos>=0 )
 		{
 			one=output.Tokenize(_T("\n"),pos);
-			list.push_back(one.Right(one.GetLength()-2));
+			one.Trim(L" \r\n\t");
+			if(one.Find(L" -> ") >= 0 || one.IsEmpty())
+				continue; // skip something like: refs/origin/HEAD -> refs/origin/master
 			if(one[0] == _T('*'))
+			{
 				if(current)
 					*current=i;
+				one = one.Mid(2);
+			}
+			list.push_back(one);
 			i++;
 		}
 	}
@@ -665,7 +748,7 @@ int CGit::GetRemoteList(STRING_VECTOR &list)
 {
 	int ret;
 	CString cmd,output;
-	cmd=_T("git.exe config  --get-regexp remote.*.url");
+	cmd=_T("git.exe config  --get-regexp \"^^remote[.].*[.]url\"");
 	ret=g_Git.Run(cmd,&output,CP_UTF8);
 	if(!ret)
 	{
@@ -751,23 +834,64 @@ BOOL CGit::CheckMsysGitDir()
 	}
 
 	TCHAR *oldpath,*home;
-	size_t size;
+	size_t homesize,size,httpsize;
 
 	// set HOME if not set already
-	_tgetenv_s(&size, NULL, 0, _T("HOME"));
-	if (!size)
+	_tgetenv_s(&homesize, NULL, 0, _T("HOME"));
+	if (!homesize)
 	{
 		_tdupenv_s(&home,&size,_T("USERPROFILE")); 
 		_tputenv_s(_T("HOME"),home);
 		free(home);
 	}
+	CString str;
 
+#ifndef _TORTOISESHELL
+	//set http_proxy
+	_tgetenv_s(&httpsize, NULL, 0, _T("http_proxy"));
+	if (!httpsize)
+	{
+		CString regServeraddress_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-host"), _T(""));
+		CString regServerport_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-port"), _T(""));
+		CString regUsername_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-username"), _T(""));
+		CString regPassword_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-password"), _T(""));
+		CString regTimeout_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-timeout"), _T(""));
+		CString regExceptions_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-exceptions"), _T(""));
+
+		CString http_proxy;
+		if(!regServeraddress_copy.IsEmpty())
+		{
+			if(regServeraddress_copy.Left(4) != _T("http"))
+				http_proxy=_T("http://");
+
+			if(!regUsername_copy.IsEmpty())
+			{
+				http_proxy += regUsername_copy;
+				http_proxy += _T(":")+regPassword_copy;
+				http_proxy += _T("@");
+			}
+			http_proxy+=regServeraddress_copy;
+			if(!regServerport_copy.IsEmpty())
+			{
+				http_proxy +=_T(":")+regServerport_copy;
+			}
+			_tputenv_s(_T("http_proxy"),http_proxy);
+		}
+	}
 	//setup ssh client
 	CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
 
 	if(!sshclient.IsEmpty())
 	{
 		_tputenv_s(_T("GIT_SSH"),sshclient);
+		
+		//Setup SVN_SSH
+		CString ssh=sshclient;
+		ssh.Replace(_T("/"),_T("\\"));
+		ssh.Replace(_T("\\"),_T("\\\\"));
+		ssh=CString(_T("\""))+ssh+_T('\"');
+		_tputenv_s(_T("SVN_SSH"),ssh);
+
 	}else
 	{
 		TCHAR sPlink[MAX_PATH];
@@ -776,6 +900,13 @@ BOOL CGit::CheckMsysGitDir()
 		if (ptr) {
 			_tcscpy(ptr + 1, _T("TortoisePlink.exe"));
 			_tputenv_s(_T("GIT_SSH"), sPlink);
+
+			//Setup SVN_SSH
+			CString ssh=sPlink;
+			ssh.Replace(_T("/"),_T("\\"));
+			ssh.Replace(_T("\\"),_T("\\\\"));
+			ssh=CString(_T("\""))+ssh+_T('\"');
+			_tputenv_s(_T("SVN_SSH"),ssh);
 		}
 	}
 
@@ -799,8 +930,8 @@ BOOL CGit::CheckMsysGitDir()
 
 	// add git/bin path to PATH
 
-	CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE,HKEY_LOCAL_MACHINE);
-	CString str=msysdir;
+	CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);
+	str=msysdir;
 	if(str.IsEmpty())
 	{
 		CRegString msysinstalldir=CRegString(REG_MSYSGIT_INSTALL,_T(""),FALSE,HKEY_LOCAL_MACHINE);
@@ -816,6 +947,7 @@ BOOL CGit::CheckMsysGitDir()
 			return false;
 		}
 	}
+#endif
 	//CGit::m_MsysGitPath=str;
 
 	//set path
@@ -833,6 +965,10 @@ BOOL CGit::CheckMsysGitDir()
 
     if( !FindGitPath() )
 	{
+		if(!homesize)
+		{
+			_tputenv_s(_T("HOME"),_T(""));
+		}
 		return false;
 	}
 	else
@@ -841,6 +977,10 @@ BOOL CGit::CheckMsysGitDir()
 		l_processEnv = GetEnvironmentStrings();
 		// updated environment is now duplicated for use in CreateProcess, restore original PATH for current process
 		_tputenv_s(_T("PATH"),sOldPath);
+		if(!homesize)
+		{
+			_tputenv_s(_T("HOME"),_T(""));
+		}
 #endif
 
 		bInitialized = TRUE;
@@ -1005,10 +1145,27 @@ BOOL CGit::EnumFiles(const TCHAR *pszProjectPath, const TCHAR *pszSubPath, unsig
 		sMode = _T("-");
 	}
 
+	// NOTE: there seems to be some issue with msys based app receiving backslash on commandline, at least
+	// if followed by " like for example 'igit "C:\"', the commandline igit receives is 'igit.exe C:" status' with
+	// the 'C:" status' part as a single arg, Maybe it uses unix style processing. In order to avoid this just
+	// use forward slashes for supplied project and sub paths
+
+	CString sProjectPath = pszProjectPath;
+	sProjectPath.Replace(_T('\\'), _T('/'));
+
 	if (pszSubPath)
-		cmd.Format(_T("igit.exe \"%s\" status %s \"%s\""), pszProjectPath, sMode, pszSubPath);
+	{
+		CString sSubPath = pszSubPath;
+		sSubPath.Replace(_T('\\'), _T('/'));
+
+		cmd.Format(_T("tgit.exe statusex \"%s\" status %s \"%s\""), sProjectPath, sMode, sSubPath);
+	}
 	else
-		cmd.Format(_T("igit.exe \"%s\" status %s"), pszProjectPath, sMode);
+	{
+		cmd.Format(_T("tgit.exe statusex \"%s\" status %s"), sProjectPath, sMode);
+	}
+
+	//OutputDebugStringA("---");OutputDebugStringW(cmd);OutputDebugStringA("\r\n");
 
 	W_GitCall.SetCmd(cmd);
 	// NOTE: should igit get added as a part of msysgit then use below line instead of the above one
@@ -1059,24 +1216,25 @@ int CGit::Revert(CTGitPath &path,bool keep)
 	CString cmd, out;
 	if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
 	{	//To init git repository, there are not HEAD, so we can use git reset command
-		cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());
-		if(g_Git.Run(cmd,&out,CP_OEMCP))
+		cmd.Format(_T("git.exe rm --cached -- \"%s\""),path.GetGitPathString());
+
+		if(g_Git.Run(cmd,&out,CP_ACP))
 			return -1;
 	}
 	else if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED )
 	{
-		cmd.Format(_T("git.exe mv \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
-		if(g_Git.Run(cmd,&out,CP_OEMCP))
+		cmd.Format(_T("git.exe mv -- \"%s\" \"%s\""),path.GetGitPathString(),path.GetGitOldPathString());
+		if(g_Git.Run(cmd,&out,CP_ACP))
 			return -1;
 		
 		cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitOldPathString());
-		if(g_Git.Run(cmd,&out,CP_OEMCP))
+		if(g_Git.Run(cmd,&out,CP_ACP))
 			return -1;
 	}
 	else
 	{
 		cmd.Format(_T("git.exe checkout HEAD -f -- \"%s\""),path.GetGitPathString());
-		if(g_Git.Run(cmd,&out,CP_OEMCP))
+		if(g_Git.Run(cmd,&out,CP_ACP))
 			return -1;
 	}
 	return 0;
@@ -1100,4 +1258,49 @@ int CGit::ListConflictFile(CTGitPathList &list,CTGitPath *path)
 	list.ParserFromLsFile(vector);
 
 	return 0;
-}
\ No newline at end of file
+}
+
+bool CGit::IsFastForward(CString &from, CString &to)
+{
+	CString base,hash;
+	CString cmd;
+	cmd.Format(_T("git.exe merge-base %s %s"), to,from);
+
+	if(g_Git.Run(cmd,&base,CP_ACP))
+	{
+		//CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
+		return false;
+	}
+	base=base.Left(40);
+
+	hash=g_Git.GetHash(from);
+
+	hash=hash.Left(40);
+	
+	return hash == base;
+}
+
+unsigned int CGit::Hash2int(CString &hash)
+{
+	int ret=0;
+	for(int i=0;i<8;i++)
+	{
+		ret =ret <<4;
+		if(hash[i]>=_T('a'))
+			ret |= (hash[i]-_T('a')+10)&0xFF;
+		else if(hash[i]>=_T('A'))
+			ret |= (hash[i]-_T('A')+10)&0xFF;
+		else
+			ret |= (hash[i]-_T('0'))&0xFF;		
+		
+	}
+	return ret;
+}
+
+int CGit::RefreshGitIndex()
+{
+	CString cmd,output;
+	cmd=_T("git.exe update-index --refresh");
+	return Run(cmd,&output,CP_ACP);
+}
+