#include "stdafx.h"\r
#include "TortoiseProc.h"\r
#include "SyncDlg.h"\r
-\r
+#include "progressdlg.h"\r
+#include "MessageBox.h"\r
+#include "ImportPatchDlg.h"\r
+#include "PathUtils.h"\r
+#include "RebaseDlg.h"\r
\r
// CSyncDlg dialog\r
\r
\r
CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)\r
: CResizableStandAloneDialog(CSyncDlg::IDD, pParent)\r
- , m_bAutoLoadPuttyKey(FALSE)\r
{\r
m_pTooltip=&this->m_tooltips;\r
m_bInited=false;\r
+ m_CmdOutCurrentPos=0;\r
+ m_bAutoLoadPuttyKey = CAppUtils::IsSSHPutty();\r
}\r
\r
CSyncDlg::~CSyncDlg()\r
{\r
CDialog::DoDataExchange(pDX);\r
DDX_Check(pDX, IDC_CHECK_PUTTY_KEY, m_bAutoLoadPuttyKey);\r
+ DDX_Check(pDX, IDC_CHECK_FORCE,m_bForce);\r
DDX_Control(pDX, IDC_COMBOBOXEX_URL, m_ctrlURL);\r
DDX_Control(pDX, IDC_BUTTON_TABCTRL, m_ctrlDumyButton);\r
DDX_Control(pDX, IDC_BUTTON_PULL, m_ctrlPull);\r
DDX_Control(pDX, IDC_STATIC_STATUS, m_ctrlStatus);\r
DDX_Control(pDX, IDC_PROGRESS_SYNC, m_ctrlProgress);\r
DDX_Control(pDX, IDC_ANIMATE_SYNC, m_ctrlAnimate);\r
-\r
+ DDX_Control(pDX, IDC_BUTTON_SUBMODULE,m_ctrlSubmodule);\r
BRANCH_COMBOX_DDX;\r
}\r
\r
BRANCH_COMBOX_EVENT\r
ON_NOTIFY(CBEN_ENDEDIT, IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbenEndeditComboboxexUrl)\r
ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbnEditchangeComboboxexUrl)\r
+ ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI, OnProgressUpdateUI)\r
+ ON_BN_CLICKED(IDC_BUTTON_COMMIT, &CSyncDlg::OnBnClickedButtonCommit)\r
+ ON_BN_CLICKED(IDC_BUTTON_SUBMODULE, &CSyncDlg::OnBnClickedButtonSubmodule)\r
END_MESSAGE_MAP()\r
\r
\r
+void CSyncDlg::EnableControlButton(bool bEnabled)\r
+{\r
+ GetDlgItem(IDC_BUTTON_PULL)->EnableWindow(bEnabled);\r
+ GetDlgItem(IDC_BUTTON_PUSH)->EnableWindow(bEnabled);\r
+ GetDlgItem(IDC_BUTTON_APPLY)->EnableWindow(bEnabled);\r
+ GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(bEnabled);\r
+ GetDlgItem(IDOK)->EnableWindow(bEnabled);\r
+ GetDlgItem(IDC_BUTTON_SUBMODULE)->EnableWindow(bEnabled);\r
+}\r
// CSyncDlg message handlers\r
\r
void CSyncDlg::OnBnClickedButtonPull()\r
{\r
// TODO: Add your control notification handler code here\r
- this->m_regPullButton =this->m_ctrlPull.GetCurrentEntry();\r
+ int CurrentEntry;\r
+ CurrentEntry = this->m_ctrlPull.GetCurrentEntry(); \r
+ this->m_regPullButton = CurrentEntry;\r
+\r
+\r
+ this->m_bAbort=false;\r
+ this->m_GitCmdList.clear();\r
+\r
+ this->UpdateData();\r
+ UpdateCombox();\r
+\r
+ m_oldHash = g_Git.GetHash(CString(_T("HEAD")));\r
+\r
+ if( CurrentEntry == 0)\r
+ {\r
+ if( g_Git.GetHash(this->m_strLocalBranch) != m_oldHash)\r
+ {\r
+ CMessageBox::Show(NULL,_T("Pull require local branch must be current branch"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+ return; \r
+ }\r
+ }\r
+\r
+ if(this->m_strURL.IsEmpty())\r
+ {\r
+ CMessageBox::Show(NULL,_T("URL can't Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+ return;\r
+ }\r
+\r
+ if(this->m_bAutoLoadPuttyKey)\r
+ {\r
+ CAppUtils::LaunchPAgent(NULL,&this->m_strURL);\r
+ }\r
+\r
+ this->SwitchToRun();\r
+\r
+ CString force;\r
+ if(this->m_bForce)\r
+ force = _T(" --force ");\r
+\r
+ CString cmd;\r
+\r
+ ShowTab(IDC_CMD_LOG);\r
+\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);\r
+\r
+ this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_HIDE);\r
+\r
+ ///Pull \r
+ if(CurrentEntry == 0) //Pull\r
+ {\r
+ cmd.Format(_T("git.exe pull %s \"%s\" %s"),\r
+ force,\r
+ m_strURL,\r
+ this->m_strRemoteBranch);\r
+\r
+ m_CurrentCmd = GIT_COMMAND_PULL;\r
+ m_GitCmdList.push_back(cmd);\r
+\r
+ m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
+ if (m_pThread==NULL)\r
+ {\r
+ // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));\r
+ }\r
+ else\r
+ {\r
+ m_pThread->m_bAutoDelete = TRUE;\r
+ m_pThread->ResumeThread();\r
+ }\r
+\r
+ }\r
+\r
+ ///Fetch\r
+ if(CurrentEntry == 1 || CurrentEntry ==2 ) //Fetch\r
+ {\r
+ cmd.Format(_T("git.exe fetch %s \"%s\" %s"),\r
+ force,\r
+ m_strURL,\r
+ this->m_strRemoteBranch);\r
+ if(CurrentEntry == 1) \r
+ m_CurrentCmd = GIT_COMMAND_FETCH;\r
+ else\r
+ m_CurrentCmd = GIT_COMMAND_FETCHANDREBASE;\r
+ m_GitCmdList.push_back(cmd);\r
+\r
+ m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
+ if (m_pThread==NULL)\r
+ {\r
+ // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));\r
+ }\r
+ else\r
+ {\r
+ m_pThread->m_bAutoDelete = TRUE;\r
+ m_pThread->ResumeThread();\r
+ }\r
+ }\r
+\r
+\r
+ \r
+}\r
+\r
+void CSyncDlg::PullComplete()\r
+{\r
+ EnableControlButton(true);\r
+ SwitchToInput();\r
+ this->FetchOutList(true);\r
+\r
+ CString newhash;\r
+ newhash = g_Git.GetHash(CString(_T("HEAD")));\r
+\r
+ \r
+\r
+ if( this ->m_GitCmdStatus )\r
+ {\r
+ CTGitPathList list;\r
+ if(g_Git.ListConflictFile(list))\r
+ {\r
+ this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ this->m_ctrlCmdOut.ReplaceSel(_T("Get conflict files fail\n"));\r
+\r
+ this->ShowTab(IDC_CMD_LOG);\r
+ return;\r
+ }\r
+\r
+ if(list.GetCount()>0)\r
+ {\r
+ this->m_ConflictFileList.Clear(); \r
+ CTGitPathList list;\r
+ CTGitPath path;\r
+ list.AddPath(path);\r
+\r
+ this->m_ConflictFileList.GetStatus(&list,true);\r
+ this->m_ConflictFileList.Show(CTGitPath::LOGACTIONS_UNMERGED,\r
+ CTGitPath::LOGACTIONS_UNMERGED);\r
+ \r
+ this->ShowTab(IDC_IN_CONFLICT);\r
+\r
+ this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_NORMAL);\r
+ }\r
+ else\r
+ this->ShowTab(IDC_CMD_LOG);\r
+\r
+ }else\r
+ {\r
+ if(newhash == this->m_oldHash)\r
+ {\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);\r
+ this->m_InLogList.ShowText(_T("No commits get after pull"));\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
+ }\r
+ else\r
+ {\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
+ \r
+ this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,m_oldHash);\r
+ \r
+ m_InLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+ &this->m_oldHash,&newhash);\r
+ }\r
+ this->ShowTab(IDC_IN_LOGLIST);\r
+ }\r
+}\r
+\r
+void CSyncDlg::FetchComplete()\r
+{\r
+ EnableControlButton(true);\r
+ SwitchToInput();\r
+ this->FetchOutList(true);\r
+\r
+ ShowTab(IDC_CMD_LOG);\r
+ if( (!this->m_GitCmdStatus) && this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)\r
+ {\r
+ CRebaseDlg dlg;\r
+ dlg.m_PostButtonTexts.Add(_T("Email &Patch..."));\r
+ int response = dlg.DoModal();\r
+ if(response == IDOK)\r
+ {\r
+ return ;\r
+ }\r
+\r
+ if(response == IDC_REBASE_POST_BUTTON)\r
+ {\r
+ CString cmd,out;\r
+ cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),\r
+ g_Git.m_CurrentDir,\r
+ dlg.m_Upstream,dlg.m_Branch);\r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
+ {\r
+ CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+ return ;\r
+ }\r
+\r
+ CAppUtils::SendPatchMail(cmd,out);\r
+ }\r
+ }\r
}\r
\r
void CSyncDlg::OnBnClickedButtonPush()\r
{\r
// TODO: Add your control notification handler code here\r
+ this->UpdateData();\r
+ UpdateCombox();\r
+\r
+ if(this->m_strURL.IsEmpty())\r
+ {\r
+ CMessageBox::Show(NULL,_T("URL can't Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+ return;\r
+ }\r
+\r
this->m_regPushButton=this->m_ctrlPush.GetCurrentEntry();\r
this->SwitchToRun();\r
+ this->m_bAbort=false;\r
+ this->m_GitCmdList.clear();\r
+\r
+ ShowTab(IDC_CMD_LOG);\r
+\r
+ CString cmd;\r
+ CString tags;\r
+ CString force;\r
+ CString all;\r
+\r
+\r
+\r
+ switch (m_ctrlPush.GetCurrentEntry())\r
+ {\r
+ case 1:\r
+ tags = _T(" --tags ");\r
+ break;\r
+ case 2:\r
+ all = _T(" --all ");\r
+ break;\r
+ }\r
+\r
+ if(this->m_bForce)\r
+ force = _T(" --force ");\r
+\r
+ cmd.Format(_T("git.exe push %s %s %s \"%s\" %s"),\r
+ tags,force,all,\r
+ m_strURL,\r
+ m_strLocalBranch);\r
+\r
+ if (!m_strRemoteBranch.IsEmpty())\r
+ {\r
+ cmd += _T(":") + m_strRemoteBranch;\r
+ }\r
+ \r
+ m_GitCmdList.push_back(cmd);\r
+\r
+ m_CurrentCmd = GIT_COMMAND_PUSH;\r
+\r
+ if(this->m_bAutoLoadPuttyKey)\r
+ {\r
+ CAppUtils::LaunchPAgent(NULL,&this->m_strURL);\r
+ }\r
+\r
+ m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
+ if (m_pThread==NULL)\r
+ {\r
+// ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));\r
+ }\r
+ else\r
+ {\r
+ m_pThread->m_bAutoDelete = TRUE;\r
+ m_pThread->ResumeThread();\r
+ }\r
+ \r
}\r
\r
void CSyncDlg::OnBnClickedButtonApply()\r
{\r
// TODO: Add your control notification handler code here\r
+ CString oldhash;\r
+ oldhash=g_Git.GetHash(CString(_T("HEAD")));\r
+ \r
+ CImportPatchDlg dlg;\r
+ CString cmd,output;\r
+\r
+ if(dlg.DoModal() == IDOK)\r
+ {\r
+ int err=0;\r
+ for(int i=0;i<dlg.m_PathList.GetCount();i++)\r
+ { \r
+ cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());\r
+ \r
+ if(g_Git.Run(cmd,&output,CP_ACP))\r
+ {\r
+ CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);\r
+\r
+ err=1;\r
+ break;\r
+ }\r
+ this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ this->m_ctrlCmdOut.ReplaceSel(cmd+_T("\n"));\r
+ this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ this->m_ctrlCmdOut.ReplaceSel(output);\r
+ }\r
+ \r
+\r
+ CString newhash=g_Git.GetHash(CString(_T("HEAD"))); \r
+\r
+ this->m_InLogList.Clear();\r
+ this->m_InChangeFileList.Clear();\r
+\r
+ if(newhash == oldhash)\r
+ {\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);\r
+ this->m_InLogList.ShowText(_T("No commits get from patch"));\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
+\r
+ }else\r
+ {\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,true);\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,true);\r
+ \r
+ this->AddDiffFileList(&m_InChangeFileList,&m_arInChangeList,newhash,oldhash);\r
+ m_InLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+ &oldhash,&newhash);\r
+\r
+ this->FetchOutList(true);\r
+\r
+ }\r
+\r
+ this->m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,true);\r
+\r
+ if(err)\r
+ {\r
+ this->ShowTab(IDC_CMD_LOG);\r
+\r
+ }else\r
+ {\r
+ this->ShowTab(IDC_IN_LOGLIST);\r
+ }\r
+ }\r
}\r
\r
void CSyncDlg::OnBnClickedButtonEmail()\r
{\r
// TODO: Add your control notification handler code here\r
+ CString cmd,out;\r
+ \r
+ this->m_strLocalBranch = this->m_ctrlLocalBranch.GetString();\r
+ this->m_ctrlRemoteBranch.GetWindowText(this->m_strRemoteBranch);\r
+ this->m_ctrlURL.GetWindowText(this->m_strURL);\r
+ m_strURL=m_strURL.Trim();\r
+ m_strRemoteBranch=m_strRemoteBranch.Trim();\r
+ \r
+ cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),\r
+ g_Git.m_CurrentDir,\r
+ m_strURL+_T('/')+m_strRemoteBranch,m_strLocalBranch);\r
+ \r
+ if(g_Git.Run(cmd,&out,CP_ACP))\r
+ {\r
+ CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
+ return ;\r
+ }\r
+\r
+ CAppUtils::SendPatchMail(cmd,out); \r
+\r
}\r
void CSyncDlg::ShowProgressCtrl(bool bShow)\r
{\r
this->m_ctrlAnimate.Play(0,-1,-1);\r
*/\r
\r
- //Create Tabctrl\r
+ // ------------------ Create Tabctrl -----------\r
CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);\r
CRect rectDummy;\r
pwnd->GetWindowRect(&rectDummy);\r
}\r
m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);\r
\r
- DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;\r
+ // -------------Create Command Log Ctrl ---------\r
+ DWORD dwStyle;\r
+ dwStyle= ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_AUTOVSCROLL |WS_VSCROLL ;\r
+\r
+ if( !m_ctrlCmdOut.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_CMD_LOG))\r
+ {\r
+ TRACE0("Failed to create Log commits window\n");\r
+ return FALSE; // fail to create\r
+ }\r
+\r
+ m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut,_T("Log"),-1);\r
+ \r
+ //m_ctrlCmdOut.ReplaceSel(_T("Hello"));\r
+\r
+ //---------- Create in coming list ctrl -----------\r
+ dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;\r
+\r
+ if( !m_InLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_LOGLIST))\r
+ {\r
+ TRACE0("Failed to create output commits window\n");\r
+ return FALSE; // fail to create\r
+\r
+ }\r
+\r
+ m_ctrlTabCtrl.InsertTab(&m_InLogList,_T("In Commits"),-1);\r
+\r
+ m_InLogList.InsertGitColumn();\r
+\r
+ //----------- Create In Change file list -----------\r
+ dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
+ \r
+ if( !m_InChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CHANGELIST))\r
+ {\r
+ TRACE0("Failed to create output change files window\n");\r
+ return FALSE; // fail to create\r
+ }\r
+ m_ctrlTabCtrl.InsertTab(&m_InChangeFileList,_T("In ChangeList"),-1);\r
+\r
+ m_InChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
+ (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r
+ CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)),false);\r
+\r
+\r
+ //---------- Create Conflict List Ctrl -----------------\r
+ dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
+ \r
+ if( !m_ConflictFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_IN_CONFLICT))\r
+ {\r
+ TRACE0("Failed to create output change files window\n");\r
+ return FALSE; // fail to create\r
+ }\r
+ m_ctrlTabCtrl.InsertTab(&m_ConflictFileList,_T("Conflict"),-1);\r
+\r
+ m_ConflictFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
+ (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r
+ CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)|\r
+ SVNSLC_POPCONFLICT|SVNSLC_POPRESOLVE),false);\r
+\r
+\r
+ //---------- Create Commit Out List Ctrl---------------\r
+ \r
+ dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;\r
\r
if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))\r
{\r
return FALSE; // fail to create\r
\r
}\r
- m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);\r
+\r
+ m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),-1);\r
+ \r
\r
m_OutLogList.InsertGitColumn();\r
\r
+ //------------- Create Change File List Control ----------------\r
+\r
dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
\r
if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))\r
TRACE0("Failed to create output change files window\n");\r
return FALSE; // fail to create\r
}\r
- m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);\r
+ m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),-1);\r
\r
m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
(CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r
AddAnchor(IDC_BUTTON_MANAGE,TOP_RIGHT);\r
AddAnchor(IDC_BUTTON_PULL,BOTTOM_LEFT);\r
AddAnchor(IDC_BUTTON_PUSH,BOTTOM_LEFT);\r
- AddAnchor(IDC_BUTTON_APPLY,BOTTOM_LEFT);\r
- AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_LEFT);\r
+ AddAnchor(IDC_BUTTON_SUBMODULE,BOTTOM_LEFT);\r
+ AddAnchor(IDC_BUTTON_APPLY,BOTTOM_RIGHT);\r
+ AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_RIGHT);\r
AddAnchor(IDC_PROGRESS_SYNC,TOP_LEFT,TOP_RIGHT);\r
AddAnchor(IDOK,BOTTOM_RIGHT);\r
AddAnchor(IDHELP,BOTTOM_RIGHT);\r
AddAnchor(IDC_STATIC_STATUS,BOTTOM_LEFT);\r
AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT);\r
- \r
+ AddAnchor(IDC_BUTTON_COMMIT,BOTTOM_LEFT);\r
+\r
BRANCH_COMBOX_ADD_ANCHOR();\r
\r
+ this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_HIDE);\r
+\r
CString WorkingDir=g_Git.m_CurrentDir;\r
WorkingDir.Replace(_T(':'),_T('_'));\r
m_RegKeyRemoteBranch = CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir;\r
this->AddOthersToAnchor();\r
// TODO: Add extra initialization here\r
\r
- this->m_ctrlPush.AddEntry(CString(_T("Push")));\r
- this->m_ctrlPush.AddEntry(CString(_T("Push tags")));\r
- this->m_ctrlPush.AddEntry(CString(_T("Push All")));\r
+ this->m_ctrlPush.AddEntry(CString(_T("Pus&h")));\r
+ this->m_ctrlPush.AddEntry(CString(_T("Push ta&gs")));\r
+ ///this->m_ctrlPush.AddEntry(CString(_T("Push All")));\r
\r
this->m_ctrlPull.AddEntry(CString(_T("&Pull")));\r
- this->m_ctrlPull.AddEntry(CString(_T("&Fetch")));\r
- this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Rebase")));\r
+ this->m_ctrlPull.AddEntry(CString(_T("Fetc&h")));\r
+ this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Re&base")));\r
\r
+ this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Update")));\r
+ this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Init")));\r
+ this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Sync")));\r
\r
WorkingDir.Replace(_T(':'),_T('_'));\r
\r
\r
this->m_regPullButton = CRegDWORD(regkey+_T("\\Pull"),0);\r
this->m_regPushButton = CRegDWORD(regkey+_T("\\Push"),0);\r
+ this->m_regSubmoduleButton = CRegDWORD(regkey+_T("\\Submodule"));\r
\r
this->m_ctrlPull.SetCurrentEntry(this->m_regPullButton);\r
this->m_ctrlPush.SetCurrentEntry(this->m_regPushButton);\r
+ this->m_ctrlSubmodule.SetCurrentEntry(this->m_regSubmoduleButton);\r
\r
CString str;\r
this->GetWindowText(str);\r
\r
EnableSaveRestore(_T("SyncDlg"));\r
\r
+ this->m_ctrlURL.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir, _T("url"));\r
+\r
+ STRING_VECTOR list;\r
+ \r
+ if(!g_Git.GetRemoteList(list))\r
+ { \r
+ for(unsigned int i=0;i<list.size();i++)\r
+ {\r
+ m_ctrlURL.AddString(list[i]);\r
+ }\r
+ } \r
+ m_ctrlURL.SetCurSel(0);\r
+ m_ctrlRemoteBranch.SetCurSel(0);\r
+ m_ctrlURL.SetURLHistory(true);\r
+ \r
this->LoadBranchInfo();\r
\r
this->m_bInited=true;\r
FetchOutList();\r
\r
+ m_ctrlTabCtrl.ShowTab(IDC_CMD_LOG-1,false);\r
+ m_ctrlTabCtrl.ShowTab(IDC_IN_LOGLIST-1,false);\r
+ m_ctrlTabCtrl.ShowTab(IDC_IN_CHANGELIST-1,false);\r
+ m_ctrlTabCtrl.ShowTab(IDC_IN_CONFLICT-1,false);\r
+ \r
return TRUE; // return TRUE unless you set the focus to a control\r
// EXCEPTION: OCX Property Pages should return FALSE\r
}\r
m_tooltips.RelayEvent(pMsg);\r
return __super::PreTranslateMessage(pMsg);\r
}\r
-void CSyncDlg::FetchOutList()\r
+void CSyncDlg::FetchOutList(bool force)\r
{\r
if(!m_bInited)\r
return;\r
this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
m_OutLocalBranch.Empty();\r
m_OutRemoteBranch.Empty();\r
+\r
+ this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);\r
return ;\r
\r
}else if(g_Git.GetHash(remotebranch).GetLength()<40)\r
this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
m_OutLocalBranch.Empty();\r
m_OutRemoteBranch.Empty();\r
+\r
+ this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);\r
return ;\r
}\r
else\r
CString localbranch;\r
localbranch=this->m_ctrlLocalBranch.GetString();\r
\r
- if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch)\r
+ if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch || force)\r
{\r
m_OutLogList.ClearText();\r
m_OutLogList.FillGitLog(NULL,CGit:: LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
m_OutLogList.ShowText(str);\r
this->m_ctrlStatus.SetWindowText(str);\r
this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+ this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(FALSE);\r
}\r
else\r
{\r
str.Format(_T("%d commits ahead \"%s\""),m_OutLogList.GetItemCount(),remotebranch);\r
this->m_ctrlStatus.SetWindowText(str);\r
- g_Git.GetCommitDiffList(localbranch,remotebranch,m_arOutChangeList);\r
- m_OutChangeFileList.m_Rev1=localbranch;\r
- m_OutChangeFileList.m_Rev2=remotebranch;\r
- m_OutChangeFileList.Show(0,this->m_arOutChangeList);\r
- m_OutChangeFileList.SetEmptyString(CString(_T("No changed file")));\r
+\r
+ AddDiffFileList(&m_OutChangeFileList,&m_arOutChangeList,localbranch,remotebranch);\r
+ \r
this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,TRUE);\r
+ this->GetDlgItem(IDC_BUTTON_EMAIL)->EnableWindow(TRUE);\r
}\r
}\r
this->m_OutLocalBranch=localbranch;\r
this->FetchOutList();\r
// TODO: Add your control notification handler code here\r
}\r
+\r
+UINT CSyncDlg::ProgressThread()\r
+{\r
+ m_GitCmdStatus=CProgressDlg::RunCmdList(this,m_GitCmdList,true,NULL,&this->m_bAbort);\r
+ return 0;\r
+}\r
+\r
+\r
+LRESULT CSyncDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)\r
+{\r
+ if(wParam == MSG_PROGRESSDLG_START)\r
+ {\r
+ m_ctrlAnimate.Play(0,-1,-1);\r
+ this->m_ctrlProgress.SetPos(0);\r
+ }\r
+\r
+ if(wParam == MSG_PROGRESSDLG_END || wParam == MSG_PROGRESSDLG_FAILED)\r
+ {\r
+ //m_bDone = true;\r
+ m_ctrlAnimate.Stop();\r
+ m_ctrlProgress.SetPos(100);\r
+ //this->DialogEnableWindow(IDOK,TRUE);\r
+\r
+ //if(wParam == MSG_PROGRESSDLG_END)\r
+ if(this->m_CurrentCmd == GIT_COMMAND_PUSH )\r
+ {\r
+ EnableControlButton(true);\r
+ SwitchToInput();\r
+ this->FetchOutList(true);\r
+ }\r
+ if(this->m_CurrentCmd == GIT_COMMAND_PULL )\r
+ {\r
+ PullComplete();\r
+ }\r
+ if(this->m_CurrentCmd == GIT_COMMAND_FETCH || this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)\r
+ {\r
+ FetchComplete();\r
+ }\r
+ if(this->m_CurrentCmd == GIT_COMMAND_SUBMODULE)\r
+ {\r
+ //this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ //this->m_ctrlCmdOut.ReplaceSel(_T("Done\r\n"));\r
+ //this->m_ctrlCmdOut.SetSel(-1,-1);\r
+ EnableControlButton(true);\r
+ SwitchToInput();\r
+ }\r
+ }\r
+\r
+ if(lParam != 0)\r
+ ParserCmdOutput((TCHAR)lParam);\r
+\r
+ return 0;\r
+}\r
+\r
+\r
+void CSyncDlg::ParserCmdOutput(TCHAR ch)\r
+{\r
+ CProgressDlg::ParserCmdOutput(m_ctrlCmdOut,m_ctrlProgress,m_LogText,ch);\r
+}\r
+void CSyncDlg::OnBnClickedButtonCommit()\r
+{\r
+ // TODO: Add your control notification handler code here\r
+ CString proc=CPathUtils::GetAppDirectory();\r
+ proc += _T("TortoiseProc.exe /command:commit");\r
+ proc += _T(" /path:\"");\r
+ proc += g_Git.m_CurrentDir;\r
+ \r
+ CAppUtils::LaunchApplication(proc,IDS_ERROR_CANNON_FIND_TORTOISEPROC,false);\r
+}\r
+\r
+void CSyncDlg::OnOK()\r
+{\r
+ // TODO: Add your specialized code here and/or call the base class\r
+ UpdateCombox();\r
+ m_ctrlURL.SaveHistory();\r
+ SaveHistory();\r
+ __super::OnOK();\r
+}\r
+\r
+void CSyncDlg::OnBnClickedButtonSubmodule()\r
+{\r
+ // TODO: Add your control notification handler code here\r
+ // TODO: Add your control notification handler code here\r
+ this->UpdateData();\r
+ UpdateCombox();\r
+\r
+ this->m_regSubmoduleButton = this->m_ctrlSubmodule.GetCurrentEntry();\r
+\r
+ this->SwitchToRun();\r
+ \r
+ this->m_bAbort=false;\r
+ this->m_GitCmdList.clear();\r
+\r
+ ShowTab(IDC_CMD_LOG);\r
+\r
+ CString cmd;\r
+\r
+ switch (m_ctrlSubmodule.GetCurrentEntry())\r
+ {\r
+ case 0:\r
+ cmd=_T("git.exe submodule update");\r
+ break;\r
+ case 1:\r
+ cmd=_T("git.exe submodule init");\r
+ break;\r
+ case 2:\r
+ cmd=_T("git.exe submodule sync");\r
+ break;\r
+ }\r
+\r
+ \r
+ m_GitCmdList.push_back(cmd);\r
+\r
+ m_CurrentCmd = GIT_COMMAND_SUBMODULE;\r
+\r
+ m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
+ if (m_pThread==NULL)\r
+ {\r
+// ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));\r
+ }\r
+ else\r
+ {\r
+ m_pThread->m_bAutoDelete = TRUE;\r
+ m_pThread->ResumeThread();\r
+ }\r
+\r
+}\r
OSDN Git Service
