1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2011-2012 - 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
= ::LoadLibrary(_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 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
150 //IDC_REBASE_DUMY_TAB
152 GetClientRect(m_DlgOrigRect
);
153 m_CommitList
.GetClientRect(m_CommitListOrigRect
);
155 CWnd
*pwnd
=this->GetDlgItem(IDC_REBASE_DUMY_TAB
);
156 pwnd
->GetWindowRect(&rectDummy
);
157 this->ScreenToClient(rectDummy
);
159 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_REBASE_TAB
))
161 TRACE0("Failed to create output tab window\n");
162 return FALSE
; // fail to create
164 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
165 // Create output panes:
166 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
167 DWORD dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;
169 if (! this->m_FileListCtrl
.Create(dwStyle
,rectDummy
,&this->m_ctrlTabCtrl
,0) )
171 TRACE0("Failed to create output windows\n");
172 return FALSE
; // fail to create
174 m_FileListCtrl
.m_hwndLogicalParent
= this;
176 if( ! this->m_LogMessageCtrl
.Create(_T("Scintilla"),_T("source"),0,rectDummy
,&m_ctrlTabCtrl
,0,0) )
178 TRACE0("Failed to create log message control");
181 m_LogMessageCtrl
.Init(0);
182 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
184 dwStyle
= LBS_NOINTEGRALHEIGHT
| WS_CHILD
| WS_VISIBLE
| WS_HSCROLL
| WS_VSCROLL
;
186 if (!m_wndOutputRebase
.Create(_T("Scintilla"),_T("source"),0,rectDummy
, &m_ctrlTabCtrl
, 0,0) )
188 TRACE0("Failed to create output windows\n");
189 return -1; // fail to create
191 m_wndOutputRebase
.Init(0);
192 m_wndOutputRebase
.Call(SCI_SETREADONLY
, TRUE
);
194 m_tooltips
.Create(this);
196 m_tooltips
.AddTool(IDC_REBASE_CHECK_FORCE
,IDS_REBASE_FORCE_TT
);
197 m_tooltips
.AddTool(IDC_REBASE_ABORT
,IDS_REBASE_ABORT_TT
);
201 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
);
203 m_ctrlTabCtrl
.AddTab(&m_FileListCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_REVISIONFILES
)));
204 m_ctrlTabCtrl
.AddTab(&m_LogMessageCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_COMMITMESSAGE
)), 1);
207 AdjustControlSize(IDC_PICK_ALL
);
208 AdjustControlSize(IDC_SQUASH_ALL
);
209 AdjustControlSize(IDC_EDIT_ALL
);
210 AdjustControlSize(IDC_CHECK_CHERRYPICKED_FROM
);
212 CString sWindowTitle
;
213 GetWindowText(sWindowTitle
);
214 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
216 EnableSaveRestore(_T("RebaseDlg"));
218 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
219 RECT rcDlg
, rcLogMsg
, rcFileList
;
220 GetClientRect(&rcDlg
);
221 m_CommitList
.GetWindowRect(&rcLogMsg
);
222 ScreenToClient(&rcLogMsg
);
223 this->m_ctrlTabCtrl
.GetWindowRect(&rcFileList
);
224 ScreenToClient(&rcFileList
);
228 m_wndSplitter
.GetWindowRect(&rectSplitter
);
229 ScreenToClient(&rectSplitter
);
230 int delta
= yPos
- rectSplitter
.top
;
231 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
233 m_wndSplitter
.SetWindowPos(NULL
, 0, yPos
, 0, 0, SWP_NOSIZE
);
238 if( this->m_RebaseStage
== CHOOSE_BRANCH
)
240 this->LoadBranchInfo();
245 this->m_BranchCtrl
.EnableWindow(FALSE
);
246 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
249 m_CommitList
.m_ColumnRegKey
= _T("Rebase");
250 m_CommitList
.m_IsIDReplaceAction
= TRUE
;
251 // m_CommitList.m_IsOldFirst = TRUE;
252 m_CommitList
.m_IsRebaseReplaceGraph
= TRUE
;
253 m_CommitList
.m_bNoHightlightHead
= TRUE
;
255 m_CommitList
.InsertGitColumn();
257 this->SetControlEnable();
259 if(!this->m_PreCmd
.IsEmpty())
261 CProgressDlg progress
;
262 progress
.m_GitCmd
=m_PreCmd
;
263 progress
.m_bAutoCloseOnSuccess
=true;
269 this->m_BranchCtrl
.SetCurSel(-1);
270 this->m_BranchCtrl
.EnableWindow(FALSE
);
271 GetDlgItem(IDC_REBASE_CHECK_FORCE
)->ShowWindow(SW_HIDE
);
272 GetDlgItem(IDC_BUTTON_BROWSE
)->EnableWindow(FALSE
);
273 this->m_UpstreamCtrl
.AddString(_T("HEAD"));
274 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
275 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_CHERRYPICK
)));
276 this->m_CommitList
.StartFilter();
280 GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM
)->ShowWindow(SW_HIDE
);
281 SetContinueButtonText();
282 m_CommitList
.DeleteAllItems();
286 m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK
)|
287 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV
)|
288 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_RESET
)|
289 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTREV
)|
290 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION
)|
291 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV
)|
292 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT
));
294 if(m_CommitList
.m_IsOldFirst
)
295 this->m_CurrentRebaseIndex
= -1;
297 this->m_CurrentRebaseIndex
= (int)m_CommitList
.m_logEntries
.size();
300 if(this->CheckRebaseCondition())
302 /* Disable Start Rebase */
303 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
308 // CRebaseDlg message handlers
310 void CRebaseDlg::OnBnClickedPickAll()
314 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
316 this->m_bEditAll
=FALSE
;
317 this->m_bSquashAll
=FALSE
;
318 this->UpdateData(FALSE
);
321 void CRebaseDlg::OnBnClickedSquashAll()
324 if(this->m_bSquashAll
)
325 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
327 this->m_bEditAll
=FALSE
;
328 this->m_bPickAll
=FALSE
;
329 this->UpdateData(FALSE
);
332 void CRebaseDlg::OnBnClickedEditAll()
335 if( this->m_bEditAll
)
336 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
338 this->m_bPickAll
=FALSE
;
339 this->m_bSquashAll
=FALSE
;
340 this->UpdateData(FALSE
);
343 void CRebaseDlg::SetAllRebaseAction(int action
)
345 for(int i
=0;i
<this->m_CommitList
.m_logEntries
.size();i
++)
347 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
)=action
;
349 m_CommitList
.Invalidate();
352 void CRebaseDlg::OnBnClickedRebaseSplit()
357 LRESULT
CRebaseDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
361 if (wParam
== IDC_REBASE_SPLIT
)
363 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
369 return __super::DefWindowProc(message
, wParam
, lParam
);
372 void CRebaseDlg::DoSize(int delta
)
374 this->RemoveAllAnchors();
376 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST
), delta
, CW_TOPALIGN
);
377 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
378 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB
), -delta
, CW_BOTTOMALIGN
);
379 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
380 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL
),0,delta
);
381 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL
),0,delta
);
382 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL
),0,delta
);
383 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2
),0,delta
);
384 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2
),0,delta
);
385 CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE
),0,delta
);
387 this->AddRebaseAnchor();
388 // adjust the minimum size of the dialog to prevent the resizing from
389 // moving the list control too far down.
391 m_CommitList
.GetClientRect(rcLogMsg
);
392 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_CommitListOrigRect
.Height()+rcLogMsg
.Height()));
395 // m_CommitList.Invalidate();
397 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
399 this->m_ctrlTabCtrl
.Invalidate();
400 this->m_CommitList
.Invalidate();
401 this->m_FileListCtrl
.Invalidate();
402 this->m_LogMessageCtrl
.Invalidate();
406 void CRebaseDlg::SetSplitterRange()
408 if ((m_CommitList
)&&(m_ctrlTabCtrl
))
411 m_CommitList
.GetWindowRect(rcTop
);
412 ScreenToClient(rcTop
);
414 m_ctrlTabCtrl
.GetWindowRect(rcMiddle
);
415 ScreenToClient(rcMiddle
);
416 if (rcMiddle
.Height() && rcMiddle
.Width())
417 m_wndSplitter
.SetRange(rcTop
.top
+60, rcMiddle
.bottom
-80);
421 void CRebaseDlg::OnSize(UINT nType
,int cx
, int cy
)
423 // first, let the resizing take place
424 __super::OnSize(nType
, cx
, cy
);
430 void CRebaseDlg::SaveSplitterPos()
434 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
436 m_wndSplitter
.GetWindowRect(&rectSplitter
);
437 ScreenToClient(&rectSplitter
);
438 regPos
= rectSplitter
.top
;
442 void CRebaseDlg::LoadBranchInfo()
444 m_BranchCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
445 m_UpstreamCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
450 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL
);
451 m_BranchCtrl
.AddString(list
);
452 m_BranchCtrl
.SetCurSel(current
);
454 g_Git
.GetBranchList(list
, NULL
, CGit::BRANCH_ALL_F
);
455 m_UpstreamCtrl
.AddString(list
);
457 AddBranchToolTips(&m_BranchCtrl
);
458 AddBranchToolTips(&m_UpstreamCtrl
);
460 if(!m_Upstream
.IsEmpty())
462 m_UpstreamCtrl
.AddString(m_Upstream
);
463 m_UpstreamCtrl
.SetCurSel(m_UpstreamCtrl
.GetCount()-1);
467 //Select pull-remote from current branch
468 CString currentBranch
= g_Git
.GetSymbolicRef();
470 configName
.Format(L
"branch.%s.remote", currentBranch
);
471 CString pullRemote
= g_Git
.GetConfigValue(configName
);
473 //Select pull-branch from current branch
474 configName
.Format(L
"branch.%s.merge", currentBranch
);
475 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
477 CString defaultUpstream
;
478 defaultUpstream
.Format(L
"remotes/%s/%s", pullRemote
, pullBranch
);
479 int found
= m_UpstreamCtrl
.FindStringExact(0, defaultUpstream
);
481 m_UpstreamCtrl
.SetCurSel(found
);
483 m_UpstreamCtrl
.SetCurSel(-1);
487 void CRebaseDlg::OnCbnSelchangeBranch()
492 void CRebaseDlg::OnCbnSelchangeUpstream()
497 void CRebaseDlg::FetchLogList()
500 m_IsFastForward
=FALSE
;
502 hash
=g_Git
.GetHash(m_BranchCtrl
.GetString());
504 if(hash
== g_Git
.GetHash(this->m_UpstreamCtrl
.GetString()))
506 m_CommitList
.Clear();
508 fmt
.LoadString(IDS_REBASE_EQUAL_FMT
);
509 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
511 m_CommitList
.ShowText(text
);
512 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
516 if (g_Git
.IsFastForward(m_BranchCtrl
.GetString(), m_UpstreamCtrl
.GetString(), &base
))
519 this->m_IsFastForward
=TRUE
;
521 m_CommitList
.Clear();
523 fmt
.LoadString(IDS_REBASE_FASTFORWARD_FMT
);
524 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString(),
525 m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
527 m_CommitList
.ShowText(text
);
528 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(true);
529 SetContinueButtonText();
538 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
542 m_CommitList
.Clear();
544 fmt
.LoadString(IDS_REBASE_UPTODATE_FMT
);
545 text
.Format(fmt
,m_BranchCtrl
.GetString());
546 m_CommitList
.ShowText(text
);
547 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
548 SetContinueButtonText();
553 m_CommitList
.Clear();
555 from
= m_UpstreamCtrl
.GetString();
556 to
= m_BranchCtrl
.GetString();
557 this->m_CommitList
.FillGitLog(NULL
,0,&from
,&to
);
559 if( m_CommitList
.GetItemCount() == 0 )
560 m_CommitList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_NOTHINGTOREBASE
)));
562 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
565 if(m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
.size() >=0 )
567 if(hash
== m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
[0])
569 m_CommitList
.Clear();
570 m_CommitList
.ShowText(_T("Nothing Rebase"));
576 AddBranchToolTips(&this->m_BranchCtrl
);
577 AddBranchToolTips(&this->m_UpstreamCtrl
);
579 for(int i
=0;i
<m_CommitList
.m_logEntries
.size();i
++)
581 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
) = CTGitPath::LOGACTIONS_REBASE_PICK
;
584 m_CommitList
.Invalidate();
586 if(m_CommitList
.m_IsOldFirst
)
587 this->m_CurrentRebaseIndex
= -1;
589 this->m_CurrentRebaseIndex
= (int)m_CommitList
.m_logEntries
.size();
591 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
592 SetContinueButtonText();
595 void CRebaseDlg::AddBranchToolTips(CHistoryCombo
*pBranch
)
599 CString text
=pBranch
->GetString();
605 tooltip
.Format(_T("%s: %s\n%s: %s <%s>\n%s: %s\n%s:\n%s\n%s"),
606 CString(MAKEINTRESOURCE(IDS_LOG_REVISION
)),
607 rev
.m_CommitHash
.ToString(),
608 CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR
)),
610 rev
.GetAuthorEmail(),
611 CString(MAKEINTRESOURCE(IDS_LOG_DATE
)),
612 CLoglistUtils::FormatDateAndTime(rev
.GetAuthorDate(), DATE_LONGDATE
),
613 CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE
)),
617 pBranch
->DisableTooltip();
618 this->m_tooltips
.AddTool(pBranch
->GetComboBoxCtrl(),tooltip
);
622 BOOL
CRebaseDlg::PreTranslateMessage(MSG
*pMsg
)
624 if (pMsg
->message
== WM_KEYDOWN
)
626 switch (pMsg
->wParam
)
629 if(LogListHasFocus(pMsg
->hwnd
))
631 m_CommitList
.ShiftSelectedAction();
636 if(LogListHasFocus(pMsg
->hwnd
))
638 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
643 if(LogListHasFocus(pMsg
->hwnd
))
645 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP
);
650 if(LogListHasFocus(pMsg
->hwnd
))
652 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
657 if(LogListHasFocus(pMsg
->hwnd
))
659 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
664 if(LogListHasFocus(pMsg
->hwnd
) && GetAsyncKeyState(VK_CONTROL
) & 0x8000)
666 // select all entries
667 for (int i
= 0; i
< m_CommitList
.GetItemCount(); ++i
)
669 m_CommitList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
682 if (GetAsyncKeyState(VK_CONTROL
) & 0x8000)
684 if (GetDlgItem(IDC_REBASE_CONTINUE
)->IsWindowEnabled())
685 GetDlgItem(IDC_REBASE_CONTINUE
)->SetFocus();
686 else if (GetDlgItem(IDC_REBASE_ABORT
)->IsWindowEnabled())
687 GetDlgItem(IDC_REBASE_ABORT
)->SetFocus();
689 GetDlgItem(IDHELP
)->SetFocus();
694 /* Avoid TAB control destroy but dialog exist*/
699 ::GetClassName(pMsg
->hwnd
,buff
,128);
702 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0 ||
703 _tcsnicmp(buff
,_T("Scintilla"),128)==0 ||
704 _tcsnicmp(buff
,_T("SysListView32"),128)==0||
705 ::GetParent(pMsg
->hwnd
) == this->m_ctrlTabCtrl
.m_hWnd
)
707 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
713 else if (pMsg
->message
== WM_NEXTDLGCTL
)
715 if (GetFocus()->GetSafeHwnd() == m_LogMessageCtrl
.GetSafeHwnd())
717 if (GetDlgItem(IDC_REBASE_CONTINUE
)->IsWindowEnabled())
718 GetDlgItem(IDC_REBASE_CONTINUE
)->SetFocus();
719 else if (GetDlgItem(IDC_REBASE_ABORT
)->IsWindowEnabled())
720 GetDlgItem(IDC_REBASE_ABORT
)->SetFocus();
722 GetDlgItem(IDHELP
)->SetFocus();
726 m_tooltips
.RelayEvent(pMsg
);
727 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
730 bool CRebaseDlg::LogListHasFocus(HWND hwnd
)
733 ::GetClassName(hwnd
, buff
, 128);
735 if(_tcsnicmp(buff
, _T("SysListView32"), 128) == 0)
740 int CRebaseDlg::CheckRebaseCondition()
742 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
744 if( !g_Git
.CheckCleanWorkTree() )
746 if (CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
, IDS_APPNAME
, 1, IDI_QUESTION
, IDS_STASHBUTTON
, IDS_ABORTBUTTON
) == 1)
749 cmd
=_T("git.exe stash");
750 this->AddLogString(cmd
);
751 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
753 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
761 //Todo Check $REBASE_ROOT
764 if (!CAppUtils::CheckUserData())
767 //Todo call pre_rebase_hook
770 int CRebaseDlg::StartRebase()
773 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
774 if(!this->m_IsCherryPick
)
776 //Todo call comment_for_reflog
777 cmd
.Format(_T("git.exe checkout %s"),this->m_BranchCtrl
.GetString());
778 this->AddLogString(cmd
);
782 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
784 this->AddLogString(out
);
785 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
792 this->AddLogString(out
);
795 cmd
=_T("git.exe rev-parse --verify HEAD");
796 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
798 AddLogString(CString(MAKEINTRESOURCE(IDS_PROC_NOHEAD
)));
802 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
803 // echo "detached HEAD" > "$DOTEST"/head-name
805 cmd
.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
806 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
808 AddLogString(_T("update ORIG_HEAD Fail"));
812 m_OrigUpstreamHash
.Empty();
813 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
814 if(m_OrigUpstreamHash
.IsEmpty())
816 this->AddLogString(m_OrigUpstreamHash
);
820 if( !this->m_IsCherryPick
)
822 cmd
.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash
.ToString());
823 this->AddLogString(cmd
);
827 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
829 this->AddLogString(out
);
830 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
839 if( !this->m_IsCherryPick
)
841 m_OrigBranchHash
= g_Git
.GetHash(this->m_BranchCtrl
.GetString());
842 if(m_OrigBranchHash
.IsEmpty())
844 this->AddLogString(m_OrigBranchHash
.ToString());
847 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTREBASE
)));
850 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTCHERRYPICK
)));
852 this->AddLogString(log
);
855 int CRebaseDlg::VerifyNoConflict()
858 if(g_Git
.ListConflictFile(list
))
860 AddLogString(_T("Get conflict files fail"));
863 if( list
.GetCount() != 0 )
865 CMessageBox::Show(NULL
, IDS_PROGRS_CONFLICTSOCCURED
, IDS_APPNAME
, MB_OK
);
871 int CRebaseDlg::FinishRebase()
873 if(this->m_IsCherryPick
) //cherry pick mode no "branch", working at upstream branch
876 git_revnum_t head
= g_Git
.GetHash(_T("HEAD"));
879 cmd
.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl
.GetString());
884 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
887 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
895 cmd
.Format(_T("git.exe reset --hard %s"),head
);
900 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
903 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
911 m_ctrlTabCtrl
.RemoveTab(0);
912 m_ctrlTabCtrl
.RemoveTab(0);
913 m_LogMessageCtrl
.ShowWindow(SW_HIDE
);
914 m_CtrlStatusText
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED
)));
918 void CRebaseDlg::OnBnClickedContinue()
920 if( m_RebaseStage
== REBASE_DONE
)
926 if( this->m_IsFastForward
)
929 CString oldbranch
= g_Git
.GetCurrentBranch();
930 if( oldbranch
!= m_BranchCtrl
.GetString() )
932 cmd
.Format(_T("git.exe checkout %s"),m_BranchCtrl
.GetString());
937 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
939 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
941 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
950 m_OrigBranchHash
= g_Git
.GetHash(m_BranchCtrl
.GetString());
951 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
953 if(!g_Git
.IsFastForward(this->m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString()))
955 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
956 AddLogString(_T("No fast forward possible.\r\nMaybe repository changed"));
960 cmd
.Format(_T("git.exe reset --hard %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
962 log
.Format(IDS_PROC_REBASE_FFTO
, m_UpstreamCtrl
.GetString());
963 this->AddLogString(log
);
966 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
970 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
972 AddLogString(CString(MAKEINTRESOURCE(IDS_FAIL
)));
974 if (CMessageBox::Show(m_hWnd
, out
+ _T("\nRetry?"), _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
981 AddLogString(CString(MAKEINTRESOURCE(IDS_DONE
)));
982 m_RebaseStage
= REBASE_DONE
;
983 UpdateCurrentStatus();
987 if( m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
989 if(CheckRebaseCondition())
991 m_RebaseStage
= REBASE_START
;
992 m_FileListCtrl
.Clear();
993 m_FileListCtrl
.m_CurrentVersion
= L
"";
994 m_ctrlTabCtrl
.SetTabLabel(REBASE_TAB_CONFLICT
, CString(MAKEINTRESOURCE(IDS_PROC_CONFLICTFILES
)));
995 m_ctrlTabCtrl
.AddTab(&m_wndOutputRebase
, CString(MAKEINTRESOURCE(IDS_LOG
)), 2);
998 if( m_RebaseStage
== REBASE_FINISH
)
1006 if( m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
1008 if(VerifyNoConflict())
1010 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1011 if(this->CheckNextCommitIsSquash())
1012 {//next commit is not squash;
1013 m_RebaseStage
= REBASE_SQUASH_EDIT
;
1014 this->OnRebaseUpdateUI(0,0);
1015 this->UpdateCurrentStatus();
1019 m_RebaseStage
=REBASE_CONTINUE
;
1020 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1021 this->UpdateCurrentStatus();
1025 if( m_RebaseStage
== REBASE_CONFLICT
)
1027 if(VerifyNoConflict())
1030 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1032 CString out
=_T("");
1034 cmd
.Format(_T("git.exe commit -a -C %s"), curRev
->m_CommitHash
.ToString());
1038 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1041 if(!g_Git
.CheckCleanWorkTree())
1043 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1049 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1050 if( curRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_EDIT
)
1052 m_RebaseStage
=REBASE_EDIT
;
1053 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1054 this->UpdateCurrentStatus();
1059 m_RebaseStage
=REBASE_CONTINUE
;
1060 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1061 this->UpdateCurrentStatus();
1065 if( m_RebaseStage
== REBASE_EDIT
|| m_RebaseStage
== REBASE_SQUASH_EDIT
)
1068 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1070 str
=this->m_LogMessageCtrl
.GetText();
1071 if(str
.Trim().IsEmpty())
1073 CMessageBox::Show(NULL
, IDS_PROC_COMMITMESSAGE_EMPTY
,IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1077 CString tempfile
=::GetTempFile();
1078 CAppUtils::SaveCommitUnicodeFile(tempfile
, str
);
1082 if( m_RebaseStage
== REBASE_SQUASH_EDIT
)
1083 cmd
.Format(_T("git.exe commit -F \"%s\""), tempfile
);
1085 cmd
.Format(_T("git.exe commit --amend -F \"%s\""), tempfile
);
1087 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1089 if(!g_Git
.CheckCleanWorkTree())
1091 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1096 CFile::Remove(tempfile
);
1098 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1099 m_RebaseStage
=REBASE_CONTINUE
;
1100 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1101 this->UpdateCurrentStatus();
1105 InterlockedExchange(&m_bThreadRunning
, TRUE
);
1108 if (AfxBeginThread(RebaseThreadEntry
, this)==NULL
)
1110 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1111 CMessageBox::Show(NULL
, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1115 int CRebaseDlg::CheckNextCommitIsSquash()
1118 if(m_CommitList
.m_IsOldFirst
)
1119 index
=m_CurrentRebaseIndex
+1;
1121 index
=m_CurrentRebaseIndex
-1;
1128 if(index
>= m_CommitList
.GetItemCount())
1131 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[index
];
1133 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1135 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
)
1137 if(m_CommitList
.m_IsOldFirst
)
1145 }while(curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
);
1150 int CRebaseDlg::GoNext()
1152 if(m_CommitList
.m_IsOldFirst
)
1153 m_CurrentRebaseIndex
++;
1155 m_CurrentRebaseIndex
--;
1159 int CRebaseDlg::StateAction()
1161 switch(this->m_RebaseStage
)
1164 case CHOOSE_COMMIT_PICK_MODE
:
1167 m_RebaseStage
= REBASE_START
;
1174 void CRebaseDlg::SetContinueButtonText()
1177 switch(this->m_RebaseStage
)
1180 case CHOOSE_COMMIT_PICK_MODE
:
1181 if(this->m_IsFastForward
)
1182 Text
.LoadString(IDS_PROC_STARTREBASEFFBUTTON
);
1184 Text
.LoadString(IDS_PROC_STARTREBASEBUTTON
);
1188 case REBASE_CONTINUE
:
1189 case REBASE_SQUASH_CONFLICT
:
1190 Text
.LoadString(IDS_CONTINUEBUTTON
);
1193 case REBASE_CONFLICT
:
1194 Text
.LoadString(IDS_COMMITBUTTON
);
1197 Text
.LoadString(IDS_AMENDBUTTON
);
1200 case REBASE_SQUASH_EDIT
:
1201 Text
.LoadString(IDS_COMMITBUTTON
);
1206 Text
.LoadString(IDS_FINISHBUTTON
);
1210 Text
.LoadString(IDS_DONE
);
1213 this->GetDlgItem(IDC_REBASE_CONTINUE
)->SetWindowText(Text
);
1216 void CRebaseDlg::SetControlEnable()
1218 switch(this->m_RebaseStage
)
1221 case CHOOSE_COMMIT_PICK_MODE
:
1223 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(TRUE
);
1224 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(TRUE
);
1225 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(TRUE
);
1226 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(TRUE
);
1227 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(TRUE
);
1231 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(TRUE
);
1232 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(TRUE
);
1233 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(TRUE
);
1235 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1236 this->m_CommitList
.m_ContextMenuMask
|= m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1237 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1238 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1239 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
);
1243 case REBASE_CONTINUE
:
1246 case REBASE_CONFLICT
:
1248 case REBASE_SQUASH_CONFLICT
:
1250 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(FALSE
);
1251 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(FALSE
);
1252 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(FALSE
);
1253 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(FALSE
);
1254 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(FALSE
);
1255 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(FALSE
);
1256 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(FALSE
);
1257 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(FALSE
);
1258 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1259 this->m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1260 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1261 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1262 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
));
1264 if( m_RebaseStage
== REBASE_DONE
&& (this->m_PostButtonTexts
.GetCount() != 0) )
1266 this->GetDlgItem(IDC_STATUS_STATIC
)->ShowWindow(SW_HIDE
);
1267 this->GetDlgItem(IDC_REBASE_POST_BUTTON
)->ShowWindow(SW_SHOWNORMAL
);
1268 this->m_PostButton
.RemoveAll();
1269 this->m_PostButton
.AddEntries(m_PostButtonTexts
);
1270 //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1275 if(m_bThreadRunning
)
1277 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1282 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(TRUE
);
1286 void CRebaseDlg::UpdateProgress()
1291 if(m_CommitList
.m_IsOldFirst
)
1292 index
= m_CurrentRebaseIndex
+1;
1294 index
= m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1296 m_ProgressBar
.SetRange32(1, m_CommitList
.GetItemCount());
1297 m_ProgressBar
.SetPos(index
);
1300 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1301 m_pTaskbarList
->SetProgressValue(m_hWnd
, index
, m_CommitList
.GetItemCount());
1304 if(m_CurrentRebaseIndex
>=0 && m_CurrentRebaseIndex
< m_CommitList
.GetItemCount())
1307 text
.Format(IDS_PROC_REBASING_PROGRESS
, index
, m_CommitList
.GetItemCount());
1308 m_CtrlStatusText
.SetWindowText(text
);
1312 GitRev
*prevRev
=NULL
, *curRev
=NULL
;
1314 if( m_CurrentRebaseIndex
>= 0 && m_CurrentRebaseIndex
< m_CommitList
.m_arShownList
.GetSize())
1316 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1319 for(int i
=0;i
<m_CommitList
.m_arShownList
.GetSize();i
++)
1321 prevRev
=(GitRev
*)m_CommitList
.m_arShownList
[i
];
1322 if(prevRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_CURRENT
)
1324 prevRev
->GetAction(&m_CommitList
) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1325 m_CommitList
.GetItemRect(i
,&rect
,LVIR_BOUNDS
);
1326 m_CommitList
.InvalidateRect(rect
);
1332 curRev
->GetAction(&m_CommitList
) |= CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1333 m_CommitList
.GetItemRect(m_CurrentRebaseIndex
,&rect
,LVIR_BOUNDS
);
1334 m_CommitList
.InvalidateRect(rect
);
1336 m_CommitList
.EnsureVisible(m_CurrentRebaseIndex
,FALSE
);
1339 void CRebaseDlg::UpdateCurrentStatus()
1341 SetContinueButtonText();
1346 void CRebaseDlg::AddLogString(CString str
)
1348 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, FALSE
);
1349 CStringA sTextA
= m_wndOutputRebase
.StringForControl(str
);//CUnicodeUtils::GetUTF8(str);
1350 this->m_wndOutputRebase
.SendMessage(SCI_DOCUMENTEND
);
1351 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)sTextA
);
1352 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)"\n");
1353 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, TRUE
);
1356 int CRebaseDlg::GetCurrentCommitID()
1358 if(m_CommitList
.m_IsOldFirst
)
1360 return this->m_CurrentRebaseIndex
+1;
1365 return m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1369 int CRebaseDlg::DoRebase()
1372 if(m_CurrentRebaseIndex
<0)
1374 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1377 GitRev
*pRev
= (GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1378 int mode
=pRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK
;
1381 if( mode
== CTGitPath::LOGACTIONS_REBASE_SKIP
)
1383 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1387 if (!CheckNextCommitIsSquash() || mode
!= CTGitPath::LOGACTIONS_REBASE_PICK
)
1388 { // next commit is squash or not pick
1389 if (!this->m_SquashMessage
.IsEmpty())
1390 this->m_SquashMessage
+= _T("\n\n");
1391 this->m_SquashMessage
+= pRev
->GetSubject();
1392 this->m_SquashMessage
+= _T("\n");
1393 this->m_SquashMessage
+= pRev
->GetBody().TrimRight();
1396 this->m_SquashMessage
.Empty();
1398 if (!CheckNextCommitIsSquash() || mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1399 { // next or this commit is squash
1400 nocommit
=_T(" --no-commit ");
1404 log
.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode
),this->GetCurrentCommitID(),pRev
->m_CommitHash
.ToString());
1406 AddLogString(pRev
->GetSubject());
1407 if (pRev
->GetSubject().IsEmpty())
1409 CMessageBox::Show(m_hWnd
, IDS_PROC_REBASE_EMPTYCOMMITMSG
, IDS_APPNAME
, MB_OK
| MB_ICONEXCLAMATION
);
1410 mode
= CTGitPath::LOGACTIONS_REBASE_EDIT
;
1413 CString cherryPickedFrom
;
1414 if (m_bAddCherryPickedFrom
)
1415 cherryPickedFrom
= _T("-x ");
1417 cmd
.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom
, nocommit
, pRev
->m_CommitHash
.ToString());
1419 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1423 if(g_Git
.ListConflictFile(list
))
1425 AddLogString(_T("Get conflict files fail"));
1428 if(list
.GetCount() == 0 )
1430 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1432 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1435 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1437 this->m_RebaseStage
= REBASE_EDIT
;
1438 return -1; // Edit return -1 to stop rebase.
1441 if(CheckNextCommitIsSquash())
1443 // let user edit last commmit message
1444 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1448 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1449 m_RebaseStage
= REBASE_SQUASH_CONFLICT
;
1451 m_RebaseStage
= REBASE_CONFLICT
;
1458 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1460 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1463 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1465 this->m_RebaseStage
= REBASE_EDIT
;
1466 return -1; // Edit return -1 to stop rebase.
1470 if(CheckNextCommitIsSquash())
1472 // let user edit last commmit message
1473 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1476 else if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1477 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1483 BOOL
CRebaseDlg::IsEnd()
1485 if(m_CommitList
.m_IsOldFirst
)
1486 return m_CurrentRebaseIndex
>= this->m_CommitList
.GetItemCount();
1488 return m_CurrentRebaseIndex
<0;
1491 int CRebaseDlg::RebaseThread()
1493 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
1498 if( m_RebaseStage
== REBASE_START
)
1500 if( this->StartRebase() )
1502 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1504 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1507 m_RebaseStage
= REBASE_CONTINUE
;
1510 else if( m_RebaseStage
== REBASE_CONTINUE
)
1513 UpdateCurrentStatus();
1517 m_RebaseStage
= REBASE_FINISH
;
1531 else if( m_RebaseStage
== REBASE_FINISH
)
1534 m_RebaseStage
= REBASE_DONE
;
1536 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1544 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1545 //this->UpdateCurrentStatus();
1548 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1549 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1553 void CRebaseDlg::ListConflictFile()
1555 this->m_FileListCtrl
.Clear();
1560 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
1562 this->m_FileListCtrl
.GetStatus(&list
,true);
1563 this->m_FileListCtrl
.Show(CTGitPath::LOGACTIONS_UNMERGED
|CTGitPath::LOGACTIONS_MODIFIED
|CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_DELETED
,
1564 CTGitPath::LOGACTIONS_UNMERGED
);
1567 LRESULT
CRebaseDlg::OnRebaseUpdateUI(WPARAM
,LPARAM
)
1569 UpdateCurrentStatus();
1570 if(m_CurrentRebaseIndex
<0)
1572 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1574 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1576 switch(m_RebaseStage
)
1578 case REBASE_CONFLICT
:
1579 case REBASE_SQUASH_CONFLICT
:
1581 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_CONFLICT
);
1583 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1584 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1585 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1588 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1590 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1591 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1592 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1594 case REBASE_SQUASH_EDIT
:
1595 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1596 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1597 this->m_LogMessageCtrl
.SetText(this->m_SquashMessage
);
1599 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1602 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1606 void CRebaseDlg::OnCancel()
1610 void CRebaseDlg::OnBnClickedAbort()
1613 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1616 CString pron
= m_OrigUpstreamHash
.ToString();
1617 if(m_OrigUpstreamHash
.IsEmpty())
1619 __super::OnCancel();
1622 if(m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
1627 if(CMessageBox::Show(NULL
, IDS_PROC_REBASE_ABORT
, IDS_APPNAME
, MB_YESNO
) != IDYES
)
1630 if(this->m_IsFastForward
)
1632 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1636 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1639 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1645 __super::OnCancel();
1648 cmd
.Format(_T("git.exe checkout -f %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
1652 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1655 if (CMessageBox::Show(this->m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1657 __super::OnCancel();
1665 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash
.ToString());
1669 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1672 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1674 __super::OnCancel();
1682 if(this->m_IsCherryPick
) //there are not "branch" at cherry pick mode
1684 __super::OnCancel();
1688 cmd
.Format(_T("git checkout -f %s"),this->m_BranchCtrl
.GetString());
1689 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1692 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1693 __super::OnCancel();
1697 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1701 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1704 if (CMessageBox::Show(m_hWnd
, _T("Retry?\nUnrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_YESNO
| MB_ICONERROR
) != IDYES
)
1710 __super::OnCancel();
1713 void CRebaseDlg::OnBnClickedButtonBrowse()
1715 if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl
, gPickRef_NoTag
))
1716 OnCbnSelchangeUpstream();
1719 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1722 this->FetchLogList();
1723 if(this->CheckRebaseCondition())
1725 /* Disable Start Rebase */
1726 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1730 void CRebaseDlg::OnBnClickedRebasePostButton()
1732 this->m_Upstream
=this->m_UpstreamCtrl
.GetString();
1733 this->m_Branch
=this->m_BranchCtrl
.GetString();
1735 this->EndDialog((int)(IDC_REBASE_POST_BUTTON
+this->m_PostButton
.GetCurrentEntry()));
1738 LRESULT
CRebaseDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
1744 void CRebaseDlg::Refresh()
1746 if (m_RebaseStage
== REBASE_CONFLICT
|| m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
1752 if(this->m_IsCherryPick
)
1755 if(this->m_RebaseStage
== CHOOSE_BRANCH
)
1758 this->FetchLogList();
1759 if(this->CheckRebaseCondition())
1761 /* Disable Start Rebase */
1762 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1767 void CRebaseDlg::OnBnClickedButtonUp2()
1770 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1772 // do nothing if the first selected item is the first item in the list
1773 if (m_CommitList
.GetNextSelectedItem(pos
) == 0)
1776 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1778 bool changed
= false;
1781 int index
=m_CommitList
.GetNextSelectedItem(pos
);
1784 CGitHash old
= m_CommitList
.m_logEntries
[index
-1];
1785 m_CommitList
.m_logEntries
[index
-1] = m_CommitList
.m_logEntries
[index
];
1786 m_CommitList
.m_logEntries
[index
] = old
;
1787 m_CommitList
.SetItemState(index
-1, LVIS_SELECTED
, LVIS_SELECTED
);
1788 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1794 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1795 m_CommitList
.Invalidate();
1796 m_CommitList
.SetFocus();
1800 void CRebaseDlg::OnBnClickedButtonDown2()
1802 if (m_CommitList
.GetSelectedCount() == 0)
1806 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1807 bool changed
= false;
1808 // use an array to store all selected item indexes; the user won't select too much items
1809 int* indexes
= NULL
;
1810 indexes
= new int[m_CommitList
.GetSelectedCount()];
1814 indexes
[i
++] = m_CommitList
.GetNextSelectedItem(pos
);
1816 // don't move any item if the last selected item is the last item in the m_CommitList
1817 // (that would change the order of the selected items)
1818 if(indexes
[m_CommitList
.GetSelectedCount() - 1] < m_CommitList
.GetItemCount() - 1)
1820 // iterate over the indexes backwards in order to correctly move multiselected items
1821 for (i
= m_CommitList
.GetSelectedCount() - 1; i
>= 0; i
--)
1823 int index
= indexes
[i
];
1824 CGitHash old
= m_CommitList
.m_logEntries
[index
+1];
1825 m_CommitList
.m_logEntries
[index
+1] = m_CommitList
.m_logEntries
[index
];
1826 m_CommitList
.m_logEntries
[index
] = old
;
1827 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1828 m_CommitList
.SetItemState(index
+1, LVIS_SELECTED
, LVIS_SELECTED
);
1836 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1837 m_CommitList
.Invalidate();
1838 m_CommitList
.SetFocus();
1842 LRESULT
CRebaseDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1844 m_pTaskbarList
.Release();
1845 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1849 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1851 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1853 if(m_CommitList
.m_bNoDispUpdates
)
1855 if (pNMLV
->iItem
>= 0)
1857 this->m_CommitList
.m_nSearchIndex
= pNMLV
->iItem
;
1858 if (pNMLV
->iSubItem
!= 0)
1860 if ((pNMLV
->iItem
== m_CommitList
.m_arShownList
.GetCount()))
1862 // remove the selected state
1863 if (pNMLV
->uChanged
& LVIF_STATE
)
1865 m_CommitList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1866 FillLogMessageCtrl();
1870 if (pNMLV
->uChanged
& LVIF_STATE
)
1872 FillLogMessageCtrl();
1877 FillLogMessageCtrl();
1881 void CRebaseDlg::FillLogMessageCtrl()
1883 int selCount
= m_CommitList
.GetSelectedCount();
1884 if (selCount
== 1 && (m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
))
1886 POSITION pos
= m_CommitList
.GetFirstSelectedItemPosition();
1887 int selIndex
= m_CommitList
.GetNextSelectedItem(pos
);
1888 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_CommitList
.m_arShownList
.SafeGetAt(selIndex
));
1889 m_FileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_CommitList
));
1890 m_FileListCtrl
.m_CurrentVersion
= pLogEntry
->m_CommitHash
;
1891 m_FileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
1892 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1893 m_LogMessageCtrl
.SetText(pLogEntry
->GetSubject() + _T("\n") + pLogEntry
->GetBody());
1894 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
1897 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()