1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2011 - TortoiseGit
4 // Copyright (C) 2011 - 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 "MessageBox.h"
29 #include "UnicodeUtils.h"
30 #include "BrowseRefsDlg.h"
31 #include "ProgressDlg.h"
34 IMPLEMENT_DYNAMIC(CRebaseDlg
, CResizableStandAloneDialog
)
36 CRebaseDlg::CRebaseDlg(CWnd
* pParent
/*=NULL*/)
37 : CResizableStandAloneDialog(CRebaseDlg::IDD
, pParent
)
42 m_RebaseStage
=CHOOSE_BRANCH
;
43 m_CurrentRebaseIndex
=-1;
44 m_bThreadRunning
=FALSE
;
45 this->m_IsCherryPick
= FALSE
;
47 m_IsFastForward
=FALSE
;
50 CRebaseDlg::~CRebaseDlg()
54 void CRebaseDlg::DoDataExchange(CDataExchange
* pDX
)
56 CDialog::DoDataExchange(pDX
);
57 DDX_Control(pDX
, IDC_REBASE_PROGRESS
, m_ProgressBar
);
58 DDX_Control(pDX
, IDC_STATUS_STATIC
, m_CtrlStatusText
);
59 DDX_Check(pDX
, IDC_PICK_ALL
, m_bPickAll
);
60 DDX_Check(pDX
, IDC_SQUASH_ALL
, m_bSquashAll
);
61 DDX_Check(pDX
, IDC_EDIT_ALL
, m_bEditAll
);
62 DDX_Control(pDX
, IDC_REBASE_SPLIT
, m_wndSplitter
);
63 DDX_Control(pDX
,IDC_COMMIT_LIST
,m_CommitList
);
64 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_BRANCH
, this->m_BranchCtrl
);
65 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_UPSTREAM
, this->m_UpstreamCtrl
);
66 DDX_Check(pDX
, IDC_REBASE_CHECK_FORCE
,m_bForce
);
67 DDX_Control(pDX
,IDC_REBASE_POST_BUTTON
,m_PostButton
);
71 BEGIN_MESSAGE_MAP(CRebaseDlg
, CResizableStandAloneDialog
)
72 ON_BN_CLICKED(IDC_PICK_ALL
, &CRebaseDlg::OnBnClickedPickAll
)
73 ON_BN_CLICKED(IDC_SQUASH_ALL
, &CRebaseDlg::OnBnClickedSquashAll
)
74 ON_BN_CLICKED(IDC_EDIT_ALL
, &CRebaseDlg::OnBnClickedEditAll
)
75 ON_BN_CLICKED(IDC_REBASE_SPLIT
, &CRebaseDlg::OnBnClickedRebaseSplit
)
76 ON_BN_CLICKED(IDC_REBASE_CONTINUE
,OnBnClickedContinue
)
77 ON_BN_CLICKED(IDC_REBASE_ABORT
, OnBnClickedAbort
)
79 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH
, &CRebaseDlg::OnCbnSelchangeBranch
)
80 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM
, &CRebaseDlg::OnCbnSelchangeUpstream
)
81 ON_MESSAGE(MSG_REBASE_UPDATE_UI
, OnRebaseUpdateUI
)
82 ON_BN_CLICKED(IDC_BUTTON_BROWSE
, &CRebaseDlg::OnBnClickedButtonBrowse
)
83 ON_BN_CLICKED(IDC_REBASE_CHECK_FORCE
, &CRebaseDlg::OnBnClickedRebaseCheckForce
)
84 ON_BN_CLICKED(IDC_REBASE_POST_BUTTON
, &CRebaseDlg::OnBnClickedRebasePostButton
)
85 ON_BN_CLICKED(IDC_BUTTON_UP2
, &CRebaseDlg::OnBnClickedButtonUp2
)
86 ON_BN_CLICKED(IDC_BUTTON_DOWN2
, &CRebaseDlg::OnBnClickedButtonDown2
)
87 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
90 void CRebaseDlg::AddRebaseAnchor()
92 AddAnchor(IDC_REBASE_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
93 AddAnchor(IDC_COMMIT_LIST
,TOP_LEFT
, TOP_RIGHT
);
94 AddAnchor(IDC_REBASE_SPLIT
,TOP_LEFT
, TOP_RIGHT
);
95 AddAnchor(IDC_STATUS_STATIC
, BOTTOM_LEFT
,BOTTOM_RIGHT
);
96 AddAnchor(IDC_REBASE_CONTINUE
,BOTTOM_RIGHT
);
97 AddAnchor(IDC_REBASE_ABORT
, BOTTOM_RIGHT
);
98 AddAnchor(IDC_REBASE_PROGRESS
,BOTTOM_LEFT
, BOTTOM_RIGHT
);
99 AddAnchor(IDC_PICK_ALL
,TOP_LEFT
);
100 AddAnchor(IDC_SQUASH_ALL
,TOP_LEFT
);
101 AddAnchor(IDC_EDIT_ALL
,TOP_LEFT
);
102 AddAnchor(IDC_BUTTON_UP2
,TOP_LEFT
);
103 AddAnchor(IDC_BUTTON_DOWN2
,TOP_LEFT
);
104 AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM
,TOP_LEFT
);
105 AddAnchor(IDC_REBASE_COMBOXEX_BRANCH
,TOP_LEFT
);
106 AddAnchor(IDC_REBASE_STATIC_UPSTREAM
,TOP_LEFT
);
107 AddAnchor(IDC_REBASE_STATIC_BRANCH
,TOP_LEFT
);
108 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
109 AddAnchor(IDC_REBASE_CHECK_FORCE
,TOP_RIGHT
);
110 AddAnchor(IDC_REBASE_POST_BUTTON
,BOTTOM_LEFT
);
112 this->AddOthersToAnchor();
115 BOOL
CRebaseDlg::OnInitDialog()
117 CResizableStandAloneDialog::OnInitDialog();
119 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
120 // do this, Explorer would be unable to send that message to our window if we
121 // were running elevated. It's OK to make the call all the time, since if we're
122 // not elevated, this is a no-op.
123 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
124 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
125 HMODULE hUser
= ::LoadLibrary(_T("user32.dll"));
128 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
129 if (pfnChangeWindowMessageFilterEx
)
131 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
135 m_pTaskbarList
.Release();
136 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
139 //IDC_REBASE_DUMY_TAB
141 GetClientRect(m_DlgOrigRect
);
142 m_CommitList
.GetClientRect(m_CommitListOrigRect
);
144 CWnd
*pwnd
=this->GetDlgItem(IDC_REBASE_DUMY_TAB
);
145 pwnd
->GetWindowRect(&rectDummy
);
146 this->ScreenToClient(rectDummy
);
148 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_REBASE_TAB
))
150 TRACE0("Failed to create output tab window\n");
151 return FALSE
; // fail to create
153 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
154 // Create output panes:
155 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
156 DWORD dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
|LVS_SINGLESEL
|WS_CHILD
| WS_VISIBLE
;
158 if (! this->m_FileListCtrl
.Create(dwStyle
,rectDummy
,&this->m_ctrlTabCtrl
,0) )
160 TRACE0("Failed to create output windows\n");
161 return FALSE
; // fail to create
164 if( ! this->m_LogMessageCtrl
.Create(_T("Scintilla"),_T("source"),0,rectDummy
,&m_ctrlTabCtrl
,0,0) )
166 TRACE0("Failed to create log message control");
169 m_LogMessageCtrl
.Init(0);
171 dwStyle
= LBS_NOINTEGRALHEIGHT
| WS_CHILD
| WS_VISIBLE
| WS_HSCROLL
| WS_VSCROLL
;
173 if (!m_wndOutputRebase
.Create(_T("Scintilla"),_T("source"),0,rectDummy
, &m_ctrlTabCtrl
, 0,0) )
175 TRACE0("Failed to create output windows\n");
176 return -1; // fail to create
178 m_wndOutputRebase
.Init(0);
179 m_wndOutputRebase
.Call(SCI_SETREADONLY
, TRUE
);
181 m_tooltips
.Create(this);
183 m_tooltips
.AddTool(IDC_REBASE_CHECK_FORCE
,IDS_REBASE_FORCE_TT
);
184 m_tooltips
.AddTool(IDC_REBASE_ABORT
,IDS_REBASE_ABORT_TT
);
188 m_FileListCtrl
.Init(SVNSLC_COLEXT
| SVNSLC_COLSTATUS
|SVNSLC_COLADD
|SVNSLC_COLDEL
, _T("RebaseDlg"),(SVNSLC_POPALL
^ SVNSLC_POPCOMMIT
),false);
190 m_ctrlTabCtrl
.AddTab(&m_FileListCtrl
,_T("Conflict File"));
191 m_ctrlTabCtrl
.AddTab(&m_LogMessageCtrl
,_T("Commit Message"),1);
192 m_ctrlTabCtrl
.AddTab(&m_wndOutputRebase
,_T("Log"),2);
196 EnableSaveRestore(_T("RebaseDlg"));
198 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
199 RECT rcDlg
, rcLogMsg
, rcFileList
;
200 GetClientRect(&rcDlg
);
201 m_CommitList
.GetWindowRect(&rcLogMsg
);
202 ScreenToClient(&rcLogMsg
);
203 this->m_ctrlTabCtrl
.GetWindowRect(&rcFileList
);
204 ScreenToClient(&rcFileList
);
208 m_wndSplitter
.GetWindowRect(&rectSplitter
);
209 ScreenToClient(&rectSplitter
);
210 int delta
= yPos
- rectSplitter
.top
;
211 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
213 m_wndSplitter
.SetWindowPos(NULL
, 0, yPos
, 0, 0, SWP_NOSIZE
);
218 if( this->m_RebaseStage
== CHOOSE_BRANCH
)
220 this->LoadBranchInfo();
224 this->m_BranchCtrl
.EnableWindow(FALSE
);
225 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
228 m_CommitList
.m_ColumnRegKey
= _T("Rebase");
229 m_CommitList
.m_IsIDReplaceAction
= TRUE
;
230 // m_CommitList.m_IsOldFirst = TRUE;
231 m_CommitList
.m_IsRebaseReplaceGraph
= TRUE
;
233 m_CommitList
.InsertGitColumn();
235 this->SetControlEnable();
237 if(!this->m_PreCmd
.IsEmpty())
239 CProgressDlg progress
;
240 progress
.m_GitCmd
=m_PreCmd
;
241 progress
.m_bAutoCloseOnSuccess
=true;
247 this->m_BranchCtrl
.SetCurSel(-1);
248 this->m_BranchCtrl
.EnableWindow(FALSE
);
249 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
250 this->SetWindowText(_T("Cherry Pick"));
251 this->m_CommitList
.StartFilter();
255 SetContinueButtonText();
256 m_CommitList
.DeleteAllItems();
260 m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK
)|
261 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV
)|
262 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_RESET
)|
263 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTREV
)|
264 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION
)|
265 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV
)|
266 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT
));
268 if(m_CommitList
.m_IsOldFirst
)
269 this->m_CurrentRebaseIndex
= -1;
271 this->m_CurrentRebaseIndex
= m_CommitList
.m_logEntries
.size();
274 if(this->CheckRebaseCondition())
276 /* Disable Start Rebase */
277 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
282 // CRebaseDlg message handlers
284 void CRebaseDlg::OnBnClickedPickAll()
288 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
290 this->m_bEditAll
=FALSE
;
291 this->m_bSquashAll
=FALSE
;
292 this->UpdateData(FALSE
);
295 void CRebaseDlg::OnBnClickedSquashAll()
298 if(this->m_bSquashAll
)
299 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
301 this->m_bEditAll
=FALSE
;
302 this->m_bPickAll
=FALSE
;
303 this->UpdateData(FALSE
);
306 void CRebaseDlg::OnBnClickedEditAll()
309 if( this->m_bEditAll
)
310 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
312 this->m_bPickAll
=FALSE
;
313 this->m_bSquashAll
=FALSE
;
314 this->UpdateData(FALSE
);
317 void CRebaseDlg::SetAllRebaseAction(int action
)
319 for(int i
=0;i
<this->m_CommitList
.m_logEntries
.size();i
++)
321 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
)=action
;
323 m_CommitList
.Invalidate();
326 void CRebaseDlg::OnBnClickedRebaseSplit()
331 LRESULT
CRebaseDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
335 if (wParam
== IDC_REBASE_SPLIT
)
337 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
343 return __super::DefWindowProc(message
, wParam
, lParam
);
346 void CRebaseDlg::DoSize(int delta
)
348 this->RemoveAllAnchors();
350 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST
), delta
, CW_TOPALIGN
);
351 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
352 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB
), -delta
, CW_BOTTOMALIGN
);
353 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
354 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL
),0,delta
);
355 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL
),0,delta
);
356 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL
),0,delta
);
357 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2
),0,delta
);
358 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2
),0,delta
);
359 CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE
),0,delta
);
361 this->AddRebaseAnchor();
362 // adjust the minimum size of the dialog to prevent the resizing from
363 // moving the list control too far down.
365 m_CommitList
.GetClientRect(rcLogMsg
);
366 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_CommitListOrigRect
.Height()+rcLogMsg
.Height()));
369 // m_CommitList.Invalidate();
371 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
373 this->m_ctrlTabCtrl
.Invalidate();
374 this->m_CommitList
.Invalidate();
375 this->m_FileListCtrl
.Invalidate();
376 this->m_LogMessageCtrl
.Invalidate();
380 void CRebaseDlg::SetSplitterRange()
382 if ((m_CommitList
)&&(m_ctrlTabCtrl
))
385 m_CommitList
.GetWindowRect(rcTop
);
386 ScreenToClient(rcTop
);
388 m_ctrlTabCtrl
.GetWindowRect(rcMiddle
);
389 ScreenToClient(rcMiddle
);
390 if (rcMiddle
.Height() && rcMiddle
.Width())
391 m_wndSplitter
.SetRange(rcTop
.top
+60, rcMiddle
.bottom
-80);
395 void CRebaseDlg::OnSize(UINT nType
,int cx
, int cy
)
397 // first, let the resizing take place
398 __super::OnSize(nType
, cx
, cy
);
404 void CRebaseDlg::SaveSplitterPos()
408 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
410 m_wndSplitter
.GetWindowRect(&rectSplitter
);
411 ScreenToClient(&rectSplitter
);
412 regPos
= rectSplitter
.top
;
416 void CRebaseDlg::LoadBranchInfo()
418 m_BranchCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
419 m_UpstreamCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
424 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL
);
425 m_BranchCtrl
.AddString(list
);
427 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL_F
);
428 m_UpstreamCtrl
.AddString(list
);
430 m_BranchCtrl
.SetCurSel(current
);
432 AddBranchToolTips(&m_BranchCtrl
);
433 AddBranchToolTips(&m_UpstreamCtrl
);
435 if(!m_Upstream
.IsEmpty())
437 m_UpstreamCtrl
.AddString(m_Upstream
);
438 m_UpstreamCtrl
.SetCurSel(m_UpstreamCtrl
.GetCount()-1);
442 //Select pull-remote from current branch
443 CString currentBranch
= g_Git
.GetSymbolicRef();
445 configName
.Format(L
"branch.%s.remote", currentBranch
);
446 CString pullRemote
= g_Git
.GetConfigValue(configName
);
448 //Select pull-branch from current branch
449 configName
.Format(L
"branch.%s.merge", currentBranch
);
450 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
452 CString defaultUpstream
;
453 defaultUpstream
.Format(L
"remotes/%s/%s", pullRemote
, pullBranch
);
454 int found
= m_UpstreamCtrl
.FindStringExact(0, defaultUpstream
);
456 m_UpstreamCtrl
.SetCurSel(found
);
460 void CRebaseDlg::OnCbnSelchangeBranch()
465 void CRebaseDlg::OnCbnSelchangeUpstream()
470 void CRebaseDlg::FetchLogList()
475 m_IsFastForward
=FALSE
;
476 cmd
.Format(_T("git.exe merge-base %s %s"), g_Git
.FixBranchName(m_UpstreamCtrl
.GetString()),
477 g_Git
.FixBranchName(m_BranchCtrl
.GetString()));
478 if(g_Git
.Run(cmd
,&basestr
,CP_ACP
))
480 CMessageBox::Show(NULL
,basestr
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
485 hash
=g_Git
.GetHash(m_BranchCtrl
.GetString());
487 if(hash
== g_Git
.GetHash(this->m_UpstreamCtrl
.GetString()))
489 m_CommitList
.Clear();
491 fmt
.LoadString(IDS_REBASE_EQUAL_FMT
);
492 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
494 m_CommitList
.ShowText(text
);
495 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
502 this->m_IsFastForward
=TRUE
;
504 m_CommitList
.Clear();
506 fmt
.LoadString(IDS_REBASE_FASTFORWARD_FMT
);
507 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString(),
508 m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
510 m_CommitList
.ShowText(text
);
511 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(true);
512 SetContinueButtonText();
521 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
525 m_CommitList
.Clear();
527 fmt
.LoadString(IDS_REBASE_UPTODATE_FMT
);
528 text
.Format(fmt
,m_BranchCtrl
.GetString());
529 m_CommitList
.ShowText(text
);
530 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
531 SetContinueButtonText();
536 m_CommitList
.Clear();
538 from
= m_UpstreamCtrl
.GetString();
539 to
= m_BranchCtrl
.GetString();
540 this->m_CommitList
.FillGitLog(NULL
,0,&from
,&to
);
542 if( m_CommitList
.GetItemCount() == 0 )
543 m_CommitList
.ShowText(_T("Nothing to Rebase"));
545 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
548 if(m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
.size() >=0 )
550 if(hash
== m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
[0])
552 m_CommitList
.Clear();
553 m_CommitList
.ShowText(_T("Nothing Rebase"));
559 AddBranchToolTips(&this->m_BranchCtrl
);
560 AddBranchToolTips(&this->m_UpstreamCtrl
);
562 for(int i
=0;i
<m_CommitList
.m_logEntries
.size();i
++)
564 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
) = CTGitPath::LOGACTIONS_REBASE_PICK
;
567 m_CommitList
.Invalidate();
569 if(m_CommitList
.m_IsOldFirst
)
570 this->m_CurrentRebaseIndex
= -1;
572 this->m_CurrentRebaseIndex
= m_CommitList
.m_logEntries
.size();
574 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
575 SetContinueButtonText();
578 void CRebaseDlg::AddBranchToolTips(CHistoryCombo
*pBranch
)
582 CString text
=pBranch
->GetString();
588 tooltip
.Format(_T("CommitHash:%s\nCommit by: %s %s\n <b>%s</b> \n %s"),
589 rev
.m_CommitHash
.ToString(),
591 CAppUtils::FormatDateAndTime(rev
.GetAuthorDate(),DATE_LONGDATE
),
595 pBranch
->DisableTooltip();
596 this->m_tooltips
.AddTool(pBranch
->GetComboBoxCtrl(),tooltip
);
600 BOOL
CRebaseDlg::PreTranslateMessage(MSG
*pMsg
)
602 if (pMsg
->message
== WM_KEYDOWN
)
604 switch (pMsg
->wParam
)
613 /* Avoid TAB control destroy but dialog exist*/
618 ::GetClassName(pMsg
->hwnd
,buff
,128);
621 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0 ||
622 _tcsnicmp(buff
,_T("Scintilla"),128)==0 ||
623 _tcsnicmp(buff
,_T("SysListView32"),128)==0||
624 ::GetParent(pMsg
->hwnd
) == this->m_ctrlTabCtrl
.m_hWnd
)
626 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
632 m_tooltips
.RelayEvent(pMsg
);
633 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
635 int CRebaseDlg::CheckRebaseCondition()
637 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
639 if( !g_Git
.CheckCleanWorkTree() )
641 if(CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
644 cmd
=_T("git.exe stash");
645 this->AddLogString(cmd
);
646 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
648 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
655 //Todo Check $REBASE_ROOT
659 cmd
=_T("git.exe var GIT_COMMITTER_IDENT");
660 if(g_Git
.Run(cmd
,NULL
,CP_UTF8
))
663 //Todo call pre_rebase_hook
666 int CRebaseDlg::StartRebase()
669 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
670 if(!this->m_IsCherryPick
)
672 //Todo call comment_for_reflog
673 cmd
.Format(_T("git.exe checkout %s"),this->m_BranchCtrl
.GetString());
674 this->AddLogString(cmd
);
676 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
679 this->AddLogString(out
);
682 cmd
=_T("git.exe rev-parse --verify HEAD");
683 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
685 AddLogString(_T("No Head"));
689 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
690 // echo "detached HEAD" > "$DOTEST"/head-name
692 cmd
.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
693 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
695 AddLogString(_T("update ORIG_HEAD Fail"));
699 m_OrigUpstreamHash
.Empty();
700 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
701 if(m_OrigUpstreamHash
.IsEmpty())
703 this->AddLogString(m_OrigUpstreamHash
);
707 if( !this->m_IsCherryPick
)
709 cmd
.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash
.ToString());
710 this->AddLogString(cmd
);
713 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
715 this->AddLogString(out
);
720 if( !this->m_IsCherryPick
)
722 m_OrigBranchHash
= g_Git
.GetHash(this->m_BranchCtrl
.GetString());
723 if(m_OrigBranchHash
.IsEmpty())
725 this->AddLogString(m_OrigBranchHash
.ToString());
728 this->AddLogString(_T("Start Rebase\r\n"));
731 this->AddLogString(_T("Start Cherry-pick\r\n"));
735 int CRebaseDlg::VerifyNoConflict()
738 if(g_Git
.ListConflictFile(list
))
740 AddLogString(_T("Get conflict files fail"));
743 if( list
.GetCount() != 0 )
745 CMessageBox::Show(NULL
,_T("There are conflict file, you should mark it resolve"),_T("TortoiseGit"),MB_OK
);
751 int CRebaseDlg::FinishRebase()
753 if(this->m_IsCherryPick
) //cherry pick mode no "branch", working at upstream branch
756 git_revnum_t head
= g_Git
.GetHash(_T("HEAD"));
760 cmd
.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl
.GetString());
762 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
770 cmd
.Format(_T("git.exe reset --hard %s"),head
);
772 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
779 m_CtrlStatusText
.SetWindowText(_T("Finished rebasing."));
783 void CRebaseDlg::OnBnClickedContinue()
785 if( m_RebaseStage
== REBASE_DONE
)
791 if( this->m_IsFastForward
)
794 CString oldbranch
= g_Git
.GetCurrentBranch();
795 if( oldbranch
!= m_BranchCtrl
.GetString() )
797 cmd
.Format(_T("git.exe checkout %s"),m_BranchCtrl
.GetString());
799 if( g_Git
.Run(cmd
,&out
,CP_ACP
) )
801 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
808 m_OrigBranchHash
= g_Git
.GetHash(m_BranchCtrl
.GetString());
809 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
811 if(!g_Git
.IsFastForward(this->m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString()))
813 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
814 AddLogString(_T("No fast forward\r\nMaybe repository changed"));
818 cmd
.Format(_T("git.exe reset --hard %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
819 this->AddLogString(CString(_T("Fast forward to "))+m_UpstreamCtrl
.GetString());
822 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
823 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
825 AddLogString(_T("Fail"));
830 AddLogString(_T("Done"));
831 m_RebaseStage
= REBASE_DONE
;
832 UpdateCurrentStatus();
836 if( m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
838 if(CheckRebaseCondition())
840 m_RebaseStage
= REBASE_START
;
843 if( m_RebaseStage
== REBASE_FINISH
)
851 if( m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
853 if(VerifyNoConflict())
855 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
856 if(this->CheckNextCommitIsSquash())
857 {//next commit is not squash;
858 m_RebaseStage
= REBASE_SQUASH_EDIT
;
859 this->OnRebaseUpdateUI(0,0);
860 this->UpdateCurrentStatus();
864 m_RebaseStage
=REBASE_CONTINUE
;
865 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
866 this->UpdateCurrentStatus();
870 if( m_RebaseStage
== REBASE_CONFLICT
)
872 if(VerifyNoConflict())
875 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
879 cmd
.Format(_T("git.exe commit -a -C %s"), curRev
->m_CommitHash
.ToString());
883 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
886 if(!g_Git
.CheckCleanWorkTree())
888 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
894 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
895 if( curRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_EDIT
)
897 m_RebaseStage
=REBASE_EDIT
;
898 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
899 this->UpdateCurrentStatus();
904 m_RebaseStage
=REBASE_CONTINUE
;
905 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
906 this->UpdateCurrentStatus();
910 if( m_RebaseStage
== REBASE_EDIT
|| m_RebaseStage
== REBASE_SQUASH_EDIT
)
913 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
915 str
=this->m_LogMessageCtrl
.GetText();
916 if(str
.Trim().IsEmpty())
918 CMessageBox::Show(NULL
,_T("Commit Message Is Empty"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
922 CString tempfile
=::GetTempFile();
923 CFile
file(tempfile
,CFile::modeReadWrite
|CFile::modeCreate
);
924 CStringA log
=CUnicodeUtils::GetUTF8( str
);
925 file
.Write(log
,log
.GetLength());
926 //file.WriteString(m_sLogMessage);
931 if( m_RebaseStage
== REBASE_SQUASH_EDIT
)
932 cmd
.Format(_T("git.exe commit -F \"%s\""), tempfile
);
934 cmd
.Format(_T("git.exe commit --amend -F \"%s\""), tempfile
);
936 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
938 if(!g_Git
.CheckCleanWorkTree())
940 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
945 CFile::Remove(tempfile
);
947 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
948 m_RebaseStage
=REBASE_CONTINUE
;
949 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
950 this->UpdateCurrentStatus();
954 InterlockedExchange(&m_bThreadRunning
, TRUE
);
957 if (AfxBeginThread(RebaseThreadEntry
, this)==NULL
)
959 InterlockedExchange(&m_bThreadRunning
, FALSE
);
960 CMessageBox::Show(NULL
, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
964 int CRebaseDlg::CheckNextCommitIsSquash()
967 if(m_CommitList
.m_IsOldFirst
)
968 index
=m_CurrentRebaseIndex
+1;
970 index
=m_CurrentRebaseIndex
-1;
977 if(index
>= m_CommitList
.GetItemCount())
980 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[index
];
982 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SQUASH
)
984 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
)
986 if(m_CommitList
.m_IsOldFirst
)
993 }while(curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
);
998 int CRebaseDlg::GoNext()
1000 if(m_CommitList
.m_IsOldFirst
)
1001 m_CurrentRebaseIndex
++;
1003 m_CurrentRebaseIndex
--;
1007 int CRebaseDlg::StateAction()
1009 switch(this->m_RebaseStage
)
1012 case CHOOSE_COMMIT_PICK_MODE
:
1015 m_RebaseStage
= REBASE_START
;
1022 void CRebaseDlg::SetContinueButtonText()
1025 switch(this->m_RebaseStage
)
1028 case CHOOSE_COMMIT_PICK_MODE
:
1029 if(this->m_IsFastForward
)
1030 Text
= _T("Start(FastFwd)");
1036 case REBASE_CONTINUE
:
1037 case REBASE_SQUASH_CONFLICT
:
1038 Text
= _T("Continue");
1041 case REBASE_CONFLICT
:
1042 Text
= _T("Commit");
1048 case REBASE_SQUASH_EDIT
:
1049 Text
= _T("Commit");
1054 Text
= _T("Finish");
1061 this->GetDlgItem(IDC_REBASE_CONTINUE
)->SetWindowText(Text
);
1064 void CRebaseDlg::SetControlEnable()
1066 switch(this->m_RebaseStage
)
1069 case CHOOSE_COMMIT_PICK_MODE
:
1071 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(TRUE
);
1072 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(TRUE
);
1073 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(TRUE
);
1074 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(TRUE
);
1075 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(TRUE
);
1079 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(TRUE
);
1080 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(TRUE
);
1081 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(TRUE
);
1083 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1084 this->m_CommitList
.m_ContextMenuMask
|= m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1085 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1086 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1087 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
);
1091 case REBASE_CONTINUE
:
1094 case REBASE_CONFLICT
:
1096 case REBASE_SQUASH_CONFLICT
:
1098 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(FALSE
);
1099 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(FALSE
);
1100 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(FALSE
);
1101 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(FALSE
);
1102 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(FALSE
);
1103 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(FALSE
);
1104 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(FALSE
);
1105 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(FALSE
);
1106 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1107 this->m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1108 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1109 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1110 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
));
1112 if( m_RebaseStage
== REBASE_DONE
&& (this->m_PostButtonTexts
.GetCount() != 0) )
1114 this->GetDlgItem(IDC_STATUS_STATIC
)->ShowWindow(SW_HIDE
);
1115 this->GetDlgItem(IDC_REBASE_POST_BUTTON
)->ShowWindow(SW_SHOWNORMAL
);
1116 this->m_PostButton
.RemoveAll();
1117 this->m_PostButton
.AddEntries(m_PostButtonTexts
);
1118 //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1123 if(m_bThreadRunning
)
1125 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1129 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(TRUE
);
1133 void CRebaseDlg::UpdateProgress()
1138 if(m_CommitList
.m_IsOldFirst
)
1139 index
= m_CurrentRebaseIndex
+1;
1141 index
= m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1143 m_ProgressBar
.SetRange(1,m_CommitList
.GetItemCount());
1144 m_ProgressBar
.SetPos(index
);
1147 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1148 m_pTaskbarList
->SetProgressValue(m_hWnd
, index
, m_CommitList
.GetItemCount());
1151 if(m_CurrentRebaseIndex
>=0 && m_CurrentRebaseIndex
< m_CommitList
.GetItemCount())
1154 text
.Format(_T("Rebasing... (%d/%d)"),index
,m_CommitList
.GetItemCount());
1155 m_CtrlStatusText
.SetWindowText(text
);
1159 GitRev
*prevRev
=NULL
, *curRev
=NULL
;
1161 if( m_CurrentRebaseIndex
>= 0 && m_CurrentRebaseIndex
< m_CommitList
.m_arShownList
.GetSize())
1163 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1166 for(int i
=0;i
<m_CommitList
.m_arShownList
.GetSize();i
++)
1168 prevRev
=(GitRev
*)m_CommitList
.m_arShownList
[i
];
1169 if(prevRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_CURRENT
)
1171 prevRev
->GetAction(&m_CommitList
) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1172 m_CommitList
.GetItemRect(i
,&rect
,LVIR_BOUNDS
);
1173 m_CommitList
.InvalidateRect(rect
);
1179 curRev
->GetAction(&m_CommitList
) |= CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1180 m_CommitList
.GetItemRect(m_CurrentRebaseIndex
,&rect
,LVIR_BOUNDS
);
1181 m_CommitList
.InvalidateRect(rect
);
1183 m_CommitList
.EnsureVisible(m_CurrentRebaseIndex
,FALSE
);
1186 void CRebaseDlg::UpdateCurrentStatus()
1188 SetContinueButtonText();
1193 void CRebaseDlg::AddLogString(CString str
)
1195 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, FALSE
);
1196 CStringA sTextA
= m_wndOutputRebase
.StringForControl(str
);//CUnicodeUtils::GetUTF8(str);
1197 this->m_wndOutputRebase
.SendMessage(SCI_DOCUMENTEND
);
1198 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)sTextA
);
1199 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)"\n");
1200 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, TRUE
);
1203 int CRebaseDlg::GetCurrentCommitID()
1205 if(m_CommitList
.m_IsOldFirst
)
1207 return this->m_CurrentRebaseIndex
+1;
1211 return m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1215 int CRebaseDlg::DoRebase()
1218 if(m_CurrentRebaseIndex
<0)
1220 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1223 GitRev
*pRev
= (GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1224 int mode
=pRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK
;
1227 if( mode
== CTGitPath::LOGACTIONS_REBASE_SKIP
)
1229 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1233 if( mode
!= CTGitPath::LOGACTIONS_REBASE_PICK
)
1235 this->m_SquashMessage
+= pRev
->GetSubject();
1236 this->m_SquashMessage
+= _T("\n");
1237 this->m_SquashMessage
+= pRev
->GetBody();
1240 this->m_SquashMessage
.Empty();
1242 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1243 nocommit
=_T(" --no-commit ");
1246 log
.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode
),this->GetCurrentCommitID(),pRev
->m_CommitHash
.ToString());
1248 AddLogString(pRev
->GetSubject());
1249 if (pRev
->GetSubject().IsEmpty())
1251 CMessageBox::Show(m_hWnd
, _T("Found an empty commit message. You have to enter one or rebase cannot proceed."), _T("TortoiseGit"), MB_OK
| MB_ICONEXCLAMATION
);
1252 mode
= CTGitPath::LOGACTIONS_REBASE_EDIT
;
1255 cmd
.Format(_T("git.exe cherry-pick %s %s"),nocommit
,pRev
->m_CommitHash
.ToString());
1257 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1261 if(g_Git
.ListConflictFile(list
))
1263 AddLogString(_T("Get conflict files fail"));
1266 if(list
.GetCount() == 0 )
1268 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1270 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1273 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1275 this->m_RebaseStage
= REBASE_EDIT
;
1276 return -1; // Edit return -1 to stop rebase.
1279 if(CheckNextCommitIsSquash())
1281 // let user edit last commmit message
1282 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1286 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1287 m_RebaseStage
= REBASE_SQUASH_CONFLICT
;
1289 m_RebaseStage
= REBASE_CONFLICT
;
1295 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1297 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1300 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1302 this->m_RebaseStage
= REBASE_EDIT
;
1303 return -1; // Edit return -1 to stop rebase.
1307 if(CheckNextCommitIsSquash())
1309 // let user edit last commmit message
1310 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1312 } else if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1313 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1319 BOOL
CRebaseDlg::IsEnd()
1321 if(m_CommitList
.m_IsOldFirst
)
1322 return m_CurrentRebaseIndex
>= this->m_CommitList
.GetItemCount();
1324 return m_CurrentRebaseIndex
<0;
1327 int CRebaseDlg::RebaseThread()
1332 if( m_RebaseStage
== REBASE_START
)
1334 if( this->StartRebase() )
1336 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1340 m_RebaseStage
= REBASE_CONTINUE
;
1342 }else if( m_RebaseStage
== REBASE_CONTINUE
)
1345 UpdateCurrentStatus();
1349 m_RebaseStage
= REBASE_FINISH
;
1361 }else if( m_RebaseStage
== REBASE_FINISH
)
1364 m_RebaseStage
= REBASE_DONE
;
1366 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1373 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1374 //this->UpdateCurrentStatus();
1377 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1378 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1382 void CRebaseDlg::ListConflictFile()
1384 this->m_FileListCtrl
.Clear();
1389 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
1391 this->m_FileListCtrl
.GetStatus(&list
,true);
1392 this->m_FileListCtrl
.Show(CTGitPath::LOGACTIONS_UNMERGED
|CTGitPath::LOGACTIONS_MODIFIED
|CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_DELETED
,
1393 CTGitPath::LOGACTIONS_UNMERGED
);
1396 LRESULT
CRebaseDlg::OnRebaseUpdateUI(WPARAM
,LPARAM
)
1398 UpdateCurrentStatus();
1399 if(m_CurrentRebaseIndex
<0)
1401 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1403 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1405 switch(m_RebaseStage
)
1407 case REBASE_CONFLICT
:
1408 case REBASE_SQUASH_CONFLICT
:
1410 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_CONFLICT
);
1412 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1413 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1416 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1418 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1419 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1421 case REBASE_SQUASH_EDIT
:
1422 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1423 this->m_LogMessageCtrl
.SetText(this->m_SquashMessage
);
1425 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1428 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1432 void CRebaseDlg::OnCancel()
1436 void CRebaseDlg::OnBnClickedAbort()
1439 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1442 if(m_OrigUpstreamHash
.IsEmpty())
1444 __super::OnCancel();
1447 if(m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
1452 if(CMessageBox::Show(NULL
,_T("Are you sure you want to abort the rebase process?"),_T("TortoiseGit"),MB_YESNO
) != IDYES
)
1455 if(this->m_IsFastForward
)
1457 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1458 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1463 __super::OnCancel();
1466 cmd
.Format(_T("git.exe checkout -f %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
1467 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1473 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash
.ToString());
1474 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1480 if(this->m_IsCherryPick
) //there are not "branch" at cherry pick mode
1482 __super::OnCancel();
1486 cmd
.Format(_T("git checkout -f %s"),this->m_BranchCtrl
.GetString());
1487 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1493 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1494 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1499 __super::OnCancel();
1502 void CRebaseDlg::OnBnClickedButtonBrowse()
1504 if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl
, gPickRef_NoTag
))
1505 OnCbnSelchangeUpstream();
1508 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1511 this->FetchLogList();
1512 if(this->CheckRebaseCondition())
1514 /* Disable Start Rebase */
1515 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1519 void CRebaseDlg::OnBnClickedRebasePostButton()
1521 this->m_Upstream
=this->m_UpstreamCtrl
.GetString();
1522 this->m_Branch
=this->m_BranchCtrl
.GetString();
1524 this->EndDialog(IDC_REBASE_POST_BUTTON
+this->m_PostButton
.GetCurrentEntry());
1527 void CRebaseDlg::Refresh()
1529 if(this->m_IsCherryPick
)
1532 if(this->m_RebaseStage
== CHOOSE_BRANCH
)
1535 this->FetchLogList();
1536 if(this->CheckRebaseCondition())
1538 /* Disable Start Rebase */
1539 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1544 void CRebaseDlg::OnBnClickedButtonUp2()
1547 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1548 bool changed
= false;
1551 int index
=m_CommitList
.GetNextSelectedItem(pos
);
1554 CGitHash old
= m_CommitList
.m_logEntries
[index
-1];
1555 m_CommitList
.m_logEntries
[index
-1] = m_CommitList
.m_logEntries
[index
];
1556 m_CommitList
.m_logEntries
[index
] = old
;
1557 m_CommitList
.SetItemState(index
-1, LVIS_SELECTED
, LVIS_SELECTED
);
1558 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1564 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1565 m_CommitList
.Invalidate();
1566 m_CommitList
.SetFocus();
1570 void CRebaseDlg::OnBnClickedButtonDown2()
1573 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1574 bool changed
= false;
1575 // use an array to store all selected item indexes; the user won't select too much items
1576 int* indexes
= NULL
;
1577 indexes
= new int[m_CommitList
.GetSelectedCount()];
1581 indexes
[i
++] = m_CommitList
.GetNextSelectedItem(pos
);
1583 // don't move any item if the last selected item is the last item in the m_CommitList
1584 // (that would change the order of the selected items)
1585 if(indexes
[m_CommitList
.GetSelectedCount() - 1] < m_CommitList
.GetItemCount() - 1)
1587 // iterate over the indexes backwards in order to correctly move multiselected items
1588 for (i
= m_CommitList
.GetSelectedCount() - 1; i
>= 0; i
--)
1590 int index
= indexes
[i
];
1591 CGitHash old
= m_CommitList
.m_logEntries
[index
+1];
1592 m_CommitList
.m_logEntries
[index
+1] = m_CommitList
.m_logEntries
[index
];
1593 m_CommitList
.m_logEntries
[index
] = old
;
1594 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1595 m_CommitList
.SetItemState(index
+1, LVIS_SELECTED
, LVIS_SELECTED
);
1603 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1604 m_CommitList
.Invalidate();
1605 m_CommitList
.SetFocus();
1609 LRESULT
CRebaseDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1611 m_pTaskbarList
.Release();
1612 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);