1 // RebaseDlg.cpp : implementation file
\r
5 #include "TortoiseProc.h"
\r
6 #include "RebaseDlg.h"
\r
7 #include "AppUtils.h"
\r
8 #include "MessageBox.h"
\r
9 #include "UnicodeUtils.h"
\r
10 // CRebaseDlg dialog
\r
12 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)
\r
14 CRebaseDlg::CRebaseDlg(CWnd* pParent /*=NULL*/)
\r
15 : CResizableStandAloneDialog(CRebaseDlg::IDD, pParent)
\r
17 , m_bSquashAll(FALSE)
\r
20 m_RebaseStage=CHOOSE_BRANCH;
\r
21 m_CurrentRebaseIndex=-1;
\r
22 m_bThreadRunning =FALSE;
\r
23 this->m_IsCherryPick = FALSE;
\r
26 CRebaseDlg::~CRebaseDlg()
\r
30 void CRebaseDlg::DoDataExchange(CDataExchange* pDX)
\r
32 CDialog::DoDataExchange(pDX);
\r
33 DDX_Control(pDX, IDC_REBASE_PROGRESS, m_ProgressBar);
\r
34 DDX_Control(pDX, IDC_STATUS_STATIC, m_CtrlStatusText);
\r
35 DDX_Check(pDX, IDC_PICK_ALL, m_bPickAll);
\r
36 DDX_Check(pDX, IDC_SQUASH_ALL, m_bSquashAll);
\r
37 DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);
\r
38 DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);
\r
39 DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);
\r
40 DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);
\r
41 DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM, this->m_UpstreamCtrl);
\r
46 BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog)
\r
47 ON_BN_CLICKED(IDC_PICK_ALL, &CRebaseDlg::OnBnClickedPickAll)
\r
48 ON_BN_CLICKED(IDC_SQUASH_ALL, &CRebaseDlg::OnBnClickedSquashAll)
\r
49 ON_BN_CLICKED(IDC_EDIT_ALL, &CRebaseDlg::OnBnClickedEditAll)
\r
50 ON_BN_CLICKED(IDC_REBASE_SPLIT, &CRebaseDlg::OnBnClickedRebaseSplit)
\r
51 ON_BN_CLICKED(IDC_REBASE_CONTINUE,OnBnClickedContinue)
\r
52 ON_BN_CLICKED(IDC_REBASE_ABORT, OnBnClickedAbort)
\r
54 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH, &CRebaseDlg::OnCbnSelchangeBranch)
\r
55 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)
\r
56 ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)
\r
59 void CRebaseDlg::AddRebaseAnchor()
\r
61 AddAnchor(IDC_REBASE_TAB,TOP_LEFT,BOTTOM_RIGHT);
\r
62 AddAnchor(IDC_COMMIT_LIST,TOP_LEFT, TOP_RIGHT);
\r
63 AddAnchor(IDC_REBASE_SPLIT,TOP_LEFT, TOP_RIGHT);
\r
64 AddAnchor(IDC_STATUS_STATIC, BOTTOM_LEFT,BOTTOM_RIGHT);
\r
65 AddAnchor(IDC_REBASE_CONTINUE,BOTTOM_RIGHT);
\r
66 AddAnchor(IDC_REBASE_ABORT, BOTTOM_RIGHT);
\r
67 AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);
\r
68 AddAnchor(IDC_PICK_ALL,TOP_LEFT);
\r
69 AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);
\r
70 AddAnchor(IDC_EDIT_ALL,TOP_LEFT);
\r
71 AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);
\r
72 AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);
\r
73 AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);
\r
74 AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);
\r
78 BOOL CRebaseDlg::OnInitDialog()
\r
80 CResizableStandAloneDialog::OnInitDialog();
\r
83 //IDC_REBASE_DUMY_TAB
\r
85 GetClientRect(m_DlgOrigRect);
\r
86 m_CommitList.GetClientRect(m_CommitListOrigRect);
\r
88 CWnd *pwnd=this->GetDlgItem(IDC_REBASE_DUMY_TAB);
\r
89 pwnd->GetWindowRect(&rectDummy);
\r
90 this->ScreenToClient(rectDummy);
\r
92 if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_REBASE_TAB))
\r
94 TRACE0("Failed to create output tab window\n");
\r
95 return FALSE; // fail to create
\r
97 m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
\r
98 // Create output panes:
\r
99 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
\r
100 DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
\r
102 if (! this->m_FileListCtrl.Create(dwStyle,rectDummy,&this->m_ctrlTabCtrl,0) )
\r
104 TRACE0("Failed to create output windows\n");
\r
105 return FALSE; // fail to create
\r
108 if( ! this->m_LogMessageCtrl.Create(_T("Scintilla"),_T("source"),0,rectDummy,&m_ctrlTabCtrl,0,0) )
\r
110 TRACE0("Failed to create log message control");
\r
113 m_LogMessageCtrl.Init(0);
\r
115 dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
\r
117 if (!m_wndOutputRebase.Create(_T("Scintilla"),_T("source"),0,rectDummy, &m_ctrlTabCtrl, 0,0) )
\r
119 TRACE0("Failed to create output windows\n");
\r
120 return -1; // fail to create
\r
122 m_wndOutputRebase.Init(0);
\r
123 m_wndOutputRebase.Call(SCI_SETREADONLY, TRUE);
\r
125 m_tooltips.Create(this);
\r
127 m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);
\r
129 m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));
\r
130 m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1);
\r
131 m_ctrlTabCtrl.AddTab(&m_wndOutputRebase,_T("Log"),2);
\r
135 EnableSaveRestore(_T("RebaseDlg"));
\r
137 DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
\r
138 RECT rcDlg, rcLogMsg, rcFileList;
\r
139 GetClientRect(&rcDlg);
\r
140 m_CommitList.GetWindowRect(&rcLogMsg);
\r
141 ScreenToClient(&rcLogMsg);
\r
142 this->m_ctrlTabCtrl.GetWindowRect(&rcFileList);
\r
143 ScreenToClient(&rcFileList);
\r
147 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
148 ScreenToClient(&rectSplitter);
\r
149 int delta = yPos - rectSplitter.top;
\r
150 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
\r
152 m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
\r
157 if( this->m_RebaseStage == CHOOSE_BRANCH)
\r
159 this->LoadBranchInfo();
\r
163 this->m_BranchCtrl.EnableWindow(FALSE);
\r
164 this->m_UpstreamCtrl.EnableWindow(FALSE);
\r
167 m_CommitList.m_IsIDReplaceAction = TRUE;
\r
168 // m_CommitList.m_IsOldFirst = TRUE;
\r
169 m_CommitList.m_IsRebaseReplaceGraph = TRUE;
\r
171 m_CommitList.InsertGitColumn();
\r
173 this->SetControlEnable();
\r
177 this->m_BranchCtrl.SetCurSel(-1);
\r
178 this->m_BranchCtrl.EnableWindow(FALSE);
\r
179 this->m_UpstreamCtrl.EnableWindow(FALSE);
\r
180 this->SetWindowText(_T("Cherry Pick"));
\r
181 this->m_CommitList.StartFilter();
\r
185 SetContinueButtonText();
\r
186 m_CommitList.DeleteAllItems();
\r
190 m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK)|
\r
191 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV)|
\r
192 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_RESET)|
\r
193 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTREV)|
\r
194 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION)|
\r
195 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV)|
\r
196 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT));
\r
200 // CRebaseDlg message handlers
\r
202 void CRebaseDlg::OnBnClickedPickAll()
\r
204 // TODO: Add your control notification handler code here
\r
205 this->UpdateData();
\r
206 if(this->m_bPickAll)
\r
207 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK);
\r
209 this->m_bEditAll=FALSE;
\r
210 this->m_bSquashAll=FALSE;
\r
211 this->UpdateData(FALSE);
\r
215 void CRebaseDlg::OnBnClickedSquashAll()
\r
217 // TODO: Add your control notification handler code here
\r
218 this->UpdateData();
\r
219 if(this->m_bSquashAll)
\r
220 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
\r
222 this->m_bEditAll=FALSE;
\r
223 this->m_bPickAll=FALSE;
\r
224 this->UpdateData(FALSE);
\r
228 void CRebaseDlg::OnBnClickedEditAll()
\r
230 // TODO: Add your control notification handler code here
\r
231 this->UpdateData();
\r
232 if( this->m_bEditAll )
\r
233 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
\r
235 this->m_bPickAll=FALSE;
\r
236 this->m_bSquashAll=FALSE;
\r
237 this->UpdateData(FALSE);
\r
241 void CRebaseDlg::SetAllRebaseAction(int action)
\r
243 for(int i=0;i<this->m_CommitList.m_logEntries.size();i++)
\r
245 m_CommitList.m_logEntries[i].m_Action=action;
\r
247 m_CommitList.Invalidate();
\r
250 void CRebaseDlg::OnBnClickedRebaseSplit()
\r
252 this->UpdateData();
\r
253 // TODO: Add your control notification handler code here
\r
256 LRESULT CRebaseDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
260 if (wParam == IDC_REBASE_SPLIT)
\r
262 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
263 DoSize(pHdr->delta);
\r
268 return __super::DefWindowProc(message, wParam, lParam);
\r
271 void CRebaseDlg::DoSize(int delta)
\r
274 this->RemoveAllAnchors();
\r
276 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST), delta, CW_TOPALIGN);
\r
277 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
\r
278 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN);
\r
279 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
\r
280 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);
\r
281 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);
\r
282 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);
\r
284 this->AddRebaseAnchor();
\r
285 // adjust the minimum size of the dialog to prevent the resizing from
\r
286 // moving the list control too far down.
\r
288 m_CommitList.GetClientRect(rcLogMsg);
\r
289 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_CommitListOrigRect.Height()+rcLogMsg.Height()));
\r
291 SetSplitterRange();
\r
292 // m_CommitList.Invalidate();
\r
294 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
296 this->m_ctrlTabCtrl.Invalidate();
\r
297 this->m_CommitList.Invalidate();
\r
298 this->m_FileListCtrl.Invalidate();
\r
299 this->m_LogMessageCtrl.Invalidate();
\r
303 void CRebaseDlg::SetSplitterRange()
\r
305 if ((m_CommitList)&&(m_ctrlTabCtrl))
\r
308 m_CommitList.GetWindowRect(rcTop);
\r
309 ScreenToClient(rcTop);
\r
311 m_ctrlTabCtrl.GetWindowRect(rcMiddle);
\r
312 ScreenToClient(rcMiddle);
\r
313 if (rcMiddle.Height() && rcMiddle.Width())
\r
314 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
318 void CRebaseDlg::OnSize(UINT nType,int cx, int cy)
\r
320 // first, let the resizing take place
\r
321 __super::OnSize(nType, cx, cy);
\r
324 SetSplitterRange();
\r
327 void CRebaseDlg::SaveSplitterPos()
\r
331 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
\r
333 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
334 ScreenToClient(&rectSplitter);
\r
335 regPos = rectSplitter.top;
\r
339 void CRebaseDlg::LoadBranchInfo()
\r
341 m_BranchCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
342 m_UpstreamCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
344 STRING_VECTOR list;
\r
347 g_Git.GetBranchList(list,¤t,CGit::BRANCH_ALL);
\r
348 m_BranchCtrl.AddString(list);
\r
349 m_UpstreamCtrl.AddString(list);
\r
351 m_BranchCtrl.SetCurSel(current);
\r
353 AddBranchToolTips(&m_BranchCtrl);
\r
354 AddBranchToolTips(&m_UpstreamCtrl);
\r
356 if(!m_Upstream.IsEmpty())
\r
358 m_UpstreamCtrl.AddString(m_Upstream);
\r
359 m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.GetCount()-1);
\r
363 void CRebaseDlg::OnCbnSelchangeBranch()
\r
368 void CRebaseDlg::OnCbnSelchangeUpstream()
\r
373 void CRebaseDlg::FetchLogList()
\r
375 m_CommitList.Clear();
\r
376 this->m_CommitList.FillGitLog(NULL,0,&m_UpstreamCtrl.GetString(),&m_BranchCtrl.GetString());
\r
377 if( m_CommitList.GetItemCount() == 0 )
\r
378 m_CommitList.ShowText(_T("Nothing Rebase"));
\r
380 CString hash=g_Git.GetHash(m_UpstreamCtrl.GetString());
\r
383 if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )
\r
385 if(hash == m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])
\r
387 m_CommitList.Clear();
\r
388 m_CommitList.ShowText(_T("Nothing Rebase"));
\r
394 AddBranchToolTips(&this->m_BranchCtrl);
\r
395 AddBranchToolTips(&this->m_UpstreamCtrl);
\r
397 for(int i=0;i<m_CommitList.m_logEntries.size();i++)
\r
399 m_CommitList.m_logEntries[i].m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;
\r
402 m_CommitList.Invalidate();
\r
404 if(m_CommitList.m_IsOldFirst)
\r
405 this->m_CurrentRebaseIndex = -1;
\r
407 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();
\r
411 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
\r
415 CString text=pBranch->GetString();
\r
418 g_Git.GetLog(data,text,NULL,1,0);
\r
420 rev.ParserFromLog(data);
\r
421 tooltip.Format(_T("CommitHash:%s\nCommit by: %s %s\n <b>%s</b> \n %s"),
\r
424 CAppUtils::FormatDateAndTime(rev.m_AuthorDate,DATE_LONGDATE),
\r
428 pBranch->DisableTooltip();
\r
429 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);
\r
433 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)
\r
435 m_tooltips.RelayEvent(pMsg);
\r
436 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
438 int CRebaseDlg::CheckRebaseCondition()
\r
440 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
442 if( !g_Git.CheckCleanWorkTree() )
\r
444 CMessageBox::Show(NULL,_T("Rebase Need Clean Working Tree"),_T("TortoiseGit"),MB_OK);
\r
447 //Todo Check $REBASE_ROOT
\r
448 //Todo Check $DOTEST
\r
451 cmd=_T("git.exe var GIT_COMMITTER_IDENT");
\r
452 if(g_Git.Run(cmd,NULL,CP_UTF8))
\r
455 //Todo call pre_rebase_hook
\r
457 int CRebaseDlg::StartRebase()
\r
460 //Todo call comment_for_reflog
\r
461 cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());
\r
462 this->AddLogString(cmd);
\r
464 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
467 this->AddLogString(out);
\r
469 cmd=_T("git.exe rev-parse --verify HEAD");
\r
470 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
472 AddLogString(_T("No Head"));
\r
476 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
\r
477 // echo "detached HEAD" > "$DOTEST"/head-name
\r
479 cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
\r
480 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
482 AddLogString(_T("update ORIG_HEAD Fail"));
\r
486 cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
\r
488 cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());
\r
489 this->AddLogString(cmd);
\r
492 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
497 cmd.Format(_T("git.exe rev-parse %s"),this->m_UpstreamCtrl.GetString());
\r
498 if(g_Git.Run(cmd,&this->m_OrigUpstreamHash,CP_UTF8))
\r
500 this->AddLogString(m_OrigUpstreamHash);
\r
504 cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());
\r
505 if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))
\r
507 this->AddLogString(m_OrigBranchHash);
\r
511 this->AddLogString(_T("Start Rebase\r\n"));
\r
514 int CRebaseDlg::VerifyNoConflict()
\r
516 CTGitPathList list;
\r
517 if(g_Git.ListConflictFile(list))
\r
519 AddLogString(_T("Get conflict files fail"));
\r
522 if( list.GetCount() != 0 )
\r
524 CMessageBox::Show(NULL,_T("There are conflict file, you should mark it resolve"),_T("TortoiseGit"),MB_OK);
\r
530 void CRebaseDlg::OnBnClickedContinue()
\r
532 if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )
\r
534 if(CheckRebaseCondition())
\r
536 m_RebaseStage = REBASE_START;
\r
539 if( m_RebaseStage == REBASE_FINISH )
\r
542 cmd.Format(_T("git branch -f %s"),this->m_BranchCtrl.GetString());
\r
543 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
548 cmd.Format(_T("git reset --hard %s"),this->m_OrigUpstreamHash);
\r
549 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
557 if( m_RebaseStage == REBASE_SQUASH_CONFLICT)
\r
559 if(VerifyNoConflict())
\r
561 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
562 if(this->CheckNextCommitIsSquash())
\r
563 {//next commit is not squash;
\r
564 m_RebaseStage = REBASE_SQUASH_EDIT;
\r
565 this->OnRebaseUpdateUI(0,0);
\r
566 this->UpdateCurrentStatus();
\r
570 m_RebaseStage=REBASE_CONTINUE;
\r
571 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
572 this->UpdateCurrentStatus();
\r
576 if( m_RebaseStage == REBASE_CONFLICT )
\r
578 if(VerifyNoConflict())
\r
581 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
583 CString out =_T("");
\r
585 cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash);
\r
587 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
589 if(!g_Git.CheckCleanWorkTree())
\r
591 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
597 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
598 if( curRev->m_Action & CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
600 m_RebaseStage=REBASE_EDIT;
\r
601 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
602 this->UpdateCurrentStatus();
\r
607 m_RebaseStage=REBASE_CONTINUE;
\r
608 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
609 this->UpdateCurrentStatus();
\r
614 if( m_RebaseStage == REBASE_EDIT || m_RebaseStage == REBASE_SQUASH_EDIT )
\r
617 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
619 str=this->m_LogMessageCtrl.GetText();
\r
620 if(str.Trim().IsEmpty())
\r
622 CMessageBox::Show(NULL,_T("Commit Message Is Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
626 CString tempfile=::GetTempFile();
\r
627 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
\r
628 CStringA log=CUnicodeUtils::GetUTF8( str);
\r
629 file.Write(log,log.GetLength());
\r
630 //file.WriteString(m_sLogMessage);
\r
635 if( m_RebaseStage == REBASE_SQUASH_EDIT )
\r
636 cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
\r
638 cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
\r
640 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
642 if(!g_Git.CheckCleanWorkTree())
\r
644 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
649 CFile::Remove(tempfile);
\r
651 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
652 m_RebaseStage=REBASE_CONTINUE;
\r
653 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
654 this->UpdateCurrentStatus();
\r
658 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
659 SetControlEnable();
\r
661 if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
\r
663 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
664 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
\r
665 SetControlEnable();
\r
668 int CRebaseDlg::CheckNextCommitIsSquash()
\r
671 if(m_CommitList.m_IsOldFirst)
\r
672 index=m_CurrentRebaseIndex+1;
\r
674 index=m_CurrentRebaseIndex-1;
\r
679 curRev=(GitRev*)m_CommitList.m_arShownList[index];
\r
681 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH )
\r
683 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
685 if(m_CommitList.m_IsOldFirst)
\r
694 if(index>= m_CommitList.GetItemCount())
\r
697 }while(curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP);
\r
702 int CRebaseDlg::GoNext()
\r
704 if(m_CommitList.m_IsOldFirst)
\r
705 m_CurrentRebaseIndex++;
\r
707 m_CurrentRebaseIndex--;
\r
711 int CRebaseDlg::StateAction()
\r
713 switch(this->m_RebaseStage)
\r
715 case CHOOSE_BRANCH:
\r
716 case CHOOSE_COMMIT_PICK_MODE:
\r
719 m_RebaseStage = REBASE_START;
\r
726 void CRebaseDlg::SetContinueButtonText()
\r
729 switch(this->m_RebaseStage)
\r
731 case CHOOSE_BRANCH:
\r
732 case CHOOSE_COMMIT_PICK_MODE:
\r
733 Text = _T("Start");
\r
737 case REBASE_CONTINUE:
\r
738 case REBASE_SQUASH_CONFLICT:
\r
739 Text = _T("Continue");
\r
742 case REBASE_CONFLICT:
\r
743 Text = _T("Commit");
\r
746 Text = _T("Amend");
\r
749 case REBASE_SQUASH_EDIT:
\r
750 Text = _T("Commit");
\r
754 case REBASE_FINISH:
\r
755 Text = _T("Finish");
\r
758 this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
\r
761 void CRebaseDlg::SetControlEnable()
\r
763 switch(this->m_RebaseStage)
\r
765 case CHOOSE_BRANCH:
\r
766 case CHOOSE_COMMIT_PICK_MODE:
\r
768 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
\r
769 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
\r
770 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
\r
771 if(!m_IsCherryPick)
\r
773 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
\r
774 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
\r
776 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
\r
777 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
778 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
779 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
780 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
\r
784 case REBASE_CONTINUE:
\r
786 case REBASE_FINISH:
\r
787 case REBASE_CONFLICT:
\r
789 case REBASE_SQUASH_CONFLICT:
\r
790 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
\r
791 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
\r
792 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
\r
793 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
\r
794 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
\r
795 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
\r
796 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
797 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
798 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
799 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
\r
803 if(m_bThreadRunning)
\r
805 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
\r
806 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(FALSE);
\r
810 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
\r
811 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(TRUE);
\r
815 void CRebaseDlg::UpdateProgress()
\r
820 if(m_CommitList.m_IsOldFirst)
\r
821 index = m_CurrentRebaseIndex+1;
\r
823 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
825 m_ProgressBar.SetRange(1,m_CommitList.GetItemCount());
\r
826 m_ProgressBar.SetPos(index);
\r
828 if(m_CurrentRebaseIndex>0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
\r
831 text.Format(_T("Rebasing...(%d/%d)"),index,m_CommitList.GetItemCount());
\r
832 m_CtrlStatusText.SetWindowText(text);
\r
836 GitRev *prevRev=NULL, *curRev=NULL;
\r
838 if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
\r
840 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
843 for(int i=0;i<m_CommitList.m_arShownList.GetSize();i++)
\r
845 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
\r
846 if(prevRev->m_Action & CTGitPath::LOGACTIONS_REBASE_CURRENT)
\r
848 prevRev->m_Action &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
849 m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
\r
850 m_CommitList.InvalidateRect(rect);
\r
856 curRev->m_Action |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
857 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
\r
858 m_CommitList.InvalidateRect(rect);
\r
860 m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
\r
864 void CRebaseDlg::UpdateCurrentStatus()
\r
866 if( m_CurrentRebaseIndex < 0)
\r
868 if(m_CommitList.m_IsOldFirst)
\r
869 m_RebaseStage = CRebaseDlg::REBASE_START;
\r
871 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
874 if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize())
\r
876 if(m_CommitList.m_IsOldFirst)
\r
877 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
879 m_RebaseStage = CRebaseDlg::REBASE_START;
\r
882 SetContinueButtonText();
\r
883 SetControlEnable();
\r
887 void CRebaseDlg::AddLogString(CString str)
\r
889 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
\r
890 CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
\r
891 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
\r
892 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
\r
893 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
\r
896 int CRebaseDlg::GetCurrentCommitID()
\r
898 if(m_CommitList.m_IsOldFirst)
\r
900 return this->m_CurrentRebaseIndex+1;
\r
904 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
908 int CRebaseDlg::DoRebase()
\r
911 if(m_CurrentRebaseIndex <0)
\r
913 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
916 GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
917 int mode=pRev->m_Action & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
\r
920 if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
922 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
926 if( mode != CTGitPath::LOGACTIONS_REBASE_PICK )
\r
928 this->m_SquashMessage+= pRev->m_Subject;
\r
929 this->m_SquashMessage+= _T("\n");
\r
930 this->m_SquashMessage+= pRev->m_Body;
\r
933 this->m_SquashMessage.Empty();
\r
935 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
936 nocommit=_T(" --no-commit ");
\r
939 log.Format(_T("%s %d:%s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash);
\r
941 AddLogString(pRev->m_Subject);
\r
942 cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash);
\r
944 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
947 CTGitPathList list;
\r
948 if(g_Git.ListConflictFile(list))
\r
950 AddLogString(_T("Get conflict files fail"));
\r
953 if(list.GetCount() == 0 )
\r
955 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
957 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
960 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
961 return -1; // Edit return -1 to stop rebase.
\r
964 if(CheckNextCommitIsSquash())
\r
966 // let user edit last commmit message
\r
967 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
971 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
972 m_RebaseStage = REBASE_SQUASH_CONFLICT;
\r
974 m_RebaseStage = REBASE_CONFLICT;
\r
980 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
982 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
985 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
986 return -1; // Edit return -1 to stop rebase.
\r
989 if(CheckNextCommitIsSquash())
\r
991 // let user edit last commmit message
\r
992 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
1000 BOOL CRebaseDlg::IsEnd()
\r
1002 if(m_CommitList.m_IsOldFirst)
\r
1003 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
\r
1005 return m_CurrentRebaseIndex<0;
\r
1008 int CRebaseDlg::RebaseThread()
\r
1013 if( m_RebaseStage == REBASE_START )
\r
1015 if( this->StartRebase() )
\r
1017 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1021 m_RebaseStage = REBASE_CONTINUE;
\r
1023 }else if( m_RebaseStage == REBASE_CONTINUE )
\r
1029 m_RebaseStage = REBASE_FINISH;
\r
1042 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1043 //this->UpdateCurrentStatus();
\r
1046 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1047 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1051 void CRebaseDlg::ListConflictFile()
\r
1053 this->m_FileListCtrl.Clear();
\r
1054 CTGitPathList list;
\r
1056 list.AddPath(path);
\r
1058 this->m_FileListCtrl.GetStatus(&list,true);
\r
1059 this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED,CTGitPath::LOGACTIONS_UNMERGED);
\r
1060 if( this->m_FileListCtrl.GetItemCount() == 0 )
\r
1066 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
\r
1068 UpdateCurrentStatus();
\r
1069 if(m_CurrentRebaseIndex <0)
\r
1071 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
1073 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
1075 switch(m_RebaseStage)
\r
1077 case REBASE_CONFLICT:
\r
1078 case REBASE_SQUASH_CONFLICT:
\r
1079 ListConflictFile();
\r
1080 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
\r
1081 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1084 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1085 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1087 case REBASE_SQUASH_EDIT:
\r
1088 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1089 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
\r
1092 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
1096 void CRebaseDlg::OnCancel()
\r
1098 OnBnClickedAbort();
\r
1100 void CRebaseDlg::OnBnClickedAbort()
\r
1103 if(m_OrigUpstreamHash.IsEmpty())
\r
1105 __super::OnCancel();
\r
1108 if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
\r
1113 if(CMessageBox::Show(NULL,_T("Are you sure abort rebase"),_T("TortoiseGit"),MB_YESNO) != IDYES)
\r
1116 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash.Left(40));
\r
1117 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1119 AddLogString(out);
\r
1123 cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
\r
1124 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1126 AddLogString(out);
\r
1130 __super::OnCancel();
\r