#include "CommitDlg.h"\r
#include "DirFileEnum.h"\r
//#include "GitConfig.h"\r
-//#include "GitProperties.h"\r
+#include "ProjectProperties.h"\r
#include "MessageBox.h"\r
#include "AppUtils.h"\r
#include "PathUtils.h"\r
#include "UnicodeUtils.h"\r
#include "ProgressDlg.h"\r
#include "ShellUpdater.h"\r
+#include "Commands/PushCommand.h"\r
\r
#ifdef _DEBUG\r
#define new DEBUG_NEW\r
ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)\r
ON_BN_CLICKED(IDC_COMMIT_AMEND, &CCommitDlg::OnBnClickedCommitAmend)\r
ON_BN_CLICKED(IDC_WHOLE_PROJECT, &CCommitDlg::OnBnClickedWholeProject)\r
+ ON_STN_CLICKED(IDC_BUGIDLABEL, &CCommitDlg::OnStnClickedBugidlabel)\r
END_MESSAGE_MAP()\r
\r
BOOL CCommitDlg::OnInitDialog()\r
\r
UpdateData(FALSE);\r
\r
- m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS , _T("CommitDlg"));\r
+ m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS | SVNSLC_COLADD |SVNSLC_COLDEL, _T("CommitDlg"));\r
m_ListCtrl.SetSelectButton(&m_SelectAll);\r
m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
m_ListCtrl.SetCancelBool(&m_bCancelled);\r
m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r
\r
//this->DialogEnableWindow(IDC_COMMIT_AMEND,FALSE);\r
-// m_ProjectProperties.ReadPropsPathList(m_pathList);\r
+ m_ProjectProperties.ReadPropsPathList(m_pathList);\r
+\r
m_cLogMessage.Init(m_ProjectProperties);\r
m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
m_cLogMessage.RegisterContextMenuHandler(this);\r
\r
m_SelectAll.SetCheck(BST_INDETERMINATE);\r
\r
-#if 0\r
+\r
CBugTraqAssociations bugtraq_associations;\r
bugtraq_associations.Load();\r
\r
- if (bugtraq_associations.FindProvider(m_pathList, &m_bugtraq_association))\r
+ if (bugtraq_associations.FindProvider(g_Git.m_CurrentDir, &m_bugtraq_association))\r
{\r
GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\r
}\r
}\r
else\r
-#endif\r
{\r
GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\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
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
+ else if(!( entry->m_Action & CTGitPath::LOGACTIONS_UNVER ) )\r
{\r
- cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());\r
- g_Git.Run(cmd,&out,CP_OEMCP);\r
+ cmd.Format(_T("git.exe reset -- \"%s\""),entry->GetGitPathString());\r
+ g_Git.Run(cmd,&out,CP_ACP);\r
}\r
\r
// uncheckedfiles += _T("\"")+entry->GetGitPathString()+_T("\" ");\r
// cmd.Format(_T("git.exe reset -- %s"),uncheckedfiles);\r
// g_Git.Run(cmd,&out);\r
//}\r
+ \r
+ m_sBugID.Trim();\r
+ if (!m_sBugID.IsEmpty())\r
+ {\r
+ m_sBugID.Replace(_T(", "), _T(","));\r
+ m_sBugID.Replace(_T(" ,"), _T(","));\r
+ CString sBugID = m_ProjectProperties.sMessage;\r
+ sBugID.Replace(_T("%BUGID%"), m_sBugID);\r
+ if (m_ProjectProperties.bAppend)\r
+ m_sLogMessage += _T("\n") + sBugID + _T("\n");\r
+ else\r
+ m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
+ }\r
\r
+ BOOL bCloseCommitDlg=true;\r
//if(checkedfiles.GetLength()>0)\r
if(nchecked||m_bCommitAmend)\r
{\r
// g_Git.Run(cmd,&out);\r
\r
CString tempfile=::GetTempFile();\r
- CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );\r
- CStringA log=CUnicodeUtils::GetUTF8( m_sLogMessage);\r
- file.Write(log,log.GetLength());\r
+ \r
+ CAppUtils::SaveCommitUnicodeFile(tempfile,m_sLogMessage);\r
//file.WriteString(m_sLogMessage);\r
- file.Close();\r
+ \r
\r
out =_T("");\r
CString amend;\r
progress.m_GitCmd=cmd;\r
progress.m_bShowCommand = FALSE; // don't show the commit command\r
progress.m_PreText = out; // show any output already generated in log window\r
- progress.DoModal();\r
- \r
+ progress.m_changeAbortButtonOnSuccessTo = "Push";\r
+ DWORD userResponse = progress.DoModal();\r
+ \r
+ if(progress.m_GitStatus)\r
+ {\r
+ bCloseCommitDlg = false;\r
+ this->Refresh();\r
+ }\r
+ else if(userResponse == IDCANCEL)\r
+ {\r
+ //User pressed 'Push' button after successful commit.\r
+ PushCommand cmdPush;\r
+ cmdPush.Execute();\r
+ }\r
+\r
CFile::Remove(tempfile);\r
}else\r
CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);\r
if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
m_bKeepChangeList = FALSE;\r
InterlockedExchange(&m_bBlock, FALSE);\r
- m_sBugID.Trim();\r
- if (!m_sBugID.IsEmpty())\r
- {\r
- m_sBugID.Replace(_T(", "), _T(","));\r
- m_sBugID.Replace(_T(" ,"), _T(","));\r
- CString sBugID = m_ProjectProperties.sMessage;\r
- sBugID.Replace(_T("%BUGID%"), m_sBugID);\r
- if (m_ProjectProperties.bAppend)\r
- m_sLogMessage += _T("\n") + sBugID + _T("\n");\r
- else\r
- m_sLogMessage = sBugID + _T("\n") + m_sLogMessage;\r
- }\r
+\r
m_History.AddEntry(m_sLogMessage);\r
m_History.Save();\r
\r
SaveSplitterPos();\r
\r
- CResizableStandAloneDialog::OnOK();\r
+ if( bCloseCommitDlg )\r
+ CResizableStandAloneDialog::OnOK();\r
\r
CShellUpdater::Instance().Flush();\r
}\r
DialogEnableWindow(IDC_EXTERNALWARNING, false);\r
// read the list of recent log entries before querying the WC for status\r
// -> the user may select one and modify / update it while we are crawling the WC\r
-#if 0\r
+\r
if (m_History.GetCount()==0)\r
{\r
CString reg;\r
- if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)\r
- {\r
- Git Git;\r
- reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));\r
- }\r
- else\r
- reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
+ reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
+ reg.Replace(_T(':'),_T('_'));\r
m_History.Load(reg, _T("logmsgs"));\r
}\r
-#endif\r
+\r
// Initialise the list control with the status of the files/folders below us\r
m_ListCtrl.Clear();\r
BOOL success;\r
CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));\r
m_nPopupPasteListCmd = nCmd++;\r
mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteListCmd, sMenuItemText);\r
+\r
+ //CString sMenuItemText(MAKEINTRESOURCE(IDS_COMMITDLG_POPUP_PASTEFILELIST));\r
+ if(m_History.GetCount() > 0)\r
+ {\r
+ sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);\r
+ m_nPopupPasteLastMessage = nCmd++;\r
+ mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);\r
+ }\r
+ \r
}\r
\r
bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)\r
return true;\r
}\r
\r
+ if(cmd == m_nPopupPasteLastMessage)\r
+ {\r
+ if(m_History.GetCount() ==0 )\r
+ return false;\r
+\r
+ CString logmsg;\r
+ logmsg +=m_History.GetEntry(0);\r
+ pSciEdit->InsertText(logmsg);\r
+ return true;\r
+ }\r
return false;\r
}\r
\r
\r
void CCommitDlg::OnBnClickedBugtraqbutton()\r
{\r
-#if 0\r
m_tooltips.Pop(); // hide the tooltips\r
CString sMsg = m_cLogMessage.GetText();\r
\r
return;\r
\r
BSTR parameters = m_bugtraq_association.GetParameters().AllocSysString();\r
- BSTR commonRoot = SysAllocString(m_pathList.GetCommonRoot().GetDirectory().GetWinPath());\r
+ BSTR commonRoot = SysAllocString(g_Git.m_CurrentDir);\r
SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());\r
\r
for (LONG index = 0; index < m_pathList.GetCount(); ++index)\r
\r
BSTR originalMessage = sMsg.AllocSysString();\r
BSTR temp = NULL;\r
+// m_revProps.clear();\r
\r
// first try the IBugTraqProvider2 interface\r
CComPtr<IBugTraqProvider2> pProvider2 = NULL;\r
HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);\r
if (SUCCEEDED(hr))\r
{\r
- CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();\r
- BSTR repositoryRoot = common.AllocSysString();\r
- if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))\r
+ //CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();\r
+ BSTR repositoryRoot = g_Git.m_CurrentDir.AllocSysString();\r
+ BSTR bugIDOut = NULL;\r
+ GetDlgItemText(IDC_BUGID, m_sBugID);\r
+ BSTR bugID = m_sBugID.AllocSysString();\r
+ SAFEARRAY * revPropNames = NULL;\r
+ SAFEARRAY * revPropValues = NULL;\r
+ if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, bugID, &bugIDOut, &revPropNames, &revPropValues, &temp)))\r
{\r
CString sErr;\r
sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
}\r
else\r
+ {\r
+ if (bugIDOut)\r
+ {\r
+ m_sBugID = bugIDOut;\r
+ SysFreeString(bugIDOut);\r
+ SetDlgItemText(IDC_BUGID, m_sBugID);\r
+ }\r
+ SysFreeString(bugID);\r
+ SysFreeString(repositoryRoot);\r
m_cLogMessage.SetText(temp);\r
+ BSTR HUGEP *pbRevNames;\r
+ BSTR HUGEP *pbRevValues;\r
+\r
+ HRESULT hr1 = SafeArrayAccessData(revPropNames, (void HUGEP**)&pbRevNames);\r
+ if (SUCCEEDED(hr1))\r
+ {\r
+ HRESULT hr2 = SafeArrayAccessData(revPropValues, (void HUGEP**)&pbRevValues);\r
+ if (SUCCEEDED(hr2))\r
+ {\r
+ if (revPropNames->rgsabound->cElements == revPropValues->rgsabound->cElements)\r
+ {\r
+ for (ULONG i = 0; i < revPropNames->rgsabound->cElements; i++)\r
+ {\r
+// m_revProps[pbRevNames[i]] = pbRevValues[i];\r
+ }\r
+ }\r
+ SafeArrayUnaccessData(revPropValues);\r
+ }\r
+ SafeArrayUnaccessData(revPropNames);\r
+ }\r
+ if (revPropNames)\r
+ SafeArrayDestroy(revPropNames);\r
+ if (revPropValues)\r
+ SafeArrayDestroy(revPropValues);\r
+ }\r
}\r
else\r
{\r
// if IBugTraqProvider2 failed, try IBugTraqProvider\r
CComPtr<IBugTraqProvider> pProvider = NULL;\r
- HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider);\r
+ hr = m_BugTraqProvider.QueryInterface(&pProvider);\r
if (FAILED(hr))\r
{\r
CString sErr;\r
else\r
m_cLogMessage.SetText(temp);\r
}\r
+ m_sLogMessage = m_cLogMessage.GetText();\r
+ if (!m_ProjectProperties.sMessage.IsEmpty())\r
+ {\r
+ CString sBugID = m_ProjectProperties.FindBugID(m_sLogMessage);\r
+ if (!sBugID.IsEmpty())\r
+ {\r
+ SetDlgItemText(IDC_BUGID, sBugID);\r
+ }\r
+ }\r
\r
m_cLogMessage.SetFocus();\r
\r
+ SysFreeString(parameters);\r
+ SysFreeString(commonRoot);\r
+ SafeArrayDestroy(pathList);\r
+ SysFreeString(originalMessage);\r
SysFreeString(temp);\r
-#endif\r
+\r
}\r
\r
LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)\r
SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
\r
}\r
+\r
+void CCommitDlg::OnStnClickedBugidlabel()\r
+{\r
+ // TODO: Add your control notification handler code here\r
+}\r
OSDN Git Service
