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"
38 IMPLEMENT_DYNAMIC(CRebaseDlg
, CResizableStandAloneDialog
)
40 CRebaseDlg::CRebaseDlg(CWnd
* pParent
/*=NULL*/)
41 : CResizableStandAloneDialog(CRebaseDlg::IDD
, pParent
)
45 , m_bAddCherryPickedFrom(FALSE
)
47 m_RebaseStage
=CHOOSE_BRANCH
;
48 m_CurrentRebaseIndex
=-1;
49 m_bThreadRunning
=FALSE
;
50 this->m_IsCherryPick
= FALSE
;
52 m_IsFastForward
=FALSE
;
55 CRebaseDlg::~CRebaseDlg()
59 void CRebaseDlg::DoDataExchange(CDataExchange
* pDX
)
61 CDialog::DoDataExchange(pDX
);
62 DDX_Control(pDX
, IDC_REBASE_PROGRESS
, m_ProgressBar
);
63 DDX_Control(pDX
, IDC_STATUS_STATIC
, m_CtrlStatusText
);
64 DDX_Check(pDX
, IDC_PICK_ALL
, m_bPickAll
);
65 DDX_Check(pDX
, IDC_SQUASH_ALL
, m_bSquashAll
);
66 DDX_Check(pDX
, IDC_EDIT_ALL
, m_bEditAll
);
67 DDX_Control(pDX
, IDC_REBASE_SPLIT
, m_wndSplitter
);
68 DDX_Control(pDX
,IDC_COMMIT_LIST
,m_CommitList
);
69 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_BRANCH
, this->m_BranchCtrl
);
70 DDX_Control(pDX
,IDC_REBASE_COMBOXEX_UPSTREAM
, this->m_UpstreamCtrl
);
71 DDX_Check(pDX
, IDC_REBASE_CHECK_FORCE
,m_bForce
);
72 DDX_Check(pDX
, IDC_CHECK_CHERRYPICKED_FROM
, m_bAddCherryPickedFrom
);
73 DDX_Control(pDX
,IDC_REBASE_POST_BUTTON
,m_PostButton
);
77 BEGIN_MESSAGE_MAP(CRebaseDlg
, CResizableStandAloneDialog
)
78 ON_BN_CLICKED(IDC_PICK_ALL
, &CRebaseDlg::OnBnClickedPickAll
)
79 ON_BN_CLICKED(IDC_SQUASH_ALL
, &CRebaseDlg::OnBnClickedSquashAll
)
80 ON_BN_CLICKED(IDC_EDIT_ALL
, &CRebaseDlg::OnBnClickedEditAll
)
81 ON_BN_CLICKED(IDC_REBASE_SPLIT
, &CRebaseDlg::OnBnClickedRebaseSplit
)
82 ON_BN_CLICKED(IDC_REBASE_CONTINUE
,OnBnClickedContinue
)
83 ON_BN_CLICKED(IDC_REBASE_ABORT
, OnBnClickedAbort
)
85 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH
, &CRebaseDlg::OnCbnSelchangeBranch
)
86 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM
, &CRebaseDlg::OnCbnSelchangeUpstream
)
87 ON_MESSAGE(MSG_REBASE_UPDATE_UI
, OnRebaseUpdateUI
)
88 ON_BN_CLICKED(IDC_BUTTON_BROWSE
, &CRebaseDlg::OnBnClickedButtonBrowse
)
89 ON_BN_CLICKED(IDC_REBASE_CHECK_FORCE
, &CRebaseDlg::OnBnClickedRebaseCheckForce
)
90 ON_BN_CLICKED(IDC_CHECK_CHERRYPICKED_FROM
, &CRebaseDlg::OnBnClickedCheckCherryPickedFrom
)
91 ON_BN_CLICKED(IDC_REBASE_POST_BUTTON
, &CRebaseDlg::OnBnClickedRebasePostButton
)
92 ON_BN_CLICKED(IDC_BUTTON_UP2
, &CRebaseDlg::OnBnClickedButtonUp2
)
93 ON_BN_CLICKED(IDC_BUTTON_DOWN2
, &CRebaseDlg::OnBnClickedButtonDown2
)
94 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
95 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_COMMIT_LIST
, OnLvnItemchangedLoglist
)
98 void CRebaseDlg::AddRebaseAnchor()
100 AddAnchor(IDC_REBASE_TAB
,TOP_LEFT
,BOTTOM_RIGHT
);
101 AddAnchor(IDC_COMMIT_LIST
,TOP_LEFT
, TOP_RIGHT
);
102 AddAnchor(IDC_REBASE_SPLIT
,TOP_LEFT
, TOP_RIGHT
);
103 AddAnchor(IDC_STATUS_STATIC
, BOTTOM_LEFT
,BOTTOM_RIGHT
);
104 AddAnchor(IDC_REBASE_CONTINUE
,BOTTOM_RIGHT
);
105 AddAnchor(IDC_REBASE_ABORT
, BOTTOM_RIGHT
);
106 AddAnchor(IDC_REBASE_PROGRESS
,BOTTOM_LEFT
, BOTTOM_RIGHT
);
107 AddAnchor(IDC_PICK_ALL
,TOP_LEFT
);
108 AddAnchor(IDC_SQUASH_ALL
,TOP_LEFT
);
109 AddAnchor(IDC_EDIT_ALL
,TOP_LEFT
);
110 AddAnchor(IDC_BUTTON_UP2
,TOP_LEFT
);
111 AddAnchor(IDC_BUTTON_DOWN2
,TOP_LEFT
);
112 AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM
,TOP_LEFT
);
113 AddAnchor(IDC_REBASE_COMBOXEX_BRANCH
,TOP_LEFT
);
114 AddAnchor(IDC_REBASE_STATIC_UPSTREAM
,TOP_LEFT
);
115 AddAnchor(IDC_REBASE_STATIC_BRANCH
,TOP_LEFT
);
116 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
117 AddAnchor(IDC_REBASE_CHECK_FORCE
,TOP_RIGHT
);
118 AddAnchor(IDC_CHECK_CHERRYPICKED_FROM
, TOP_RIGHT
);
119 AddAnchor(IDC_REBASE_POST_BUTTON
,BOTTOM_LEFT
);
121 this->AddOthersToAnchor();
124 BOOL
CRebaseDlg::OnInitDialog()
126 CResizableStandAloneDialog::OnInitDialog();
127 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
129 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
130 // do this, Explorer would be unable to send that message to our window if we
131 // were running elevated. It's OK to make the call all the time, since if we're
132 // not elevated, this is a no-op.
133 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
134 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
135 CAutoLibrary hUser
= ::LoadLibrary(_T("user32.dll"));
138 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
139 if (pfnChangeWindowMessageFilterEx
)
141 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
144 m_pTaskbarList
.Release();
145 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
148 //IDC_REBASE_DUMY_TAB
150 GetClientRect(m_DlgOrigRect
);
151 m_CommitList
.GetClientRect(m_CommitListOrigRect
);
153 CWnd
*pwnd
=this->GetDlgItem(IDC_REBASE_DUMY_TAB
);
154 pwnd
->GetWindowRect(&rectDummy
);
155 this->ScreenToClient(rectDummy
);
157 if (!m_ctrlTabCtrl
.Create(CMFCTabCtrl::STYLE_FLAT
, rectDummy
, this, IDC_REBASE_TAB
))
159 TRACE0("Failed to create output tab window\n");
160 return FALSE
; // fail to create
162 m_ctrlTabCtrl
.SetResizeMode(CMFCTabCtrl::RESIZE_NO
);
163 // Create output panes:
164 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
165 DWORD dwStyle
=LVS_REPORT
| LVS_SHOWSELALWAYS
| LVS_ALIGNLEFT
| WS_BORDER
| WS_TABSTOP
| WS_CHILD
| WS_VISIBLE
;
167 if (! this->m_FileListCtrl
.Create(dwStyle
,rectDummy
,&this->m_ctrlTabCtrl
,0) )
169 TRACE0("Failed to create output windows\n");
170 return FALSE
; // fail to create
173 if( ! this->m_LogMessageCtrl
.Create(_T("Scintilla"),_T("source"),0,rectDummy
,&m_ctrlTabCtrl
,0,0) )
175 TRACE0("Failed to create log message control");
178 m_LogMessageCtrl
.Init(0);
179 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
181 dwStyle
= LBS_NOINTEGRALHEIGHT
| WS_CHILD
| WS_VISIBLE
| WS_HSCROLL
| WS_VSCROLL
;
183 if (!m_wndOutputRebase
.Create(_T("Scintilla"),_T("source"),0,rectDummy
, &m_ctrlTabCtrl
, 0,0) )
185 TRACE0("Failed to create output windows\n");
186 return -1; // fail to create
188 m_wndOutputRebase
.Init(0);
189 m_wndOutputRebase
.Call(SCI_SETREADONLY
, TRUE
);
191 m_tooltips
.Create(this);
193 m_tooltips
.AddTool(IDC_REBASE_CHECK_FORCE
,IDS_REBASE_FORCE_TT
);
194 m_tooltips
.AddTool(IDC_REBASE_ABORT
,IDS_REBASE_ABORT_TT
);
198 m_FileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("RebaseDlg"),(GITSLC_POPALL
^ (GITSLC_POPCOMMIT
|GITSLC_POPRESTORE
)),false);
200 m_ctrlTabCtrl
.AddTab(&m_FileListCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_REVISIONFILES
)));
201 m_ctrlTabCtrl
.AddTab(&m_LogMessageCtrl
, CString(MAKEINTRESOURCE(IDS_PROC_COMMITMESSAGE
)), 1);
204 AdjustControlSize(IDC_PICK_ALL
);
205 AdjustControlSize(IDC_SQUASH_ALL
);
206 AdjustControlSize(IDC_EDIT_ALL
);
207 AdjustControlSize(IDC_CHECK_CHERRYPICKED_FROM
);
209 CString sWindowTitle
;
210 GetWindowText(sWindowTitle
);
211 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
213 EnableSaveRestore(_T("RebaseDlg"));
215 DWORD yPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
216 RECT rcDlg
, rcLogMsg
, rcFileList
;
217 GetClientRect(&rcDlg
);
218 m_CommitList
.GetWindowRect(&rcLogMsg
);
219 ScreenToClient(&rcLogMsg
);
220 this->m_ctrlTabCtrl
.GetWindowRect(&rcFileList
);
221 ScreenToClient(&rcFileList
);
225 m_wndSplitter
.GetWindowRect(&rectSplitter
);
226 ScreenToClient(&rectSplitter
);
227 int delta
= yPos
- rectSplitter
.top
;
228 if ((rcLogMsg
.bottom
+ delta
> rcLogMsg
.top
)&&(rcLogMsg
.bottom
+ delta
< rcFileList
.bottom
- 30))
230 m_wndSplitter
.SetWindowPos(NULL
, 0, yPos
, 0, 0, SWP_NOSIZE
);
235 if( this->m_RebaseStage
== CHOOSE_BRANCH
)
237 this->LoadBranchInfo();
242 this->m_BranchCtrl
.EnableWindow(FALSE
);
243 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
246 m_CommitList
.m_ColumnRegKey
= _T("Rebase");
247 m_CommitList
.m_IsIDReplaceAction
= TRUE
;
248 // m_CommitList.m_IsOldFirst = TRUE;
249 m_CommitList
.m_IsRebaseReplaceGraph
= TRUE
;
251 m_CommitList
.InsertGitColumn();
253 this->SetControlEnable();
255 if(!this->m_PreCmd
.IsEmpty())
257 CProgressDlg progress
;
258 progress
.m_GitCmd
=m_PreCmd
;
259 progress
.m_bAutoCloseOnSuccess
=true;
265 this->m_BranchCtrl
.SetCurSel(-1);
266 this->m_BranchCtrl
.EnableWindow(FALSE
);
267 GetDlgItem(IDC_REBASE_CHECK_FORCE
)->ShowWindow(SW_HIDE
);
268 GetDlgItem(IDC_BUTTON_BROWSE
)->EnableWindow(FALSE
);
269 this->m_UpstreamCtrl
.AddString(_T("HEAD"));
270 this->m_UpstreamCtrl
.EnableWindow(FALSE
);
271 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_CHERRYPICK
)));
272 this->m_CommitList
.StartFilter();
276 GetDlgItem(IDC_CHECK_CHERRYPICKED_FROM
)->ShowWindow(SW_HIDE
);
277 SetContinueButtonText();
278 m_CommitList
.DeleteAllItems();
282 m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK
)|
283 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV
)|
284 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_RESET
)|
285 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTREV
)|
286 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION
)|
287 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV
)|
288 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT
));
290 if(m_CommitList
.m_IsOldFirst
)
291 this->m_CurrentRebaseIndex
= -1;
293 this->m_CurrentRebaseIndex
= m_CommitList
.m_logEntries
.size();
296 if(this->CheckRebaseCondition())
298 /* Disable Start Rebase */
299 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
304 // CRebaseDlg message handlers
306 void CRebaseDlg::OnBnClickedPickAll()
310 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
312 this->m_bEditAll
=FALSE
;
313 this->m_bSquashAll
=FALSE
;
314 this->UpdateData(FALSE
);
317 void CRebaseDlg::OnBnClickedSquashAll()
320 if(this->m_bSquashAll
)
321 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
323 this->m_bEditAll
=FALSE
;
324 this->m_bPickAll
=FALSE
;
325 this->UpdateData(FALSE
);
328 void CRebaseDlg::OnBnClickedEditAll()
331 if( this->m_bEditAll
)
332 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
334 this->m_bPickAll
=FALSE
;
335 this->m_bSquashAll
=FALSE
;
336 this->UpdateData(FALSE
);
339 void CRebaseDlg::SetAllRebaseAction(int action
)
341 for(int i
=0;i
<this->m_CommitList
.m_logEntries
.size();i
++)
343 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
)=action
;
345 m_CommitList
.Invalidate();
348 void CRebaseDlg::OnBnClickedRebaseSplit()
353 LRESULT
CRebaseDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
357 if (wParam
== IDC_REBASE_SPLIT
)
359 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
365 return __super::DefWindowProc(message
, wParam
, lParam
);
368 void CRebaseDlg::DoSize(int delta
)
370 this->RemoveAllAnchors();
372 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST
), delta
, CW_TOPALIGN
);
373 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
374 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB
), -delta
, CW_BOTTOMALIGN
);
375 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
376 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL
),0,delta
);
377 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL
),0,delta
);
378 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL
),0,delta
);
379 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_UP2
),0,delta
);
380 CSplitterControl::ChangePos(GetDlgItem(IDC_BUTTON_DOWN2
),0,delta
);
381 CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE
),0,delta
);
383 this->AddRebaseAnchor();
384 // adjust the minimum size of the dialog to prevent the resizing from
385 // moving the list control too far down.
387 m_CommitList
.GetClientRect(rcLogMsg
);
388 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(), m_DlgOrigRect
.Height()-m_CommitListOrigRect
.Height()+rcLogMsg
.Height()));
391 // m_CommitList.Invalidate();
393 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
395 this->m_ctrlTabCtrl
.Invalidate();
396 this->m_CommitList
.Invalidate();
397 this->m_FileListCtrl
.Invalidate();
398 this->m_LogMessageCtrl
.Invalidate();
402 void CRebaseDlg::SetSplitterRange()
404 if ((m_CommitList
)&&(m_ctrlTabCtrl
))
407 m_CommitList
.GetWindowRect(rcTop
);
408 ScreenToClient(rcTop
);
410 m_ctrlTabCtrl
.GetWindowRect(rcMiddle
);
411 ScreenToClient(rcMiddle
);
412 if (rcMiddle
.Height() && rcMiddle
.Width())
413 m_wndSplitter
.SetRange(rcTop
.top
+60, rcMiddle
.bottom
-80);
417 void CRebaseDlg::OnSize(UINT nType
,int cx
, int cy
)
419 // first, let the resizing take place
420 __super::OnSize(nType
, cx
, cy
);
426 void CRebaseDlg::SaveSplitterPos()
430 CRegDWORD regPos
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
432 m_wndSplitter
.GetWindowRect(&rectSplitter
);
433 ScreenToClient(&rectSplitter
);
434 regPos
= rectSplitter
.top
;
438 void CRebaseDlg::LoadBranchInfo()
440 m_BranchCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
441 m_UpstreamCtrl
.SetMaxHistoryItems(0x7FFFFFFF);
446 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL
);
447 m_BranchCtrl
.AddString(list
);
449 g_Git
.GetBranchList(list
,¤t
,CGit::BRANCH_ALL_F
);
450 m_UpstreamCtrl
.AddString(list
);
452 m_BranchCtrl
.SetCurSel(current
);
454 AddBranchToolTips(&m_BranchCtrl
);
455 AddBranchToolTips(&m_UpstreamCtrl
);
457 if(!m_Upstream
.IsEmpty())
459 m_UpstreamCtrl
.AddString(m_Upstream
);
460 m_UpstreamCtrl
.SetCurSel(m_UpstreamCtrl
.GetCount()-1);
464 //Select pull-remote from current branch
465 CString currentBranch
= g_Git
.GetSymbolicRef();
467 configName
.Format(L
"branch.%s.remote", currentBranch
);
468 CString pullRemote
= g_Git
.GetConfigValue(configName
);
470 //Select pull-branch from current branch
471 configName
.Format(L
"branch.%s.merge", currentBranch
);
472 CString pullBranch
= CGit::StripRefName(g_Git
.GetConfigValue(configName
));
474 CString defaultUpstream
;
475 defaultUpstream
.Format(L
"remotes/%s/%s", pullRemote
, pullBranch
);
476 int found
= m_UpstreamCtrl
.FindStringExact(0, defaultUpstream
);
478 m_UpstreamCtrl
.SetCurSel(found
);
482 void CRebaseDlg::OnCbnSelchangeBranch()
487 void CRebaseDlg::OnCbnSelchangeUpstream()
492 void CRebaseDlg::FetchLogList()
495 CString basestr
, err
;
497 m_IsFastForward
=FALSE
;
498 cmd
.Format(_T("git.exe merge-base %s %s"), g_Git
.FixBranchName(m_UpstreamCtrl
.GetString()),
499 g_Git
.FixBranchName(m_BranchCtrl
.GetString()));
500 g_Git
.Run(cmd
, &basestr
, &err
, CP_UTF8
);
504 hash
=g_Git
.GetHash(m_BranchCtrl
.GetString());
506 if(hash
== g_Git
.GetHash(this->m_UpstreamCtrl
.GetString()))
508 m_CommitList
.Clear();
510 fmt
.LoadString(IDS_REBASE_EQUAL_FMT
);
511 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
513 m_CommitList
.ShowText(text
);
514 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(false);
521 this->m_IsFastForward
=TRUE
;
523 m_CommitList
.Clear();
525 fmt
.LoadString(IDS_REBASE_FASTFORWARD_FMT
);
526 text
.Format(fmt
,m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString(),
527 m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString());
529 m_CommitList
.ShowText(text
);
530 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(true);
531 SetContinueButtonText();
540 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
544 m_CommitList
.Clear();
546 fmt
.LoadString(IDS_REBASE_UPTODATE_FMT
);
547 text
.Format(fmt
,m_BranchCtrl
.GetString());
548 m_CommitList
.ShowText(text
);
549 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
550 SetContinueButtonText();
555 m_CommitList
.Clear();
557 from
= m_UpstreamCtrl
.GetString();
558 to
= m_BranchCtrl
.GetString();
559 this->m_CommitList
.FillGitLog(NULL
,0,&from
,&to
);
561 if( m_CommitList
.GetItemCount() == 0 )
562 m_CommitList
.ShowText(CString(MAKEINTRESOURCE(IDS_PROC_NOTHINGTOREBASE
)));
564 hash
=g_Git
.GetHash(m_UpstreamCtrl
.GetString());
567 if(m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
.size() >=0 )
569 if(hash
== m_CommitList
.m_logEntries
[m_CommitList
.m_logEntries
.size()-1].m_ParentHash
[0])
571 m_CommitList
.Clear();
572 m_CommitList
.ShowText(_T("Nothing Rebase"));
578 AddBranchToolTips(&this->m_BranchCtrl
);
579 AddBranchToolTips(&this->m_UpstreamCtrl
);
581 for(int i
=0;i
<m_CommitList
.m_logEntries
.size();i
++)
583 m_CommitList
.m_logEntries
.GetGitRevAt(i
).GetAction(&m_CommitList
) = CTGitPath::LOGACTIONS_REBASE_PICK
;
586 m_CommitList
.Invalidate();
588 if(m_CommitList
.m_IsOldFirst
)
589 this->m_CurrentRebaseIndex
= -1;
591 this->m_CurrentRebaseIndex
= m_CommitList
.m_logEntries
.size();
593 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(m_CommitList
.GetItemCount());
594 SetContinueButtonText();
597 void CRebaseDlg::AddBranchToolTips(CHistoryCombo
*pBranch
)
601 CString text
=pBranch
->GetString();
607 tooltip
.Format(_T("%s: %s\n%s: %s\n%s: %s\n%s:\n<b>%s</b>\n%s"),
608 CString(MAKEINTRESOURCE(IDS_LOG_REVISION
)),
609 rev
.m_CommitHash
.ToString(),
610 CString(MAKEINTRESOURCE(IDS_LOG_AUTHOR
)),
612 CString(MAKEINTRESOURCE(IDS_LOG_DATE
)),
613 CLoglistUtils::FormatDateAndTime(rev
.GetAuthorDate(), DATE_LONGDATE
),
614 CString(MAKEINTRESOURCE(IDS_LOG_MESSAGE
)),
618 pBranch
->DisableTooltip();
619 this->m_tooltips
.AddTool(pBranch
->GetComboBoxCtrl(),tooltip
);
623 BOOL
CRebaseDlg::PreTranslateMessage(MSG
*pMsg
)
625 if (pMsg
->message
== WM_KEYDOWN
)
627 switch (pMsg
->wParam
)
630 if(LogListHasFocus(pMsg
->hwnd
))
632 m_CommitList
.ShiftSelectedAction();
637 if(LogListHasFocus(pMsg
->hwnd
))
639 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK
);
644 if(LogListHasFocus(pMsg
->hwnd
))
646 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP
);
651 if(LogListHasFocus(pMsg
->hwnd
))
653 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH
);
658 if(LogListHasFocus(pMsg
->hwnd
))
660 m_CommitList
.SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT
);
665 if(LogListHasFocus(pMsg
->hwnd
) && GetAsyncKeyState(VK_CONTROL
) & 0x8000)
667 // select all entries
668 for (int i
= 0; i
< m_CommitList
.GetItemCount(); ++i
)
670 m_CommitList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
681 /* Avoid TAB control destroy but dialog exist*/
686 ::GetClassName(pMsg
->hwnd
,buff
,128);
689 if(_tcsnicmp(buff
,_T("RichEdit20W"),128)==0 ||
690 _tcsnicmp(buff
,_T("Scintilla"),128)==0 ||
691 _tcsnicmp(buff
,_T("SysListView32"),128)==0||
692 ::GetParent(pMsg
->hwnd
) == this->m_ctrlTabCtrl
.m_hWnd
)
694 this->PostMessage(WM_KEYDOWN
,VK_ESCAPE
,0);
700 m_tooltips
.RelayEvent(pMsg
);
701 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
704 bool CRebaseDlg::LogListHasFocus(HWND hwnd
)
707 ::GetClassName(hwnd
, buff
, 128);
709 if(_tcsnicmp(buff
, _T("SysListView32"), 128) == 0)
714 int CRebaseDlg::CheckRebaseCondition()
716 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
718 if( !g_Git
.CheckCleanWorkTree() )
720 if(CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
723 cmd
=_T("git.exe stash");
724 this->AddLogString(cmd
);
725 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
727 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
735 //Todo Check $REBASE_ROOT
739 cmd
=_T("git.exe var GIT_COMMITTER_IDENT");
740 if(g_Git
.Run(cmd
,NULL
,CP_UTF8
))
743 //Todo call pre_rebase_hook
746 int CRebaseDlg::StartRebase()
749 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
750 if(!this->m_IsCherryPick
)
752 //Todo call comment_for_reflog
753 cmd
.Format(_T("git.exe checkout %s"),this->m_BranchCtrl
.GetString());
754 this->AddLogString(cmd
);
756 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
758 this->AddLogString(out
);
762 this->AddLogString(out
);
765 cmd
=_T("git.exe rev-parse --verify HEAD");
766 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
768 AddLogString(CString(MAKEINTRESOURCE(IDS_PROC_NOHEAD
)));
772 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
773 // echo "detached HEAD" > "$DOTEST"/head-name
775 cmd
.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
776 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
778 AddLogString(_T("update ORIG_HEAD Fail"));
782 m_OrigUpstreamHash
.Empty();
783 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
784 if(m_OrigUpstreamHash
.IsEmpty())
786 this->AddLogString(m_OrigUpstreamHash
);
790 if( !this->m_IsCherryPick
)
792 cmd
.Format(_T("git.exe checkout -f %s"), m_OrigUpstreamHash
.ToString());
793 this->AddLogString(cmd
);
796 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
798 this->AddLogString(out
);
804 if( !this->m_IsCherryPick
)
806 m_OrigBranchHash
= g_Git
.GetHash(this->m_BranchCtrl
.GetString());
807 if(m_OrigBranchHash
.IsEmpty())
809 this->AddLogString(m_OrigBranchHash
.ToString());
812 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTREBASE
)));
815 log
.Format(_T("%s\r\n"), CString(MAKEINTRESOURCE(IDS_PROC_REBASE_STARTCHERRYPICK
)));
817 this->AddLogString(log
);
820 int CRebaseDlg::VerifyNoConflict()
823 if(g_Git
.ListConflictFile(list
))
825 AddLogString(_T("Get conflict files fail"));
828 if( list
.GetCount() != 0 )
830 CMessageBox::Show(NULL
, IDS_PROGRS_CONFLICTSOCCURED
, IDS_APPNAME
, MB_OK
);
836 int CRebaseDlg::FinishRebase()
838 if(this->m_IsCherryPick
) //cherry pick mode no "branch", working at upstream branch
841 git_revnum_t head
= g_Git
.GetHash(_T("HEAD"));
845 cmd
.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl
.GetString());
847 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
855 cmd
.Format(_T("git.exe reset --hard %s"),head
);
857 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
864 m_ctrlTabCtrl
.RemoveTab(0);
865 m_ctrlTabCtrl
.RemoveTab(0);
866 m_CtrlStatusText
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED
)));
870 void CRebaseDlg::OnBnClickedContinue()
872 if( m_RebaseStage
== REBASE_DONE
)
878 if( this->m_IsFastForward
)
881 CString oldbranch
= g_Git
.GetCurrentBranch();
882 if( oldbranch
!= m_BranchCtrl
.GetString() )
884 cmd
.Format(_T("git.exe checkout %s"),m_BranchCtrl
.GetString());
886 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
888 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
895 m_OrigBranchHash
= g_Git
.GetHash(m_BranchCtrl
.GetString());
896 m_OrigUpstreamHash
= g_Git
.GetHash(this->m_UpstreamCtrl
.GetString());
898 if(!g_Git
.IsFastForward(this->m_BranchCtrl
.GetString(),this->m_UpstreamCtrl
.GetString()))
900 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
901 AddLogString(_T("No fast forward possible.\r\nMaybe repository changed"));
905 cmd
.Format(_T("git.exe reset --hard %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
907 log
.Format(IDS_PROC_REBASE_FFTO
, m_UpstreamCtrl
.GetString());
908 this->AddLogString(log
);
911 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
912 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
914 AddLogString(CString(MAKEINTRESOURCE(IDS_FAIL
)));
919 AddLogString(CString(MAKEINTRESOURCE(IDS_DONE
)));
920 m_RebaseStage
= REBASE_DONE
;
921 UpdateCurrentStatus();
925 if( m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
927 if(CheckRebaseCondition())
929 m_RebaseStage
= REBASE_START
;
930 m_FileListCtrl
.Clear();
931 m_FileListCtrl
.m_CurrentVersion
= L
"";
932 m_ctrlTabCtrl
.SetTabLabel(REBASE_TAB_CONFLICT
, CString(MAKEINTRESOURCE(IDS_PROC_CONFLICTFILES
)));
933 m_ctrlTabCtrl
.AddTab(&m_wndOutputRebase
, CString(MAKEINTRESOURCE(IDS_LOG
)), 2);
936 if( m_RebaseStage
== REBASE_FINISH
)
944 if( m_RebaseStage
== REBASE_SQUASH_CONFLICT
)
946 if(VerifyNoConflict())
948 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
949 if(this->CheckNextCommitIsSquash())
950 {//next commit is not squash;
951 m_RebaseStage
= REBASE_SQUASH_EDIT
;
952 this->OnRebaseUpdateUI(0,0);
953 this->UpdateCurrentStatus();
957 m_RebaseStage
=REBASE_CONTINUE
;
958 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
959 this->UpdateCurrentStatus();
963 if( m_RebaseStage
== REBASE_CONFLICT
)
965 if(VerifyNoConflict())
968 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
972 cmd
.Format(_T("git.exe commit -a -C %s"), curRev
->m_CommitHash
.ToString());
976 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
979 if(!g_Git
.CheckCleanWorkTree())
981 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
987 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
988 if( curRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_EDIT
)
990 m_RebaseStage
=REBASE_EDIT
;
991 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
992 this->UpdateCurrentStatus();
997 m_RebaseStage
=REBASE_CONTINUE
;
998 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
999 this->UpdateCurrentStatus();
1003 if( m_RebaseStage
== REBASE_EDIT
|| m_RebaseStage
== REBASE_SQUASH_EDIT
)
1006 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1008 str
=this->m_LogMessageCtrl
.GetText();
1009 if(str
.Trim().IsEmpty())
1011 CMessageBox::Show(NULL
, IDS_PROC_COMMITMESSAGE_EMPTY
,IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1015 CString tempfile
=::GetTempFile();
1016 CAppUtils::SaveCommitUnicodeFile(tempfile
, str
);
1020 if( m_RebaseStage
== REBASE_SQUASH_EDIT
)
1021 cmd
.Format(_T("git.exe commit -F \"%s\""), tempfile
);
1023 cmd
.Format(_T("git.exe commit --amend -F \"%s\""), tempfile
);
1025 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1027 if(!g_Git
.CheckCleanWorkTree())
1029 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1034 CFile::Remove(tempfile
);
1036 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1037 m_RebaseStage
=REBASE_CONTINUE
;
1038 curRev
->GetAction(&m_CommitList
)|=CTGitPath::LOGACTIONS_REBASE_DONE
;
1039 this->UpdateCurrentStatus();
1043 InterlockedExchange(&m_bThreadRunning
, TRUE
);
1046 if (AfxBeginThread(RebaseThreadEntry
, this)==NULL
)
1048 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1049 CMessageBox::Show(NULL
, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
1053 int CRebaseDlg::CheckNextCommitIsSquash()
1056 if(m_CommitList
.m_IsOldFirst
)
1057 index
=m_CurrentRebaseIndex
+1;
1059 index
=m_CurrentRebaseIndex
-1;
1066 if(index
>= m_CommitList
.GetItemCount())
1069 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[index
];
1071 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1073 if( curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
)
1075 if(m_CommitList
.m_IsOldFirst
)
1083 }while(curRev
->GetAction(&m_CommitList
)&CTGitPath::LOGACTIONS_REBASE_SKIP
);
1088 int CRebaseDlg::GoNext()
1090 if(m_CommitList
.m_IsOldFirst
)
1091 m_CurrentRebaseIndex
++;
1093 m_CurrentRebaseIndex
--;
1097 int CRebaseDlg::StateAction()
1099 switch(this->m_RebaseStage
)
1102 case CHOOSE_COMMIT_PICK_MODE
:
1105 m_RebaseStage
= REBASE_START
;
1112 void CRebaseDlg::SetContinueButtonText()
1115 switch(this->m_RebaseStage
)
1118 case CHOOSE_COMMIT_PICK_MODE
:
1119 if(this->m_IsFastForward
)
1120 Text
.LoadString(IDS_PROC_STARTREBASEFFBUTTON
);
1122 Text
.LoadString(IDS_PROC_STARTREBASEBUTTON
);
1126 case REBASE_CONTINUE
:
1127 case REBASE_SQUASH_CONFLICT
:
1128 Text
.LoadString(IDS_CONTINUEBUTTON
);
1131 case REBASE_CONFLICT
:
1132 Text
.LoadString(IDS_COMMITBUTTON
);
1135 Text
.LoadString(IDS_AMENDBUTTON
);
1138 case REBASE_SQUASH_EDIT
:
1139 Text
.LoadString(IDS_COMMITBUTTON
);
1144 Text
.LoadString(IDS_FINISHBUTTON
);
1148 Text
.LoadString(IDS_DONE
);
1151 this->GetDlgItem(IDC_REBASE_CONTINUE
)->SetWindowText(Text
);
1154 void CRebaseDlg::SetControlEnable()
1156 switch(this->m_RebaseStage
)
1159 case CHOOSE_COMMIT_PICK_MODE
:
1161 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(TRUE
);
1162 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(TRUE
);
1163 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(TRUE
);
1164 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(TRUE
);
1165 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(TRUE
);
1169 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(TRUE
);
1170 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(TRUE
);
1171 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(TRUE
);
1173 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
1174 this->m_CommitList
.m_ContextMenuMask
|= m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1175 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1176 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1177 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
);
1181 case REBASE_CONTINUE
:
1184 case REBASE_CONFLICT
:
1186 case REBASE_SQUASH_CONFLICT
:
1188 this->GetDlgItem(IDC_PICK_ALL
)->EnableWindow(FALSE
);
1189 this->GetDlgItem(IDC_EDIT_ALL
)->EnableWindow(FALSE
);
1190 this->GetDlgItem(IDC_SQUASH_ALL
)->EnableWindow(FALSE
);
1191 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH
)->EnableWindow(FALSE
);
1192 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM
)->EnableWindow(FALSE
);
1193 this->GetDlgItem(IDC_REBASE_CHECK_FORCE
)->EnableWindow(FALSE
);
1194 this->GetDlgItem(IDC_BUTTON_UP2
)->EnableWindow(FALSE
);
1195 this->GetDlgItem(IDC_BUTTON_DOWN2
)->EnableWindow(FALSE
);
1196 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
1197 this->m_CommitList
.m_ContextMenuMask
&= ~(m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK
)|
1198 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH
)|
1199 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT
)|
1200 m_CommitList
.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP
));
1202 if( m_RebaseStage
== REBASE_DONE
&& (this->m_PostButtonTexts
.GetCount() != 0) )
1204 this->GetDlgItem(IDC_STATUS_STATIC
)->ShowWindow(SW_HIDE
);
1205 this->GetDlgItem(IDC_REBASE_POST_BUTTON
)->ShowWindow(SW_SHOWNORMAL
);
1206 this->m_PostButton
.RemoveAll();
1207 this->m_PostButton
.AddEntries(m_PostButtonTexts
);
1208 //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
1213 if(m_bThreadRunning
)
1215 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1220 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(TRUE
);
1224 void CRebaseDlg::UpdateProgress()
1229 if(m_CommitList
.m_IsOldFirst
)
1230 index
= m_CurrentRebaseIndex
+1;
1232 index
= m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1234 m_ProgressBar
.SetRange(1,m_CommitList
.GetItemCount());
1235 m_ProgressBar
.SetPos(index
);
1238 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
1239 m_pTaskbarList
->SetProgressValue(m_hWnd
, index
, m_CommitList
.GetItemCount());
1242 if(m_CurrentRebaseIndex
>=0 && m_CurrentRebaseIndex
< m_CommitList
.GetItemCount())
1245 text
.Format(IDS_PROC_REBASING_PROGRESS
, index
, m_CommitList
.GetItemCount());
1246 m_CtrlStatusText
.SetWindowText(text
);
1250 GitRev
*prevRev
=NULL
, *curRev
=NULL
;
1252 if( m_CurrentRebaseIndex
>= 0 && m_CurrentRebaseIndex
< m_CommitList
.m_arShownList
.GetSize())
1254 curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1257 for(int i
=0;i
<m_CommitList
.m_arShownList
.GetSize();i
++)
1259 prevRev
=(GitRev
*)m_CommitList
.m_arShownList
[i
];
1260 if(prevRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_CURRENT
)
1262 prevRev
->GetAction(&m_CommitList
) &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1263 m_CommitList
.GetItemRect(i
,&rect
,LVIR_BOUNDS
);
1264 m_CommitList
.InvalidateRect(rect
);
1270 curRev
->GetAction(&m_CommitList
) |= CTGitPath::LOGACTIONS_REBASE_CURRENT
;
1271 m_CommitList
.GetItemRect(m_CurrentRebaseIndex
,&rect
,LVIR_BOUNDS
);
1272 m_CommitList
.InvalidateRect(rect
);
1274 m_CommitList
.EnsureVisible(m_CurrentRebaseIndex
,FALSE
);
1277 void CRebaseDlg::UpdateCurrentStatus()
1279 SetContinueButtonText();
1284 void CRebaseDlg::AddLogString(CString str
)
1286 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, FALSE
);
1287 CStringA sTextA
= m_wndOutputRebase
.StringForControl(str
);//CUnicodeUtils::GetUTF8(str);
1288 this->m_wndOutputRebase
.SendMessage(SCI_DOCUMENTEND
);
1289 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)sTextA
);
1290 this->m_wndOutputRebase
.SendMessage(SCI_REPLACESEL
, 0, (LPARAM
)(LPCSTR
)"\n");
1291 this->m_wndOutputRebase
.SendMessage(SCI_SETREADONLY
, TRUE
);
1294 int CRebaseDlg::GetCurrentCommitID()
1296 if(m_CommitList
.m_IsOldFirst
)
1298 return this->m_CurrentRebaseIndex
+1;
1303 return m_CommitList
.GetItemCount()-m_CurrentRebaseIndex
;
1307 int CRebaseDlg::DoRebase()
1310 if(m_CurrentRebaseIndex
<0)
1312 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1315 GitRev
*pRev
= (GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1316 int mode
=pRev
->GetAction(&m_CommitList
) & CTGitPath::LOGACTIONS_REBASE_MODE_MASK
;
1319 if( mode
== CTGitPath::LOGACTIONS_REBASE_SKIP
)
1321 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1325 if( mode
!= CTGitPath::LOGACTIONS_REBASE_PICK
)
1327 this->m_SquashMessage
+= pRev
->GetSubject();
1328 this->m_SquashMessage
+= _T("\n");
1329 this->m_SquashMessage
+= pRev
->GetBody();
1332 this->m_SquashMessage
.Empty();
1334 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1335 nocommit
=_T(" --no-commit ");
1338 log
.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode
),this->GetCurrentCommitID(),pRev
->m_CommitHash
.ToString());
1340 AddLogString(pRev
->GetSubject());
1341 if (pRev
->GetSubject().IsEmpty())
1343 CMessageBox::Show(m_hWnd
, IDS_PROC_REBASE_EMPTYCOMMITMSG
, IDS_APPNAME
, MB_OK
| MB_ICONEXCLAMATION
);
1344 mode
= CTGitPath::LOGACTIONS_REBASE_EDIT
;
1347 CString cherryPickedFrom
;
1348 if (m_bAddCherryPickedFrom
)
1349 cherryPickedFrom
= _T("-x ");
1351 cmd
.Format(_T("git.exe cherry-pick %s%s %s"), cherryPickedFrom
, nocommit
, pRev
->m_CommitHash
.ToString());
1353 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1357 if(g_Git
.ListConflictFile(list
))
1359 AddLogString(_T("Get conflict files fail"));
1362 if(list
.GetCount() == 0 )
1364 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1366 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1369 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1371 this->m_RebaseStage
= REBASE_EDIT
;
1372 return -1; // Edit return -1 to stop rebase.
1375 if(CheckNextCommitIsSquash())
1377 // let user edit last commmit message
1378 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1382 if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1383 m_RebaseStage
= REBASE_SQUASH_CONFLICT
;
1385 m_RebaseStage
= REBASE_CONFLICT
;
1392 if(mode
== CTGitPath::LOGACTIONS_REBASE_PICK
)
1394 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1397 if(mode
== CTGitPath::LOGACTIONS_REBASE_EDIT
)
1399 this->m_RebaseStage
= REBASE_EDIT
;
1400 return -1; // Edit return -1 to stop rebase.
1404 if(CheckNextCommitIsSquash())
1406 // let user edit last commmit message
1407 this->m_RebaseStage
= REBASE_SQUASH_EDIT
;
1410 else if(mode
== CTGitPath::LOGACTIONS_REBASE_SQUASH
)
1411 pRev
->GetAction(&m_CommitList
)|= CTGitPath::LOGACTIONS_REBASE_DONE
;
1417 BOOL
CRebaseDlg::IsEnd()
1419 if(m_CommitList
.m_IsOldFirst
)
1420 return m_CurrentRebaseIndex
>= this->m_CommitList
.GetItemCount();
1422 return m_CurrentRebaseIndex
<0;
1425 int CRebaseDlg::RebaseThread()
1427 CBlockCacheForPath
cacheBlock(g_Git
.m_CurrentDir
);
1432 if( m_RebaseStage
== REBASE_START
)
1434 if( this->StartRebase() )
1436 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1438 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1441 m_RebaseStage
= REBASE_CONTINUE
;
1444 else if( m_RebaseStage
== REBASE_CONTINUE
)
1447 UpdateCurrentStatus();
1451 m_RebaseStage
= REBASE_FINISH
;
1465 else if( m_RebaseStage
== REBASE_FINISH
)
1468 m_RebaseStage
= REBASE_DONE
;
1470 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1478 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1479 //this->UpdateCurrentStatus();
1482 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1483 this->PostMessage(MSG_REBASE_UPDATE_UI
);
1487 void CRebaseDlg::ListConflictFile()
1489 this->m_FileListCtrl
.Clear();
1494 m_FileListCtrl
.m_bIsRevertTheirMy
= !m_IsCherryPick
;
1496 this->m_FileListCtrl
.GetStatus(&list
,true);
1497 this->m_FileListCtrl
.Show(CTGitPath::LOGACTIONS_UNMERGED
|CTGitPath::LOGACTIONS_MODIFIED
|CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_DELETED
,
1498 CTGitPath::LOGACTIONS_UNMERGED
);
1501 LRESULT
CRebaseDlg::OnRebaseUpdateUI(WPARAM
,LPARAM
)
1503 UpdateCurrentStatus();
1504 if(m_CurrentRebaseIndex
<0)
1506 if(m_CurrentRebaseIndex
>= m_CommitList
.GetItemCount() )
1508 GitRev
*curRev
=(GitRev
*)m_CommitList
.m_arShownList
[m_CurrentRebaseIndex
];
1510 switch(m_RebaseStage
)
1512 case REBASE_CONFLICT
:
1513 case REBASE_SQUASH_CONFLICT
:
1515 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_CONFLICT
);
1517 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_ERROR
);
1518 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1519 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1522 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1524 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1525 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1526 this->m_LogMessageCtrl
.SetText(curRev
->GetSubject()+_T("\n")+curRev
->GetBody());
1528 case REBASE_SQUASH_EDIT
:
1529 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_MESSAGE
);
1530 this->m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1531 this->m_LogMessageCtrl
.SetText(this->m_SquashMessage
);
1533 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_PAUSED
);
1536 this->m_ctrlTabCtrl
.SetActiveTab(REBASE_TAB_LOG
);
1540 void CRebaseDlg::OnCancel()
1544 void CRebaseDlg::OnBnClickedAbort()
1547 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
1550 CString pron
= m_OrigUpstreamHash
.ToString();
1551 if(m_OrigUpstreamHash
.IsEmpty())
1553 __super::OnCancel();
1556 if(m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
)
1561 if(CMessageBox::Show(NULL
, IDS_PROC_REBASE_ABORT
, IDS_APPNAME
, MB_YESNO
) != IDYES
)
1564 if(this->m_IsFastForward
)
1566 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1567 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1570 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1572 __super::OnCancel();
1575 cmd
.Format(_T("git.exe checkout -f %s"),g_Git
.FixBranchName(this->m_UpstreamCtrl
.GetString()));
1576 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1579 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1580 __super::OnCancel();
1584 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash
.ToString());
1585 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1588 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1589 __super::OnCancel();
1593 if(this->m_IsCherryPick
) //there are not "branch" at cherry pick mode
1595 __super::OnCancel();
1599 cmd
.Format(_T("git checkout -f %s"),this->m_BranchCtrl
.GetString());
1600 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1603 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1604 __super::OnCancel();
1608 cmd
.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash
.ToString());
1609 if(g_Git
.Run(cmd
,&out
,CP_UTF8
))
1612 ::MessageBox(this->m_hWnd
, _T("Unrecoverable error on cleanup:\n") + out
, _T("TortoiseGit"), MB_ICONERROR
);
1614 __super::OnCancel();
1617 void CRebaseDlg::OnBnClickedButtonBrowse()
1619 if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl
, gPickRef_NoTag
))
1620 OnCbnSelchangeUpstream();
1623 void CRebaseDlg::OnBnClickedRebaseCheckForce()
1626 this->FetchLogList();
1627 if(this->CheckRebaseCondition())
1629 /* Disable Start Rebase */
1630 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1634 void CRebaseDlg::OnBnClickedRebasePostButton()
1636 this->m_Upstream
=this->m_UpstreamCtrl
.GetString();
1637 this->m_Branch
=this->m_BranchCtrl
.GetString();
1639 this->EndDialog(IDC_REBASE_POST_BUTTON
+this->m_PostButton
.GetCurrentEntry());
1642 void CRebaseDlg::Refresh()
1644 if(this->m_IsCherryPick
)
1647 if(this->m_RebaseStage
== CHOOSE_BRANCH
)
1650 this->FetchLogList();
1651 if(this->CheckRebaseCondition())
1653 /* Disable Start Rebase */
1654 this->GetDlgItem(IDC_REBASE_CONTINUE
)->EnableWindow(FALSE
);
1659 void CRebaseDlg::OnBnClickedButtonUp2()
1662 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1664 // do nothing if the first selected item is the first item in the list
1665 if (m_CommitList
.GetNextSelectedItem(pos
) == 0)
1668 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1670 bool changed
= false;
1673 int index
=m_CommitList
.GetNextSelectedItem(pos
);
1676 CGitHash old
= m_CommitList
.m_logEntries
[index
-1];
1677 m_CommitList
.m_logEntries
[index
-1] = m_CommitList
.m_logEntries
[index
];
1678 m_CommitList
.m_logEntries
[index
] = old
;
1679 m_CommitList
.SetItemState(index
-1, LVIS_SELECTED
, LVIS_SELECTED
);
1680 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1686 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1687 m_CommitList
.Invalidate();
1688 m_CommitList
.SetFocus();
1692 void CRebaseDlg::OnBnClickedButtonDown2()
1694 if (m_CommitList
.GetSelectedCount() == 0)
1698 pos
= m_CommitList
.GetFirstSelectedItemPosition();
1699 bool changed
= false;
1700 // use an array to store all selected item indexes; the user won't select too much items
1701 int* indexes
= NULL
;
1702 indexes
= new int[m_CommitList
.GetSelectedCount()];
1706 indexes
[i
++] = m_CommitList
.GetNextSelectedItem(pos
);
1708 // don't move any item if the last selected item is the last item in the m_CommitList
1709 // (that would change the order of the selected items)
1710 if(indexes
[m_CommitList
.GetSelectedCount() - 1] < m_CommitList
.GetItemCount() - 1)
1712 // iterate over the indexes backwards in order to correctly move multiselected items
1713 for (i
= m_CommitList
.GetSelectedCount() - 1; i
>= 0; i
--)
1715 int index
= indexes
[i
];
1716 CGitHash old
= m_CommitList
.m_logEntries
[index
+1];
1717 m_CommitList
.m_logEntries
[index
+1] = m_CommitList
.m_logEntries
[index
];
1718 m_CommitList
.m_logEntries
[index
] = old
;
1719 m_CommitList
.SetItemState(index
, 0, LVIS_SELECTED
);
1720 m_CommitList
.SetItemState(index
+1, LVIS_SELECTED
, LVIS_SELECTED
);
1728 m_CommitList
.RecalculateShownList(&m_CommitList
.m_arShownList
);
1729 m_CommitList
.Invalidate();
1730 m_CommitList
.SetFocus();
1734 LRESULT
CRebaseDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1736 m_pTaskbarList
.Release();
1737 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
1741 void CRebaseDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1743 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1745 if(m_CommitList
.m_bNoDispUpdates
)
1747 if (pNMLV
->iItem
>= 0)
1749 this->m_CommitList
.m_nSearchIndex
= pNMLV
->iItem
;
1750 if (pNMLV
->iSubItem
!= 0)
1752 if ((pNMLV
->iItem
== m_CommitList
.m_arShownList
.GetCount()))
1754 // remove the selected state
1755 if (pNMLV
->uChanged
& LVIF_STATE
)
1757 m_CommitList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1758 FillLogMessageCtrl();
1762 if (pNMLV
->uChanged
& LVIF_STATE
)
1764 FillLogMessageCtrl();
1769 FillLogMessageCtrl();
1773 void CRebaseDlg::FillLogMessageCtrl()
1775 int selCount
= m_CommitList
.GetSelectedCount();
1776 if (selCount
== 1 && (m_RebaseStage
== CHOOSE_BRANCH
|| m_RebaseStage
== CHOOSE_COMMIT_PICK_MODE
))
1778 POSITION pos
= m_CommitList
.GetFirstSelectedItemPosition();
1779 int selIndex
= m_CommitList
.GetNextSelectedItem(pos
);
1780 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_CommitList
.m_arShownList
.SafeGetAt(selIndex
));
1781 m_FileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_CommitList
));
1782 m_FileListCtrl
.m_CurrentVersion
= pLogEntry
->m_CommitHash
;
1783 m_FileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
1784 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, FALSE
);
1785 m_LogMessageCtrl
.SetText(pLogEntry
->GetSubject() + _T("\n") + pLogEntry
->GetBody());
1786 m_LogMessageCtrl
.Call(SCI_SETREADONLY
, TRUE
);
1789 void CRebaseDlg::OnBnClickedCheckCherryPickedFrom()