1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - 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
)
41 m_pTooltip
=&this->m_tooltips
;
44 m_bAutoLoadPuttyKey
= CAppUtils::IsSSHPutty();
47 m_startTick
= GetTickCount();
54 void CSyncDlg::DoDataExchange(CDataExchange
* pDX
)
56 CDialog::DoDataExchange(pDX
);
57 DDX_Check(pDX
, IDC_CHECK_PUTTY_KEY
, m_bAutoLoadPuttyKey
);
58 DDX_Check(pDX
, IDC_CHECK_FORCE
,m_bForce
);
59 DDX_Control(pDX
, IDC_COMBOBOXEX_URL
, m_ctrlURL
);
60 DDX_Control(pDX
, IDC_BUTTON_TABCTRL
, m_ctrlDumyButton
);
61 DDX_Control(pDX
, IDC_BUTTON_PULL
, m_ctrlPull
);
62 DDX_Control(pDX
, IDC_BUTTON_PUSH
, m_ctrlPush
);
63 DDX_Control(pDX
, IDC_STATIC_STATUS
, m_ctrlStatus
);
64 DDX_Control(pDX
, IDC_PROGRESS_SYNC
, m_ctrlProgress
);
65 DDX_Control(pDX
, IDC_ANIMATE_SYNC
, m_ctrlAnimate
);
66 DDX_Control(pDX
, IDC_BUTTON_SUBMODULE
,m_ctrlSubmodule
);
71 BEGIN_MESSAGE_MAP(CSyncDlg
, CResizableStandAloneDialog
)
72 ON_BN_CLICKED(IDC_BUTTON_PULL
, &CSyncDlg::OnBnClickedButtonPull
)
73 ON_BN_CLICKED(IDC_BUTTON_PUSH
, &CSyncDlg::OnBnClickedButtonPush
)
74 ON_BN_CLICKED(IDC_BUTTON_APPLY
, &CSyncDlg::OnBnClickedButtonApply
)
75 ON_BN_CLICKED(IDC_BUTTON_EMAIL
, &CSyncDlg::OnBnClickedButtonEmail
)
76 ON_BN_CLICKED(IDC_BUTTON_MANAGE
, &CSyncDlg::OnBnClickedButtonManage
)
78 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL
, &CSyncDlg::OnCbnEditchangeComboboxex
)
79 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_REMOTE_BRANCH
, &CSyncDlg::OnCbnEditchangeComboboxex
)
80 ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI
, OnProgressUpdateUI
)
81 ON_NOTIFY(LVN_COLUMNCLICK
, IDC_IN_LOGLIST
, OnLvnInLogListColumnClick
)
82 ON_BN_CLICKED(IDC_BUTTON_COMMIT
, &CSyncDlg::OnBnClickedButtonCommit
)
83 ON_BN_CLICKED(IDC_BUTTON_SUBMODULE
, &CSyncDlg::OnBnClickedButtonSubmodule
)
85 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
86 ON_BN_CLICKED(IDC_CHECK_FORCE
, &CSyncDlg::OnBnClickedCheckForce
)
87 ON_BN_CLICKED(IDC_LOG
, &CSyncDlg::OnBnClickedLog
)
91 void CSyncDlg::EnableControlButton(bool bEnabled
)
93 GetDlgItem(IDC_BUTTON_PULL
)->EnableWindow(bEnabled
);
94 GetDlgItem(IDC_BUTTON_PUSH
)->EnableWindow(bEnabled
);
95 GetDlgItem(IDC_BUTTON_APPLY
)->EnableWindow(bEnabled
);
96 GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(bEnabled
);
97 GetDlgItem(IDOK
)->EnableWindow(bEnabled
);
98 GetDlgItem(IDC_BUTTON_SUBMODULE
)->EnableWindow(bEnabled
);
100 // CSyncDlg message handlers
102 void CSyncDlg::OnBnClickedButtonPull()
105 CurrentEntry
= (int)this->m_ctrlPull
.GetCurrentEntry();
106 this->m_regPullButton
= CurrentEntry
;
108 this->m_bAbort
=false;
109 this->m_GitCmdList
.clear();
110 m_ctrlCmdOut
.SetWindowTextW(_T(""));
116 m_oldHash
= g_Git
.GetHash(_T("HEAD"));
118 if( CurrentEntry
== 0)
120 if( g_Git
.GetHash(this->m_strLocalBranch
) != m_oldHash
)
122 CMessageBox::Show(NULL
, IDS_PROC_SYNC_PULLWRONGBRANCH
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
127 if(this->m_strURL
.IsEmpty())
129 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
133 if(this->m_bAutoLoadPuttyKey
)
135 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
142 force
= _T(" --force ");
146 ShowTab(IDC_CMD_LOG
);
148 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
149 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
150 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
153 if(CurrentEntry
== 0) //Pull
155 CString remotebranch
;
156 remotebranch
= m_strRemoteBranch
;
161 configName
.Format(L
"branch.%s.merge", this->m_strLocalBranch
);
162 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
164 configName
.Format(L
"branch.%s.remote", m_strLocalBranch
);
165 CString pullRemote
= g_Git
.GetConfigValue(configName
);
167 if(pullBranch
== remotebranch
&& pullRemote
== this->m_strURL
)
168 remotebranch
.Empty();
171 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
172 force
+= _T("--progress ");
174 cmd
.Format(_T("git.exe pull -v %s \"%s\" %s"),
179 m_CurrentCmd
= GIT_COMMAND_PULL
;
180 m_GitCmdList
.push_back(cmd
);
182 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
185 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
189 m_pThread
->m_bAutoDelete
= TRUE
;
190 m_pThread
->ResumeThread();
196 if(CurrentEntry
== 1 || CurrentEntry
==2 ) //Fetch
198 CString remotebranch
;
199 if(this->IsURL() || m_strRemoteBranch
.IsEmpty())
201 remotebranch
=this->m_strRemoteBranch
;
206 remotebranch
.Format(_T("remotes/%s/%s"),
207 m_strURL
,m_strRemoteBranch
);
208 if(g_Git
.GetHash(remotebranch
).IsEmpty())
209 remotebranch
=m_strRemoteBranch
;
211 remotebranch
=m_strRemoteBranch
+_T(":")+remotebranch
;
214 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
215 force
+= _T("--progress ");
217 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"),
222 if(CurrentEntry
== 1)
223 m_CurrentCmd
= GIT_COMMAND_FETCH
;
225 m_CurrentCmd
= GIT_COMMAND_FETCHANDREBASE
;
226 m_GitCmdList
.push_back(cmd
);
228 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
231 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
235 m_pThread
->m_bAutoDelete
= TRUE
;
236 m_pThread
->ResumeThread();
241 if(CurrentEntry
== 3)
243 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
244 cmd
=_T("git.exe remote update");
245 m_GitCmdList
.push_back(cmd
);
247 InterlockedExchange(&m_bBlock
, TRUE
);
249 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
252 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
253 InterlockedExchange(&m_bBlock
, FALSE
);
257 m_pThread
->m_bAutoDelete
= TRUE
;
258 m_pThread
->ResumeThread();
262 ///Cleanup stale remote banches
263 if(CurrentEntry
== 4)
265 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
266 cmd
.Format(_T("git.exe remote prune \"%s\""), m_strURL
);
267 m_GitCmdList
.push_back(cmd
);
269 InterlockedExchange(&m_bBlock
, TRUE
);
271 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
274 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
275 InterlockedExchange(&m_bBlock
, FALSE
);
279 m_pThread
->m_bAutoDelete
= TRUE
;
280 m_pThread
->ResumeThread();
285 void CSyncDlg::PullComplete()
287 EnableControlButton(true);
289 this->FetchOutList(true);
292 newhash
= g_Git
.GetHash(_T("HEAD"));
294 if( this ->m_GitCmdStatus
)
297 if(g_Git
.ListConflictFile(list
))
299 this->m_ctrlCmdOut
.SetSel(-1,-1);
300 this->m_ctrlCmdOut
.ReplaceSel(_T("Get conflict files fail\n"));
302 this->ShowTab(IDC_CMD_LOG
);
306 if(list
.GetCount()>0)
308 this->m_ConflictFileList
.Clear();
313 this->m_ConflictFileList
.GetStatus(&list
,true);
314 this->m_ConflictFileList
.Show(CTGitPath::LOGACTIONS_UNMERGED
,
315 CTGitPath::LOGACTIONS_UNMERGED
);
317 this->ShowTab(IDC_IN_CONFLICT
);
320 this->ShowTab(IDC_CMD_LOG
);
325 if(newhash
== this->m_oldHash
)
327 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
328 this->m_InLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_UPTODATE
)));
329 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
333 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
334 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
336 CString oldhash
=m_oldHash
.ToString();
337 this->AddDiffFileList(&m_InChangeFileList
,&m_arInChangeList
,newhash
,oldhash
);
339 m_InLogList
.FillGitLog(NULL
,CGit:: LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
,
342 this->ShowTab(IDC_IN_LOGLIST
);
346 void CSyncDlg::FetchComplete()
348 EnableControlButton(true);
350 this->FetchOutList(true);
352 ShowTab(IDC_CMD_LOG
);
353 if( (!this->m_GitCmdStatus
) && this->m_CurrentCmd
== GIT_COMMAND_FETCHANDREBASE
)
356 dlg
.m_PostButtonTexts
.Add(_T("Email &Patch..."));
357 INT_PTR response
= dlg
.DoModal();
363 if(response
== IDC_REBASE_POST_BUTTON
)
365 CString cmd
, out
, err
;
366 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
368 g_Git
.FixBranchName(dlg
.m_Upstream
),
369 g_Git
.FixBranchName(dlg
.m_Branch
));
370 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
372 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
376 CAppUtils::SendPatchMail(cmd
,out
);
381 void CSyncDlg::OnBnClickedButtonPush()
385 m_ctrlCmdOut
.SetWindowTextW(_T(""));
388 if(this->m_strURL
.IsEmpty())
390 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
394 this->m_regPushButton
=(DWORD
)this->m_ctrlPush
.GetCurrentEntry();
396 this->m_bAbort
=false;
397 this->m_GitCmdList
.clear();
399 ShowTab(IDC_CMD_LOG
);
407 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
409 if (CHooks::Instance().PrePush(list
,exitcode
, error
))
414 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
416 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
421 switch (m_ctrlPush
.GetCurrentEntry())
424 arg
+= _T(" --tags ");
427 arg
+= _T(" --all ");
432 arg
+= _T(" --force ");
434 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
435 arg
+= _T("--progress ");
437 cmd
.Format(_T("git.exe push -v %s \"%s\" %s"),
440 g_Git
.FixBranchName(m_strLocalBranch
));
442 if (!m_strRemoteBranch
.IsEmpty())
444 cmd
+= _T(":") + m_strRemoteBranch
;
447 m_GitCmdList
.push_back(cmd
);
449 m_CurrentCmd
= GIT_COMMAND_PUSH
;
451 if(this->m_bAutoLoadPuttyKey
)
453 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
456 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
459 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
463 m_pThread
->m_bAutoDelete
= TRUE
;
464 m_pThread
->ResumeThread();
468 void CSyncDlg::OnBnClickedButtonApply()
471 oldhash
=g_Git
.GetHash(_T("HEAD"));
476 if(dlg
.DoModal() == IDOK
)
479 for(int i
=0;i
<dlg
.m_PathList
.GetCount();i
++)
481 cmd
.Format(_T("git.exe am \"%s\""),dlg
.m_PathList
[i
].GetGitPathString());
483 if (g_Git
.Run(cmd
, &output
, CP_UTF8
))
485 CMessageBox::Show(NULL
,output
,_T("TortoiseGit"),MB_OK
);
490 this->m_ctrlCmdOut
.SetSel(-1,-1);
491 this->m_ctrlCmdOut
.ReplaceSel(cmd
+_T("\n"));
492 this->m_ctrlCmdOut
.SetSel(-1,-1);
493 this->m_ctrlCmdOut
.ReplaceSel(output
);
496 CString newhash
=g_Git
.GetHash(_T("HEAD"));
498 this->m_InLogList
.Clear();
499 this->m_InChangeFileList
.Clear();
501 if(newhash
== oldhash
)
503 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
504 this->m_InLogList
.ShowText(_T("No commits get from patch"));
505 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
510 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
511 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
513 this->AddDiffFileList(&m_InChangeFileList
,&m_arInChangeList
,newhash
,oldhash
);
514 m_InLogList
.FillGitLog(NULL
,CGit:: LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
,
517 this->FetchOutList(true);
520 this->m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,true);
524 this->ShowTab(IDC_CMD_LOG
);
528 this->ShowTab(IDC_IN_LOGLIST
);
533 void CSyncDlg::OnBnClickedButtonEmail()
535 CString cmd
, out
, err
;
537 this->m_strLocalBranch
= this->m_ctrlLocalBranch
.GetString();
538 this->m_ctrlRemoteBranch
.GetWindowText(this->m_strRemoteBranch
);
539 this->m_ctrlURL
.GetWindowText(this->m_strURL
);
540 m_strURL
=m_strURL
.Trim();
541 m_strRemoteBranch
=m_strRemoteBranch
.Trim();
543 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
545 m_strURL
+_T('/')+m_strRemoteBranch
,g_Git
.FixBranchName(m_strLocalBranch
));
547 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
549 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
553 CAppUtils::SendPatchMail(cmd
,out
);
556 void CSyncDlg::ShowProgressCtrl(bool bShow
)
558 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
559 this->m_ctrlAnimate
.ShowWindow(b
);
560 this->m_ctrlProgress
.ShowWindow(b
);
561 this->m_ctrlAnimate
.Open(IDR_DOWNLOAD
);
563 this->m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
565 this->m_ctrlAnimate
.Stop();
567 void CSyncDlg::ShowInputCtrl(bool bShow
)
569 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
570 this->m_ctrlURL
.ShowWindow(b
);
571 this->m_ctrlLocalBranch
.ShowWindow(b
);
572 this->m_ctrlRemoteBranch
.ShowWindow(b
);
573 this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH
)->ShowWindow(b
);
574 this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH
)->ShowWindow(b
);
575 this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH
)->ShowWindow(b
);
576 this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH
)->ShowWindow(b
);
577 this->GetDlgItem(IDC_BUTTON_MANAGE
)->ShowWindow(b
);
578 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->ShowWindow(b
);
579 this->GetDlgItem(IDC_CHECK_FORCE
)->ShowWindow(b
);
580 this->GetDlgItem(IDC_STATIC_REMOTE_URL
)->ShowWindow(b
);
582 BOOL
CSyncDlg::OnInitDialog()
584 CResizableStandAloneDialog::OnInitDialog();
585 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
587 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
588 // do this, Explorer would be unable to send that message to our window if we
589 // were running elevated. It's OK to make the call all the time, since if we're
590 // not elevated, this is a no-op.
591 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
592 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
593 CAutoLibrary hUser
= ::LoadLibrary(_T("user32.dll"));
596 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
597 if (pfnChangeWindowMessageFilterEx
)
599 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
602 m_pTaskbarList
.Release();
603 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
605 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->EnableWindow(CAppUtils::IsSSHPutty());
608 this->m_ctrlAnimate.ShowWindow(SW_NORMAL);
609 this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
610 this->m_ctrlAnimate.Play(0,-1,-1);
613 // ------------------ Create Tabctrl -----------
614 CWnd
*pwnd
=this->GetDlgItem(IDC_BUTTON_TABCTRL
);
616 pwnd
->GetWindowRect(&rectDummy
);
617 this->ScreenToClient(rectDummy
);
619 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_SYNC_TAB
))
621 TRACE0("Failed to create output tab window\n");
622 return FALSE
; // fail to create
624 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
626 // -------------Create Command Log Ctrl ---------
628 dwStyle
= ES_MULTILINE
| ES_READONLY
| WS_CHILD
| WS_VISIBLE
| ES_AUTOHSCROLL
| ES_AUTOVSCROLL
|WS_VSCROLL
;
630 if( !m_ctrlCmdOut
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_CMD_LOG
))
632 TRACE0("Failed to create Log commits window\n");
633 return FALSE
; // fail to create
636 // set the font to use in the log message view, configured in the settings dialog
638 CAppUtils::CreateFontForLogs(m_logFont
);
639 //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont);
640 m_ctrlCmdOut
.SetFont(&m_logFont
);
641 m_ctrlTabCtrl
.InsertTab(&m_ctrlCmdOut
, CString(MAKEINTRESOURCE(IDS_LOG
)), -1);
643 //m_ctrlCmdOut.ReplaceSel(_T("Hello"));
645 //---------- Create in coming list ctrl -----------
646 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
648 if( !m_InLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_LOGLIST
))
650 TRACE0("Failed to create output commits window\n");
651 return FALSE
; // fail to create
654 m_ctrlTabCtrl
.InsertTab(&m_InLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCOMMITS
)), -1);
656 m_InLogList
.m_ColumnRegKey
=_T("SyncIn");
657 m_InLogList
.InsertGitColumn();
659 //----------- Create In Change file list -----------
660 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
662 if( !m_InChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CHANGELIST
))
664 TRACE0("Failed to create output change files window\n");
665 return FALSE
; // fail to create
667 m_ctrlTabCtrl
.InsertTab(&m_InChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCHANGELIST
)), -1);
669 m_InChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("InSyncDlg"),
670 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
671 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
674 //---------- Create Conflict List Ctrl -----------------
675 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
677 if( !m_ConflictFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CONFLICT
))
679 TRACE0("Failed to create output change files window\n");
680 return FALSE
; // fail to create
682 m_ctrlTabCtrl
.InsertTab(&m_ConflictFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CONFLICTS
)), -1);
684 m_ConflictFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("ConflictSyncDlg"),
685 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
686 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)|
687 GITSLC_POPCONFLICT
|GITSLC_POPRESOLVE
),false);
690 //---------- Create Commit Out List Ctrl---------------
692 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
694 if( !m_OutLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_LOGLIST
))
696 TRACE0("Failed to create output commits window\n");
697 return FALSE
; // fail to create
701 m_ctrlTabCtrl
.InsertTab(&m_OutLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCOMMITS
)), -1);
703 m_OutLogList
.m_ColumnRegKey
= _T("SyncOut");
704 m_OutLogList
.InsertGitColumn();
706 //------------- Create Change File List Control ----------------
708 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
710 if( !m_OutChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_CHANGELIST
))
712 TRACE0("Failed to create output change files window\n");
713 return FALSE
; // fail to create
715 m_ctrlTabCtrl
.InsertTab(&m_OutChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCHANGELIST
)), -1);
717 m_OutChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, _T("OutSyncDlg"),
718 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO
)|
719 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
721 this->m_tooltips
.Create(this);
723 AddAnchor(IDC_SYNC_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
725 AddAnchor(IDC_GROUP_INFO
,TOP_LEFT
,TOP_RIGHT
);
726 AddAnchor(IDC_COMBOBOXEX_URL
,TOP_LEFT
,TOP_RIGHT
);
727 AddAnchor(IDC_BUTTON_MANAGE
,TOP_RIGHT
);
728 AddAnchor(IDC_BUTTON_PULL
,BOTTOM_LEFT
);
729 AddAnchor(IDC_BUTTON_PUSH
,BOTTOM_LEFT
);
730 AddAnchor(IDC_BUTTON_SUBMODULE
,BOTTOM_LEFT
);
731 AddAnchor(IDC_BUTTON_APPLY
,BOTTOM_RIGHT
);
732 AddAnchor(IDC_BUTTON_EMAIL
,BOTTOM_RIGHT
);
733 AddAnchor(IDC_PROGRESS_SYNC
,TOP_LEFT
,TOP_RIGHT
);
734 AddAnchor(IDOK
,BOTTOM_RIGHT
);
735 AddAnchor(IDHELP
,BOTTOM_RIGHT
);
736 AddAnchor(IDC_STATIC_STATUS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
737 AddAnchor(IDC_ANIMATE_SYNC
,TOP_LEFT
);
738 AddAnchor(IDC_BUTTON_COMMIT
,BOTTOM_LEFT
);
739 AddAnchor(IDC_LOG
, BOTTOM_LEFT
);
741 // do not use BRANCH_COMBOX_ADD_ANCHOR here, we want to have different stylings
742 AddAnchor(IDC_COMBOBOXEX_LOCAL_BRANCH
, TOP_LEFT
,TOP_CENTER
);
743 AddAnchor(IDC_COMBOBOXEX_REMOTE_BRANCH
, TOP_CENTER
, TOP_RIGHT
);
744 AddAnchor(IDC_BUTTON_LOCAL_BRANCH
, TOP_CENTER
);
745 AddAnchor(IDC_BUTTON_REMOTE_BRANCH
, TOP_RIGHT
);
746 AddAnchor(IDC_STATIC_REMOTE_BRANCH
, TOP_CENTER
);
748 AdjustControlSize(IDC_CHECK_PUTTY_KEY
);
749 AdjustControlSize(IDC_CHECK_FORCE
);
751 CString WorkingDir
=g_Git
.m_CurrentDir
;
752 WorkingDir
.Replace(_T(':'),_T('_'));
753 m_RegKeyRemoteBranch
= CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir
;
756 this->AddOthersToAnchor();
758 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSH
)));
759 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSHTAGS
)));
760 ///this->m_ctrlPush.AddEntry(CString(_T("Push All")));
762 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PULL
)));
763 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCH
)));
764 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCHREBASE
)));
765 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REMOTEUPDATE
)));
766 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CLEANUPSTALEBRANCHES
)));
768 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEUPDATE
)));
769 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEINIT
)));
770 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULESYNC
)));
772 WorkingDir
.Replace(_T(':'),_T('_'));
775 regkey
.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"),WorkingDir
);
777 this->m_regPullButton
= CRegDWORD(regkey
+_T("\\Pull"),0);
778 this->m_regPushButton
= CRegDWORD(regkey
+_T("\\Push"),0);
779 this->m_regSubmoduleButton
= CRegDWORD(regkey
+_T("\\Submodule"));
780 this->m_regAutoLoadPutty
= CRegDWORD(regkey
+ _T("\\AutoLoadPutty"), CAppUtils::IsSSHPutty());
782 m_tooltips
.Create(this);
784 this->m_bAutoLoadPuttyKey
= m_regAutoLoadPutty
;
785 if(!CAppUtils::IsSSHPutty())
786 m_bAutoLoadPuttyKey
= false;
787 this->UpdateData(FALSE
);
789 this->m_ctrlPull
.SetCurrentEntry(this->m_regPullButton
);
790 this->m_ctrlPush
.SetCurrentEntry(this->m_regPushButton
);
791 this->m_ctrlSubmodule
.SetCurrentEntry(this->m_regSubmoduleButton
);
793 CString sWindowTitle
;
794 GetWindowText(sWindowTitle
);
795 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
797 EnableSaveRestore(_T("SyncDlg"));
799 this->m_ctrlURL
.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir
, _T("url"));
803 if(!g_Git
.GetRemoteList(list
))
805 for(unsigned int i
=0;i
<list
.size();i
++)
807 m_ctrlURL
.AddString(list
[i
]);
810 m_ctrlURL
.SetCurSel(0);
811 m_ctrlRemoteBranch
.SetCurSel(0);
812 m_ctrlURL
.SetURLHistory(true);
814 this->LoadBranchInfo();
816 this->m_bInited
=true;
819 m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,false);
820 m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
821 m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
822 m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
824 m_ctrlRemoteBranch
.m_bWantReturn
= TRUE
;
825 m_ctrlURL
.m_bWantReturn
= TRUE
;
827 this->m_Gitverion
= CAppUtils::GetMsysgitVersion();
829 return TRUE
; // return TRUE unless you set the focus to a control
830 // EXCEPTION: OCX Property Pages should return FALSE
833 void CSyncDlg::OnBnClickedButtonManage()
835 CAppUtils::LaunchRemoteSetting();
839 void CSyncDlg::Refresh()
841 theApp
.DoWaitCursor(1);
843 int lastSelected
= m_ctrlURL
.GetCurSel();
845 this->m_ctrlURL
.GetWindowText(url
);
847 this->m_ctrlURL
.Reset();
848 CString workingDir
= g_Git
.m_CurrentDir
;
849 workingDir
.Replace(_T(':'), _T('_'));
850 this->m_ctrlURL
.LoadHistory(_T("Software\\TortoiseGit\\History\\SyncURL\\") + workingDir
, _T("url"));
854 if (!g_Git
.GetRemoteList(list
))
856 for (int i
= 0; i
< list
.size(); i
++)
858 m_ctrlURL
.AddString(list
[i
]);
863 if (lastSelected
>= 0 && !found
)
865 m_ctrlURL
.SetCurSel(0);
866 m_ctrlURL
.GetWindowText(url
);
871 this->m_ctrlLocalBranch
.GetWindowText(local
);
872 this->m_ctrlRemoteBranch
.GetWindowText(remote
);
874 this->LoadBranchInfo();
876 this->m_ctrlLocalBranch
.AddString(local
);
877 this->m_ctrlRemoteBranch
.AddString(remote
);
878 this->m_ctrlURL
.AddString(url
);
880 m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REFRESHING
)));
881 this->FetchOutList(true);
882 theApp
.DoWaitCursor(-1);
885 BOOL
CSyncDlg::PreTranslateMessage(MSG
* pMsg
)
887 if (pMsg
->message
== WM_KEYDOWN
)
889 switch (pMsg
->wParam
)
895 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
900 /* Avoid TAB control destroy but dialog exist*/
905 ::GetClassName(pMsg
->hwnd
,buff
,128);
907 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0)
909 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
915 m_tooltips
.RelayEvent(pMsg
);
916 return __super::PreTranslateMessage(pMsg
);
918 void CSyncDlg::FetchOutList(bool force
)
922 m_OutChangeFileList
.Clear();
923 this->m_OutLogList
.Clear();
926 this->m_ctrlURL
.GetWindowText(remote
);
927 CString remotebranch
;
928 this->m_ctrlRemoteBranch
.GetWindowText(remotebranch
);
929 remotebranch
=remote
+_T("/")+remotebranch
;
934 str
.LoadString(IDS_PROC_SYNC_PUSH_UNKNOWN
);
935 m_OutLogList
.ShowText(str
);
936 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
937 m_OutLocalBranch
.Empty();
938 m_OutRemoteBranch
.Empty();
940 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
944 else if(g_Git
.GetHash(remotebranch
).IsEmpty())
947 str
.Format(IDS_PROC_SYNC_PUSH_UNKNOWNBRANCH
, remotebranch
);
948 m_OutLogList
.ShowText(str
);
949 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
950 m_OutLocalBranch
.Empty();
951 m_OutRemoteBranch
.Empty();
953 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
959 localbranch
=this->m_ctrlLocalBranch
.GetString();
961 if(localbranch
!= m_OutLocalBranch
|| m_OutRemoteBranch
!= remotebranch
|| force
)
963 m_OutLogList
.ClearText();
965 CGitHash base
, remotehash
;
966 bool isFastForward
= g_Git
.IsFastForward(remotebranch
, localbranch
, &base
);
968 remotehash
= g_Git
.GetHash(remotebranch
);
969 if (remotehash
== g_Git
.GetHash(localbranch
))
972 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, 0, remotebranch
);
973 m_OutLogList
.ShowText(str
);
974 this->m_ctrlStatus
.SetWindowText(str
);
975 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
976 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
978 else if (isFastForward
|| m_bForce
)
981 m_OutLogList
.FillGitLog(NULL
, CGit::LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
, &remotebranch
, &localbranch
);
983 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, m_OutLogList
.GetItemCount(), remotebranch
);
984 this->m_ctrlStatus
.SetWindowText(str
);
987 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, remotebranch
);
990 CString baseString
= base
.ToString();
991 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, baseString
);
994 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,TRUE
);
995 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(TRUE
);
1000 str
.Format(IDS_PROC_SYNC_NOFASTFORWARD
, localbranch
, remotebranch
);
1001 m_OutLogList
.ShowText(str
);
1002 this->m_ctrlStatus
.SetWindowText(str
);
1003 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID() - 1, FALSE
);
1004 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1007 this->m_OutLocalBranch
=localbranch
;
1008 this->m_OutRemoteBranch
=remotebranch
;
1013 bool CSyncDlg::IsURL()
1016 this->m_ctrlURL
.GetWindowText(str
);
1017 if(str
.Find(_T('\\'))>=0 || str
.Find(_T('/'))>=0)
1022 void CSyncDlg::OnCbnEditchangeComboboxex()
1024 SetTimer(IDT_INPUT
, 1000, NULL
);
1025 this->m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_WAINTINPUT
)));
1027 //this->FetchOutList();
1030 UINT
CSyncDlg::ProgressThread()
1032 m_startTick
= GetTickCount();
1033 m_GitCmdStatus
=CProgressDlg::RunCmdList(this,m_GitCmdList
,true,NULL
,&this->m_bAbort
);
1034 InterlockedExchange(&m_bBlock
, FALSE
);
1039 LRESULT
CSyncDlg::OnProgressUpdateUI(WPARAM wParam
,LPARAM lParam
)
1041 if(wParam
== MSG_PROGRESSDLG_START
)
1043 m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
1044 this->m_ctrlProgress
.SetPos(0);
1047 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1048 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
1052 if(wParam
== MSG_PROGRESSDLG_END
|| wParam
== MSG_PROGRESSDLG_FAILED
)
1054 DWORD tickSpent
= GetTickCount() - m_startTick
;
1055 CString strEndTime
= CLoglistUtils::FormatDateAndTime(CTime::GetCurrentTime(), DATE_SHORTDATE
, true, false);
1057 m_ctrlAnimate
.Stop();
1058 m_ctrlProgress
.SetPos(100);
1059 //this->DialogEnableWindow(IDOK,TRUE);
1061 DWORD exitCode
= (DWORD
)lParam
;
1066 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1067 m_pTaskbarList
->SetProgressValue(m_hWnd
, 100, 100);
1070 log
.Format(IDS_PROC_PROGRESS_GITUNCLEANEXIT
, exitCode
);
1072 err
.Format(_T("\r\n\r\n%s (%d ms @ %s)\r\n"), log
, tickSpent
, strEndTime
);
1073 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, err
, RGB(255,0,0));
1078 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1080 temp
.LoadString(IDS_SUCCESS
);
1082 log
.Format(_T("\r\n%s (%d ms @ %s)\r\n"), temp
, tickSpent
, strEndTime
);
1083 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, log
, RGB(0,0,255));
1086 //if(wParam == MSG_PROGRESSDLG_END)
1087 if(this->m_CurrentCmd
== GIT_COMMAND_PUSH
)
1092 list
.AddPath(CTGitPath(g_Git
.m_CurrentDir
));
1095 if (CHooks::Instance().PostPush(list
,exitcode
, error
))
1100 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
1101 //ReportError(temp);
1102 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1108 EnableControlButton(true);
1110 this->FetchOutList(true);
1112 if(this->m_CurrentCmd
== GIT_COMMAND_PULL
)
1116 if(this->m_CurrentCmd
== GIT_COMMAND_FETCH
|| this->m_CurrentCmd
== GIT_COMMAND_FETCHANDREBASE
)
1120 if(this->m_CurrentCmd
== GIT_COMMAND_SUBMODULE
)
1122 //this->m_ctrlCmdOut.SetSel(-1,-1);
1123 //this->m_ctrlCmdOut.ReplaceSel(_T("Done\r\n"));
1124 //this->m_ctrlCmdOut.SetSel(-1,-1);
1125 EnableControlButton(true);
1128 if(this->m_CurrentCmd
== GIT_COMMAND_REMOTE
)
1130 this->FetchOutList(true);
1131 EnableControlButton(true);
1137 ParserCmdOutput((char)lParam
);
1143 void CSyncDlg::ParserCmdOutput(char ch
)
1145 CProgressDlg::ParserCmdOutput(m_ctrlCmdOut
,m_ctrlProgress
,m_hWnd
,m_pTaskbarList
,m_LogText
,ch
);
1147 void CSyncDlg::OnBnClickedButtonCommit()
1149 CString cmd
= _T("/command:commit");
1150 cmd
+= _T(" /path:\"");
1151 cmd
+= g_Git
.m_CurrentDir
;
1154 CAppUtils::RunTortoiseProc(cmd
);
1157 void CSyncDlg::OnOK()
1161 m_ctrlURL
.SaveHistory();
1163 m_regAutoLoadPutty
= this->m_bAutoLoadPuttyKey
;
1167 void CSyncDlg::OnBnClickedButtonSubmodule()
1171 m_ctrlCmdOut
.SetWindowTextW(_T(""));
1174 this->m_regSubmoduleButton
= (DWORD
)this->m_ctrlSubmodule
.GetCurrentEntry();
1176 this->SwitchToRun();
1178 this->m_bAbort
=false;
1179 this->m_GitCmdList
.clear();
1181 ShowTab(IDC_CMD_LOG
);
1185 switch (m_ctrlSubmodule
.GetCurrentEntry())
1188 cmd
=_T("git.exe submodule update --init");
1191 cmd
=_T("git.exe submodule init");
1194 cmd
=_T("git.exe submodule sync");
1198 m_GitCmdList
.push_back(cmd
);
1200 m_CurrentCmd
= GIT_COMMAND_SUBMODULE
;
1202 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
1203 if (m_pThread
==NULL
)
1205 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
1209 m_pThread
->m_bAutoDelete
= TRUE
;
1210 m_pThread
->ResumeThread();
1214 void CSyncDlg::OnTimer(UINT_PTR nIDEvent
)
1216 if( nIDEvent
== IDT_INPUT
)
1218 KillTimer(IDT_INPUT
);
1219 this->FetchOutList(true);
1224 void CSyncDlg::OnLvnInLogListColumnClick(NMHDR
* /* pNMHDR */, LRESULT
*pResult
)
1229 LRESULT
CSyncDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1231 m_pTaskbarList
.Release();
1232 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1236 void CSyncDlg::OnBnClickedCheckForce()
1241 void CSyncDlg::OnBnClickedLog()
1243 CString cmd
= _T("/command:log");
1244 cmd
+= _T(" /path:\"");
1245 cmd
+= g_Git
.m_CurrentDir
;
1248 CAppUtils::RunTortoiseProc(cmd
);