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
75 this->AddOthersToAnchor();
\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 |SVNSLC_COLADD|SVNSLC_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
198 if(m_CommitList.m_IsOldFirst)
\r
199 this->m_CurrentRebaseIndex = -1;
\r
201 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();
\r
206 // CRebaseDlg message handlers
\r
208 void CRebaseDlg::OnBnClickedPickAll()
\r
210 // TODO: Add your control notification handler code here
\r
211 this->UpdateData();
\r
212 if(this->m_bPickAll)
\r
213 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK);
\r
215 this->m_bEditAll=FALSE;
\r
216 this->m_bSquashAll=FALSE;
\r
217 this->UpdateData(FALSE);
\r
221 void CRebaseDlg::OnBnClickedSquashAll()
\r
223 // TODO: Add your control notification handler code here
\r
224 this->UpdateData();
\r
225 if(this->m_bSquashAll)
\r
226 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
\r
228 this->m_bEditAll=FALSE;
\r
229 this->m_bPickAll=FALSE;
\r
230 this->UpdateData(FALSE);
\r
234 void CRebaseDlg::OnBnClickedEditAll()
\r
236 // TODO: Add your control notification handler code here
\r
237 this->UpdateData();
\r
238 if( this->m_bEditAll )
\r
239 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
\r
241 this->m_bPickAll=FALSE;
\r
242 this->m_bSquashAll=FALSE;
\r
243 this->UpdateData(FALSE);
\r
247 void CRebaseDlg::SetAllRebaseAction(int action)
\r
249 for(int i=0;i<this->m_CommitList.m_logEntries.size();i++)
\r
251 m_CommitList.m_logEntries[i].m_Action=action;
\r
253 m_CommitList.Invalidate();
\r
256 void CRebaseDlg::OnBnClickedRebaseSplit()
\r
258 this->UpdateData();
\r
259 // TODO: Add your control notification handler code here
\r
262 LRESULT CRebaseDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
266 if (wParam == IDC_REBASE_SPLIT)
\r
268 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
269 DoSize(pHdr->delta);
\r
274 return __super::DefWindowProc(message, wParam, lParam);
\r
277 void CRebaseDlg::DoSize(int delta)
\r
280 this->RemoveAllAnchors();
\r
282 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST), delta, CW_TOPALIGN);
\r
283 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
\r
284 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN);
\r
285 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
\r
286 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);
\r
287 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);
\r
288 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);
\r
290 this->AddRebaseAnchor();
\r
291 // adjust the minimum size of the dialog to prevent the resizing from
\r
292 // moving the list control too far down.
\r
294 m_CommitList.GetClientRect(rcLogMsg);
\r
295 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_CommitListOrigRect.Height()+rcLogMsg.Height()));
\r
297 SetSplitterRange();
\r
298 // m_CommitList.Invalidate();
\r
300 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
302 this->m_ctrlTabCtrl.Invalidate();
\r
303 this->m_CommitList.Invalidate();
\r
304 this->m_FileListCtrl.Invalidate();
\r
305 this->m_LogMessageCtrl.Invalidate();
\r
309 void CRebaseDlg::SetSplitterRange()
\r
311 if ((m_CommitList)&&(m_ctrlTabCtrl))
\r
314 m_CommitList.GetWindowRect(rcTop);
\r
315 ScreenToClient(rcTop);
\r
317 m_ctrlTabCtrl.GetWindowRect(rcMiddle);
\r
318 ScreenToClient(rcMiddle);
\r
319 if (rcMiddle.Height() && rcMiddle.Width())
\r
320 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
324 void CRebaseDlg::OnSize(UINT nType,int cx, int cy)
\r
326 // first, let the resizing take place
\r
327 __super::OnSize(nType, cx, cy);
\r
330 SetSplitterRange();
\r
333 void CRebaseDlg::SaveSplitterPos()
\r
337 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
\r
339 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
340 ScreenToClient(&rectSplitter);
\r
341 regPos = rectSplitter.top;
\r
345 void CRebaseDlg::LoadBranchInfo()
\r
347 m_BranchCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
348 m_UpstreamCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
350 STRING_VECTOR list;
\r
353 g_Git.GetBranchList(list,¤t,CGit::BRANCH_ALL);
\r
354 m_BranchCtrl.AddString(list);
\r
355 m_UpstreamCtrl.AddString(list);
\r
357 m_BranchCtrl.SetCurSel(current);
\r
359 AddBranchToolTips(&m_BranchCtrl);
\r
360 AddBranchToolTips(&m_UpstreamCtrl);
\r
362 if(!m_Upstream.IsEmpty())
\r
364 m_UpstreamCtrl.AddString(m_Upstream);
\r
365 m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.GetCount()-1);
\r
369 void CRebaseDlg::OnCbnSelchangeBranch()
\r
374 void CRebaseDlg::OnCbnSelchangeUpstream()
\r
379 void CRebaseDlg::FetchLogList()
\r
381 m_CommitList.Clear();
\r
382 this->m_CommitList.FillGitLog(NULL,0,&m_UpstreamCtrl.GetString(),&m_BranchCtrl.GetString());
\r
383 if( m_CommitList.GetItemCount() == 0 )
\r
384 m_CommitList.ShowText(_T("Nothing Rebase"));
\r
386 CString hash=g_Git.GetHash(m_UpstreamCtrl.GetString());
\r
389 if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )
\r
391 if(hash == m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])
\r
393 m_CommitList.Clear();
\r
394 m_CommitList.ShowText(_T("Nothing Rebase"));
\r
400 AddBranchToolTips(&this->m_BranchCtrl);
\r
401 AddBranchToolTips(&this->m_UpstreamCtrl);
\r
403 for(int i=0;i<m_CommitList.m_logEntries.size();i++)
\r
405 m_CommitList.m_logEntries[i].m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;
\r
408 m_CommitList.Invalidate();
\r
410 if(m_CommitList.m_IsOldFirst)
\r
411 this->m_CurrentRebaseIndex = -1;
\r
413 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();
\r
417 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
\r
421 CString text=pBranch->GetString();
\r
424 g_Git.GetLog(data,text,NULL,1,0);
\r
426 rev.ParserFromLog(data);
\r
427 tooltip.Format(_T("CommitHash:%s\nCommit by: %s %s\n <b>%s</b> \n %s"),
\r
430 CAppUtils::FormatDateAndTime(rev.m_AuthorDate,DATE_LONGDATE),
\r
434 pBranch->DisableTooltip();
\r
435 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);
\r
439 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)
\r
441 m_tooltips.RelayEvent(pMsg);
\r
442 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
444 int CRebaseDlg::CheckRebaseCondition()
\r
446 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
448 if( !g_Git.CheckCleanWorkTree() )
\r
450 CMessageBox::Show(NULL,_T("Rebase Need Clean Working Tree"),_T("TortoiseGit"),MB_OK);
\r
453 //Todo Check $REBASE_ROOT
\r
454 //Todo Check $DOTEST
\r
457 cmd=_T("git.exe var GIT_COMMITTER_IDENT");
\r
458 if(g_Git.Run(cmd,NULL,CP_UTF8))
\r
461 //Todo call pre_rebase_hook
\r
464 int CRebaseDlg::StartRebase()
\r
468 if(!this->m_IsCherryPick)
\r
470 //Todo call comment_for_reflog
\r
471 cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());
\r
472 this->AddLogString(cmd);
\r
474 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
477 this->AddLogString(out);
\r
480 cmd=_T("git.exe rev-parse --verify HEAD");
\r
481 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
483 AddLogString(_T("No Head"));
\r
487 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
\r
488 // echo "detached HEAD" > "$DOTEST"/head-name
\r
490 cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
\r
491 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
493 AddLogString(_T("update ORIG_HEAD Fail"));
\r
497 if( !this->m_IsCherryPick )
\r
499 cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());
\r
500 this->AddLogString(cmd);
\r
503 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
509 m_OrigUpstreamHash.Empty();
\r
510 m_OrigUpstreamHash= g_Git.GetHash(this->m_UpstreamCtrl.GetString());
\r
511 if(m_OrigUpstreamHash.IsEmpty())
\r
513 this->AddLogString(m_OrigUpstreamHash);
\r
517 if( !this->m_IsCherryPick )
\r
519 cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());
\r
520 if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))
\r
522 this->AddLogString(m_OrigBranchHash);
\r
525 this->AddLogString(_T("Start Rebase\r\n"));
\r
528 this->AddLogString(_T("Start Cherry-pick\r\n"));
\r
532 int CRebaseDlg::VerifyNoConflict()
\r
534 CTGitPathList list;
\r
535 if(g_Git.ListConflictFile(list))
\r
537 AddLogString(_T("Get conflict files fail"));
\r
540 if( list.GetCount() != 0 )
\r
542 CMessageBox::Show(NULL,_T("There are conflict file, you should mark it resolve"),_T("TortoiseGit"),MB_OK);
\r
548 int CRebaseDlg::FinishRebase()
\r
550 if(this->m_IsCherryPick) //cherry pick mode no "branch", working at upstream branch
\r
554 cmd.Format(_T("git.exe branch -f %s"),this->m_BranchCtrl.GetString());
\r
555 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
561 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash);
\r
562 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
568 cmd.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl.GetString());
\r
569 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
576 void CRebaseDlg::OnBnClickedContinue()
\r
578 if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )
\r
580 if(CheckRebaseCondition())
\r
582 m_RebaseStage = REBASE_START;
\r
585 if( m_RebaseStage == REBASE_DONE)
\r
590 if( m_RebaseStage == REBASE_FINISH )
\r
598 if( m_RebaseStage == REBASE_SQUASH_CONFLICT)
\r
600 if(VerifyNoConflict())
\r
602 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
603 if(this->CheckNextCommitIsSquash())
\r
604 {//next commit is not squash;
\r
605 m_RebaseStage = REBASE_SQUASH_EDIT;
\r
606 this->OnRebaseUpdateUI(0,0);
\r
607 this->UpdateCurrentStatus();
\r
611 m_RebaseStage=REBASE_CONTINUE;
\r
612 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
613 this->UpdateCurrentStatus();
\r
617 if( m_RebaseStage == REBASE_CONFLICT )
\r
619 if(VerifyNoConflict())
\r
622 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
624 CString out =_T("");
\r
626 cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash);
\r
628 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
630 if(!g_Git.CheckCleanWorkTree())
\r
632 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
638 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
639 if( curRev->m_Action & CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
641 m_RebaseStage=REBASE_EDIT;
\r
642 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
643 this->UpdateCurrentStatus();
\r
648 m_RebaseStage=REBASE_CONTINUE;
\r
649 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
650 this->UpdateCurrentStatus();
\r
655 if( m_RebaseStage == REBASE_EDIT || m_RebaseStage == REBASE_SQUASH_EDIT )
\r
658 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
660 str=this->m_LogMessageCtrl.GetText();
\r
661 if(str.Trim().IsEmpty())
\r
663 CMessageBox::Show(NULL,_T("Commit Message Is Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
667 CString tempfile=::GetTempFile();
\r
668 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
\r
669 CStringA log=CUnicodeUtils::GetUTF8( str);
\r
670 file.Write(log,log.GetLength());
\r
671 //file.WriteString(m_sLogMessage);
\r
676 if( m_RebaseStage == REBASE_SQUASH_EDIT )
\r
677 cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
\r
679 cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
\r
681 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
683 if(!g_Git.CheckCleanWorkTree())
\r
685 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
690 CFile::Remove(tempfile);
\r
692 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
693 m_RebaseStage=REBASE_CONTINUE;
\r
694 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
695 this->UpdateCurrentStatus();
\r
699 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
700 SetControlEnable();
\r
702 if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
\r
704 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
705 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
\r
706 SetControlEnable();
\r
709 int CRebaseDlg::CheckNextCommitIsSquash()
\r
712 if(m_CommitList.m_IsOldFirst)
\r
713 index=m_CurrentRebaseIndex+1;
\r
715 index=m_CurrentRebaseIndex-1;
\r
722 if(index>= m_CommitList.GetItemCount())
\r
725 curRev=(GitRev*)m_CommitList.m_arShownList[index];
\r
727 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH )
\r
729 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
731 if(m_CommitList.m_IsOldFirst)
\r
738 }while(curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP);
\r
743 int CRebaseDlg::GoNext()
\r
745 if(m_CommitList.m_IsOldFirst)
\r
746 m_CurrentRebaseIndex++;
\r
748 m_CurrentRebaseIndex--;
\r
752 int CRebaseDlg::StateAction()
\r
754 switch(this->m_RebaseStage)
\r
756 case CHOOSE_BRANCH:
\r
757 case CHOOSE_COMMIT_PICK_MODE:
\r
760 m_RebaseStage = REBASE_START;
\r
767 void CRebaseDlg::SetContinueButtonText()
\r
770 switch(this->m_RebaseStage)
\r
772 case CHOOSE_BRANCH:
\r
773 case CHOOSE_COMMIT_PICK_MODE:
\r
774 Text = _T("Start");
\r
778 case REBASE_CONTINUE:
\r
779 case REBASE_SQUASH_CONFLICT:
\r
780 Text = _T("Continue");
\r
783 case REBASE_CONFLICT:
\r
784 Text = _T("Commit");
\r
787 Text = _T("Amend");
\r
790 case REBASE_SQUASH_EDIT:
\r
791 Text = _T("Commit");
\r
795 case REBASE_FINISH:
\r
796 Text = _T("Finish");
\r
803 this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
\r
806 void CRebaseDlg::SetControlEnable()
\r
808 switch(this->m_RebaseStage)
\r
810 case CHOOSE_BRANCH:
\r
811 case CHOOSE_COMMIT_PICK_MODE:
\r
813 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
\r
814 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
\r
815 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
\r
816 if(!m_IsCherryPick)
\r
818 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
\r
819 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
\r
821 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
\r
822 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
823 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
824 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
825 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
\r
829 case REBASE_CONTINUE:
\r
831 case REBASE_FINISH:
\r
832 case REBASE_CONFLICT:
\r
834 case REBASE_SQUASH_CONFLICT:
\r
836 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
\r
837 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
\r
838 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
\r
839 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
\r
840 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
\r
841 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
\r
842 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
843 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
844 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
845 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
\r
849 if(m_bThreadRunning)
\r
851 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
\r
852 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(FALSE);
\r
856 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
\r
857 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(TRUE);
\r
861 void CRebaseDlg::UpdateProgress()
\r
866 if(m_CommitList.m_IsOldFirst)
\r
867 index = m_CurrentRebaseIndex+1;
\r
869 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
871 m_ProgressBar.SetRange(1,m_CommitList.GetItemCount());
\r
872 m_ProgressBar.SetPos(index);
\r
874 if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
\r
877 text.Format(_T("Rebasing...(%d/%d)"),index,m_CommitList.GetItemCount());
\r
878 m_CtrlStatusText.SetWindowText(text);
\r
882 GitRev *prevRev=NULL, *curRev=NULL;
\r
884 if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
\r
886 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
889 for(int i=0;i<m_CommitList.m_arShownList.GetSize();i++)
\r
891 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
\r
892 if(prevRev->m_Action & CTGitPath::LOGACTIONS_REBASE_CURRENT)
\r
894 prevRev->m_Action &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
895 m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
\r
896 m_CommitList.InvalidateRect(rect);
\r
902 curRev->m_Action |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
903 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
\r
904 m_CommitList.InvalidateRect(rect);
\r
906 m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
\r
910 void CRebaseDlg::UpdateCurrentStatus()
\r
912 if( m_CurrentRebaseIndex < 0 && m_RebaseStage!= REBASE_DONE)
\r
914 if(m_CommitList.m_IsOldFirst)
\r
915 m_RebaseStage = CRebaseDlg::REBASE_START;
\r
917 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
920 if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize() && m_RebaseStage!= REBASE_DONE)
\r
922 if(m_CommitList.m_IsOldFirst)
\r
923 m_RebaseStage = CRebaseDlg::REBASE_DONE;
\r
925 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
928 SetContinueButtonText();
\r
929 SetControlEnable();
\r
933 void CRebaseDlg::AddLogString(CString str)
\r
935 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
\r
936 CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
\r
937 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
\r
938 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
\r
939 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
\r
942 int CRebaseDlg::GetCurrentCommitID()
\r
944 if(m_CommitList.m_IsOldFirst)
\r
946 return this->m_CurrentRebaseIndex+1;
\r
950 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
954 int CRebaseDlg::DoRebase()
\r
957 if(m_CurrentRebaseIndex <0)
\r
959 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
962 GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
963 int mode=pRev->m_Action & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
\r
966 if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
968 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
972 if( mode != CTGitPath::LOGACTIONS_REBASE_PICK )
\r
974 this->m_SquashMessage+= pRev->m_Subject;
\r
975 this->m_SquashMessage+= _T("\n");
\r
976 this->m_SquashMessage+= pRev->m_Body;
\r
979 this->m_SquashMessage.Empty();
\r
981 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
982 nocommit=_T(" --no-commit ");
\r
985 log.Format(_T("%s %d:%s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash);
\r
987 AddLogString(pRev->m_Subject);
\r
988 cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash);
\r
990 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
993 CTGitPathList list;
\r
994 if(g_Git.ListConflictFile(list))
\r
996 AddLogString(_T("Get conflict files fail"));
\r
999 if(list.GetCount() == 0 )
\r
1001 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
1003 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
1006 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
1008 this->m_RebaseStage = REBASE_EDIT ;
\r
1009 return -1; // Edit return -1 to stop rebase.
\r
1012 if(CheckNextCommitIsSquash())
\r
1014 // let user edit last commmit message
\r
1015 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
1019 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
1020 m_RebaseStage = REBASE_SQUASH_CONFLICT;
\r
1022 m_RebaseStage = REBASE_CONFLICT;
\r
1027 AddLogString(out);
\r
1028 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
1030 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
1033 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
1035 this->m_RebaseStage = REBASE_EDIT ;
\r
1036 return -1; // Edit return -1 to stop rebase.
\r
1040 if(CheckNextCommitIsSquash())
\r
1042 // let user edit last commmit message
\r
1043 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
1051 BOOL CRebaseDlg::IsEnd()
\r
1053 if(m_CommitList.m_IsOldFirst)
\r
1054 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
\r
1056 return m_CurrentRebaseIndex<0;
\r
1059 int CRebaseDlg::RebaseThread()
\r
1064 if( m_RebaseStage == REBASE_START )
\r
1066 if( this->StartRebase() )
\r
1068 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1072 m_RebaseStage = REBASE_CONTINUE;
\r
1074 }else if( m_RebaseStage == REBASE_CONTINUE )
\r
1080 m_RebaseStage = REBASE_FINISH;
\r
1092 }else if( m_RebaseStage == REBASE_FINISH )
\r
1095 m_RebaseStage = REBASE_DONE;
\r
1102 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1103 //this->UpdateCurrentStatus();
\r
1106 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1107 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1111 void CRebaseDlg::ListConflictFile()
\r
1113 this->m_FileListCtrl.Clear();
\r
1114 CTGitPathList list;
\r
1116 list.AddPath(path);
\r
1118 this->m_FileListCtrl.GetStatus(&list,true);
\r
1119 this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,
\r
1120 CTGitPath::LOGACTIONS_UNMERGED);
\r
1121 if( this->m_FileListCtrl.GetItemCount() == 0 )
\r
1127 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
\r
1129 UpdateCurrentStatus();
\r
1130 if(m_CurrentRebaseIndex <0)
\r
1132 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
1134 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
1136 switch(m_RebaseStage)
\r
1138 case REBASE_CONFLICT:
\r
1139 case REBASE_SQUASH_CONFLICT:
\r
1140 ListConflictFile();
\r
1141 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
\r
1142 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1145 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1146 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1148 case REBASE_SQUASH_EDIT:
\r
1149 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1150 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
\r
1153 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
1157 void CRebaseDlg::OnCancel()
\r
1159 OnBnClickedAbort();
\r
1161 void CRebaseDlg::OnBnClickedAbort()
\r
1164 if(m_OrigUpstreamHash.IsEmpty())
\r
1166 __super::OnCancel();
\r
1169 if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
\r
1174 if(CMessageBox::Show(NULL,_T("Are you sure abort rebase"),_T("TortoiseGit"),MB_YESNO) != IDYES)
\r
1177 cmd.Format(_T("git.exe checkout -f %s"),this->m_UpstreamCtrl.GetString());
\r
1178 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1180 AddLogString(out);
\r
1184 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash.Left(40));
\r
1185 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1187 AddLogString(out);
\r
1191 if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode
\r
1194 cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
\r
1195 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1197 AddLogString(out);
\r
1201 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash.Left(40));
\r
1202 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1204 AddLogString(out);
\r
1207 __super::OnCancel();
\r