#include "ShellUpdater.h"\r
#include "IconMenu.h"\r
#include "BugTraqAssociations.h"\r
+#include "patch.h"\r
\r
static UINT WM_GITPROGRESS = RegisterWindowMessage(_T("TORTOISEGIT_GITPROGRESS_MSG"));\r
\r
data->color = m_Colors.GetColor(CColors::Added);\r
// }\r
break;\r
+ case git_wc_notify_sendmail:\r
+ data->sActionColumnText.LoadString(IDS_SVNACTION_SENDMAIL);\r
+ data->color = m_Colors.GetColor(CColors::Modified);\r
+ break;\r
\r
case git_wc_notify_resolved:\r
data->sActionColumnText.LoadString(IDS_SVNACTION_RESOLVE);\r
case GitProgress_Update:\r
bSuccess = CmdUpdate(sWindowTitle, localoperation);\r
break;\r
+ case GitProgress_SendMail:\r
+ bSuccess = CmdSendMail(sWindowTitle, localoperation);\r
+ break;\r
}\r
if (!bSuccess)\r
temp.LoadString(IDS_PROGRS_TITLEFAILED);\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
for(int i=0;i<m_targetPathList.GetCount();i++)\r
{\r
- CString cmd,out;\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
return false;\r
}\r
+ \r
+\r
+ try\r
+ {\r
+ tempmergefile = CAppUtils::GetMergeTempFile(_T("LOCAL"),(CTGitPath &)m_targetPathList[i]);\r
+ CFile::Remove(tempmergefile);\r
+ }catch(...)\r
+ {\r
+ }\r
+ \r
+ try\r
+ {\r
+ tempmergefile = CAppUtils::GetMergeTempFile(_T("REMOTE"),(CTGitPath &)m_targetPathList[i]);\r
+ CFile::Remove(tempmergefile);\r
+ }catch(...)\r
+ {\r
+ }\r
+\r
+ try\r
+ {\r
+ tempmergefile = CAppUtils::GetMergeTempFile(_T("BASE"),(CTGitPath &)m_targetPathList[i]);\r
+ CFile::Remove(tempmergefile);\r
+ }catch(...)\r
+ {\r
+ }\r
+ \r
+\r
Notify(m_targetPathList[i],git_wc_notify_resolved);\r
}\r
#if 0\r
}\r
return sPath;\r
}\r
+\r
+bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*/)\r
+{\r
+ sWindowTitle.LoadString(IDS_PROGRS_TITLE_SENDMAIL);\r
+ SetWindowText(sWindowTitle);\r
+ //SetBackgroundImage(IDI_ADD_BKG);\r
+ ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL)));\r
+\r
+ for(int i=0;i<m_targetPathList.GetCount();i++)\r
+ {\r
+ CPatch patch;\r
+ patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,\r
+ this->m_SendMailCC,this->m_SendMailFlags&SENDMAIL_ATTACHMENT);\r
+ Notify(m_targetPathList[i],git_wc_notify_sendmail);\r
+ }\r
+ return true;\r
+}
\ No newline at end of file