1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 // SyncDlg.cpp : implementation file
24 #include "TortoiseProc.h"
27 #include "progressdlg.h"
28 #include "MessageBox.h"
29 #include "ImportPatchDlg.h"
30 #include "RebaseDlg.h"
32 #include "SmartHandle.h"
36 IMPLEMENT_DYNAMIC(CSyncDlg
, CResizableStandAloneDialog
)
38 CSyncDlg::CSyncDlg(CWnd
* pParent
/*=NULL*/)
39 : CResizableStandAloneDialog(CSyncDlg::IDD
, pParent
)
42 m_pTooltip
=&this->m_tooltips
;
45 m_bAutoLoadPuttyKey
= CAppUtils::IsSSHPutty();
52 m_startTick
= GetTickCount();
59 void CSyncDlg::DoDataExchange(CDataExchange
* pDX
)
61 CDialog::DoDataExchange(pDX
);
62 DDX_Check(pDX
, IDC_CHECK_PUTTY_KEY
, m_bAutoLoadPuttyKey
);
63 DDX_Check(pDX
, IDC_CHECK_FORCE
,m_bForce
);
64 DDX_Control(pDX
, IDC_COMBOBOXEX_URL
, m_ctrlURL
);
65 DDX_Control(pDX
, IDC_BUTTON_TABCTRL
, m_ctrlDumyButton
);
66 DDX_Control(pDX
, IDC_BUTTON_PULL
, m_ctrlPull
);
67 DDX_Control(pDX
, IDC_BUTTON_PUSH
, m_ctrlPush
);
68 DDX_Control(pDX
, IDC_STATIC_STATUS
, m_ctrlStatus
);
69 DDX_Control(pDX
, IDC_PROGRESS_SYNC
, m_ctrlProgress
);
70 DDX_Control(pDX
, IDC_ANIMATE_SYNC
, m_ctrlAnimate
);
71 DDX_Control(pDX
, IDC_BUTTON_SUBMODULE
,m_ctrlSubmodule
);
76 BEGIN_MESSAGE_MAP(CSyncDlg
, CResizableStandAloneDialog
)
77 ON_BN_CLICKED(IDC_BUTTON_PULL
, &CSyncDlg::OnBnClickedButtonPull
)
78 ON_BN_CLICKED(IDC_BUTTON_PUSH
, &CSyncDlg::OnBnClickedButtonPush
)
79 ON_BN_CLICKED(IDC_BUTTON_APPLY
, &CSyncDlg::OnBnClickedButtonApply
)
80 ON_BN_CLICKED(IDC_BUTTON_EMAIL
, &CSyncDlg::OnBnClickedButtonEmail
)
81 ON_BN_CLICKED(IDC_BUTTON_MANAGE
, &CSyncDlg::OnBnClickedButtonManage
)
83 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL
, &CSyncDlg::OnCbnEditchangeComboboxex
)
84 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_REMOTE_BRANCH
, &CSyncDlg::OnCbnEditchangeComboboxex
)
85 ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI
, OnProgressUpdateUI
)
86 ON_NOTIFY(LVN_COLUMNCLICK
, IDC_IN_LOGLIST
, OnLvnInLogListColumnClick
)
87 ON_BN_CLICKED(IDC_BUTTON_COMMIT
, &CSyncDlg::OnBnClickedButtonCommit
)
88 ON_BN_CLICKED(IDC_BUTTON_SUBMODULE
, &CSyncDlg::OnBnClickedButtonSubmodule
)
90 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
91 ON_BN_CLICKED(IDC_CHECK_FORCE
, &CSyncDlg::OnBnClickedCheckForce
)
92 ON_BN_CLICKED(IDC_LOG
, &CSyncDlg::OnBnClickedLog
)
96 void CSyncDlg::EnableControlButton(bool bEnabled
)
98 GetDlgItem(IDC_BUTTON_PULL
)->EnableWindow(bEnabled
);
99 GetDlgItem(IDC_BUTTON_PUSH
)->EnableWindow(bEnabled
);
100 GetDlgItem(IDC_BUTTON_APPLY
)->EnableWindow(bEnabled
);
101 GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(bEnabled
);
102 GetDlgItem(IDOK
)->EnableWindow(bEnabled
);
103 GetDlgItem(IDC_BUTTON_SUBMODULE
)->EnableWindow(bEnabled
);
105 // CSyncDlg message handlers
107 void CSyncDlg::OnBnClickedButtonPull()
110 CurrentEntry
= (int)this->m_ctrlPull
.GetCurrentEntry();
111 this->m_regPullButton
= CurrentEntry
;
113 this->m_bAbort
=false;
114 this->m_GitCmdList
.clear();
115 m_ctrlCmdOut
.SetWindowTextW(_T(""));
121 if (g_Git
.GetHash(m_oldHash
, _T("HEAD")))
123 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
127 if( CurrentEntry
== 0)
129 CGitHash localBranchHash
;
130 if (g_Git
.GetHash(localBranchHash
, m_strLocalBranch
))
132 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_strLocalBranch
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
135 if (localBranchHash
!= m_oldHash
)
137 CMessageBox::Show(NULL
, IDS_PROC_SYNC_PULLWRONGBRANCH
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
142 if(this->m_strURL
.IsEmpty())
144 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
148 if (m_bAutoLoadPuttyKey
&& CurrentEntry
!= 3) // CurrentEntry (Remote Update) handles this on its own)
150 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
157 force
= _T(" --force ");
161 ShowTab(IDC_CMD_LOG
);
163 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
164 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
165 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
168 if(CurrentEntry
== 0) //Pull
170 CString remotebranch
;
171 remotebranch
= m_strRemoteBranch
;
176 configName
.Format(L
"branch.%s.merge", this->m_strLocalBranch
);
177 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
179 configName
.Format(L
"branch.%s.remote", m_strLocalBranch
);
180 CString pullRemote
= g_Git
.GetConfigValue(configName
);
182 if(pullBranch
== remotebranch
&& pullRemote
== this->m_strURL
)
183 remotebranch
.Empty();
186 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
187 force
+= _T("--progress ");
189 cmd
.Format(_T("git.exe pull -v %s \"%s\" %s"),
194 m_CurrentCmd
= GIT_COMMAND_PULL
;
195 m_GitCmdList
.push_back(cmd
);
197 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
200 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
204 m_pThread
->m_bAutoDelete
= TRUE
;
205 m_pThread
->ResumeThread();
211 if(CurrentEntry
== 1 || CurrentEntry
==2 ) //Fetch
213 CString remotebranch
;
214 if(this->IsURL() || m_strRemoteBranch
.IsEmpty())
216 remotebranch
=this->m_strRemoteBranch
;
221 remotebranch
.Format(_T("remotes/%s/%s"),
222 m_strURL
,m_strRemoteBranch
);
223 CGitHash remoteBranchHash
;
224 g_Git
.GetHash(remoteBranchHash
, remotebranch
);
225 if (remoteBranchHash
.IsEmpty())
226 remotebranch
=m_strRemoteBranch
;
228 remotebranch
=m_strRemoteBranch
+_T(":")+remotebranch
;
231 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
232 force
+= _T("--progress ");
234 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"),
239 if(CurrentEntry
== 1)
240 m_CurrentCmd
= GIT_COMMAND_FETCH
;
242 m_CurrentCmd
= GIT_COMMAND_FETCHANDREBASE
;
243 m_GitCmdList
.push_back(cmd
);
245 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
248 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
252 m_pThread
->m_bAutoDelete
= TRUE
;
253 m_pThread
->ResumeThread();
258 if(CurrentEntry
== 3)
260 if (m_bAutoLoadPuttyKey
)
263 if (!g_Git
.GetRemoteList(list
))
265 for (size_t i
= 0; i
< list
.size(); ++i
)
266 CAppUtils::LaunchPAgent(NULL
, &list
[i
]);
270 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
271 cmd
=_T("git.exe remote update");
272 m_GitCmdList
.push_back(cmd
);
274 InterlockedExchange(&m_bBlock
, TRUE
);
276 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
279 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
280 InterlockedExchange(&m_bBlock
, FALSE
);
284 m_pThread
->m_bAutoDelete
= TRUE
;
285 m_pThread
->ResumeThread();
289 ///Cleanup stale remote banches
290 if(CurrentEntry
== 4)
292 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
293 cmd
.Format(_T("git.exe remote prune \"%s\""), m_strURL
);
294 m_GitCmdList
.push_back(cmd
);
296 InterlockedExchange(&m_bBlock
, TRUE
);
298 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
301 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
302 InterlockedExchange(&m_bBlock
, FALSE
);
306 m_pThread
->m_bAutoDelete
= TRUE
;
307 m_pThread
->ResumeThread();
312 void CSyncDlg::PullComplete()
314 EnableControlButton(true);
316 this->FetchOutList(true);
319 if (g_Git
.GetHash(newhash
, _T("HEAD")))
320 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR
);
322 if( this ->m_GitCmdStatus
)
325 if(g_Git
.ListConflictFile(list
))
327 this->m_ctrlCmdOut
.SetSel(-1,-1);
328 this->m_ctrlCmdOut
.ReplaceSel(_T("Get conflict files fail\n"));
330 this->ShowTab(IDC_CMD_LOG
);
334 if(list
.GetCount()>0)
336 this->m_ConflictFileList
.Clear();
341 this->m_ConflictFileList
.GetStatus(&list
,true);
342 this->m_ConflictFileList
.Show(CTGitPath::LOGACTIONS_UNMERGED
,
343 CTGitPath::LOGACTIONS_UNMERGED
);
345 this->ShowTab(IDC_IN_CONFLICT
);
348 this->ShowTab(IDC_CMD_LOG
);
353 if(newhash
== this->m_oldHash
)
355 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
356 this->m_InLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_UPTODATE
)));
357 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
361 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
362 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
364 this->AddDiffFileList(&m_InChangeFileList
, &m_arInChangeList
, newhash
.ToString(), m_oldHash
.ToString());
366 m_InLogList
.FillGitLog(NULL
,CGit:: LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
,
367 &m_oldHash
.ToString(), &newhash
.ToString());
369 this->ShowTab(IDC_IN_LOGLIST
);
373 void CSyncDlg::FetchComplete()
375 EnableControlButton(true);
377 this->FetchOutList(true);
379 ShowTab(IDC_CMD_LOG
);
380 if( (!this->m_GitCmdStatus
) && this->m_CurrentCmd
== GIT_COMMAND_FETCHANDREBASE
)
383 dlg
.m_PostButtonTexts
.Add(CString(MAKEINTRESOURCE(IDS_MENULOG
)));
384 dlg
.m_PostButtonTexts
.Add(_T("Email &Patch..."));
385 INT_PTR response
= dlg
.DoModal();
391 if (response
== IDC_REBASE_POST_BUTTON
)
393 CString cmd
= _T("/command:log");
394 cmd
+= _T(" /path:\"") + g_Git
.m_CurrentDir
+ _T("\"");
395 CAppUtils::RunTortoiseGitProc(cmd
);
397 if(response
== IDC_REBASE_POST_BUTTON
+ 1)
399 CString cmd
, out
, err
;
400 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
402 g_Git
.FixBranchName(dlg
.m_Upstream
),
403 g_Git
.FixBranchName(dlg
.m_Branch
));
404 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
406 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
410 CAppUtils::SendPatchMail(cmd
,out
);
415 void CSyncDlg::OnBnClickedButtonPush()
419 m_ctrlCmdOut
.SetWindowTextW(_T(""));
422 if(this->m_strURL
.IsEmpty())
424 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
428 this->m_regPushButton
=(DWORD
)this->m_ctrlPush
.GetCurrentEntry();
430 this->m_bAbort
=false;
431 this->m_GitCmdList
.clear();
433 ShowTab(IDC_CMD_LOG
);
441 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
443 if (CHooks::Instance().PrePush(list
,exitcode
, error
))
448 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
450 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
455 switch (m_ctrlPush
.GetCurrentEntry())
458 arg
+= _T(" --tags ");
461 arg
+= _T(" --all ");
466 arg
+= _T(" --force ");
468 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
469 arg
+= _T("--progress ");
471 cmd
.Format(_T("git.exe push -v %s \"%s\" %s"),
474 g_Git
.FixBranchName(m_strLocalBranch
));
476 if (!m_strRemoteBranch
.IsEmpty())
478 cmd
+= _T(":") + m_strRemoteBranch
;
481 m_GitCmdList
.push_back(cmd
);
483 m_CurrentCmd
= GIT_COMMAND_PUSH
;
485 if(this->m_bAutoLoadPuttyKey
)
487 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
490 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
493 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
497 m_pThread
->m_bAutoDelete
= TRUE
;
498 m_pThread
->ResumeThread();
502 void CSyncDlg::OnBnClickedButtonApply()
505 if (g_Git
.GetHash(oldhash
, _T("HEAD")))
507 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
514 if(dlg
.DoModal() == IDOK
)
517 for(int i
=0;i
<dlg
.m_PathList
.GetCount();i
++)
519 cmd
.Format(_T("git.exe am \"%s\""),dlg
.m_PathList
[i
].GetGitPathString());
521 if (g_Git
.Run(cmd
, &output
, CP_UTF8
))
523 CMessageBox::Show(NULL
,output
,_T("TortoiseGit"),MB_OK
);
528 this->m_ctrlCmdOut
.SetSel(-1,-1);
529 this->m_ctrlCmdOut
.ReplaceSel(cmd
+_T("\n"));
530 this->m_ctrlCmdOut
.SetSel(-1,-1);
531 this->m_ctrlCmdOut
.ReplaceSel(output
);
535 if (g_Git
.GetHash(newhash
, _T("HEAD")))
537 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash after applying patches.")), _T("TortoiseGit"), MB_ICONERROR
);
541 this->m_InLogList
.Clear();
542 this->m_InChangeFileList
.Clear();
544 if(newhash
== oldhash
)
546 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
547 this->m_InLogList
.ShowText(_T("No commits get from patch"));
548 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
553 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
554 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
556 this->AddDiffFileList(&m_InChangeFileList
, &m_arInChangeList
, newhash
.ToString(), oldhash
.ToString());
557 m_InLogList
.FillGitLog(NULL
,CGit:: LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
,
558 &oldhash
.ToString(), &newhash
.ToString());
560 this->FetchOutList(true);
563 this->m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,true);
567 this->ShowTab(IDC_CMD_LOG
);
571 this->ShowTab(IDC_IN_LOGLIST
);
576 void CSyncDlg::OnBnClickedButtonEmail()
578 CString cmd
, out
, err
;
580 this->m_strLocalBranch
= this->m_ctrlLocalBranch
.GetString();
581 this->m_ctrlRemoteBranch
.GetWindowText(this->m_strRemoteBranch
);
582 this->m_ctrlURL
.GetWindowText(this->m_strURL
);
583 m_strURL
=m_strURL
.Trim();
584 m_strRemoteBranch
=m_strRemoteBranch
.Trim();
586 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
588 m_strURL
+_T('/')+m_strRemoteBranch
,g_Git
.FixBranchName(m_strLocalBranch
));
590 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
592 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
596 CAppUtils::SendPatchMail(cmd
,out
);
599 void CSyncDlg::ShowProgressCtrl(bool bShow
)
601 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
602 this->m_ctrlAnimate
.ShowWindow(b
);
603 this->m_ctrlProgress
.ShowWindow(b
);
604 this->m_ctrlAnimate
.Open(IDR_DOWNLOAD
);
606 this->m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
608 this->m_ctrlAnimate
.Stop();
610 void CSyncDlg::ShowInputCtrl(bool bShow
)
612 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
613 this->m_ctrlURL
.ShowWindow(b
);
614 this->m_ctrlLocalBranch
.ShowWindow(b
);
615 this->m_ctrlRemoteBranch
.ShowWindow(b
);
616 this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH
)->ShowWindow(b
);
617 this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH
)->ShowWindow(b
);
618 this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH
)->ShowWindow(b
);
619 this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH
)->ShowWindow(b
);
620 this->GetDlgItem(IDC_BUTTON_MANAGE
)->ShowWindow(b
);
621 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->ShowWindow(b
);
622 this->GetDlgItem(IDC_CHECK_FORCE
)->ShowWindow(b
);
623 this->GetDlgItem(IDC_STATIC_REMOTE_URL
)->ShowWindow(b
);
625 BOOL
CSyncDlg::OnInitDialog()
627 CResizableStandAloneDialog::OnInitDialog();
628 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
630 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
631 // do this, Explorer would be unable to send that message to our window if we
632 // were running elevated. It's OK to make the call all the time, since if we're
633 // not elevated, this is a no-op.
634 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
635 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
636 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
639 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
640 if (pfnChangeWindowMessageFilterEx
)
642 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
645 m_pTaskbarList
.Release();
646 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
647 m_pTaskbarList
= nullptr;
649 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->EnableWindow(CAppUtils::IsSSHPutty());
652 this->m_ctrlAnimate.ShowWindow(SW_NORMAL);
653 this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
654 this->m_ctrlAnimate.Play(0,-1,-1);
657 // ------------------ Create Tabctrl -----------
658 CWnd
*pwnd
=this->GetDlgItem(IDC_BUTTON_TABCTRL
);
660 pwnd
->GetWindowRect(&rectDummy
);
661 this->ScreenToClient(rectDummy
);
663 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_SYNC_TAB
))
665 TRACE0("Failed to create output tab window\n");
666 return FALSE
; // fail to create
668 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
670 // -------------Create Command Log Ctrl ---------
672 dwStyle
= ES_MULTILINE
| ES_READONLY
| WS_CHILD
| WS_VISIBLE
| ES_AUTOHSCROLL
| ES_AUTOVSCROLL
|WS_VSCROLL
;
674 if( !m_ctrlCmdOut
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_CMD_LOG
))
676 TRACE0("Failed to create Log commits window\n");
677 return FALSE
; // fail to create
680 // set the font to use in the log message view, configured in the settings dialog
682 CAppUtils::CreateFontForLogs(m_logFont
);
683 //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont);
684 m_ctrlCmdOut
.SetFont(&m_logFont
);
685 m_ctrlTabCtrl
.InsertTab(&m_ctrlCmdOut
, CString(MAKEINTRESOURCE(IDS_LOG
)), -1);
687 //m_ctrlCmdOut.ReplaceSel(_T("Hello"));
689 //---------- Create in coming list ctrl -----------
690 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
692 if( !m_InLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_LOGLIST
))
694 TRACE0("Failed to create output commits window\n");
695 return FALSE
; // fail to create
698 m_ctrlTabCtrl
.InsertTab(&m_InLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCOMMITS
)), -1);
700 m_InLogList
.m_ColumnRegKey
=_T("SyncIn");
701 m_InLogList
.InsertGitColumn();
703 //----------- Create In Change file list -----------
704 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
706 if( !m_InChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CHANGELIST
))
708 TRACE0("Failed to create output change files window\n");
709 return FALSE
; // fail to create
711 m_ctrlTabCtrl
.InsertTab(&m_InChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCHANGELIST
)), -1);
713 m_InChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("InSyncDlg"),
714 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
715 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
718 //---------- Create Conflict List Ctrl -----------------
719 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
721 if( !m_ConflictFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CONFLICT
))
723 TRACE0("Failed to create output change files window\n");
724 return FALSE
; // fail to create
726 m_ctrlTabCtrl
.InsertTab(&m_ConflictFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CONFLICTS
)), -1);
728 m_ConflictFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("ConflictSyncDlg"),
729 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
730 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)|
731 GITSLC_POPCONFLICT
|GITSLC_POPRESOLVE
),false);
734 //---------- Create Commit Out List Ctrl---------------
736 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
738 if( !m_OutLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_LOGLIST
))
740 TRACE0("Failed to create output commits window\n");
741 return FALSE
; // fail to create
745 m_ctrlTabCtrl
.InsertTab(&m_OutLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCOMMITS
)), -1);
747 m_OutLogList
.m_ColumnRegKey
= _T("SyncOut");
748 m_OutLogList
.InsertGitColumn();
750 //------------- Create Change File List Control ----------------
752 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
754 if( !m_OutChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_CHANGELIST
))
756 TRACE0("Failed to create output change files window\n");
757 return FALSE
; // fail to create
759 m_ctrlTabCtrl
.InsertTab(&m_OutChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCHANGELIST
)), -1);
761 m_OutChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, _T("OutSyncDlg"),
762 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
763 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
765 this->m_tooltips
.Create(this);
767 AddAnchor(IDC_SYNC_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
769 AddAnchor(IDC_GROUP_INFO
,TOP_LEFT
,TOP_RIGHT
);
770 AddAnchor(IDC_COMBOBOXEX_URL
,TOP_LEFT
,TOP_RIGHT
);
771 AddAnchor(IDC_BUTTON_MANAGE
,TOP_RIGHT
);
772 AddAnchor(IDC_BUTTON_PULL
,BOTTOM_LEFT
);
773 AddAnchor(IDC_BUTTON_PUSH
,BOTTOM_LEFT
);
774 AddAnchor(IDC_BUTTON_SUBMODULE
,BOTTOM_LEFT
);
775 AddAnchor(IDC_BUTTON_APPLY
,BOTTOM_RIGHT
);
776 AddAnchor(IDC_BUTTON_EMAIL
,BOTTOM_RIGHT
);
777 AddAnchor(IDC_PROGRESS_SYNC
,TOP_LEFT
,TOP_RIGHT
);
778 AddAnchor(IDOK
,BOTTOM_RIGHT
);
779 AddAnchor(IDHELP
,BOTTOM_RIGHT
);
780 AddAnchor(IDC_STATIC_STATUS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
781 AddAnchor(IDC_ANIMATE_SYNC
,TOP_LEFT
);
782 AddAnchor(IDC_BUTTON_COMMIT
,BOTTOM_LEFT
);
783 AddAnchor(IDC_LOG
, BOTTOM_LEFT
);
785 // do not use BRANCH_COMBOX_ADD_ANCHOR here, we want to have different stylings
786 AddAnchor(IDC_COMBOBOXEX_LOCAL_BRANCH
, TOP_LEFT
,TOP_CENTER
);
787 AddAnchor(IDC_COMBOBOXEX_REMOTE_BRANCH
, TOP_CENTER
, TOP_RIGHT
);
788 AddAnchor(IDC_BUTTON_LOCAL_BRANCH
, TOP_CENTER
);
789 AddAnchor(IDC_BUTTON_REMOTE_BRANCH
, TOP_RIGHT
);
790 AddAnchor(IDC_STATIC_REMOTE_BRANCH
, TOP_CENTER
);
792 AdjustControlSize(IDC_CHECK_PUTTY_KEY
);
793 AdjustControlSize(IDC_CHECK_FORCE
);
795 CString WorkingDir
=g_Git
.m_CurrentDir
;
796 WorkingDir
.Replace(_T(':'),_T('_'));
797 m_RegKeyRemoteBranch
= CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir
;
800 this->AddOthersToAnchor();
802 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSH
)));
803 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSHTAGS
)));
804 ///this->m_ctrlPush.AddEntry(CString(_T("Push All")));
806 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PULL
)));
807 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCH
)));
808 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCHREBASE
)));
809 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REMOTEUPDATE
)));
810 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CLEANUPSTALEBRANCHES
)));
812 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEUPDATE
)));
813 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEINIT
)));
814 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULESYNC
)));
816 WorkingDir
.Replace(_T(':'),_T('_'));
819 regkey
.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir
);
821 this->m_regPullButton
= CRegDWORD(regkey
+_T("\\Pull"),0);
822 this->m_regPushButton
= CRegDWORD(regkey
+_T("\\Push"),0);
823 this->m_regSubmoduleButton
= CRegDWORD(regkey
+_T("\\Submodule"));
824 this->m_regAutoLoadPutty
= CRegDWORD(regkey
+ _T("\\AutoLoadPutty"), CAppUtils::IsSSHPutty());
827 this->m_bAutoLoadPuttyKey
= m_regAutoLoadPutty
;
828 if(!CAppUtils::IsSSHPutty())
829 m_bAutoLoadPuttyKey
= false;
830 this->UpdateData(FALSE
);
832 this->m_ctrlPull
.SetCurrentEntry(this->m_regPullButton
);
833 this->m_ctrlPush
.SetCurrentEntry(this->m_regPushButton
);
834 this->m_ctrlSubmodule
.SetCurrentEntry(this->m_regSubmoduleButton
);
836 CString sWindowTitle
;
837 GetWindowText(sWindowTitle
);
838 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
840 EnableSaveRestore(_T("SyncDlg"));
842 this->m_ctrlURL
.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir
, _T("url"));
846 if(!g_Git
.GetRemoteList(list
))
848 for(unsigned int i
=0;i
<list
.size();i
++)
850 m_ctrlURL
.AddString(list
[i
]);
853 m_ctrlURL
.SetCurSel(0);
854 m_ctrlRemoteBranch
.SetCurSel(0);
855 m_ctrlURL
.SetURLHistory(true);
857 this->LoadBranchInfo();
859 this->m_bInited
=true;
862 m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,false);
863 m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
864 m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
865 m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
867 m_ctrlRemoteBranch
.m_bWantReturn
= TRUE
;
868 m_ctrlURL
.m_bWantReturn
= TRUE
;
870 this->m_Gitverion
= CAppUtils::GetMsysgitVersion();
872 return TRUE
; // return TRUE unless you set the focus to a control
873 // EXCEPTION: OCX Property Pages should return FALSE
876 void CSyncDlg::OnBnClickedButtonManage()
878 CAppUtils::LaunchRemoteSetting();
882 void CSyncDlg::Refresh()
884 theApp
.DoWaitCursor(1);
886 int lastSelected
= m_ctrlURL
.GetCurSel();
888 this->m_ctrlURL
.GetWindowText(url
);
890 this->m_ctrlURL
.Reset();
891 CString workingDir
= g_Git
.m_CurrentDir
;
892 workingDir
.Replace(_T(':'), _T('_'));
893 this->m_ctrlURL
.LoadHistory(_T("Software\\TortoiseGit\\History\\SyncURL\\") + workingDir
, _T("url"));
897 if (!g_Git
.GetRemoteList(list
))
899 for (int i
= 0; i
< list
.size(); i
++)
901 m_ctrlURL
.AddString(list
[i
]);
906 if (lastSelected
>= 0 && !found
)
908 m_ctrlURL
.SetCurSel(0);
909 m_ctrlURL
.GetWindowText(url
);
914 this->m_ctrlLocalBranch
.GetWindowText(local
);
915 this->m_ctrlRemoteBranch
.GetWindowText(remote
);
917 this->LoadBranchInfo();
919 this->m_ctrlLocalBranch
.AddString(local
);
920 this->m_ctrlRemoteBranch
.AddString(remote
);
921 this->m_ctrlURL
.AddString(url
);
923 m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REFRESHING
)));
924 this->FetchOutList(true);
925 theApp
.DoWaitCursor(-1);
928 BOOL
CSyncDlg::PreTranslateMessage(MSG
* pMsg
)
930 if (pMsg
->message
== WM_KEYDOWN
)
932 switch (pMsg
->wParam
)
938 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
943 /* Avoid TAB control destroy but dialog exist*/
948 ::GetClassName(pMsg
->hwnd
,buff
,128);
950 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0)
952 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
958 m_tooltips
.RelayEvent(pMsg
);
959 return __super::PreTranslateMessage(pMsg
);
961 void CSyncDlg::FetchOutList(bool force
)
965 m_OutChangeFileList
.Clear();
966 this->m_OutLogList
.Clear();
969 this->m_ctrlURL
.GetWindowText(remote
);
970 CString remotebranch
;
971 this->m_ctrlRemoteBranch
.GetWindowText(remotebranch
);
972 remotebranch
=remote
+_T("/")+remotebranch
;
973 CGitHash remotebranchHash
;
974 g_Git
.GetHash(remotebranchHash
, remotebranch
);
979 str
.LoadString(IDS_PROC_SYNC_PUSH_UNKNOWN
);
980 m_OutLogList
.ShowText(str
);
981 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
982 m_OutLocalBranch
.Empty();
983 m_OutRemoteBranch
.Empty();
985 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
989 else if(remotebranchHash
.IsEmpty())
992 str
.Format(IDS_PROC_SYNC_PUSH_UNKNOWNBRANCH
, remotebranch
);
993 m_OutLogList
.ShowText(str
);
994 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
995 m_OutLocalBranch
.Empty();
996 m_OutRemoteBranch
.Empty();
998 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1003 CString localbranch
;
1004 localbranch
=this->m_ctrlLocalBranch
.GetString();
1006 if(localbranch
!= m_OutLocalBranch
|| m_OutRemoteBranch
!= remotebranch
|| force
)
1008 m_OutLogList
.ClearText();
1010 CGitHash base
, localBranchHash
;
1011 bool isFastForward
= g_Git
.IsFastForward(remotebranch
, localbranch
, &base
);
1013 if (g_Git
.GetHash(localBranchHash
, localbranch
))
1015 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + localbranch
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
1018 if (remotebranchHash
== localBranchHash
)
1021 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, 0, remotebranch
);
1022 m_OutLogList
.ShowText(str
);
1023 this->m_ctrlStatus
.SetWindowText(str
);
1024 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
1025 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1027 else if (isFastForward
|| m_bForce
)
1030 m_OutLogList
.FillGitLog(NULL
, CGit::LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
, &remotebranch
, &localbranch
);
1032 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, m_OutLogList
.GetItemCount(), remotebranch
);
1033 this->m_ctrlStatus
.SetWindowText(str
);
1036 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, remotebranch
);
1039 CString baseString
= base
.ToString();
1040 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, baseString
);
1043 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,TRUE
);
1044 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(TRUE
);
1049 str
.Format(IDS_PROC_SYNC_NOFASTFORWARD
, localbranch
, remotebranch
);
1050 m_OutLogList
.ShowText(str
);
1051 this->m_ctrlStatus
.SetWindowText(str
);
1052 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID() - 1, FALSE
);
1053 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1056 this->m_OutLocalBranch
=localbranch
;
1057 this->m_OutRemoteBranch
=remotebranch
;
1062 bool CSyncDlg::IsURL()
1065 this->m_ctrlURL
.GetWindowText(str
);
1066 if(str
.Find(_T('\\'))>=0 || str
.Find(_T('/'))>=0)
1071 void CSyncDlg::OnCbnEditchangeComboboxex()
1073 SetTimer(IDT_INPUT
, 1000, NULL
);
1074 this->m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_WAINTINPUT
)));
1076 //this->FetchOutList();
1079 UINT
CSyncDlg::ProgressThread()
1081 m_startTick
= GetTickCount();
1082 m_GitCmdStatus
=CProgressDlg::RunCmdList(this,m_GitCmdList
,true,NULL
,&this->m_bAbort
);
1083 InterlockedExchange(&m_bBlock
, FALSE
);
1088 LRESULT
CSyncDlg::OnProgressUpdateUI(WPARAM wParam
,LPARAM lParam
)
1090 if(wParam
== MSG_PROGRESSDLG_START
)
1092 m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
1093 this->m_ctrlProgress
.SetPos(0);
1096 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1097 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
1101 if(wParam
== MSG_PROGRESSDLG_END
|| wParam
== MSG_PROGRESSDLG_FAILED
)
1103 DWORD tickSpent
= GetTickCount() - m_startTick
;
1104 CString strEndTime
= CLoglistUtils::FormatDateAndTime(CTime::GetCurrentTime(), DATE_SHORTDATE
, true, false);
1106 m_ctrlAnimate
.Stop();
1107 m_ctrlProgress
.SetPos(100);
1108 //this->DialogEnableWindow(IDOK,TRUE);
1110 DWORD exitCode
= (DWORD
)lParam
;
1115 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1116 m_pTaskbarList
->SetProgressValue(m_hWnd
, 100, 100);
1119 log
.Format(IDS_PROC_PROGRESS_GITUNCLEANEXIT
, exitCode
);
1121 err
.Format(_T("\r\n\r\n%s (%d ms @ %s)\r\n"), log
, tickSpent
, strEndTime
);
1122 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, err
, RGB(255,0,0));
1127 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1129 temp
.LoadString(IDS_SUCCESS
);
1131 log
.Format(_T("\r\n%s (%d ms @ %s)\r\n"), temp
, tickSpent
, strEndTime
);
1132 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, log
, RGB(0,0,255));
1135 //if(wParam == MSG_PROGRESSDLG_END)
1136 if(this->m_CurrentCmd
== GIT_COMMAND_PUSH
)
1141 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
1144 if (CHooks::Instance().PostPush(list
,exitcode
, error
))
1149 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
1150 //ReportError(temp);
1151 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1157 EnableControlButton(true);
1159 this->FetchOutList(true);
1161 if(this->m_CurrentCmd
== GIT_COMMAND_PULL
)
1165 if(this->m_CurrentCmd
== GIT_COMMAND_FETCH
|| this->m_CurrentCmd
== GIT_COMMAND_FETCHANDREBASE
)
1169 if(this->m_CurrentCmd
== GIT_COMMAND_SUBMODULE
)
1171 //this->m_ctrlCmdOut.SetSel(-1,-1);
1172 //this->m_ctrlCmdOut.ReplaceSel(_T("Done\r\n"));
1173 //this->m_ctrlCmdOut.SetSel(-1,-1);
1174 EnableControlButton(true);
1177 if(this->m_CurrentCmd
== GIT_COMMAND_REMOTE
)
1179 this->FetchOutList(true);
1180 EnableControlButton(true);
1186 ParserCmdOutput((char)lParam
);
1192 void CSyncDlg::ParserCmdOutput(char ch
)
1194 CProgressDlg::ParserCmdOutput(m_ctrlCmdOut
,m_ctrlProgress
,m_hWnd
,m_pTaskbarList
,m_LogText
,ch
);
1196 void CSyncDlg::OnBnClickedButtonCommit()
1198 CString cmd
= _T("/command:commit");
1199 cmd
+= _T(" /path:\"");
1200 cmd
+= g_Git
.m_CurrentDir
;
1203 CAppUtils::RunTortoiseGitProc(cmd
);
1206 void CSyncDlg::OnOK()
1210 m_ctrlURL
.SaveHistory();
1212 m_regAutoLoadPutty
= this->m_bAutoLoadPuttyKey
;
1216 void CSyncDlg::OnBnClickedButtonSubmodule()
1220 m_ctrlCmdOut
.SetWindowTextW(_T(""));
1223 this->m_regSubmoduleButton
= (DWORD
)this->m_ctrlSubmodule
.GetCurrentEntry();
1225 this->SwitchToRun();
1227 this->m_bAbort
=false;
1228 this->m_GitCmdList
.clear();
1230 ShowTab(IDC_CMD_LOG
);
1234 switch (m_ctrlSubmodule
.GetCurrentEntry())
1237 cmd
=_T("git.exe submodule update --init");
1240 cmd
=_T("git.exe submodule init");
1243 cmd
=_T("git.exe submodule sync");
1247 m_GitCmdList
.push_back(cmd
);
1249 m_CurrentCmd
= GIT_COMMAND_SUBMODULE
;
1251 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
1252 if (m_pThread
==NULL
)
1254 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
1258 m_pThread
->m_bAutoDelete
= TRUE
;
1259 m_pThread
->ResumeThread();
1263 void CSyncDlg::OnTimer(UINT_PTR nIDEvent
)
1265 if( nIDEvent
== IDT_INPUT
)
1267 KillTimer(IDT_INPUT
);
1268 this->FetchOutList(true);
1273 void CSyncDlg::OnLvnInLogListColumnClick(NMHDR
* /* pNMHDR */, LRESULT
*pResult
)
1278 LRESULT
CSyncDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1280 m_pTaskbarList
.Release();
1281 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1285 void CSyncDlg::OnBnClickedCheckForce()
1290 void CSyncDlg::OnBnClickedLog()
1292 CString cmd
= _T("/command:log");
1293 cmd
+= _T(" /path:\"");
1294 cmd
+= g_Git
.m_CurrentDir
;
1297 CAppUtils::RunTortoiseGitProc(cmd
);