Signed-off-by: Frank Li <lznuaa@gmail.com>
13 files changed:
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(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
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
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
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
return -1;\r
}\r
return 0;\r
CString cmd;\r
cmd.Format(_T("git.exe add %s"),path->GetGitPathString());\r
CString output;\r
CString cmd;\r
cmd.Format(_T("git.exe add %s"),path->GetGitPathString());\r
CString output;\r
- if(!g_Git.Run(cmd,&output,CP_OEMCP))\r
+ if(!g_Git.Run(cmd,&output,CP_ACP))\r
{\r
path->m_Action = CTGitPath::LOGACTIONS_ADDED;\r
SetEntryCheck(path,index,true);\r
{\r
path->m_Action = CTGitPath::LOGACTIONS_ADDED;\r
SetEntryCheck(path,index,true);\r
{\r
CString cmd,output;\r
cmd.Format(_T("git.exe add \"%s\""),fentry->GetGitPathString());\r
{\r
CString cmd,output;\r
cmd.Format(_T("git.exe add \"%s\""),fentry->GetGitPathString());\r
- if(g_Git.Run(cmd,&output,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&output,CP_ACP))\r
{\r
CMessageBox::Show(m_hWnd, output, _T("TortoiseSVN"), MB_ICONERROR);\r
}else\r
{\r
CMessageBox::Show(m_hWnd, output, _T("TortoiseSVN"), MB_ICONERROR);\r
}else\r
one.Empty();\r
path.Reset();\r
\r
one.Empty();\r
path.Reset();\r
\r
- g_Git.StringAppend(&one,&out[pos],CP_OEMCP);\r
+ g_Git.StringAppend(&one,&out[pos],CP_ACP);\r
int tabstart=0;\r
path.m_Action=path.ParserAction(out[pos]);\r
one.Tokenize(_T("\t"),tabstart); \r
int tabstart=0;\r
path.m_Action=path.ParserAction(out[pos]);\r
one.Tokenize(_T("\t"),tabstart); \r
while( pos>=0 && pos<out.size())\r
{\r
one.Empty();\r
while( pos>=0 && pos<out.size())\r
{\r
one.Empty();\r
- g_Git.StringAppend(&one,&out[pos],CP_OEMCP);\r
+ g_Git.StringAppend(&one,&out[pos],CP_ACP);\r
if(!one.IsEmpty())\r
{\r
//SetFromGit will clear all status\r
if(!one.IsEmpty())\r
{\r
//SetFromGit will clear all status\r
CString pathname2;\r
\r
if( file1>=0 )\r
CString pathname2;\r
\r
if( file1>=0 )\r
- g_Git.StringAppend(&pathname1,&log[file1],CP_OEMCP);\r
+ g_Git.StringAppend(&pathname1,&log[file1],CP_ACP);\r
- g_Git.StringAppend(&pathname2,&log[file2],CP_OEMCP);\r
+ g_Git.StringAppend(&pathname2,&log[file2],CP_ACP);\r
\r
CTGitPath *GitPath=LookForGitPath(pathname1);\r
\r
\r
CTGitPath *GitPath=LookForGitPath(pathname1);\r
\r
if(log[pos] == 0) //rename\r
{\r
pos++;\r
if(log[pos] == 0) //rename\r
{\r
pos++;\r
- g_Git.StringAppend(&file2,&log[pos],CP_OEMCP);\r
+ g_Git.StringAppend(&file2,&log[pos],CP_ACP);\r
int sec=log.find(0,pos);\r
if(sec>=0)\r
{\r
sec++;\r
int sec=log.find(0,pos);\r
if(sec>=0)\r
{\r
sec++;\r
- g_Git.StringAppend(&file1,&log[sec],CP_OEMCP);\r
+ g_Git.StringAppend(&file1,&log[sec],CP_ACP);\r
}\r
pos=sec;\r
\r
}else\r
{\r
}\r
pos=sec;\r
\r
}else\r
{\r
- g_Git.StringAppend(&file1,&log[pos],CP_OEMCP);\r
+ g_Git.StringAppend(&file1,&log[pos],CP_ACP);\r
}\r
path.SetFromGit(file1,&file2);\r
\r
}\r
path.SetFromGit(file1,&file2);\r
\r
for(int i=0;i<dlg.m_pathList.GetCount();i++)\r
{\r
cmd.Format(_T("git.exe add \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
for(int i=0;i<dlg.m_pathList.GetCount();i++)\r
{\r
cmd.Format(_T("git.exe add \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
}\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
}\r
CString cmd,out;\r
\r
cmd.Format(_T("git.exe mv \"%s\" \"%s\""),pathList[nPath].GetGitPathString(),destPath.GetGitPathString());\r
CString cmd,out;\r
\r
cmd.Format(_T("git.exe mv \"%s\" \"%s\""),pathList[nPath].GetGitPathString(),destPath.GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
if (CMessageBox::Show(hwndExplorer, out, _T("TortoiseGit"), MB_YESNO)==IDYES)\r
{\r
{\r
if (CMessageBox::Show(hwndExplorer, out, _T("TortoiseGit"), MB_YESNO)==IDYES)\r
{\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
}\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
}\r
{ \r
cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());\r
\r
{ \r
cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());\r
\r
- if(g_Git.Run(cmd,&output,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&output,CP_ACP))\r
{\r
CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
return FALSE;\r
{\r
CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
return FALSE;\r
dlg.m_VersionName);\r
\r
CString output;\r
dlg.m_VersionName);\r
\r
CString output;\r
- g_Git.Run(cmd,&output,CP_OEMCP);\r
+ g_Git.Run(cmd,&output,CP_ACP);\r
\r
CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
}\r
\r
CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
}\r
{\r
\r
cmd.Format(format,pathList[nPath].GetGitPathString());\r
{\r
\r
cmd.Format(format,pathList[nPath].GetGitPathString());\r
- if(g_Git.Run(cmd,&output,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&output,CP_ACP))\r
{\r
key=CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_ICONERROR|MB_OKCANCEL);\r
if(key == IDCANCEL)\r
{\r
key=CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_ICONERROR|MB_OKCANCEL);\r
if(key == IDCANCEL)\r
cmdLinePath.GetGitPathString(),\r
sNewName);\r
\r
cmdLinePath.GetGitPathString(),\r
sNewName);\r
\r
- if(g_Git.Run(cmd,&output,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&output,CP_ACP))\r
{\r
CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_OK);\r
}\r
{\r
CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_OK);\r
}\r
for(int i=0;i< dlg.m_selectedPathList.GetCount() ;i++)\r
{\r
cmd.Format(_T("git.exe checkout -f -- \"%s\""),dlg.m_selectedPathList[i].GetGitPathString());\r
for(int i=0;i< dlg.m_selectedPathList.GetCount() ;i++)\r
{\r
cmd.Format(_T("git.exe checkout -f -- \"%s\""),dlg.m_selectedPathList[i].GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
}\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
}\r
else\r
cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());\r
\r
else\r
cmd.Format(_T("git.exe update-index -- \"%s\""),entry->GetGitPathString());\r
\r
- g_Git.Run(cmd,&out,CP_OEMCP);\r
+ g_Git.Run(cmd,&out,CP_ACP);\r
nchecked++;\r
\r
//checkedLists.insert(entry->GetGitPathString());\r
nchecked++;\r
\r
//checkedLists.insert(entry->GetGitPathString());\r
if(entry->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\""),entry->GetGitPathString());\r
if(entry->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\""),entry->GetGitPathString());\r
- g_Git.Run(cmd,&out,CP_OEMCP); \r
+ g_Git.Run(cmd,&out,CP_ACP); \r
}\r
else\r
{\r
cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());\r
}\r
else\r
{\r
cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());\r
- g_Git.Run(cmd,&out,CP_OEMCP);\r
+ g_Git.Run(cmd,&out,CP_ACP);\r
}\r
\r
// uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
}\r
\r
// uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
{\r
CString cmd,out;\r
cmd.Format(_T("git.exe add -f \"%s\""),m_targetPathList[i].GetGitPathString());\r
{\r
CString cmd,out;\r
cmd.Format(_T("git.exe add -f \"%s\""),m_targetPathList[i].GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
m_bErrorsOccurred=true;\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
m_bErrorsOccurred=true;\r
{\r
CString cmd,out,tempmergefile;\r
cmd.Format(_T("git.exe add -f \"%s\""),m_targetPathList[i].GetGitPathString());\r
{\r
CString cmd,out,tempmergefile;\r
cmd.Format(_T("git.exe add -f \"%s\""),m_targetPathList[i].GetGitPathString());\r
- if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
m_bErrorsOccurred=true;\r
{\r
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
m_bErrorsOccurred=true;\r