1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2011-2013 - Sven Strickroth <email@cs-ware.de>
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 // RebaseDlg.cpp : implementation file
25 #include "TortoiseProc.h"
26 #include "RebaseDlg.h"
28 #include "LoglistUtils.h"
29 #include "MessageBox.h"
30 #include "UnicodeUtils.h"
31 #include "BrowseRefsDlg.h"
32 #include "ProgressDlg.h"
33 #include "SmartHandle.h"
34 #include "../TGitCache/CacheInterface.h"
35 #include "Settings\Settings.h"
39 IMPLEMENT_DYNAMIC(CRebaseDlg
, CResizableStandAloneDialog
)
41 CRebaseDlg::CRebaseDlg(CWnd
* pParent
/*=NULL*/)
42 : CResizableStandAloneDialog(CRebaseDlg::IDD
, pParent
)
46 , m_bAddCherryPickedFrom(FALSE
)
48 m_RebaseStage
=CHOOSE_BRANCH
;
49 m_CurrentRebaseIndex
=-1;
50 m_bThreadRunning
=FALSE
;
51 this->m_IsCherryPick
= FALSE
;
53 m_IsFastForward
=FALSE
;
56 CRebaseDlg::~CRebaseDlg()
60 void CRebaseDlg::DoDataExchange(CDataExchange
* pDX
)
62 CDialog::DoDataExchange(pDX
);
63 DDX_Control(pDX
, IDC_REBASE_PROGRESS
, m_ProgressBar
);
64 DDX_Control(pDX
, IDC_STATUS_STATIC
, m_CtrlStatusText
);
65 DDX_Check(pDX
, IDC_PICK_ALL
, m_bPickAll
);
66 DDX_Check(pDX
, IDC_SQUASH_ALL
, m_bSquashAll
);
67 DDX_Check(pDX
, IDC_EDIT_ALL
, m_bEditAll
);
68 DDX_Control(pDX
, IDC_REBASE_SPLIT
, m_wndSplitter
);
69 DDX_Control(pDX
,IDC_COMMIT_LIST
,m_CommitList
);
70 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_BRANCH
, this->m_BranchCtrl
);
71 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_UPSTREAM
, this->m_UpstreamCtrl
);
72 DDX_Check(pDX
, IDC_REBASE_CHECK_FORCE
,m_bForce
);
73 DDX_Check(pDX
, IDC_CHECK_CHERRYPICKED_FROM
, m_bAddCherryPickedFrom
);
74 DDX_Control(pDX
,IDC_REBASE_POST_BUTTON
,m_PostButton
);
78 BEGIN_MESSAGE_MAP(CRebaseDlg
, CResizableStandAloneDialog
)
79 ON_BN_CLICKED(IDC_PICK_ALL
, &CRebaseDlg::OnBnClickedPickAll
)
80 ON_BN_CLICKED(IDC_SQUASH_ALL
, &CRebaseDlg::OnBnClickedSquashAll
)
81 ON_BN_CLICKED(IDC_EDIT_ALL
, &CRebaseDlg::OnBnClickedEditAll
)
82 ON_BN_CLICKED(IDC_REBASE_SPLIT
, &CRebaseDlg::OnBnClickedRebaseSplit
)
83 ON_BN_CLICKED(IDC_REBASE_CONTINUE
,OnBnClickedContinue
)
84 ON_BN_CLICKED(IDC_REBASE_ABORT
, OnBnClickedAbort
)
86 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH
, &CRebaseDlg::OnCbnSelchangeBranch
)
87 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM
, &CRebaseDlg::OnCbnSelchangeUpstream
)
88 ON_MESSAGE(MSG_REBASE_UPDATE_UI
, OnRebaseUpdateUI
)
89 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnGitStatusListCtrlNeedsRefresh
)
90 ON_BN_CLICKED(IDC_BUTTON_BROWSE
, &CRebaseDlg::OnBnClickedButtonBrowse
)
91 ON_BN_CLICKED(IDC_REBASE_CHECK_FORCE
, &CRebaseDlg::OnBnClickedRebaseCheckForce
)
92 ON_BN_CLICKED(IDC_CHECK_CHERRYPICKED_FROM
, &CRebaseDlg::OnBnClickedCheckCherryPickedFrom
)
93 ON_BN_CLICKED(IDC_REBASE_POST_BUTTON
, &CRebaseDlg::OnBnClickedRebasePostButton
)
94 ON_BN_CLICKED(IDC_BUTTON_UP2
, &CRebaseDlg::OnBnClickedButtonUp2
)
95 ON_BN_CLICKED(IDC_BUTTON_DOWN2
, &CRebaseDlg::OnBnClickedButtonDown2
)
96 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
97 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_COMMIT_LIST
, OnLvnItemchangedLoglist
)
100 void CRebaseDlg::AddRebaseAnchor()
102 AddAnchor(IDC_REBASE_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
103 AddAnchor(IDC_COMMIT_LIST
,TOP_LEFT
, TOP_RIGHT
);
104 AddAnchor(IDC_REBASE_SPLIT
,TOP_LEFT
, TOP_RIGHT
);
105 AddAnchor(IDC_STATUS_STATIC
, BOTTOM_LEFT
,BOTTOM_RIGHT
);
106 AddAnchor(IDC_REBASE_CONTINUE
,BOTTOM_RIGHT
);
107 AddAnchor(IDC_REBASE_ABORT
, BOTTOM_RIGHT
);
108 AddAnchor(IDC_REBASE_PROGRESS
,BOTTOM_LEFT
, BOTTOM_RIGHT
);
109 AddAnchor(IDC_PICK_ALL
,TOP_LEFT
);
110 AddAnchor(IDC_SQUASH_ALL
,TOP_LEFT
);
111 AddAnchor(IDC_EDIT_ALL
,TOP_LEFT
);
112 AddAnchor(IDC_BUTTON_UP2
,TOP_LEFT
);
113 AddAnchor(IDC_BUTTON_DOWN2
,TOP_LEFT
);
114 AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM
,TOP_LEFT
);
115 AddAnchor(IDC_REBASE_COMBOXEX_BRANCH
,TOP_LEFT
);
116 AddAnchor(IDC_REBASE_STATIC_UPSTREAM
,TOP_LEFT
);
117 AddAnchor(IDC_REBASE_STATIC_BRANCH
,TOP_LEFT
);
118 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
119 AddAnchor(IDC_REBASE_CHECK_FORCE
,TOP_RIGHT
);
120 AddAnchor(IDC_CHECK_CHERRYPICKED_FROM
, TOP_RIGHT
);
121 AddAnchor(IDC_REBASE_POST_BUTTON
,BOTTOM_LEFT
);
123 this->AddOthersToAnchor();
126 BOOL
CRebaseDlg::OnInitDialog()
128 CResizableStandAloneDialog::OnInitDialog();
129 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
131 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
132 // do this, Explorer would be unable to send that message to our window if we
133 // were running elevated. It's OK to make the call all the time, since if we're
134 // not elevated, this is a no-op.
135 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
136 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
137 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
140 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
141 if (pfnChangeWindowMessageFilterEx
)
143 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
146 m_pTaskbarList
.Release();
147 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
148 m_pTaskbarList
= nullptr;
151 //IDC_REBASE_DUMY_TAB
153 GetClientRect(m_DlgOrigRect
);
154 m_CommitList
.GetClientRect(m_CommitListOrigRect
);
156 CWnd
*pwnd
=this->GetDlgItem(IDC_REBASE_DUMY_TAB
);
157 pwnd
->GetWindowRect(&rectDummy
);
158 this->ScreenToClient(rectDummy
);
160 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_REBASE_TAB
))
162 TRACE0("Failed to create output tab window\n");
163 return FALSE
; // fail to create
165 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
166 // Create output panes:
167 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
168 DWORD dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;
170 if (! this->m_FileListCtrl
.Create(dwStyle
,rectDummy
,&this->m_ctrlTabCtrl
,0) )
172 TRACE0("Failed to create output windows\n");
173 return FALSE
; // fail to create
175 m_FileListCtrl
.m_hwndLogicalParent
= this;
177 if( ! this->m_LogMessageCtrl
.Create(_T("Scintilla"),_T("source"),0,rectDummy
,&m_ctrlTabCtrl
,0,0) )
179 TRACE0("Failed to create log message control");
182 m_LogMessageCtrl
.Init(0);
183 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
185 dwStyle
= LBS_NOINTEGRALHEIGHT
| WS_CHILD
| WS_VISIBLE
| WS_HSCROLL
| WS_VSCROLL
;
187 if (!m_wndOutputRebase
.Create(_T("Scintilla"),_T("source"),0,rectDummy
, &m_ctrlTabCtrl
, 0,0) )
189 TRACE0("Failed to create output windows\n");
190 return -1; // fail to create
192 m_wndOutputRebase
.Init(0);
193 m_wndOutputRebase
.Call(SCI_SETREADONLY
, TRUE
);
195 m_tooltips
.Create(this);
197 m_tooltips
.AddTool(IDC_REBASE_CHECK_FORCE
,IDS_REBASE_FORCE_TT
);
198 m_tooltips
.AddTool(IDC_REBASE_ABORT
,IDS_REBASE_ABORT_TT
);
202 m_FileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("RebaseDlg"),(GITSLC_POPALL
^ (GITSLC_POPCOMMIT
|GITSLC_POPRESTORE
)), false, true, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
204 m_ctrlTabCtrl
.AddTab(&m_FileListCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_REVISIONFILES
)));
205 m_ctrlTabCtrl
.AddTab(&m_LogMessageCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_COMMITMESSAGE
)), 1);
208 AdjustControlSize(IDC_PICK_ALL
);
209 AdjustControlSize(IDC_SQUASH_ALL
);
210 AdjustControlSize(IDC_EDIT_ALL
);
211 AdjustControlSize(IDC_CHECK_CHERRYPICKED_FROM
);
213 CString sWindowTitle
;
214 GetWindowText(sWindowTitle
);
215 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
217 EnableSaveRestore(_T("RebaseDlg"));
219 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
220 RECT rcDlg
, rcLogMsg
, rcFileList
;
221 GetClientRect(&rcDlg
);
222 m_CommitList
.GetWindowRect(&rcLogMsg
);
223 ScreenToClient(&rcLogMsg
);
224 this->m_ctrlTabCtrl
.GetWindowRect(&rcFileList
);
225 ScreenToClient(&rcFileList
);
229 m_wndSplitter
.GetWindowRect(&rectSplitter
);
230 ScreenToClient(&rectSplitter
);
231 int delta
= yPos
- rectSplitter
.top
;
232 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
234 m_wndSplitter
.SetWindowPos(NULL
, 0, yPos
, 0, 0, SWP_NOSIZE
);
239 if( this->m_RebaseStage
== CHOOSE_BRANCH
)
241 this->LoadBranchInfo();
246 this->m_BranchCtrl
.EnableWindow(FALSE
);
247 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
250 m_CommitList
.m_ColumnRegKey
= _T("Rebase");
251 m_CommitList
.m_IsIDReplaceAction
= TRUE
;
252 // m_CommitList.m_IsOldFirst = TRUE;
253 m_CommitList
.m_IsRebaseReplaceGraph
= TRUE
;
254 m_CommitList
.m_bNoHightlightHead
= TRUE
;
256 m_CommitList
.InsertGitColumn();
258 this->SetControlEnable();
260 if(!this->m_PreCmd
.IsEmpty())
262 CProgressDlg progress
;
263 progress
.m_GitCmd
=m_PreCmd
;
264 progress
.m_bAutoCloseOnSuccess
=true;
270 this->m_BranchCtrl
.SetCurSel(-1);
271 this->m_BranchCtrl
.EnableWindow(FALSE
);
272 GetDlgItem(IDC_REBASE_CHECK_FORCE
)->ShowWindow(SW_HIDE
);
273 GetDlgItem(IDC_BUTTON_BROWSE
)->EnableWindow(FALSE
);
274 this->m_UpstreamCtrl
.AddString(_T("HEAD"));
275 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
276 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_CHERRYPICK
)));
277 this->m_CommitList
.StartFilter();
281 GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM
)->ShowWindow(SW_HIDE
);
282 SetContinueButtonText();
283 m_CommitList
.DeleteAllItems();
287 m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK
)|
288 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV
)|
289 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_RESET
)|
290 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTREV
)|
291 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION
)|
292 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV
)|
293 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT
));
295 if(m_CommitList
.m_IsOldFirst
)
296 this->m_CurrentRebaseIndex
= -1;
298 this->m_CurrentRebaseIndex
= (int)m_CommitList
.m_logEntries
.size();
301 if(this->CheckRebaseCondition())
303 /* Disable Start Rebase */
304 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
309 // CRebaseDlg message handlers
311 void CRebaseDlg::OnBnClickedPickAll()
315 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
317 this->m_bEditAll
=FALSE
;
318 this->m_bSquashAll
=FALSE
;
319 this->UpdateData(FALSE
);
322 void CRebaseDlg::OnBnClickedSquashAll()
325 if(this->m_bSquashAll
)
326 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
328 this->m_bEditAll
=FALSE
;
329 this->m_bPickAll
=FALSE
;
330 this->UpdateData(FALSE
);
333 void CRebaseDlg::OnBnClickedEditAll()
336 if( this->m_bEditAll
)
337 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
339 this->m_bPickAll
=FALSE
;
340 this->m_bSquashAll
=FALSE
;
341 this->UpdateData(FALSE
);
344 void CRebaseDlg::SetAllRebaseAction(int action
)
346 for (int i
= 0; i
< this->m_CommitList
.m_logEntries
.size(); ++i
)
348 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
)=action
;
350 m_CommitList
.Invalidate();
353 void CRebaseDlg::OnBnClickedRebaseSplit()
358 LRESULT
CRebaseDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
362 if (wParam
== IDC_REBASE_SPLIT
)
364 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
370 return __super::DefWindowProc(message
, wParam
, lParam
);
373 void CRebaseDlg::DoSize(int delta
)
375 this->RemoveAllAnchors();
377 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST
), delta
, CW_TOPALIGN
);
378 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
379 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB
), -delta
, CW_BOTTOMALIGN
);
380 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
381 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL
),0,delta
);
382 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL
),0,delta
);
383 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL
),0,delta
);
384 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2
),0,delta
);
385 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2
),0,delta
);
386 CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE
),0,delta
);
388 this->AddRebaseAnchor();
389 // adjust the minimum size of the dialog to prevent the resizing from
390 // moving the list control too far down.
392 m_CommitList
.GetClientRect(rcLogMsg
);
393 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_CommitListOrigRect
.Height()+rcLogMsg
.Height()));
396 // m_CommitList.Invalidate();
398 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
400 this->m_ctrlTabCtrl
.Invalidate();
401 this->m_CommitList
.Invalidate();
402 this->m_FileListCtrl
.Invalidate();
403 this->m_LogMessageCtrl
.Invalidate();
407 void CRebaseDlg::SetSplitterRange()
409 if ((m_CommitList
)&&(m_ctrlTabCtrl
))
412 m_CommitList
.GetWindowRect(rcTop
);
413 ScreenToClient(rcTop
);
415 m_ctrlTabCtrl
.GetWindowRect(rcMiddle
);
416 ScreenToClient(rcMiddle
);
417 if (rcMiddle
.Height() && rcMiddle
.Width())
418 m_wndSplitter
.SetRange(rcTop
.top
+60, rcMiddle
.bottom
-80);
422 void CRebaseDlg::OnSize(UINT nType
,int cx
, int cy
)
424 // first, let the resizing take place
425 __super::OnSize(nType
, cx
, cy
);
431 void CRebaseDlg::SaveSplitterPos()
435 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
437 m_wndSplitter
.GetWindowRect(&rectSplitter
);
438 ScreenToClient(&rectSplitter
);
439 regPos
= rectSplitter
.top
;
443 void CRebaseDlg::LoadBranchInfo()
445 m_BranchCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
446 m_UpstreamCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
451 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL
);
452 m_BranchCtrl
.AddString(list
);
453 m_BranchCtrl
.SetCurSel(current
);
455 g_Git
.GetBranchList(list
, NULL
, CGit::BRANCH_ALL_F
);
456 m_UpstreamCtrl
.AddString(list
);
458 AddBranchToolTips(&m_BranchCtrl
);
459 AddBranchToolTips(&m_UpstreamCtrl
);
461 if(!m_Upstream
.IsEmpty())
463 m_UpstreamCtrl
.AddString(m_Upstream
);
464 m_UpstreamCtrl
.SetCurSel(m_UpstreamCtrl
.GetCount()-1);
468 //Select pull-remote from current branch
469 CString currentBranch
= g_Git
.GetSymbolicRef();
471 configName
.Format(L
"branch.%s.remote", currentBranch
);
472 CString pullRemote
= g_Git
.GetConfigValue(configName
);
474 //Select pull-branch from current branch
475 configName
.Format(L
"branch.%s.merge", currentBranch
);
476 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
478 CString defaultUpstream
;
479 defaultUpstream
.Format(L
"remotes/%s/%s", pullRemote
, pullBranch
);
480 int found
= m_UpstreamCtrl
.FindStringExact(0, defaultUpstream
);
482 m_UpstreamCtrl
.SetCurSel(found
);
484 m_UpstreamCtrl
.SetCurSel(-1);
488 void CRebaseDlg::OnCbnSelchangeBranch()
493 void CRebaseDlg::OnCbnSelchangeUpstream()
498 void CRebaseDlg::FetchLogList()
500 CGitHash base
,hash
,upstream
;
501 m_IsFastForward
=FALSE
;
503 if (g_Git
.GetHash(hash
, m_BranchCtrl
.GetString()))
505 m_CommitList
.ShowText(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl
.GetString() + _T("\".")));
506 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
509 if (g_Git
.GetHash(upstream
, m_UpstreamCtrl
.GetString()))
511 m_CommitList
.ShowText(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl
.GetString() + _T("\".")));
512 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
516 if (hash
== upstream
)
518 m_CommitList
.Clear();
520 fmt
.LoadString(IDS_REBASE_EQUAL_FMT
);
521 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
523 m_CommitList
.ShowText(text
);
524 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
528 if (g_Git
.IsFastForward(m_BranchCtrl
.GetString(), m_UpstreamCtrl
.GetString(), &base
))
531 this->m_IsFastForward
=TRUE
;
533 m_CommitList
.Clear();
535 fmt
.LoadString(IDS_REBASE_FASTFORWARD_FMT
);
536 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString(),
537 m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
539 m_CommitList
.ShowText(text
);
540 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(true);
541 SetContinueButtonText();
548 if (base
== upstream
)
550 m_CommitList
.Clear();
552 fmt
.LoadString(IDS_REBASE_UPTODATE_FMT
);
553 text
.Format(fmt
,m_BranchCtrl
.GetString());
554 m_CommitList
.ShowText(text
);
555 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
556 SetContinueButtonText();
561 m_CommitList
.Clear();
563 from
= m_UpstreamCtrl
.GetString();
564 to
= m_BranchCtrl
.GetString();
565 this->m_CommitList
.FillGitLog(NULL
,0,&from
,&to
);
567 if( m_CommitList
.GetItemCount() == 0 )
568 m_CommitList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_NOTHINGTOREBASE
)));
571 if(m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
.size() >=0 )
573 if(upstream
== m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
[0])
575 m_CommitList
.Clear();
576 m_CommitList
.ShowText(_T("Nothing Rebase"));
582 AddBranchToolTips(&this->m_BranchCtrl
);
583 AddBranchToolTips(&this->m_UpstreamCtrl
);
585 for (int i
= 0; i
< m_CommitList
.m_logEntries
.size(); ++i
)
587 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
) = CTGitPath::LOGACTIONS_REBASE_PICK
;
590 m_CommitList
.Invalidate();
592 if(m_CommitList
.m_IsOldFirst
)
593 this->m_CurrentRebaseIndex
= -1;
595 this->m_CurrentRebaseIndex
= (int)m_CommitList
.m_logEntries
.size();
597 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
598 SetContinueButtonText();
601 void CRebaseDlg::AddBranchToolTips(CHistoryCombo
*pBranch
)
605 CString text
=pBranch
->GetString();
611 tooltip
.Format(_T("%s: %s\n%s: %s <%s>\n%s: %s\n%s:\n%s\n%s"),
612 CString(MAKEINTRESOURCE(IDS_LOG_REVISION
)),
613 rev
.m_CommitHash
.ToString(),
614 CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR
)),
616 rev
.GetAuthorEmail(),
617 CString(MAKEINTRESOURCE(IDS_LOG_DATE
)),
618 CLoglistUtils::FormatDateAndTime(rev
.GetAuthorDate(), DATE_LONGDATE
),
619 CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE
)),
623 pBranch
->DisableTooltip();
624 this->m_tooltips
.AddTool(pBranch
->GetComboBoxCtrl(),tooltip
);
628 BOOL
CRebaseDlg::PreTranslateMessage(MSG
*pMsg
)
630 if (pMsg
->message
== WM_KEYDOWN
)
632 switch (pMsg
->wParam
)
635 if(LogListHasFocus(pMsg
->hwnd
))
637 m_CommitList
.ShiftSelectedAction();
642 if(LogListHasFocus(pMsg
->hwnd
))
644 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
649 if(LogListHasFocus(pMsg
->hwnd
))
651 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP
);
656 if(LogListHasFocus(pMsg
->hwnd
))
658 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
663 if(LogListHasFocus(pMsg
->hwnd
))
665 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
670 if(LogListHasFocus(pMsg
->hwnd
) && GetAsyncKeyState(VK_CONTROL
) & 0x8000)
672 // select all entries
673 for (int i
= 0; i
< m_CommitList
.GetItemCount(); ++i
)
675 m_CommitList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
688 if (GetAsyncKeyState(VK_CONTROL
) & 0x8000)
690 if (GetDlgItem(IDC_REBASE_CONTINUE
)->IsWindowEnabled())
691 GetDlgItem(IDC_REBASE_CONTINUE
)->SetFocus();
692 else if (GetDlgItem(IDC_REBASE_ABORT
)->IsWindowEnabled())
693 GetDlgItem(IDC_REBASE_ABORT
)->SetFocus();
695 GetDlgItem(IDHELP
)->SetFocus();
700 /* Avoid TAB control destroy but dialog exist*/
705 ::GetClassName(pMsg
->hwnd
,buff
,128);
708 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0 ||
709 _tcsnicmp(buff
,_T("Scintilla"),128)==0 ||
710 _tcsnicmp(buff
,_T("SysListView32"),128)==0||
711 ::GetParent(pMsg
->hwnd
) == this->m_ctrlTabCtrl
.m_hWnd
)
713 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
719 else if (pMsg
->message
== WM_NEXTDLGCTL
)
721 if (GetFocus()->GetSafeHwnd() == m_LogMessageCtrl
.GetSafeHwnd())
723 if (GetDlgItem(IDC_REBASE_CONTINUE
)->IsWindowEnabled())
724 GetDlgItem(IDC_REBASE_CONTINUE
)->SetFocus();
725 else if (GetDlgItem(IDC_REBASE_ABORT
)->IsWindowEnabled())
726 GetDlgItem(IDC_REBASE_ABORT
)->SetFocus();
728 GetDlgItem(IDHELP
)->SetFocus();
732 m_tooltips
.RelayEvent(pMsg
);
733 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
736 bool CRebaseDlg::LogListHasFocus(HWND hwnd
)
739 ::GetClassName(hwnd
, buff
, 128);
741 if(_tcsnicmp(buff
, _T("SysListView32"), 128) == 0)
746 int CRebaseDlg::CheckRebaseCondition()
748 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
750 if( !g_Git
.CheckCleanWorkTree() )
752 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
755 cmd
=_T("git.exe stash");
756 this->AddLogString(cmd
);
757 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
759 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
767 //Todo Check $REBASE_ROOT
770 if (!CAppUtils::CheckUserData())
773 //Todo call pre_rebase_hook
776 int CRebaseDlg::StartRebase()
779 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
780 if(!this->m_IsCherryPick
)
782 //Todo call comment_for_reflog
783 cmd
.Format(_T("git.exe checkout %s"),this->m_BranchCtrl
.GetString());
784 this->AddLogString(cmd
);
788 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
790 this->AddLogString(out
);
791 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
798 this->AddLogString(out
);
801 cmd
=_T("git.exe rev-parse --verify HEAD");
802 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
804 AddLogString(CString(MAKEINTRESOURCE(IDS_PROC_NOHEAD
)));
808 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
809 // echo "detached HEAD" > "$DOTEST"/head-name
811 cmd
.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
812 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
814 AddLogString(_T("update ORIG_HEAD Fail"));
818 m_OrigUpstreamHash
.Empty();
819 if (g_Git
.GetHash(m_OrigUpstreamHash
, m_UpstreamCtrl
.GetString()))
821 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl
.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
825 if( !this->m_IsCherryPick
)
827 cmd
.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash
.ToString());
828 this->AddLogString(cmd
);
832 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
834 this->AddLogString(out
);
835 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
844 if( !this->m_IsCherryPick
)
846 if (g_Git
.GetHash(m_OrigBranchHash
, m_BranchCtrl
.GetString()))
848 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl
.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
851 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTREBASE
)));
854 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTCHERRYPICK
)));
856 this->AddLogString(log
);
859 int CRebaseDlg::VerifyNoConflict()
862 if(g_Git
.ListConflictFile(list
))
864 AddLogString(_T("Get conflict files fail"));
867 if( list
.GetCount() != 0 )
869 CMessageBox::Show(NULL
, IDS_PROGRS_CONFLICTSOCCURED
, IDS_APPNAME
, MB_OK
);
875 int CRebaseDlg::FinishRebase()
877 if(this->m_IsCherryPick
) //cherry pick mode no "branch", working at upstream branch
881 if (g_Git
.GetHash(head
, _T("HEAD")))
883 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
888 cmd
.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl
.GetString());
893 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
896 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
904 cmd
.Format(_T("git.exe reset --hard %s"), head
.ToString());
909 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
912 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
920 while (m_ctrlTabCtrl
.GetTabsNum() > 1)
921 m_ctrlTabCtrl
.RemoveTab(0);
922 m_CtrlStatusText
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED
)));
926 void CRebaseDlg::OnBnClickedContinue()
928 if( m_RebaseStage
== REBASE_DONE
)
934 if( this->m_IsFastForward
)
937 CString oldbranch
= g_Git
.GetCurrentBranch();
938 if( oldbranch
!= m_BranchCtrl
.GetString() )
940 cmd
.Format(_T("git.exe checkout %s"),m_BranchCtrl
.GetString());
945 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
947 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
949 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
958 if (g_Git
.GetHash(m_OrigBranchHash
, m_BranchCtrl
.GetString()))
960 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_BranchCtrl
.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
963 if (g_Git
.GetHash(m_OrigUpstreamHash
, m_UpstreamCtrl
.GetString()))
965 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + m_UpstreamCtrl
.GetString() + _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
969 if(!g_Git
.IsFastForward(this->m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString()))
971 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
972 AddLogString(_T("No fast forward possible.\r\nMaybe repository changed"));
976 cmd
.Format(_T("git.exe reset --hard %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
978 log
.Format(IDS_PROC_REBASE_FFTO
, m_UpstreamCtrl
.GetString());
979 this->AddLogString(log
);
982 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
986 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
988 AddLogString(CString(MAKEINTRESOURCE(IDS_FAIL
)));
990 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
997 AddLogString(CString(MAKEINTRESOURCE(IDS_DONE
)));
998 m_RebaseStage
= REBASE_DONE
;
999 UpdateCurrentStatus();
1003 if( m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
1005 if(CheckRebaseCondition())
1007 m_RebaseStage
= REBASE_START
;
1008 m_FileListCtrl
.Clear();
1009 m_FileListCtrl
.m_CurrentVersion
= L
"";
1010 m_ctrlTabCtrl
.SetTabLabel(REBASE_TAB_CONFLICT
, CString(MAKEINTRESOURCE(IDS_PROC_CONFLICTFILES
)));
1011 m_ctrlTabCtrl
.AddTab(&m_wndOutputRebase
, CString(MAKEINTRESOURCE(IDS_LOG
)), 2);
1014 if( m_RebaseStage
== REBASE_FINISH
)
1022 if( m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
1024 if(VerifyNoConflict())
1026 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1027 if(this->CheckNextCommitIsSquash())
1028 {//next commit is not squash;
1029 m_RebaseStage
= REBASE_SQUASH_EDIT
;
1030 this->OnRebaseUpdateUI(0,0);
1031 this->UpdateCurrentStatus();
1035 m_RebaseStage
=REBASE_CONTINUE
;
1036 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1037 this->UpdateCurrentStatus();
1041 if( m_RebaseStage
== REBASE_CONFLICT
)
1043 if(VerifyNoConflict())
1046 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1048 CString out
=_T("");
1050 cmd
.Format(_T("git.exe commit -a -C %s"), curRev
->m_CommitHash
.ToString());
1054 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1057 if(!g_Git
.CheckCleanWorkTree())
1059 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1065 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1066 if( curRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_EDIT
)
1068 m_RebaseStage
=REBASE_EDIT
;
1069 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1070 this->UpdateCurrentStatus();
1075 m_RebaseStage
=REBASE_CONTINUE
;
1076 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1077 this->UpdateCurrentStatus();
1081 if( m_RebaseStage
== REBASE_EDIT
|| m_RebaseStage
== REBASE_SQUASH_EDIT
)
1084 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1086 str
=this->m_LogMessageCtrl
.GetText();
1087 if(str
.Trim().IsEmpty())
1089 CMessageBox::Show(NULL
, IDS_PROC_COMMITMESSAGE_EMPTY
,IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1093 CString tempfile
=::GetTempFile();
1094 CAppUtils::SaveCommitUnicodeFile(tempfile
, str
);
1098 if( m_RebaseStage
== REBASE_SQUASH_EDIT
)
1099 cmd
.Format(_T("git.exe commit -F \"%s\""), tempfile
);
1101 cmd
.Format(_T("git.exe commit --amend -F \"%s\""), tempfile
);
1103 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1105 if(!g_Git
.CheckCleanWorkTree())
1107 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1112 CFile::Remove(tempfile
);
1114 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1115 m_RebaseStage
=REBASE_CONTINUE
;
1116 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1117 this->UpdateCurrentStatus();
1121 InterlockedExchange(&m_bThreadRunning
, TRUE
);
1124 if (AfxBeginThread(RebaseThreadEntry
, this)==NULL
)
1126 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1127 CMessageBox::Show(NULL
, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1131 int CRebaseDlg::CheckNextCommitIsSquash()
1134 if(m_CommitList
.m_IsOldFirst
)
1135 index
=m_CurrentRebaseIndex
+1;
1137 index
=m_CurrentRebaseIndex
-1;
1144 if(index
>= m_CommitList
.GetItemCount())
1147 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[index
];
1149 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1151 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
)
1153 if(m_CommitList
.m_IsOldFirst
)
1161 }while(curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
);
1166 int CRebaseDlg::GoNext()
1168 if(m_CommitList
.m_IsOldFirst
)
1169 ++m_CurrentRebaseIndex
;
1171 --m_CurrentRebaseIndex
;
1175 int CRebaseDlg::StateAction()
1177 switch(this->m_RebaseStage
)
1180 case CHOOSE_COMMIT_PICK_MODE
:
1183 m_RebaseStage
= REBASE_START
;
1190 void CRebaseDlg::SetContinueButtonText()
1193 switch(this->m_RebaseStage
)
1196 case CHOOSE_COMMIT_PICK_MODE
:
1197 if(this->m_IsFastForward
)
1198 Text
.LoadString(IDS_PROC_STARTREBASEFFBUTTON
);
1200 Text
.LoadString(IDS_PROC_STARTREBASEBUTTON
);
1205 case REBASE_CONTINUE
:
1206 case REBASE_SQUASH_CONFLICT
:
1207 Text
.LoadString(IDS_CONTINUEBUTTON
);
1210 case REBASE_CONFLICT
:
1211 Text
.LoadString(IDS_COMMITBUTTON
);
1214 Text
.LoadString(IDS_AMENDBUTTON
);
1217 case REBASE_SQUASH_EDIT
:
1218 Text
.LoadString(IDS_COMMITBUTTON
);
1223 Text
.LoadString(IDS_FINISHBUTTON
);
1227 Text
.LoadString(IDS_DONE
);
1230 this->GetDlgItem(IDC_REBASE_CONTINUE
)->SetWindowText(Text
);
1233 void CRebaseDlg::SetControlEnable()
1235 switch(this->m_RebaseStage
)
1238 case CHOOSE_COMMIT_PICK_MODE
:
1240 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(TRUE
);
1241 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(TRUE
);
1242 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(TRUE
);
1243 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(TRUE
);
1244 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(TRUE
);
1248 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(TRUE
);
1249 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(TRUE
);
1250 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(TRUE
);
1252 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1253 this->m_CommitList
.m_ContextMenuMask
|= m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1254 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1255 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1256 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
);
1260 case REBASE_CONTINUE
:
1264 case REBASE_CONFLICT
:
1266 case REBASE_SQUASH_CONFLICT
:
1268 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(FALSE
);
1269 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(FALSE
);
1270 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(FALSE
);
1271 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(FALSE
);
1272 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(FALSE
);
1273 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(FALSE
);
1274 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(FALSE
);
1275 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(FALSE
);
1276 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1277 this->m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1278 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1279 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1280 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
));
1282 if( m_RebaseStage
== REBASE_DONE
&& (this->m_PostButtonTexts
.GetCount() != 0) )
1284 this->GetDlgItem(IDC_STATUS_STATIC
)->ShowWindow(SW_HIDE
);
1285 this->GetDlgItem(IDC_REBASE_POST_BUTTON
)->ShowWindow(SW_SHOWNORMAL
);
1286 this->m_PostButton
.RemoveAll();
1287 this->m_PostButton
.AddEntries(m_PostButtonTexts
);
1288 //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1293 if(m_bThreadRunning
)
1295 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1298 else if (m_RebaseStage
!= REBASE_ERROR
)
1300 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(TRUE
);
1304 void CRebaseDlg::UpdateProgress()
1309 if(m_CommitList
.m_IsOldFirst
)
1310 index
= m_CurrentRebaseIndex
+1;
1312 index
= m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1314 m_ProgressBar
.SetRange32(1, m_CommitList
.GetItemCount());
1315 m_ProgressBar
.SetPos(index
);
1318 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1319 m_pTaskbarList
->SetProgressValue(m_hWnd
, index
, m_CommitList
.GetItemCount());
1322 if(m_CurrentRebaseIndex
>=0 && m_CurrentRebaseIndex
< m_CommitList
.GetItemCount())
1325 text
.Format(IDS_PROC_REBASING_PROGRESS
, index
, m_CommitList
.GetItemCount());
1326 m_CtrlStatusText
.SetWindowText(text
);
1330 GitRev
*prevRev
=NULL
, *curRev
=NULL
;
1332 if( m_CurrentRebaseIndex
>= 0 && m_CurrentRebaseIndex
< m_CommitList
.m_arShownList
.GetSize())
1334 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1337 for (int i
= 0; i
< m_CommitList
.m_arShownList
.GetSize(); ++i
)
1339 prevRev
=(GitRev
*)m_CommitList
.m_arShownList
[i
];
1340 if(prevRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_CURRENT
)
1342 prevRev
->GetAction(&m_CommitList
) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1343 m_CommitList
.GetItemRect(i
,&rect
,LVIR_BOUNDS
);
1344 m_CommitList
.InvalidateRect(rect
);
1350 curRev
->GetAction(&m_CommitList
) |= CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1351 m_CommitList
.GetItemRect(m_CurrentRebaseIndex
,&rect
,LVIR_BOUNDS
);
1352 m_CommitList
.InvalidateRect(rect
);
1354 m_CommitList
.EnsureVisible(m_CurrentRebaseIndex
,FALSE
);
1357 void CRebaseDlg::UpdateCurrentStatus()
1359 SetContinueButtonText();
1364 void CRebaseDlg::AddLogString(CString str
)
1366 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, FALSE
);
1367 CStringA sTextA
= m_wndOutputRebase
.StringForControl(str
);//CUnicodeUtils::GetUTF8(str);
1368 this->m_wndOutputRebase
.SendMessage(SCI_DOCUMENTEND
);
1369 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)sTextA
);
1370 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)"\n");
1371 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, TRUE
);
1374 int CRebaseDlg::GetCurrentCommitID()
1376 if(m_CommitList
.m_IsOldFirst
)
1378 return this->m_CurrentRebaseIndex
+1;
1383 return m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1387 int CRebaseDlg::DoRebase()
1390 if(m_CurrentRebaseIndex
<0)
1392 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1395 GitRev
*pRev
= (GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1396 int mode
=pRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK
;
1399 if( mode
== CTGitPath::LOGACTIONS_REBASE_SKIP
)
1401 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1405 if (!CheckNextCommitIsSquash() || mode
!= CTGitPath::LOGACTIONS_REBASE_PICK
)
1406 { // next commit is squash or not pick
1407 if (!this->m_SquashMessage
.IsEmpty())
1408 this->m_SquashMessage
+= _T("\n\n");
1409 this->m_SquashMessage
+= pRev
->GetSubject();
1410 this->m_SquashMessage
+= _T("\n");
1411 this->m_SquashMessage
+= pRev
->GetBody().TrimRight();
1414 this->m_SquashMessage
.Empty();
1416 if (!CheckNextCommitIsSquash() || mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1417 { // next or this commit is squash
1418 nocommit
=_T(" --no-commit ");
1422 log
.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode
),this->GetCurrentCommitID(),pRev
->m_CommitHash
.ToString());
1424 AddLogString(pRev
->GetSubject());
1425 if (pRev
->GetSubject().IsEmpty())
1427 CMessageBox::Show(m_hWnd
, IDS_PROC_REBASE_EMPTYCOMMITMSG
, IDS_APPNAME
, MB_OK
| MB_ICONEXCLAMATION
);
1428 mode
= CTGitPath::LOGACTIONS_REBASE_EDIT
;
1431 CString cherryPickedFrom
;
1432 if (m_bAddCherryPickedFrom
)
1433 cherryPickedFrom
= _T("-x ");
1435 cmd
.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom
, nocommit
, pRev
->m_CommitHash
.ToString());
1437 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1441 if(g_Git
.ListConflictFile(list
))
1443 AddLogString(_T("Get conflict files fail"));
1446 if(list
.GetCount() == 0 )
1448 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1450 m_RebaseStage
= REBASE_ERROR
;
1451 AddLogString(_T("An unrecoverable error occoured."));
1454 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1456 this->m_RebaseStage
= REBASE_EDIT
;
1457 return -1; // Edit return -1 to stop rebase.
1460 if(CheckNextCommitIsSquash())
1462 // let user edit last commmit message
1463 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1467 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1468 m_RebaseStage
= REBASE_SQUASH_CONFLICT
;
1470 m_RebaseStage
= REBASE_CONFLICT
;
1477 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1479 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1482 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1484 this->m_RebaseStage
= REBASE_EDIT
;
1485 return -1; // Edit return -1 to stop rebase.
1489 if(CheckNextCommitIsSquash())
1491 // let user edit last commmit message
1492 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1495 else if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1496 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1502 BOOL
CRebaseDlg::IsEnd()
1504 if(m_CommitList
.m_IsOldFirst
)
1505 return m_CurrentRebaseIndex
>= this->m_CommitList
.GetItemCount();
1507 return m_CurrentRebaseIndex
<0;
1510 int CRebaseDlg::RebaseThread()
1512 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
1517 if( m_RebaseStage
== REBASE_START
)
1519 if( this->StartRebase() )
1524 m_RebaseStage
= REBASE_CONTINUE
;
1527 else if( m_RebaseStage
== REBASE_CONTINUE
)
1530 SendMessage(MSG_REBASE_UPDATE_UI
);
1534 m_RebaseStage
= REBASE_FINISH
;
1548 else if( m_RebaseStage
== REBASE_FINISH
)
1550 SendMessage(MSG_REBASE_UPDATE_UI
);
1551 m_RebaseStage
= REBASE_DONE
;
1559 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1562 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1563 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1567 void CRebaseDlg::ListConflictFile()
1569 this->m_FileListCtrl
.Clear();
1574 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
1576 this->m_FileListCtrl
.GetStatus(&list
,true);
1577 this->m_FileListCtrl
.Show(CTGitPath::LOGACTIONS_UNMERGED
|CTGitPath::LOGACTIONS_MODIFIED
|CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_DELETED
,
1578 CTGitPath::LOGACTIONS_UNMERGED
);
1581 LRESULT
CRebaseDlg::OnRebaseUpdateUI(WPARAM
,LPARAM
)
1583 if (m_RebaseStage
== REBASE_FINISH
)
1587 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1590 UpdateCurrentStatus();
1591 if(m_CurrentRebaseIndex
<0)
1593 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1595 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1597 switch(m_RebaseStage
)
1599 case REBASE_CONFLICT
:
1600 case REBASE_SQUASH_CONFLICT
:
1602 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_CONFLICT
);
1604 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1605 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1606 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1609 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1611 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1612 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1613 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1615 case REBASE_SQUASH_EDIT
:
1616 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1617 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1618 this->m_LogMessageCtrl
.SetText(this->m_SquashMessage
);
1620 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1623 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1627 void CRebaseDlg::OnCancel()
1631 void CRebaseDlg::OnBnClickedAbort()
1634 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1637 CString pron
= m_OrigUpstreamHash
.ToString();
1638 if(m_OrigUpstreamHash
.IsEmpty())
1640 __super::OnCancel();
1643 if(m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
1648 if(CMessageBox::Show(NULL
, IDS_PROC_REBASE_ABORT
, IDS_APPNAME
, MB_YESNO
) != IDYES
)
1651 if(this->m_IsFastForward
)
1653 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1657 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1660 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1666 __super::OnCancel();
1669 cmd
.Format(_T("git.exe checkout -f %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
1673 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1676 if (CMessageBox::Show(this->m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1678 __super::OnCancel();
1686 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash
.ToString());
1690 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1693 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1695 __super::OnCancel();
1703 if(this->m_IsCherryPick
) //there are not "branch" at cherry pick mode
1705 __super::OnCancel();
1709 cmd
.Format(_T("git checkout -f %s"),this->m_BranchCtrl
.GetString());
1710 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1713 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1714 __super::OnCancel();
1718 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1722 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1725 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1731 __super::OnCancel();
1734 void CRebaseDlg::OnBnClickedButtonBrowse()
1736 if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl
, gPickRef_NoTag
))
1737 OnCbnSelchangeUpstream();
1740 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1743 this->FetchLogList();
1744 if(this->CheckRebaseCondition())
1746 /* Disable Start Rebase */
1747 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1751 void CRebaseDlg::OnBnClickedRebasePostButton()
1753 this->m_Upstream
=this->m_UpstreamCtrl
.GetString();
1754 this->m_Branch
=this->m_BranchCtrl
.GetString();
1756 this->EndDialog((int)(IDC_REBASE_POST_BUTTON
+this->m_PostButton
.GetCurrentEntry()));
1759 LRESULT
CRebaseDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1765 void CRebaseDlg::Refresh()
1767 if (m_RebaseStage
== REBASE_CONFLICT
|| m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
1773 if(this->m_IsCherryPick
)
1776 if(this->m_RebaseStage
== CHOOSE_BRANCH
)
1779 this->FetchLogList();
1780 if(this->CheckRebaseCondition())
1782 /* Disable Start Rebase */
1783 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1788 void CRebaseDlg::OnBnClickedButtonUp2()
1791 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1793 // do nothing if the first selected item is the first item in the list
1794 if (m_CommitList
.GetNextSelectedItem(pos
) == 0)
1797 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1799 bool changed
= false;
1802 int index
=m_CommitList
.GetNextSelectedItem(pos
);
1805 CGitHash old
= m_CommitList
.m_logEntries
[index
-1];
1806 m_CommitList
.m_logEntries
[index
-1] = m_CommitList
.m_logEntries
[index
];
1807 m_CommitList
.m_logEntries
[index
] = old
;
1808 m_CommitList
.SetItemState(index
-1, LVIS_SELECTED
, LVIS_SELECTED
);
1809 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1815 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1816 m_CommitList
.Invalidate();
1817 m_CommitList
.SetFocus();
1821 void CRebaseDlg::OnBnClickedButtonDown2()
1823 if (m_CommitList
.GetSelectedCount() == 0)
1827 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1828 bool changed
= false;
1829 // use an array to store all selected item indexes; the user won't select too much items
1830 int* indexes
= NULL
;
1831 indexes
= new int[m_CommitList
.GetSelectedCount()];
1835 indexes
[i
++] = m_CommitList
.GetNextSelectedItem(pos
);
1837 // don't move any item if the last selected item is the last item in the m_CommitList
1838 // (that would change the order of the selected items)
1839 if(indexes
[m_CommitList
.GetSelectedCount() - 1] < m_CommitList
.GetItemCount() - 1)
1841 // iterate over the indexes backwards in order to correctly move multiselected items
1842 for (i
= m_CommitList
.GetSelectedCount() - 1; i
>= 0; i
--)
1844 int index
= indexes
[i
];
1845 CGitHash old
= m_CommitList
.m_logEntries
[index
+1];
1846 m_CommitList
.m_logEntries
[index
+1] = m_CommitList
.m_logEntries
[index
];
1847 m_CommitList
.m_logEntries
[index
] = old
;
1848 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1849 m_CommitList
.SetItemState(index
+1, LVIS_SELECTED
, LVIS_SELECTED
);
1857 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1858 m_CommitList
.Invalidate();
1859 m_CommitList
.SetFocus();
1863 LRESULT
CRebaseDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1865 m_pTaskbarList
.Release();
1866 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1870 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1872 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1874 if(m_CommitList
.m_bNoDispUpdates
)
1876 if (pNMLV
->iItem
>= 0)
1878 this->m_CommitList
.m_nSearchIndex
= pNMLV
->iItem
;
1879 if (pNMLV
->iSubItem
!= 0)
1881 if ((pNMLV
->iItem
== m_CommitList
.m_arShownList
.GetCount()))
1883 // remove the selected state
1884 if (pNMLV
->uChanged
& LVIF_STATE
)
1886 m_CommitList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1887 FillLogMessageCtrl();
1891 if (pNMLV
->uChanged
& LVIF_STATE
)
1893 FillLogMessageCtrl();
1898 FillLogMessageCtrl();
1902 void CRebaseDlg::FillLogMessageCtrl()
1904 int selCount
= m_CommitList
.GetSelectedCount();
1905 if (selCount
== 1 && (m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
))
1907 POSITION pos
= m_CommitList
.GetFirstSelectedItemPosition();
1908 int selIndex
= m_CommitList
.GetNextSelectedItem(pos
);
1909 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_CommitList
.m_arShownList
.SafeGetAt(selIndex
));
1910 m_FileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_CommitList
));
1911 m_FileListCtrl
.m_CurrentVersion
= pLogEntry
->m_CommitHash
;
1912 m_FileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
1913 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1914 m_LogMessageCtrl
.SetText(pLogEntry
->GetSubject() + _T("\n") + pLogEntry
->GetBody());
1915 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
1918 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()