1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2015 - 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"
33 #include "ProgressCommands/FetchProgressCommand.h"
37 IMPLEMENT_DYNAMIC(CSyncDlg
, CResizableStandAloneDialog
)
39 CSyncDlg::CSyncDlg(CWnd
* pParent
/*=NULL*/)
40 : CResizableStandAloneDialog(CSyncDlg::IDD
, pParent
)
43 m_pTooltip
=&this->m_tooltips
;
46 m_bAutoLoadPuttyKey
= CAppUtils::IsSSHPutty();
54 m_bWantToExit
= false;
56 m_startTick
= GetTickCount();
64 void CSyncDlg::DoDataExchange(CDataExchange
* pDX
)
66 CDialog::DoDataExchange(pDX
);
67 DDX_Check(pDX
, IDC_CHECK_PUTTY_KEY
, m_bAutoLoadPuttyKey
);
68 DDX_Check(pDX
, IDC_CHECK_FORCE
,m_bForce
);
69 DDX_Control(pDX
, IDC_COMBOBOXEX_URL
, m_ctrlURL
);
70 DDX_Control(pDX
, IDC_BUTTON_TABCTRL
, m_ctrlDumyButton
);
71 DDX_Control(pDX
, IDC_BUTTON_PULL
, m_ctrlPull
);
72 DDX_Control(pDX
, IDC_BUTTON_PUSH
, m_ctrlPush
);
73 DDX_Control(pDX
, IDC_STATIC_STATUS
, m_ctrlStatus
);
74 DDX_Control(pDX
, IDC_PROGRESS_SYNC
, m_ctrlProgress
);
75 DDX_Control(pDX
, IDC_ANIMATE_SYNC
, m_ctrlAnimate
);
76 DDX_Control(pDX
, IDC_BUTTON_SUBMODULE
,m_ctrlSubmodule
);
77 DDX_Control(pDX
, IDC_BUTTON_STASH
, m_ctrlStash
);
78 DDX_Control(pDX
, IDC_PROG_LABEL
, m_ctrlProgLabel
);
83 BEGIN_MESSAGE_MAP(CSyncDlg
, CResizableStandAloneDialog
)
84 ON_BN_CLICKED(IDC_BUTTON_PULL
, &CSyncDlg::OnBnClickedButtonPull
)
85 ON_BN_CLICKED(IDC_BUTTON_PUSH
, &CSyncDlg::OnBnClickedButtonPush
)
86 ON_BN_CLICKED(IDC_BUTTON_APPLY
, &CSyncDlg::OnBnClickedButtonApply
)
87 ON_BN_CLICKED(IDC_BUTTON_EMAIL
, &CSyncDlg::OnBnClickedButtonEmail
)
88 ON_BN_CLICKED(IDC_BUTTON_MANAGE
, &CSyncDlg::OnBnClickedButtonManage
)
90 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL
, &CSyncDlg::OnCbnEditchangeComboboxex
)
91 ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_REMOTE_BRANCH
, &CSyncDlg::OnCbnEditchangeComboboxex
)
92 ON_MESSAGE(MSG_PROGRESSDLG_UPDATE_UI
, OnProgressUpdateUI
)
93 ON_MESSAGE(WM_PROG_CMD_FINISH
, OnProgCmdFinish
)
94 ON_NOTIFY(LVN_COLUMNCLICK
, IDC_IN_LOGLIST
, OnLvnInLogListColumnClick
)
95 ON_BN_CLICKED(IDC_BUTTON_COMMIT
, &CSyncDlg::OnBnClickedButtonCommit
)
96 ON_BN_CLICKED(IDC_BUTTON_SUBMODULE
, &CSyncDlg::OnBnClickedButtonSubmodule
)
97 ON_BN_CLICKED(IDC_BUTTON_STASH
, &CSyncDlg::OnBnClickedButtonStash
)
99 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
100 ON_BN_CLICKED(IDC_CHECK_FORCE
, &CSyncDlg::OnBnClickedCheckForce
)
101 ON_BN_CLICKED(IDC_LOG
, &CSyncDlg::OnBnClickedLog
)
106 void CSyncDlg::EnableControlButton(bool bEnabled
)
108 GetDlgItem(IDC_BUTTON_PULL
)->EnableWindow(bEnabled
);
109 GetDlgItem(IDC_BUTTON_PUSH
)->EnableWindow(bEnabled
);
110 GetDlgItem(IDC_BUTTON_APPLY
)->EnableWindow(bEnabled
);
111 GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(bEnabled
);
112 GetDlgItem(IDOK
)->EnableWindow(bEnabled
);
113 GetDlgItem(IDC_BUTTON_SUBMODULE
)->EnableWindow(bEnabled
);
114 GetDlgItem(IDC_BUTTON_STASH
)->EnableWindow(bEnabled
);
116 // CSyncDlg message handlers
118 void CSyncDlg::OnBnClickedButtonPull()
121 CurrentEntry
= (int)this->m_ctrlPull
.GetCurrentEntry();
122 this->m_regPullButton
= CurrentEntry
;
124 this->m_bAbort
=false;
125 this->m_GitCmdList
.clear();
126 m_ctrlCmdOut
.SetWindowTextW(_T(""));
132 if (g_Git
.GetHash(m_oldHash
, _T("HEAD")))
134 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
139 m_newHashMap
.clear();
140 m_oldHashMap
.clear();
142 if( CurrentEntry
== 0)
144 CGitHash localBranchHash
;
145 if (g_Git
.GetHash(localBranchHash
, m_strLocalBranch
))
147 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_strLocalBranch
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
150 if (localBranchHash
!= m_oldHash
)
152 CMessageBox::Show(NULL
, IDS_PROC_SYNC_PULLWRONGBRANCH
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
157 if(this->m_strURL
.IsEmpty())
159 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
163 if (m_bAutoLoadPuttyKey
&& CurrentEntry
!= 3) // CurrentEntry (Remote Update) handles this on its own)
165 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
169 if (g_Git
.GetMapHashToFriendName(m_oldHashMap
))
170 MessageBox(g_Git
.GetGitLastErr(_T("Could not get all refs.")), _T("TortoiseGit"), MB_ICONERROR
);
174 force
= _T(" --force ");
178 ShowTab(IDC_CMD_LOG
);
180 this->m_ctrlTabCtrl
.ShowTab(IDC_REFLIST
-1,true);
181 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
182 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
183 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
186 if(CurrentEntry
== 0) //Pull
188 CString remotebranch
;
189 remotebranch
= m_strRemoteBranch
;
193 CString pullRemote
, pullBranch
;
194 g_Git
.GetRemoteTrackedBranch(m_strLocalBranch
, pullRemote
, pullBranch
);
195 if(pullBranch
== remotebranch
&& pullRemote
== this->m_strURL
)
196 remotebranch
.Empty();
199 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
200 force
+= _T("--progress ");
202 cmd
.Format(_T("git.exe pull -v %s \"%s\" %s"),
205 (LPCTSTR
)remotebranch
);
207 m_CurrentCmd
= GIT_COMMAND_PULL
;
208 m_GitCmdList
.push_back(cmd
);
210 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
213 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
217 m_pThread
->m_bAutoDelete
= TRUE
;
218 m_pThread
->ResumeThread();
224 if(CurrentEntry
== 1 || CurrentEntry
==2 ) //Fetch
226 CString remotebranch
;
227 if(this->IsURL() || m_strRemoteBranch
.IsEmpty())
229 remotebranch
=this->m_strRemoteBranch
;
234 remotebranch
.Format(_T("remotes/%s/%s"), (LPCTSTR
)m_strURL
, (LPCTSTR
)m_strRemoteBranch
);
235 CGitHash remoteBranchHash
;
236 g_Git
.GetHash(remoteBranchHash
, remotebranch
);
237 if (remoteBranchHash
.IsEmpty())
238 remotebranch
=m_strRemoteBranch
;
240 remotebranch
=m_strRemoteBranch
+_T(":")+remotebranch
;
243 if(CurrentEntry
== 1)
244 m_CurrentCmd
= GIT_COMMAND_FETCH
;
246 m_CurrentCmd
= GIT_COMMAND_FETCHANDREBASE
;
248 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_FETCH
))
251 // current libgit2 only supports well formated refspec
252 refspec
.Format(_T("refs/heads/%s:refs/remotes/%s/%s"), (LPCTSTR
)m_strRemoteBranch
, (LPCTSTR
)m_strURL
, (LPCTSTR
)m_strRemoteBranch
);
254 FetchProgressCommand fetchProgressCommand
;
255 fetchProgressCommand
.SetUrl(m_strURL
);
256 fetchProgressCommand
.SetRefSpec(refspec
);
257 m_GitProgressList
.SetCommand(&fetchProgressCommand
);
258 m_GitProgressList
.Init();
259 ShowTab(IDC_CMD_GIT_PROG
);
263 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
264 force
+= _T("--progress ");
266 cmd
.Format(_T("git.exe fetch -v %s \"%s\" %s"),
269 (LPCTSTR
)remotebranch
);
271 m_GitCmdList
.push_back(cmd
);
273 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
276 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
280 m_pThread
->m_bAutoDelete
= TRUE
;
281 m_pThread
->ResumeThread();
287 if(CurrentEntry
== 3)
289 if (m_bAutoLoadPuttyKey
)
292 if (!g_Git
.GetRemoteList(list
))
294 for (size_t i
= 0; i
< list
.size(); ++i
)
295 CAppUtils::LaunchPAgent(NULL
, &list
[i
]);
299 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
300 cmd
=_T("git.exe remote update");
301 m_GitCmdList
.push_back(cmd
);
303 InterlockedExchange(&m_bBlock
, TRUE
);
305 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
308 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
309 InterlockedExchange(&m_bBlock
, FALSE
);
313 m_pThread
->m_bAutoDelete
= TRUE
;
314 m_pThread
->ResumeThread();
318 ///Cleanup stale remote banches
319 if(CurrentEntry
== 4)
321 m_CurrentCmd
= GIT_COMMAND_REMOTE
;
322 cmd
.Format(_T("git.exe remote prune \"%s\""), (LPCTSTR
)m_strURL
);
323 m_GitCmdList
.push_back(cmd
);
325 InterlockedExchange(&m_bBlock
, TRUE
);
327 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
330 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
331 InterlockedExchange(&m_bBlock
, FALSE
);
335 m_pThread
->m_bAutoDelete
= TRUE
;
336 m_pThread
->ResumeThread();
341 void CSyncDlg::PullComplete()
343 EnableControlButton(true);
345 this->FetchOutList(true);
348 if (g_Git
.GetHash(newhash
, _T("HEAD")))
349 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR
);
351 if( this ->m_GitCmdStatus
)
353 int hasConflicts
= g_Git
.HasWorkingTreeConflicts();
354 if (hasConflicts
< 0)
356 this->m_ctrlCmdOut
.SetSel(-1,-1);
357 this->m_ctrlCmdOut
.ReplaceSel(g_Git
.GetGitLastErr(L
"Checking for conflicts failed.", CGit::GIT_CMD_CHECKCONFLICTS
));
359 this->ShowTab(IDC_CMD_LOG
);
365 this->m_ConflictFileList
.Clear();
370 this->m_ConflictFileList
.GetStatus(&list
,true);
371 this->m_ConflictFileList
.Show(CTGitPath::LOGACTIONS_UNMERGED
,
372 CTGitPath::LOGACTIONS_UNMERGED
);
374 this->ShowTab(IDC_IN_CONFLICT
);
377 this->ShowTab(IDC_CMD_LOG
);
382 if(newhash
== this->m_oldHash
)
384 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
385 this->m_InLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_UPTODATE
)));
386 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
387 this->ShowTab(IDC_REFLIST
);
391 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
392 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
394 this->AddDiffFileList(&m_InChangeFileList
, &m_arInChangeList
, newhash
.ToString(), m_oldHash
.ToString());
397 range
.Format(_T("%s..%s"), (LPCTSTR
)m_oldHash
.ToString(), (LPCTSTR
)newhash
.ToString());
398 m_InLogList
.FillGitLog(nullptr, &range
, CGit::LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
);
399 this->ShowTab(IDC_IN_LOGLIST
);
404 void CSyncDlg::FetchComplete()
406 EnableControlButton(true);
408 this->FetchOutList(true);
410 if (g_Git
.UsingLibGit2(CGit::GIT_CMD_FETCH
))
411 ShowTab(IDC_CMD_GIT_PROG
);
413 ShowTab(IDC_REFLIST
);
418 if (m_CurrentCmd
!= GIT_COMMAND_FETCHANDREBASE
)
422 CString remotebranch
;
424 m_ctrlURL
.GetWindowText(remote
);
425 if (!remote
.IsEmpty())
427 STRING_VECTOR remotes
;
428 g_Git
.GetRemoteList(remotes
);
429 if (std::find(remotes
.begin(), remotes
.end(), remote
) == remotes
.end())
432 m_ctrlRemoteBranch
.GetWindowText(remotebranch
);
433 if (!remote
.IsEmpty() && !remotebranch
.IsEmpty())
434 upstream
= _T("remotes/") + remote
+ _T("/") + remotebranch
;
436 CAppUtils::RebaseAfterFetch(upstream
);
439 void CSyncDlg::StashComplete()
441 EnableControlButton(true);
442 INT_PTR entry
= m_ctrlStash
.GetCurrentEntry();
443 if (entry
!= 1 && entry
!= 2)
449 int hasConflicts
= g_Git
.HasWorkingTreeConflicts();
450 if (hasConflicts
< 0)
452 m_ctrlCmdOut
.SetSel(-1, -1);
453 m_ctrlCmdOut
.ReplaceSel(g_Git
.GetGitLastErr(L
"Checking for conflicts failed.", CGit::GIT_CMD_CHECKCONFLICTS
));
455 ShowTab(IDC_CMD_LOG
);
461 m_ConflictFileList
.Clear();
466 m_ConflictFileList
.GetStatus(&list
,true);
467 m_ConflictFileList
.Show(CTGitPath::LOGACTIONS_UNMERGED
, CTGitPath::LOGACTIONS_UNMERGED
);
469 ShowTab(IDC_IN_CONFLICT
);
472 ShowTab(IDC_CMD_LOG
);
476 void CSyncDlg::OnBnClickedButtonPush()
480 m_ctrlCmdOut
.SetWindowTextW(_T(""));
483 if(this->m_strURL
.IsEmpty())
485 CMessageBox::Show(NULL
, IDS_PROC_GITCONFIG_URLEMPTY
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
489 this->m_regPushButton
=(DWORD
)this->m_ctrlPush
.GetCurrentEntry();
491 this->m_bAbort
=false;
492 this->m_GitCmdList
.clear();
494 ShowTab(IDC_CMD_LOG
);
500 DWORD exitcode
= 0xFFFFFFFF;
501 if (CHooks::Instance().PrePush(g_Git
.m_CurrentDir
, exitcode
, error
))
506 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
507 CMessageBox::Show(NULL
,temp
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
512 CString refName
= g_Git
.FixBranchName(m_strLocalBranch
);
513 switch (m_ctrlPush
.GetCurrentEntry())
516 arg
+= _T(" --tags ");
519 refName
= _T("refs/notes/commits"); //default ref for notes
524 arg
+= _T(" --force ");
526 if(m_Gitverion
>= 0x01070203) //above 1.7.0.2
527 arg
+= _T("--progress ");
529 cmd
.Format(_T("git.exe push -v %s \"%s\" %s"),
534 if (!m_strRemoteBranch
.IsEmpty() && m_ctrlPush
.GetCurrentEntry() != 2)
536 cmd
+= _T(":") + m_strRemoteBranch
;
539 m_GitCmdList
.push_back(cmd
);
541 m_CurrentCmd
= GIT_COMMAND_PUSH
;
543 if(this->m_bAutoLoadPuttyKey
)
545 CAppUtils::LaunchPAgent(NULL
,&this->m_strURL
);
548 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
551 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
555 m_pThread
->m_bAutoDelete
= TRUE
;
556 m_pThread
->ResumeThread();
560 void CSyncDlg::OnBnClickedButtonApply()
563 if (g_Git
.GetHash(oldhash
, _T("HEAD")))
565 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
572 if(dlg
.DoModal() == IDOK
)
575 for (int i
= 0; i
< dlg
.m_PathList
.GetCount(); ++i
)
577 cmd
.Format(_T("git.exe am \"%s\""), (LPCTSTR
)dlg
.m_PathList
[i
].GetGitPathString());
579 if (g_Git
.Run(cmd
, &output
, CP_UTF8
))
581 CMessageBox::Show(NULL
,output
,_T("TortoiseGit"),MB_OK
);
586 this->m_ctrlCmdOut
.SetSel(-1,-1);
587 this->m_ctrlCmdOut
.ReplaceSel(cmd
+_T("\n"));
588 this->m_ctrlCmdOut
.SetSel(-1,-1);
589 this->m_ctrlCmdOut
.ReplaceSel(output
);
593 if (g_Git
.GetHash(newhash
, _T("HEAD")))
595 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash after applying patches.")), _T("TortoiseGit"), MB_ICONERROR
);
599 this->m_InLogList
.Clear();
600 this->m_InChangeFileList
.Clear();
602 if(newhash
== oldhash
)
604 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
605 this->m_InLogList
.ShowText(_T("No commits get from patch"));
606 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
611 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,true);
612 this->m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,true);
615 range
.Format(_T("%s..%s"), (LPCTSTR
)m_oldHash
.ToString(), (LPCTSTR
)newhash
.ToString());
616 this->AddDiffFileList(&m_InChangeFileList
, &m_arInChangeList
, newhash
.ToString(), oldhash
.ToString());
617 m_InLogList
.FillGitLog(nullptr, &range
, CGit::LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
);
619 this->FetchOutList(true);
622 this->m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,true);
626 this->ShowTab(IDC_CMD_LOG
);
630 this->ShowTab(IDC_IN_LOGLIST
);
635 void CSyncDlg::OnBnClickedButtonEmail()
637 CString cmd
, out
, err
;
639 this->m_strLocalBranch
= this->m_ctrlLocalBranch
.GetString();
640 this->m_ctrlRemoteBranch
.GetWindowText(this->m_strRemoteBranch
);
641 this->m_ctrlURL
.GetWindowText(this->m_strURL
);
642 m_strURL
=m_strURL
.Trim();
643 m_strRemoteBranch
=m_strRemoteBranch
.Trim();
645 cmd
.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
646 (LPCTSTR
)g_Git
.m_CurrentDir
,
647 (LPCTSTR
)(m_strURL
+ _T('/') + m_strRemoteBranch
), (LPCTSTR
)g_Git
.FixBranchName(m_strLocalBranch
));
649 if (g_Git
.Run(cmd
, &out
, &err
, CP_UTF8
))
651 CMessageBox::Show(NULL
, out
+ L
"\n" + err
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
655 CAppUtils::SendPatchMail(cmd
,out
);
658 void CSyncDlg::ShowProgressCtrl(bool bShow
)
660 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
661 this->m_ctrlAnimate
.ShowWindow(b
);
662 this->m_ctrlProgress
.ShowWindow(b
);
663 this->m_ctrlProgLabel
.ShowWindow(b
);
664 this->m_ctrlAnimate
.Open(IDR_DOWNLOAD
);
666 this->m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
668 this->m_ctrlAnimate
.Stop();
670 void CSyncDlg::ShowInputCtrl(bool bShow
)
672 int b
=bShow
?SW_NORMAL
:SW_HIDE
;
673 this->m_ctrlURL
.ShowWindow(b
);
674 this->m_ctrlLocalBranch
.ShowWindow(b
);
675 this->m_ctrlRemoteBranch
.ShowWindow(b
);
676 this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH
)->ShowWindow(b
);
677 this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH
)->ShowWindow(b
);
678 this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH
)->ShowWindow(b
);
679 this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH
)->ShowWindow(b
);
680 this->GetDlgItem(IDC_BUTTON_MANAGE
)->ShowWindow(b
);
681 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->ShowWindow(b
);
682 this->GetDlgItem(IDC_CHECK_FORCE
)->ShowWindow(b
);
683 this->GetDlgItem(IDC_STATIC_REMOTE_URL
)->ShowWindow(b
);
685 BOOL
CSyncDlg::OnInitDialog()
687 CResizableStandAloneDialog::OnInitDialog();
688 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
690 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
691 // do this, Explorer would be unable to send that message to our window if we
692 // were running elevated. It's OK to make the call all the time, since if we're
693 // not elevated, this is a no-op.
694 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
695 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
696 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
699 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
700 if (pfnChangeWindowMessageFilterEx
)
702 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
705 m_pTaskbarList
.Release();
706 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
707 m_pTaskbarList
= nullptr;
709 this->GetDlgItem(IDC_CHECK_PUTTY_KEY
)->EnableWindow(CAppUtils::IsSSHPutty());
712 this->m_ctrlAnimate.ShowWindow(SW_NORMAL);
713 this->m_ctrlAnimate.Open(IDR_DOWNLOAD);
714 this->m_ctrlAnimate.Play(0,-1,-1);
717 // ------------------ Create Tabctrl -----------
718 CWnd
*pwnd
=this->GetDlgItem(IDC_BUTTON_TABCTRL
);
720 pwnd
->GetWindowRect(&rectDummy
);
721 this->ScreenToClient(rectDummy
);
723 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_SYNC_TAB
))
725 TRACE0("Failed to create output tab window\n");
726 return FALSE
; // fail to create
728 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
730 // -------------Create Command Log Ctrl ---------
732 dwStyle
= ES_MULTILINE
| ES_READONLY
| WS_CHILD
| WS_VISIBLE
| ES_AUTOHSCROLL
| ES_AUTOVSCROLL
|WS_VSCROLL
;
734 if( !m_ctrlCmdOut
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_CMD_LOG
))
736 TRACE0("Failed to create Log commits window\n");
737 return FALSE
; // fail to create
740 // set the font to use in the log message view, configured in the settings dialog
742 CAppUtils::CreateFontForLogs(m_logFont
);
743 //GetDlgItem(IDC_CMD_LOG)->SetFont(&m_logFont);
744 m_ctrlCmdOut
.SetFont(&m_logFont
);
745 m_ctrlTabCtrl
.InsertTab(&m_ctrlCmdOut
, CString(MAKEINTRESOURCE(IDS_LOG
)), -1);
747 //m_ctrlCmdOut.ReplaceSel(_T("Hello"));
749 //---------- Create in coming list ctrl -----------
750 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
752 if( !m_InLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_LOGLIST
))
754 TRACE0("Failed to create output commits window\n");
755 return FALSE
; // fail to create
758 m_ctrlTabCtrl
.InsertTab(&m_InLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCOMMITS
)), -1);
760 m_InLogList
.m_ColumnRegKey
=_T("SyncIn");
761 m_InLogList
.InsertGitColumn();
763 //----------- Create In Change file list -----------
764 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
766 if( !m_InChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CHANGELIST
))
768 TRACE0("Failed to create output change files window\n");
769 return FALSE
; // fail to create
771 m_ctrlTabCtrl
.InsertTab(&m_InChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCHANGELIST
)), -1);
773 m_InChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("InSyncDlg"),
774 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWOREVISIONS
) |
775 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2REVISIONS
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
778 //---------- Create Conflict List Ctrl -----------------
779 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;
781 if( !m_ConflictFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_IN_CONFLICT
))
783 TRACE0("Failed to create output change files window\n");
784 return FALSE
; // fail to create
786 m_ctrlTabCtrl
.InsertTab(&m_ConflictFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CONFLICTS
)), -1);
788 m_ConflictFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("ConflictSyncDlg"),
789 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWOREVISIONS
) |
790 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2REVISIONS
) |
791 GITSLC_POPCONFLICT
|GITSLC_POPRESOLVE
),false);
794 //---------- Create Commit Out List Ctrl---------------
796 dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| LVS_OWNERDATA
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;;
798 if( !m_OutLogList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_LOGLIST
))
800 TRACE0("Failed to create output commits window\n");
801 return FALSE
; // fail to create
805 m_ctrlTabCtrl
.InsertTab(&m_OutLogList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCOMMITS
)), -1);
807 m_OutLogList
.m_ColumnRegKey
= _T("SyncOut");
808 m_OutLogList
.InsertGitColumn();
810 //------------- Create Change File List Control ----------------
812 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
814 if( !m_OutChangeFileList
.Create(dwStyle
,rectDummy
,&m_ctrlTabCtrl
,IDC_OUT_CHANGELIST
))
816 TRACE0("Failed to create output change files window\n");
817 return FALSE
; // fail to create
819 m_ctrlTabCtrl
.InsertTab(&m_OutChangeFileList
, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_OUTCHANGELIST
)), -1);
821 m_OutChangeFileList
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
, _T("OutSyncDlg"),
822 (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWOREVISIONS
) |
823 CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2REVISIONS
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
825 if (!m_GitProgressList
.Create(dwStyle
| LVS_OWNERDATA
, rectDummy
, &m_ctrlTabCtrl
, IDC_CMD_GIT_PROG
))
827 TRACE0("Failed to create Git Progress List Window\n");
828 return FALSE
; // fail to create
830 m_ctrlTabCtrl
.InsertTab(&m_GitProgressList
, CString(MAKEINTRESOURCE(IDS_LOG
)), -1);
831 m_GitProgressList
.m_pAnimate
= &m_ctrlAnimate
;
832 m_GitProgressList
.m_pPostWnd
= this;
833 m_GitProgressList
.m_pProgressLabelCtrl
= &m_ctrlProgLabel
;
834 m_GitProgressList
.m_pProgControl
= &m_ctrlProgress
;
835 m_GitProgressList
.m_pTaskbarList
= m_pTaskbarList
;
837 dwStyle
= LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;
838 DWORD exStyle
= LVS_EX_HEADERDRAGDROP
| LVS_EX_DOUBLEBUFFER
| LVS_EX_INFOTIP
| LVS_EX_FULLROWSELECT
;
839 m_refList
.Create(dwStyle
, rectDummy
, &m_ctrlTabCtrl
, IDC_REFLIST
);
840 m_refList
.SetExtendedStyle(exStyle
);
842 m_ctrlTabCtrl
.InsertTab(&m_refList
, CString(MAKEINTRESOURCE(IDS_REFLIST
)), -1);
844 AddAnchor(IDC_SYNC_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
846 AddAnchor(IDC_GROUP_INFO
,TOP_LEFT
,TOP_RIGHT
);
847 AddAnchor(IDC_COMBOBOXEX_URL
,TOP_LEFT
,TOP_RIGHT
);
848 AddAnchor(IDC_BUTTON_MANAGE
,TOP_RIGHT
);
849 AddAnchor(IDC_BUTTON_PULL
,BOTTOM_LEFT
);
850 AddAnchor(IDC_BUTTON_PUSH
,BOTTOM_LEFT
);
851 AddAnchor(IDC_BUTTON_SUBMODULE
,BOTTOM_LEFT
);
852 AddAnchor(IDC_BUTTON_STASH
,BOTTOM_LEFT
);
853 AddAnchor(IDC_BUTTON_APPLY
,BOTTOM_RIGHT
);
854 AddAnchor(IDC_BUTTON_EMAIL
,BOTTOM_RIGHT
);
855 AddAnchor(IDC_PROGRESS_SYNC
,TOP_LEFT
,TOP_RIGHT
);
856 AddAnchor(IDOK
,BOTTOM_RIGHT
);
857 AddAnchor(IDHELP
,BOTTOM_RIGHT
);
858 AddAnchor(IDC_STATIC_STATUS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
859 AddAnchor(IDC_ANIMATE_SYNC
,TOP_LEFT
);
860 AddAnchor(IDC_BUTTON_COMMIT
,BOTTOM_LEFT
);
861 AddAnchor(IDC_LOG
, BOTTOM_LEFT
);
863 // do not use BRANCH_COMBOX_ADD_ANCHOR here, we want to have different stylings
864 AddAnchor(IDC_COMBOBOXEX_LOCAL_BRANCH
, TOP_LEFT
,TOP_CENTER
);
865 AddAnchor(IDC_COMBOBOXEX_REMOTE_BRANCH
, TOP_CENTER
, TOP_RIGHT
);
866 AddAnchor(IDC_BUTTON_LOCAL_BRANCH
, TOP_CENTER
);
867 AddAnchor(IDC_BUTTON_REMOTE_BRANCH
, TOP_RIGHT
);
868 AddAnchor(IDC_STATIC_REMOTE_BRANCH
, TOP_CENTER
);
869 AddAnchor(IDC_PROG_LABEL
, TOP_LEFT
);
871 AdjustControlSize(IDC_CHECK_PUTTY_KEY
);
872 AdjustControlSize(IDC_CHECK_FORCE
);
874 CString WorkingDir
=g_Git
.m_CurrentDir
;
875 WorkingDir
.Replace(_T(':'),_T('_'));
876 m_RegKeyRemoteBranch
= CString(_T("Software\\TortoiseGit\\History\\SyncBranch\\"))+WorkingDir
;
879 this->AddOthersToAnchor();
881 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSH
)));
882 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSHTAGS
)));
883 this->m_ctrlPush
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PUSHNOTES
)));
885 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_PULL
)));
886 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCH
)));
887 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_FETCHREBASE
)));
888 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REMOTEUPDATE
)));
889 this->m_ctrlPull
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_CLEANUPSTALEBRANCHES
)));
891 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEUPDATE
)));
892 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULEINIT
)));
893 this->m_ctrlSubmodule
.AddEntry(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_SUBKODULESYNC
)));
895 this->m_ctrlStash
.AddEntry(CString(MAKEINTRESOURCE(IDS_MENUSTASHSAVE
)));
896 this->m_ctrlStash
.AddEntry(CString(MAKEINTRESOURCE(IDS_MENUSTASHPOP
)));
897 this->m_ctrlStash
.AddEntry(CString(MAKEINTRESOURCE(IDS_MENUSTASHAPPLY
)));
899 WorkingDir
.Replace(_T(':'),_T('_'));
902 regkey
.Format(_T("Software\\TortoiseGit\\TortoiseProc\\Sync\\%s"), (LPCTSTR
)WorkingDir
);
904 this->m_regPullButton
= CRegDWORD(regkey
+_T("\\Pull"),0);
905 this->m_regPushButton
= CRegDWORD(regkey
+_T("\\Push"),0);
906 this->m_regSubmoduleButton
= CRegDWORD(regkey
+_T("\\Submodule"));
907 this->m_regAutoLoadPutty
= CRegDWORD(regkey
+ _T("\\AutoLoadPutty"), CAppUtils::IsSSHPutty());
910 this->m_bAutoLoadPuttyKey
= m_regAutoLoadPutty
;
911 if(!CAppUtils::IsSSHPutty())
912 m_bAutoLoadPuttyKey
= false;
913 this->UpdateData(FALSE
);
915 this->m_ctrlPull
.SetCurrentEntry(this->m_regPullButton
);
916 this->m_ctrlPush
.SetCurrentEntry(this->m_regPushButton
);
917 this->m_ctrlSubmodule
.SetCurrentEntry(this->m_regSubmoduleButton
);
919 CString sWindowTitle
;
920 GetWindowText(sWindowTitle
);
921 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
923 EnableSaveRestore(_T("SyncDlg"));
925 m_ctrlURL
.SetCaseSensitive(TRUE
);
926 m_ctrlURL
.SetURLHistory(true);
927 m_ctrlURL
.SetMaxHistoryItems(0x7FFFFFFF);
928 this->m_ctrlURL
.LoadHistory(CString(_T("Software\\TortoiseGit\\History\\SyncURL\\"))+WorkingDir
, _T("url"));
932 if(!g_Git
.GetRemoteList(list
))
934 for (unsigned int i
= 0; i
< list
.size(); ++i
)
936 m_ctrlURL
.AddString(list
[i
]);
939 m_ctrlURL
.SetCurSel(0);
940 m_ctrlRemoteBranch
.SetCurSel(0);
942 this->LoadBranchInfo();
944 this->m_bInited
=true;
947 m_ctrlTabCtrl
.ShowTab(IDC_CMD_LOG
-1,false);
948 m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
-1,false);
949 m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1,false);
950 m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1,false);
951 m_ctrlTabCtrl
.ShowTab(IDC_CMD_GIT_PROG
-1, false);
952 m_ctrlTabCtrl
.ShowTab(IDC_REFLIST
-1, false);
954 m_ctrlRemoteBranch
.m_bWantReturn
= TRUE
;
955 m_ctrlURL
.m_bWantReturn
= TRUE
;
957 this->m_Gitverion
= CAppUtils::GetMsysgitVersion();
959 if (m_seq
> 0 && (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\SyncDialogRandomPos")))
963 GetWindowRect(&rect
);
964 rect
.top
-= m_seq
* 30;
965 rect
.bottom
-= m_seq
* 30;
971 MoveWindow(rect
.left
, rect
.top
, rect
.right
- rect
.left
, rect
.bottom
- rect
.top
);
974 return TRUE
; // return TRUE unless you set the focus to a control
975 // EXCEPTION: OCX Property Pages should return FALSE
978 void CSyncDlg::OnBnClickedButtonManage()
980 CAppUtils::LaunchRemoteSetting();
984 void CSyncDlg::Refresh()
986 theApp
.DoWaitCursor(1);
988 int lastSelected
= m_ctrlURL
.GetCurSel();
990 this->m_ctrlURL
.GetWindowText(url
);
992 this->m_ctrlURL
.Reset();
993 CString workingDir
= g_Git
.m_CurrentDir
;
994 workingDir
.Replace(_T(':'), _T('_'));
995 this->m_ctrlURL
.LoadHistory(_T("Software\\TortoiseGit\\History\\SyncURL\\") + workingDir
, _T("url"));
999 if (!g_Git
.GetRemoteList(list
))
1001 for (size_t i
= 0; i
< list
.size(); ++i
)
1003 m_ctrlURL
.AddString(list
[i
]);
1008 if (lastSelected
>= 0 && !found
)
1010 m_ctrlURL
.SetCurSel(0);
1011 m_ctrlURL
.GetWindowText(url
);
1016 this->m_ctrlLocalBranch
.GetWindowText(local
);
1017 this->m_ctrlRemoteBranch
.GetWindowText(remote
);
1019 this->LoadBranchInfo();
1021 this->m_ctrlLocalBranch
.AddString(local
);
1022 this->m_ctrlRemoteBranch
.AddString(remote
);
1023 this->m_ctrlURL
.AddString(url
);
1025 m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_REFRESHING
)));
1026 this->FetchOutList(true);
1027 theApp
.DoWaitCursor(-1);
1030 BOOL
CSyncDlg::PreTranslateMessage(MSG
* pMsg
)
1032 if (pMsg
->message
== WM_KEYDOWN
)
1034 switch (pMsg
->wParam
)
1040 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
1045 /* Avoid TAB control destroy but dialog exist*/
1049 TCHAR buff
[128] = { 0 };
1050 ::GetClassName(pMsg
->hwnd
,buff
,128);
1052 /* Use MSFTEDIT_CLASS http://msdn.microsoft.com/en-us/library/bb531344.aspx */
1053 if (_tcsnicmp(buff
, MSFTEDIT_CLASS
, 128) == 0 || //Unicode and MFC 2012 and later
1054 _tcsnicmp(buff
, RICHEDIT_CLASS
, 128) == 0 || //ANSI or MFC 2010
1055 _tcsnicmp(buff
, _T("SysListView32"), 128) == 0)
1057 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
1063 return __super::PreTranslateMessage(pMsg
);
1065 void CSyncDlg::FetchOutList(bool force
)
1069 m_OutChangeFileList
.Clear();
1070 this->m_OutLogList
.Clear();
1073 this->m_ctrlURL
.GetWindowText(remote
);
1074 CString remotebranch
;
1075 this->m_ctrlRemoteBranch
.GetWindowText(remotebranch
);
1076 remotebranch
=remote
+_T("/")+remotebranch
;
1077 CGitHash remotebranchHash
;
1078 g_Git
.GetHash(remotebranchHash
, remotebranch
);
1083 str
.LoadString(IDS_PROC_SYNC_PUSH_UNKNOWN
);
1084 m_OutLogList
.ShowText(str
);
1085 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
1086 m_OutLocalBranch
.Empty();
1087 m_OutRemoteBranch
.Empty();
1089 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1093 else if(remotebranchHash
.IsEmpty())
1096 str
.Format(IDS_PROC_SYNC_PUSH_UNKNOWNBRANCH
, (LPCTSTR
)remotebranch
);
1097 m_OutLogList
.ShowText(str
);
1098 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
1099 m_OutLocalBranch
.Empty();
1100 m_OutRemoteBranch
.Empty();
1102 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1107 CString localbranch
;
1108 localbranch
=this->m_ctrlLocalBranch
.GetString();
1110 if(localbranch
!= m_OutLocalBranch
|| m_OutRemoteBranch
!= remotebranch
|| force
)
1112 m_OutLogList
.ClearText();
1114 CGitHash base
, localBranchHash
;
1115 bool isFastForward
= g_Git
.IsFastForward(remotebranch
, localbranch
, &base
);
1117 if (g_Git
.GetHash(localBranchHash
, localbranch
))
1119 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + localbranch
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
1122 if (remotebranchHash
== localBranchHash
)
1125 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, 0, (LPCTSTR
)remotebranch
);
1126 m_OutLogList
.ShowText(str
);
1127 this->m_ctrlStatus
.SetWindowText(str
);
1128 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,FALSE
);
1129 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1131 else if (isFastForward
|| m_bForce
)
1134 range
.Format(_T("%s..%s"), (LPCTSTR
)g_Git
.FixBranchName(remotebranch
), (LPCTSTR
)g_Git
.FixBranchName(localbranch
));
1136 m_OutLogList
.FillGitLog(nullptr, &range
, CGit::LOG_INFO_STAT
| CGit::LOG_INFO_FILESTATE
| CGit::LOG_INFO_SHOW_MERGEDFILE
);
1138 str
.Format(IDS_PROC_SYNC_COMMITSAHEAD
, m_OutLogList
.GetItemCount(), (LPCTSTR
)remotebranch
);
1139 this->m_ctrlStatus
.SetWindowText(str
);
1142 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, remotebranch
);
1145 AddDiffFileList(&m_OutChangeFileList
, &m_arOutChangeList
, localbranch
, base
.ToString());
1148 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID()-1,TRUE
);
1149 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(TRUE
);
1154 str
.Format(IDS_PROC_SYNC_NOFASTFORWARD
, (LPCTSTR
)localbranch
, (LPCTSTR
)remotebranch
);
1155 m_OutLogList
.ShowText(str
);
1156 this->m_ctrlStatus
.SetWindowText(str
);
1157 this->m_ctrlTabCtrl
.ShowTab(m_OutChangeFileList
.GetDlgCtrlID() - 1, FALSE
);
1158 this->GetDlgItem(IDC_BUTTON_EMAIL
)->EnableWindow(FALSE
);
1161 this->m_OutLocalBranch
=localbranch
;
1162 this->m_OutRemoteBranch
=remotebranch
;
1167 bool CSyncDlg::IsURL()
1170 this->m_ctrlURL
.GetWindowText(str
);
1171 if(str
.Find(_T('\\'))>=0 || str
.Find(_T('/'))>=0)
1176 void CSyncDlg::OnCbnEditchangeComboboxex()
1178 SetTimer(IDT_INPUT
, 1000, NULL
);
1179 this->m_OutLogList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_SYNC_WAINTINPUT
)));
1181 //this->FetchOutList();
1184 UINT
CSyncDlg::ProgressThread()
1186 m_startTick
= GetTickCount();
1189 CProgressDlg::RunCmdList(this, m_GitCmdList
, list
, true, nullptr, &this->m_bAbort
, &this->m_Databuf
);
1190 InterlockedExchange(&m_bBlock
, FALSE
);
1195 LRESULT
CSyncDlg::OnProgressUpdateUI(WPARAM wParam
,LPARAM lParam
)
1197 if(wParam
== MSG_PROGRESSDLG_START
)
1200 m_ctrlAnimate
.Play(0, UINT_MAX
, UINT_MAX
);
1201 this->m_ctrlProgress
.SetPos(0);
1204 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1205 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
1209 if(wParam
== MSG_PROGRESSDLG_END
|| wParam
== MSG_PROGRESSDLG_FAILED
)
1211 DWORD tickSpent
= GetTickCount() - m_startTick
;
1212 CString strEndTime
= CLoglistUtils::FormatDateAndTime(CTime::GetCurrentTime(), DATE_SHORTDATE
, true, false);
1215 m_Databuf
.m_critSec
.Lock();
1217 m_Databuf
.m_critSec
.Unlock();
1220 m_ctrlAnimate
.Stop();
1221 m_ctrlProgress
.SetPos(100);
1222 //this->DialogEnableWindow(IDOK,TRUE);
1224 DWORD exitCode
= (DWORD
)lParam
;
1229 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1230 m_pTaskbarList
->SetProgressValue(m_hWnd
, 100, 100);
1233 log
.Format(IDS_PROC_PROGRESS_GITUNCLEANEXIT
, exitCode
);
1235 err
.Format(_T("\r\n\r\n%s (%lu ms @ %s)\r\n"), (LPCTSTR
)log
, tickSpent
, (LPCTSTR
)strEndTime
);
1236 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, err
, RGB(255,0,0));
1237 if (CRegDWORD(_T("Software\\TortoiseGit\\NoSounds"), FALSE
) == FALSE
)
1238 PlaySound((LPCTSTR
)SND_ALIAS_SYSTEMEXCLAMATION
, NULL
, SND_ALIAS_ID
| SND_ASYNC
);
1243 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1245 temp
.LoadString(IDS_SUCCESS
);
1247 log
.Format(_T("\r\n%s (%lu ms @ %s)\r\n"), (LPCTSTR
)temp
, tickSpent
, (LPCTSTR
)strEndTime
);
1248 CProgressDlg::InsertColorText(this->m_ctrlCmdOut
, log
, RGB(0,0,255));
1250 m_GitCmdStatus
= exitCode
;
1252 //if(wParam == MSG_PROGRESSDLG_END)
1257 ParserCmdOutput((char)lParam
);
1260 m_Databuf
.m_critSec
.Lock();
1261 for (size_t i
= m_BufStart
; i
< m_Databuf
.size(); ++i
)
1263 char c
= m_Databuf
[m_BufStart
];
1265 m_Databuf
.m_critSec
.Unlock();
1268 m_Databuf
.m_critSec
.Lock();
1271 if (m_BufStart
> 1000)
1273 m_Databuf
.erase(m_Databuf
.begin(), m_Databuf
.begin() + m_BufStart
);
1276 m_Databuf
.m_critSec
.Unlock();
1282 static std::map
<CString
, CGitHash
> * HashMapToRefMap(MAP_HASH_NAME
&map
)
1284 auto rmap
= new std::map
<CString
, CGitHash
>();
1285 for (auto mit
= map
.begin(); mit
!= map
.end(); ++mit
)
1287 for (auto rit
= mit
->second
.begin(); rit
!= mit
->second
.end(); ++rit
)
1289 rmap
->insert(std::make_pair(*rit
, mit
->first
));
1295 void CSyncDlg::FillNewRefMap()
1298 m_newHashMap
.clear();
1299 CAutoRepository
repo(g_Git
.GetGitRepository());
1302 CMessageBox::Show(m_hWnd
, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1306 if (CGit::GetMapHashToFriendName(repo
, m_newHashMap
))
1308 MessageBox(CGit::GetLibGit2LastErr(_T("Could not get all refs.")), _T("TortoiseGit"), MB_ICONERROR
);
1312 auto oldRefMap
= HashMapToRefMap(m_oldHashMap
);
1313 auto newRefMap
= HashMapToRefMap(m_newHashMap
);
1314 for (auto oit
= oldRefMap
->begin(); oit
!= oldRefMap
->end(); ++oit
)
1317 for (auto nit
= newRefMap
->begin(); nit
!= newRefMap
->end(); ++nit
)
1320 if (oit
->first
== nit
->first
)
1323 m_refList
.AddEntry(repo
, oit
->first
, &oit
->second
, &nit
->second
);
1330 m_refList
.AddEntry(repo
, oit
->first
, &oit
->second
, nullptr);
1333 for (auto nit
= newRefMap
->begin(); nit
!= newRefMap
->end(); ++nit
)
1336 for (auto oit
= oldRefMap
->begin(); oit
!= oldRefMap
->end(); ++oit
)
1338 if (oit
->first
== nit
->first
)
1347 m_refList
.AddEntry(repo
, nit
->first
, nullptr, &nit
->second
);
1355 void CSyncDlg::RunPostAction()
1362 if (this->m_CurrentCmd
== GIT_COMMAND_PUSH
)
1364 DWORD exitcode
= 0xFFFFFFFF;
1366 if (CHooks::Instance().PostPush(g_Git
.m_CurrentDir
, exitcode
, error
))
1371 temp
.Format(IDS_ERR_HOOKFAILED
, (LPCTSTR
)error
);
1372 CMessageBox::Show(nullptr, temp
,_T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1377 EnableControlButton(true);
1379 this->FetchOutList(true);
1381 else if (this->m_CurrentCmd
== GIT_COMMAND_PULL
)
1385 else if (this->m_CurrentCmd
== GIT_COMMAND_FETCH
|| this->m_CurrentCmd
== GIT_COMMAND_FETCHANDREBASE
)
1389 else if (this->m_CurrentCmd
== GIT_COMMAND_SUBMODULE
)
1391 //this->m_ctrlCmdOut.SetSel(-1,-1);
1392 //this->m_ctrlCmdOut.ReplaceSel(_T("Done\r\n"));
1393 //this->m_ctrlCmdOut.SetSel(-1,-1);
1394 EnableControlButton(true);
1397 else if (this->m_CurrentCmd
== GIT_COMMAND_STASH
)
1401 else if (this->m_CurrentCmd
== GIT_COMMAND_REMOTE
)
1403 this->FetchOutList(true);
1404 EnableControlButton(true);
1406 ShowTab(IDC_REFLIST
);
1409 void CSyncDlg::ParserCmdOutput(char ch
)
1411 CProgressDlg::ParserCmdOutput(m_ctrlCmdOut
,m_ctrlProgress
,m_hWnd
,m_pTaskbarList
,m_LogText
,ch
);
1413 void CSyncDlg::OnBnClickedButtonCommit()
1415 CString cmd
= _T("/command:commit");
1416 cmd
+= _T(" /path:\"");
1417 cmd
+= g_Git
.m_CurrentDir
;
1420 CAppUtils::RunTortoiseGitProc(cmd
);
1423 void CSyncDlg::OnOK()
1427 m_ctrlURL
.SaveHistory();
1429 m_regAutoLoadPutty
= this->m_bAutoLoadPuttyKey
;
1434 void CSyncDlg::OnCancel()
1439 CResizableStandAloneDialog::OnCancel();
1443 if (g_Git
.m_CurrentGitPi
.hProcess
)
1445 DWORD dwConfirmKillProcess
= CRegDWORD(_T("Software\\TortoiseGit\\ConfirmKillProcess"));
1446 if (dwConfirmKillProcess
&& CMessageBox::Show(m_hWnd
, IDS_PROC_CONFIRMKILLPROCESS
, IDS_APPNAME
, MB_YESNO
| MB_ICONQUESTION
) != IDYES
)
1448 if (::GenerateConsoleCtrlEvent(CTRL_C_EVENT
, 0))
1450 ::WaitForSingleObject(g_Git
.m_CurrentGitPi
.hProcess
, 10000);
1457 CProgressDlg::KillProcessTree(g_Git
.m_CurrentGitPi
.dwProcessId
);
1460 ::WaitForSingleObject(g_Git
.m_CurrentGitPi
.hProcess
,10000);
1462 CResizableStandAloneDialog::OnCancel();
1465 void CSyncDlg::OnBnClickedButtonSubmodule()
1469 m_ctrlCmdOut
.SetWindowTextW(_T(""));
1472 this->m_regSubmoduleButton
= (DWORD
)this->m_ctrlSubmodule
.GetCurrentEntry();
1474 this->SwitchToRun();
1476 this->m_bAbort
=false;
1477 this->m_GitCmdList
.clear();
1479 ShowTab(IDC_CMD_LOG
);
1483 switch (m_ctrlSubmodule
.GetCurrentEntry())
1486 cmd
=_T("git.exe submodule update --init");
1489 cmd
=_T("git.exe submodule init");
1492 cmd
=_T("git.exe submodule sync");
1496 m_GitCmdList
.push_back(cmd
);
1498 m_CurrentCmd
= GIT_COMMAND_SUBMODULE
;
1500 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
,0,CREATE_SUSPENDED
);
1501 if (m_pThread
==NULL
)
1503 // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
1507 m_pThread
->m_bAutoDelete
= TRUE
;
1508 m_pThread
->ResumeThread();
1512 void CSyncDlg::OnBnClickedButtonStash()
1516 m_ctrlCmdOut
.SetWindowTextW(_T(""));
1522 m_GitCmdList
.clear();
1524 ShowTab(IDC_CMD_LOG
);
1526 m_ctrlTabCtrl
.ShowTab(IDC_IN_LOGLIST
- 1, false);
1527 m_ctrlTabCtrl
.ShowTab(IDC_IN_CHANGELIST
-1, false);
1528 m_ctrlTabCtrl
.ShowTab(IDC_IN_CONFLICT
-1, false);
1531 switch (m_ctrlStash
.GetCurrentEntry())
1534 cmd
= _T("git.exe stash save");
1537 cmd
= _T("git.exe stash pop");
1540 cmd
= _T("git.exe stash apply");
1544 m_GitCmdList
.push_back(cmd
);
1545 m_CurrentCmd
= GIT_COMMAND_STASH
;
1547 m_pThread
= AfxBeginThread(ProgressThreadEntry
, this, THREAD_PRIORITY_NORMAL
, 0, CREATE_SUSPENDED
);
1550 //ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));
1554 m_pThread
->m_bAutoDelete
= TRUE
;
1555 m_pThread
->ResumeThread();
1559 void CSyncDlg::OnTimer(UINT_PTR nIDEvent
)
1561 if( nIDEvent
== IDT_INPUT
)
1563 KillTimer(IDT_INPUT
);
1564 this->FetchOutList(true);
1569 void CSyncDlg::OnLvnInLogListColumnClick(NMHDR
* /* pNMHDR */, LRESULT
*pResult
)
1574 LRESULT
CSyncDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1576 m_pTaskbarList
.Release();
1577 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1578 m_GitProgressList
.m_pTaskbarList
= m_pTaskbarList
;
1579 SetUUIDOverlayIcon(m_hWnd
);
1583 void CSyncDlg::OnBnClickedCheckForce()
1588 void CSyncDlg::OnBnClickedLog()
1590 CString cmd
= _T("/command:log");
1591 cmd
+= _T(" /path:\"");
1592 cmd
+= g_Git
.m_CurrentDir
;
1595 CAppUtils::RunTortoiseGitProc(cmd
);
1598 LRESULT
CSyncDlg::OnProgCmdFinish(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1605 void CSyncDlg::OnDestroy()
1607 m_bWantToExit
= true;
1608 __super::OnDestroy();