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 #include "BrowseRefsDlg.h"
\r
11 #include "ProgressDlg.h"
\r
12 // CRebaseDlg dialog
\r
14 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)
\r
16 CRebaseDlg::CRebaseDlg(CWnd* pParent /*=NULL*/)
\r
17 : CResizableStandAloneDialog(CRebaseDlg::IDD, pParent)
\r
19 , m_bSquashAll(FALSE)
\r
22 m_RebaseStage=CHOOSE_BRANCH;
\r
23 m_CurrentRebaseIndex=-1;
\r
24 m_bThreadRunning =FALSE;
\r
25 this->m_IsCherryPick = FALSE;
\r
27 m_IsFastForward=FALSE;
\r
30 CRebaseDlg::~CRebaseDlg()
\r
34 void CRebaseDlg::DoDataExchange(CDataExchange* pDX)
\r
36 CDialog::DoDataExchange(pDX);
\r
37 DDX_Control(pDX, IDC_REBASE_PROGRESS, m_ProgressBar);
\r
38 DDX_Control(pDX, IDC_STATUS_STATIC, m_CtrlStatusText);
\r
39 DDX_Check(pDX, IDC_PICK_ALL, m_bPickAll);
\r
40 DDX_Check(pDX, IDC_SQUASH_ALL, m_bSquashAll);
\r
41 DDX_Check(pDX, IDC_EDIT_ALL, m_bEditAll);
\r
42 DDX_Control(pDX, IDC_REBASE_SPLIT, m_wndSplitter);
\r
43 DDX_Control(pDX,IDC_COMMIT_LIST,m_CommitList);
\r
44 DDX_Control(pDX,IDC_REBASE_COMBOXEX_BRANCH, this->m_BranchCtrl);
\r
45 DDX_Control(pDX,IDC_REBASE_COMBOXEX_UPSTREAM, this->m_UpstreamCtrl);
\r
46 DDX_Check(pDX, IDC_REBASE_CHECK_FORCE,m_bForce);
\r
47 DDX_Control(pDX,IDC_REBASE_POST_BUTTON,m_PostButton);
\r
51 BEGIN_MESSAGE_MAP(CRebaseDlg, CResizableStandAloneDialog)
\r
52 ON_BN_CLICKED(IDC_PICK_ALL, &CRebaseDlg::OnBnClickedPickAll)
\r
53 ON_BN_CLICKED(IDC_SQUASH_ALL, &CRebaseDlg::OnBnClickedSquashAll)
\r
54 ON_BN_CLICKED(IDC_EDIT_ALL, &CRebaseDlg::OnBnClickedEditAll)
\r
55 ON_BN_CLICKED(IDC_REBASE_SPLIT, &CRebaseDlg::OnBnClickedRebaseSplit)
\r
56 ON_BN_CLICKED(IDC_REBASE_CONTINUE,OnBnClickedContinue)
\r
57 ON_BN_CLICKED(IDC_REBASE_ABORT, OnBnClickedAbort)
\r
59 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH, &CRebaseDlg::OnCbnSelchangeBranch)
\r
60 ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)
\r
61 ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)
\r
62 ON_BN_CLICKED(IDC_BUTTON_BROWSE, &CRebaseDlg::OnBnClickedButtonBrowse)
\r
63 ON_BN_CLICKED(IDC_REBASE_CHECK_FORCE, &CRebaseDlg::OnBnClickedRebaseCheckForce)
\r
64 ON_STN_CLICKED(IDC_STATUS_STATIC, &CRebaseDlg::OnStnClickedStatusStatic)
\r
65 ON_BN_CLICKED(IDC_REBASE_POST_BUTTON, &CRebaseDlg::OnBnClickedRebasePostButton)
\r
68 void CRebaseDlg::AddRebaseAnchor()
\r
70 AddAnchor(IDC_REBASE_TAB,TOP_LEFT,BOTTOM_RIGHT);
\r
71 AddAnchor(IDC_COMMIT_LIST,TOP_LEFT, TOP_RIGHT);
\r
72 AddAnchor(IDC_REBASE_SPLIT,TOP_LEFT, TOP_RIGHT);
\r
73 AddAnchor(IDC_STATUS_STATIC, BOTTOM_LEFT,BOTTOM_RIGHT);
\r
74 AddAnchor(IDC_REBASE_CONTINUE,BOTTOM_RIGHT);
\r
75 AddAnchor(IDC_REBASE_ABORT, BOTTOM_RIGHT);
\r
76 AddAnchor(IDC_REBASE_PROGRESS,BOTTOM_LEFT, BOTTOM_RIGHT);
\r
77 AddAnchor(IDC_PICK_ALL,TOP_LEFT);
\r
78 AddAnchor(IDC_SQUASH_ALL,TOP_LEFT);
\r
79 AddAnchor(IDC_EDIT_ALL,TOP_LEFT);
\r
80 AddAnchor(IDC_REBASE_COMBOXEX_UPSTREAM,TOP_LEFT);
\r
81 AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);
\r
82 AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);
\r
83 AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);
\r
84 AddAnchor(IDHELP, BOTTOM_RIGHT);
\r
85 AddAnchor(IDC_REBASE_CHECK_FORCE,TOP_RIGHT);
\r
86 AddAnchor(IDC_REBASE_POST_BUTTON,BOTTOM_LEFT);
\r
88 this->AddOthersToAnchor();
\r
91 BOOL CRebaseDlg::OnInitDialog()
\r
93 CResizableStandAloneDialog::OnInitDialog();
\r
96 //IDC_REBASE_DUMY_TAB
\r
98 GetClientRect(m_DlgOrigRect);
\r
99 m_CommitList.GetClientRect(m_CommitListOrigRect);
\r
101 CWnd *pwnd=this->GetDlgItem(IDC_REBASE_DUMY_TAB);
\r
102 pwnd->GetWindowRect(&rectDummy);
\r
103 this->ScreenToClient(rectDummy);
\r
105 if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_REBASE_TAB))
\r
107 TRACE0("Failed to create output tab window\n");
\r
108 return FALSE; // fail to create
\r
110 m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
\r
111 // Create output panes:
\r
112 //const DWORD dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
\r
113 DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
\r
115 if (! this->m_FileListCtrl.Create(dwStyle,rectDummy,&this->m_ctrlTabCtrl,0) )
\r
117 TRACE0("Failed to create output windows\n");
\r
118 return FALSE; // fail to create
\r
121 if( ! this->m_LogMessageCtrl.Create(_T("Scintilla"),_T("source"),0,rectDummy,&m_ctrlTabCtrl,0,0) )
\r
123 TRACE0("Failed to create log message control");
\r
126 m_LogMessageCtrl.Init(0);
\r
128 dwStyle = LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_HSCROLL | WS_VSCROLL;
\r
130 if (!m_wndOutputRebase.Create(_T("Scintilla"),_T("source"),0,rectDummy, &m_ctrlTabCtrl, 0,0) )
\r
132 TRACE0("Failed to create output windows\n");
\r
133 return -1; // fail to create
\r
135 m_wndOutputRebase.Init(0);
\r
136 m_wndOutputRebase.Call(SCI_SETREADONLY, TRUE);
\r
138 m_tooltips.Create(this);
\r
140 m_tooltips.AddTool(IDC_REBASE_CHECK_FORCE,IDS_REBASE_FORCE_TT);
\r
141 m_tooltips.AddTool(IDC_REBASE_ABORT,IDS_REBASE_ABORT_TT);
\r
145 m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);
\r
147 m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));
\r
148 m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1);
\r
149 m_ctrlTabCtrl.AddTab(&m_wndOutputRebase,_T("Log"),2);
\r
153 EnableSaveRestore(_T("RebaseDlg"));
\r
155 DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
\r
156 RECT rcDlg, rcLogMsg, rcFileList;
\r
157 GetClientRect(&rcDlg);
\r
158 m_CommitList.GetWindowRect(&rcLogMsg);
\r
159 ScreenToClient(&rcLogMsg);
\r
160 this->m_ctrlTabCtrl.GetWindowRect(&rcFileList);
\r
161 ScreenToClient(&rcFileList);
\r
165 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
166 ScreenToClient(&rectSplitter);
\r
167 int delta = yPos - rectSplitter.top;
\r
168 if ((rcLogMsg.bottom + delta > rcLogMsg.top)&&(rcLogMsg.bottom + delta < rcFileList.bottom - 30))
\r
170 m_wndSplitter.SetWindowPos(NULL, 0, yPos, 0, 0, SWP_NOSIZE);
\r
175 if( this->m_RebaseStage == CHOOSE_BRANCH)
\r
177 this->LoadBranchInfo();
\r
181 this->m_BranchCtrl.EnableWindow(FALSE);
\r
182 this->m_UpstreamCtrl.EnableWindow(FALSE);
\r
185 m_CommitList.m_IsIDReplaceAction = TRUE;
\r
186 // m_CommitList.m_IsOldFirst = TRUE;
\r
187 m_CommitList.m_IsRebaseReplaceGraph = TRUE;
\r
189 m_CommitList.InsertGitColumn();
\r
191 this->SetControlEnable();
\r
193 if(!this->m_PreCmd.IsEmpty())
\r
195 CProgressDlg progress;
\r
196 progress.m_GitCmd=m_PreCmd;
\r
197 progress.m_bAutoCloseOnSuccess=true;
\r
198 progress.DoModal();
\r
203 this->m_BranchCtrl.SetCurSel(-1);
\r
204 this->m_BranchCtrl.EnableWindow(FALSE);
\r
205 this->m_UpstreamCtrl.EnableWindow(FALSE);
\r
206 this->SetWindowText(_T("Cherry Pick"));
\r
207 this->m_CommitList.StartFilter();
\r
211 SetContinueButtonText();
\r
212 m_CommitList.DeleteAllItems();
\r
216 m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK)|
\r
217 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV)|
\r
218 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_RESET)|
\r
219 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTREV)|
\r
220 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION)|
\r
221 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV)|
\r
222 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT));
\r
224 if(m_CommitList.m_IsOldFirst)
\r
225 this->m_CurrentRebaseIndex = -1;
\r
227 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();
\r
232 // CRebaseDlg message handlers
\r
234 void CRebaseDlg::OnBnClickedPickAll()
\r
236 // TODO: Add your control notification handler code here
\r
237 this->UpdateData();
\r
238 if(this->m_bPickAll)
\r
239 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_PICK);
\r
241 this->m_bEditAll=FALSE;
\r
242 this->m_bSquashAll=FALSE;
\r
243 this->UpdateData(FALSE);
\r
247 void CRebaseDlg::OnBnClickedSquashAll()
\r
249 // TODO: Add your control notification handler code here
\r
250 this->UpdateData();
\r
251 if(this->m_bSquashAll)
\r
252 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
\r
254 this->m_bEditAll=FALSE;
\r
255 this->m_bPickAll=FALSE;
\r
256 this->UpdateData(FALSE);
\r
260 void CRebaseDlg::OnBnClickedEditAll()
\r
262 // TODO: Add your control notification handler code here
\r
263 this->UpdateData();
\r
264 if( this->m_bEditAll )
\r
265 this->SetAllRebaseAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
\r
267 this->m_bPickAll=FALSE;
\r
268 this->m_bSquashAll=FALSE;
\r
269 this->UpdateData(FALSE);
\r
273 void CRebaseDlg::SetAllRebaseAction(int action)
\r
275 for(int i=0;i<this->m_CommitList.m_logEntries.size();i++)
\r
277 m_CommitList.m_logEntries.GetGitRevAt(i).m_Action=action;
\r
279 m_CommitList.Invalidate();
\r
282 void CRebaseDlg::OnBnClickedRebaseSplit()
\r
284 this->UpdateData();
\r
285 // TODO: Add your control notification handler code here
\r
288 LRESULT CRebaseDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
\r
292 if (wParam == IDC_REBASE_SPLIT)
\r
294 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
\r
295 DoSize(pHdr->delta);
\r
300 return __super::DefWindowProc(message, wParam, lParam);
\r
303 void CRebaseDlg::DoSize(int delta)
\r
306 this->RemoveAllAnchors();
\r
308 CSplitterControl::ChangeHeight(GetDlgItem(IDC_COMMIT_LIST), delta, CW_TOPALIGN);
\r
309 //CSplitterControl::ChangeHeight(GetDlgItem(), delta, CW_TOPALIGN);
\r
310 CSplitterControl::ChangeHeight(GetDlgItem(IDC_REBASE_TAB), -delta, CW_BOTTOMALIGN);
\r
311 //CSplitterControl::ChangeHeight(GetDlgItem(), -delta, CW_BOTTOMALIGN);
\r
312 CSplitterControl::ChangePos(GetDlgItem(IDC_SQUASH_ALL),0,delta);
\r
313 CSplitterControl::ChangePos(GetDlgItem(IDC_PICK_ALL),0,delta);
\r
314 CSplitterControl::ChangePos(GetDlgItem(IDC_EDIT_ALL),0,delta);
\r
315 CSplitterControl::ChangePos(GetDlgItem(IDC_REBASE_CHECK_FORCE),0,delta);
\r
317 this->AddRebaseAnchor();
\r
318 // adjust the minimum size of the dialog to prevent the resizing from
\r
319 // moving the list control too far down.
\r
321 m_CommitList.GetClientRect(rcLogMsg);
\r
322 SetMinTrackSize(CSize(m_DlgOrigRect.Width(), m_DlgOrigRect.Height()-m_CommitListOrigRect.Height()+rcLogMsg.Height()));
\r
324 SetSplitterRange();
\r
325 // m_CommitList.Invalidate();
\r
327 // GetDlgItem(IDC_LOGMESSAGE)->Invalidate();
\r
329 this->m_ctrlTabCtrl.Invalidate();
\r
330 this->m_CommitList.Invalidate();
\r
331 this->m_FileListCtrl.Invalidate();
\r
332 this->m_LogMessageCtrl.Invalidate();
\r
336 void CRebaseDlg::SetSplitterRange()
\r
338 if ((m_CommitList)&&(m_ctrlTabCtrl))
\r
341 m_CommitList.GetWindowRect(rcTop);
\r
342 ScreenToClient(rcTop);
\r
344 m_ctrlTabCtrl.GetWindowRect(rcMiddle);
\r
345 ScreenToClient(rcMiddle);
\r
346 if (rcMiddle.Height() && rcMiddle.Width())
\r
347 m_wndSplitter.SetRange(rcTop.top+60, rcMiddle.bottom-80);
\r
351 void CRebaseDlg::OnSize(UINT nType,int cx, int cy)
\r
353 // first, let the resizing take place
\r
354 __super::OnSize(nType, cx, cy);
\r
357 SetSplitterRange();
\r
360 void CRebaseDlg::SaveSplitterPos()
\r
364 CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\RebaseDlgSizer"));
\r
366 m_wndSplitter.GetWindowRect(&rectSplitter);
\r
367 ScreenToClient(&rectSplitter);
\r
368 regPos = rectSplitter.top;
\r
372 void CRebaseDlg::LoadBranchInfo()
\r
374 m_BranchCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
375 m_UpstreamCtrl.SetMaxHistoryItems(0x7FFFFFFF);
\r
377 STRING_VECTOR list;
\r
380 g_Git.GetBranchList(list,¤t,CGit::BRANCH_ALL);
\r
381 m_BranchCtrl.AddString(list);
\r
382 m_UpstreamCtrl.AddString(list);
\r
384 m_BranchCtrl.SetCurSel(current);
\r
386 AddBranchToolTips(&m_BranchCtrl);
\r
387 AddBranchToolTips(&m_UpstreamCtrl);
\r
389 if(!m_Upstream.IsEmpty())
\r
391 m_UpstreamCtrl.AddString(m_Upstream);
\r
392 m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.GetCount()-1);
\r
396 //Select pull-remote from current branch
\r
397 CString currentBranch = g_Git.GetSymbolicRef();
\r
398 CString configName;
\r
399 configName.Format(L"branch.%s.remote", currentBranch);
\r
400 CString pullRemote = g_Git.GetConfigValue(configName);
\r
402 //Select pull-branch from current branch
\r
403 configName.Format(L"branch.%s.merge", currentBranch);
\r
404 CString pullBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));
\r
406 CString defaultUpstream;
\r
407 defaultUpstream.Format(L"remotes/%s/%s", pullRemote, pullBranch);
\r
408 int found = m_UpstreamCtrl.FindStringExact(0, defaultUpstream);
\r
410 m_UpstreamCtrl.SetCurSel(found);
\r
414 void CRebaseDlg::OnCbnSelchangeBranch()
\r
419 void CRebaseDlg::OnCbnSelchangeUpstream()
\r
424 void CRebaseDlg::FetchLogList()
\r
428 m_IsFastForward=FALSE;
\r
429 cmd.Format(_T("git.exe merge-base %s %s"), m_UpstreamCtrl.GetString(),m_BranchCtrl.GetString());
\r
430 if(g_Git.Run(cmd,&base,CP_ACP))
\r
432 CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
435 base=base.Left(40);
\r
437 hash=g_Git.GetHash(m_BranchCtrl.GetString());
\r
439 if(hash == g_Git.GetHash(this->m_UpstreamCtrl.GetString()))
\r
441 m_CommitList.Clear();
\r
443 fmt.LoadString(IDS_REBASE_EQUAL_FMT);
\r
444 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
\r
446 m_CommitList.ShowText(text);
\r
447 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(false);
\r
451 hash=hash.Left(40);
\r
456 this->m_IsFastForward=TRUE;
\r
458 m_CommitList.Clear();
\r
460 fmt.LoadString(IDS_REBASE_FASTFORWARD_FMT);
\r
461 text.Format(fmt,m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString(),
\r
462 m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString());
\r
464 m_CommitList.ShowText(text);
\r
465 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(true);
\r
466 SetContinueButtonText();
\r
473 if(!this->m_bForce)
\r
475 cmd.Format(_T("git.exe rev-parse %s"), m_UpstreamCtrl.GetString());
\r
476 if( g_Git.Run(cmd,&hash,CP_ACP))
\r
478 CMessageBox::Show(NULL,base,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
481 hash=hash.Left(40);
\r
485 m_CommitList.Clear();
\r
487 fmt.LoadString(IDS_REBASE_UPTODATE_FMT);
\r
488 text.Format(fmt,m_BranchCtrl.GetString());
\r
489 m_CommitList.ShowText(text);
\r
490 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
\r
491 SetContinueButtonText();
\r
496 m_CommitList.Clear();
\r
497 this->m_CommitList.FillGitLog(NULL,0,&m_UpstreamCtrl.GetString(),&m_BranchCtrl.GetString());
\r
498 if( m_CommitList.GetItemCount() == 0 )
\r
499 m_CommitList.ShowText(_T("Nothing to Rebase"));
\r
501 hash=g_Git.GetHash(m_UpstreamCtrl.GetString());
\r
504 if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )
\r
506 if(hash == m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])
\r
508 m_CommitList.Clear();
\r
509 m_CommitList.ShowText(_T("Nothing Rebase"));
\r
515 AddBranchToolTips(&this->m_BranchCtrl);
\r
516 AddBranchToolTips(&this->m_UpstreamCtrl);
\r
518 for(int i=0;i<m_CommitList.m_logEntries.size();i++)
\r
520 m_CommitList.m_logEntries.GetGitRevAt(i).m_Action = CTGitPath::LOGACTIONS_REBASE_PICK;
\r
523 m_CommitList.Invalidate();
\r
525 if(m_CommitList.m_IsOldFirst)
\r
526 this->m_CurrentRebaseIndex = -1;
\r
528 this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();
\r
530 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(m_CommitList.GetItemCount());
\r
531 SetContinueButtonText();
\r
534 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)
\r
538 CString text=pBranch->GetString();
\r
541 g_Git.GetLog(data,text,NULL,1,0);
\r
543 rev.ParserFromLog(data);
\r
544 tooltip.Format(_T("CommitHash:%s\nCommit by: %s %s\n <b>%s</b> \n %s"),
\r
545 rev.m_CommitHash.ToString(),
\r
547 CAppUtils::FormatDateAndTime(rev.m_AuthorDate,DATE_LONGDATE),
\r
551 pBranch->DisableTooltip();
\r
552 this->m_tooltips.AddTool(pBranch->GetComboBoxCtrl(),tooltip);
\r
556 BOOL CRebaseDlg::PreTranslateMessage(MSG*pMsg)
\r
558 m_tooltips.RelayEvent(pMsg);
\r
559 return CResizableStandAloneDialog::PreTranslateMessage(pMsg);
\r
561 int CRebaseDlg::CheckRebaseCondition()
\r
563 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
565 if( !g_Git.CheckCleanWorkTree() )
\r
567 CMessageBox::Show(NULL,_T("Rebase Need Clean Working Tree"),_T("TortoiseGit"),MB_OK);
\r
570 //Todo Check $REBASE_ROOT
\r
571 //Todo Check $DOTEST
\r
574 cmd=_T("git.exe var GIT_COMMITTER_IDENT");
\r
575 if(g_Git.Run(cmd,NULL,CP_UTF8))
\r
578 //Todo call pre_rebase_hook
\r
581 int CRebaseDlg::StartRebase()
\r
584 m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
\r
585 if(!this->m_IsCherryPick)
\r
587 //Todo call comment_for_reflog
\r
588 cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());
\r
589 this->AddLogString(cmd);
\r
591 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
594 this->AddLogString(out);
\r
597 cmd=_T("git.exe rev-parse --verify HEAD");
\r
598 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
600 AddLogString(_T("No Head"));
\r
604 //git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
\r
605 // echo "detached HEAD" > "$DOTEST"/head-name
\r
607 cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));
\r
608 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
610 AddLogString(_T("update ORIG_HEAD Fail"));
\r
614 if( !this->m_IsCherryPick )
\r
616 cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());
\r
617 this->AddLogString(cmd);
\r
620 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
626 m_OrigUpstreamHash.Empty();
\r
627 m_OrigUpstreamHash= g_Git.GetHash(this->m_UpstreamCtrl.GetString());
\r
628 if(m_OrigUpstreamHash.IsEmpty())
\r
630 this->AddLogString(m_OrigUpstreamHash);
\r
634 if( !this->m_IsCherryPick )
\r
636 cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());
\r
637 if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))
\r
639 this->AddLogString(m_OrigBranchHash);
\r
642 this->AddLogString(_T("Start Rebase\r\n"));
\r
645 this->AddLogString(_T("Start Cherry-pick\r\n"));
\r
649 int CRebaseDlg::VerifyNoConflict()
\r
651 CTGitPathList list;
\r
652 if(g_Git.ListConflictFile(list))
\r
654 AddLogString(_T("Get conflict files fail"));
\r
657 if( list.GetCount() != 0 )
\r
659 CMessageBox::Show(NULL,_T("There are conflict file, you should mark it resolve"),_T("TortoiseGit"),MB_OK);
\r
665 int CRebaseDlg::FinishRebase()
\r
667 if(this->m_IsCherryPick) //cherry pick mode no "branch", working at upstream branch
\r
671 cmd.Format(_T("git.exe branch -f %s"),this->m_BranchCtrl.GetString());
\r
672 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
678 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash);
\r
679 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
685 cmd.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl.GetString());
\r
686 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
693 void CRebaseDlg::OnBnClickedContinue()
\r
695 if( m_RebaseStage == REBASE_DONE)
\r
701 if( this->m_IsFastForward )
\r
704 CString oldbranch = g_Git.GetCurrentBranch();
\r
705 if( oldbranch != m_BranchCtrl.GetString() )
\r
707 cmd.Format(_T("git.exe checkout %s"),m_BranchCtrl.GetString());
\r
709 if( g_Git.Run(cmd,&out,CP_ACP) )
\r
711 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
718 m_OrigBranchHash = g_Git.GetHash(m_BranchCtrl.GetString());
\r
719 m_OrigUpstreamHash = g_Git.GetHash(this->m_UpstreamCtrl.GetString());
\r
721 if(!g_Git.IsFastForward(this->m_BranchCtrl.GetString(),this->m_UpstreamCtrl.GetString()))
\r
723 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
724 AddLogString(_T("No fast forward\r\nMaybe repository changed"));
\r
728 cmd.Format(_T("git.exe reset --hard %s"),this->m_UpstreamCtrl.GetString());
\r
729 this->AddLogString(CString(_T("Fast forward to "))+m_UpstreamCtrl.GetString());
\r
732 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
733 if(g_Git.Run(cmd,&out,CP_ACP))
\r
735 AddLogString(_T("Fail"));
\r
740 AddLogString(_T("Done"));
\r
741 m_RebaseStage = REBASE_DONE;
\r
742 UpdateCurrentStatus();
\r
746 if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )
\r
748 if(CheckRebaseCondition())
\r
750 m_RebaseStage = REBASE_START;
\r
754 if( m_RebaseStage == REBASE_FINISH )
\r
762 if( m_RebaseStage == REBASE_SQUASH_CONFLICT)
\r
764 if(VerifyNoConflict())
\r
766 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
767 if(this->CheckNextCommitIsSquash())
\r
768 {//next commit is not squash;
\r
769 m_RebaseStage = REBASE_SQUASH_EDIT;
\r
770 this->OnRebaseUpdateUI(0,0);
\r
771 this->UpdateCurrentStatus();
\r
775 m_RebaseStage=REBASE_CONTINUE;
\r
776 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
777 this->UpdateCurrentStatus();
\r
781 if( m_RebaseStage == REBASE_CONFLICT )
\r
783 if(VerifyNoConflict())
\r
786 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
788 CString out =_T("");
\r
790 cmd.Format(_T("git.exe commit -C %s"), curRev->m_CommitHash.ToString());
\r
792 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
794 if(!g_Git.CheckCleanWorkTree())
\r
796 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
802 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
803 if( curRev->m_Action & CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
805 m_RebaseStage=REBASE_EDIT;
\r
806 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
807 this->UpdateCurrentStatus();
\r
812 m_RebaseStage=REBASE_CONTINUE;
\r
813 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
814 this->UpdateCurrentStatus();
\r
819 if( m_RebaseStage == REBASE_EDIT || m_RebaseStage == REBASE_SQUASH_EDIT )
\r
822 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
824 str=this->m_LogMessageCtrl.GetText();
\r
825 if(str.Trim().IsEmpty())
\r
827 CMessageBox::Show(NULL,_T("Commit Message Is Empty"),_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
831 CString tempfile=::GetTempFile();
\r
832 CFile file(tempfile,CFile::modeReadWrite|CFile::modeCreate );
\r
833 CStringA log=CUnicodeUtils::GetUTF8( str);
\r
834 file.Write(log,log.GetLength());
\r
835 //file.WriteString(m_sLogMessage);
\r
840 if( m_RebaseStage == REBASE_SQUASH_EDIT )
\r
841 cmd.Format(_T("git.exe commit -F \"%s\""), tempfile);
\r
843 cmd.Format(_T("git.exe commit --amend -F \"%s\""), tempfile);
\r
845 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
847 if(!g_Git.CheckCleanWorkTree())
\r
849 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
\r
854 CFile::Remove(tempfile);
\r
856 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
857 m_RebaseStage=REBASE_CONTINUE;
\r
858 curRev->m_Action|=CTGitPath::LOGACTIONS_REBASE_DONE;
\r
859 this->UpdateCurrentStatus();
\r
863 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
864 SetControlEnable();
\r
866 if (AfxBeginThread(RebaseThreadEntry, this)==NULL)
\r
868 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
869 CMessageBox::Show(NULL, _T("Create Rebase Thread Fail"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
\r
870 SetControlEnable();
\r
873 int CRebaseDlg::CheckNextCommitIsSquash()
\r
876 if(m_CommitList.m_IsOldFirst)
\r
877 index=m_CurrentRebaseIndex+1;
\r
879 index=m_CurrentRebaseIndex-1;
\r
886 if(index>= m_CommitList.GetItemCount())
\r
889 curRev=(GitRev*)m_CommitList.m_arShownList[index];
\r
891 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH )
\r
893 if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
895 if(m_CommitList.m_IsOldFirst)
\r
902 }while(curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP);
\r
907 int CRebaseDlg::GoNext()
\r
909 if(m_CommitList.m_IsOldFirst)
\r
910 m_CurrentRebaseIndex++;
\r
912 m_CurrentRebaseIndex--;
\r
916 int CRebaseDlg::StateAction()
\r
918 switch(this->m_RebaseStage)
\r
920 case CHOOSE_BRANCH:
\r
921 case CHOOSE_COMMIT_PICK_MODE:
\r
924 m_RebaseStage = REBASE_START;
\r
931 void CRebaseDlg::SetContinueButtonText()
\r
934 switch(this->m_RebaseStage)
\r
936 case CHOOSE_BRANCH:
\r
937 case CHOOSE_COMMIT_PICK_MODE:
\r
938 if(this->m_IsFastForward)
\r
939 Text = _T("Start(FastFwd)");
\r
941 Text = _T("Start");
\r
945 case REBASE_CONTINUE:
\r
946 case REBASE_SQUASH_CONFLICT:
\r
947 Text = _T("Continue");
\r
950 case REBASE_CONFLICT:
\r
951 Text = _T("Commit");
\r
954 Text = _T("Amend");
\r
957 case REBASE_SQUASH_EDIT:
\r
958 Text = _T("Commit");
\r
962 case REBASE_FINISH:
\r
963 Text = _T("Finish");
\r
970 this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);
\r
973 void CRebaseDlg::SetControlEnable()
\r
975 switch(this->m_RebaseStage)
\r
977 case CHOOSE_BRANCH:
\r
978 case CHOOSE_COMMIT_PICK_MODE:
\r
980 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);
\r
981 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);
\r
982 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);
\r
984 if(!m_IsCherryPick)
\r
986 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);
\r
987 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);
\r
988 this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(TRUE);
\r
990 //this->m_CommitList.m_IsEnableRebaseMenu=TRUE;
\r
991 this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
992 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
993 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
994 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP);
\r
998 case REBASE_CONTINUE:
\r
1000 case REBASE_FINISH:
\r
1001 case REBASE_CONFLICT:
\r
1003 case REBASE_SQUASH_CONFLICT:
\r
1005 this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);
\r
1006 this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);
\r
1007 this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);
\r
1008 this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(FALSE);
\r
1009 this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(FALSE);
\r
1010 this->GetDlgItem(IDC_REBASE_CHECK_FORCE)->EnableWindow(FALSE);
\r
1011 //this->m_CommitList.m_IsEnableRebaseMenu=FALSE;
\r
1012 this->m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|
\r
1013 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|
\r
1014 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_EDIT)|
\r
1015 m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SKIP));
\r
1017 if( m_RebaseStage == REBASE_DONE && (this->m_PostButtonTexts.GetCount() != 0) )
\r
1019 this->GetDlgItem(IDC_STATUS_STATIC)->ShowWindow(SW_HIDE);
\r
1020 this->GetDlgItem(IDC_REBASE_POST_BUTTON)->ShowWindow(SW_SHOWNORMAL);
\r
1021 this->m_PostButton.RemoveAll();
\r
1022 this->m_PostButton.AddEntries(m_PostButtonTexts);
\r
1023 //this->GetDlgItem(IDC_REBASE_POST_BUTTON)->SetWindowText(this->m_PostButtonText);
\r
1028 if(m_bThreadRunning)
\r
1030 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(FALSE);
\r
1031 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(FALSE);
\r
1035 this->GetDlgItem(IDC_REBASE_CONTINUE)->EnableWindow(TRUE);
\r
1036 this->GetDlgItem(IDC_REBASE_ABORT)->EnableWindow(TRUE);
\r
1040 void CRebaseDlg::UpdateProgress()
\r
1045 if(m_CommitList.m_IsOldFirst)
\r
1046 index = m_CurrentRebaseIndex+1;
\r
1048 index = m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
1050 m_ProgressBar.SetRange(1,m_CommitList.GetItemCount());
\r
1051 m_ProgressBar.SetPos(index);
\r
1053 if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())
\r
1056 text.Format(_T("Rebasing...(%d/%d)"),index,m_CommitList.GetItemCount());
\r
1057 m_CtrlStatusText.SetWindowText(text);
\r
1061 GitRev *prevRev=NULL, *curRev=NULL;
\r
1063 if( m_CurrentRebaseIndex >= 0 && m_CurrentRebaseIndex< m_CommitList.m_arShownList.GetSize())
\r
1065 curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
1068 for(int i=0;i<m_CommitList.m_arShownList.GetSize();i++)
\r
1070 prevRev=(GitRev*)m_CommitList.m_arShownList[i];
\r
1071 if(prevRev->m_Action & CTGitPath::LOGACTIONS_REBASE_CURRENT)
\r
1073 prevRev->m_Action &= ~ CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
1074 m_CommitList.GetItemRect(i,&rect,LVIR_BOUNDS);
\r
1075 m_CommitList.InvalidateRect(rect);
\r
1081 curRev->m_Action |= CTGitPath::LOGACTIONS_REBASE_CURRENT;
\r
1082 m_CommitList.GetItemRect(m_CurrentRebaseIndex,&rect,LVIR_BOUNDS);
\r
1083 m_CommitList.InvalidateRect(rect);
\r
1085 m_CommitList.EnsureVisible(m_CurrentRebaseIndex,FALSE);
\r
1089 void CRebaseDlg::UpdateCurrentStatus()
\r
1091 if( m_CurrentRebaseIndex < 0 && m_RebaseStage!= REBASE_DONE)
\r
1093 if(m_CommitList.m_IsOldFirst)
\r
1094 m_RebaseStage = CRebaseDlg::REBASE_START;
\r
1096 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
1099 if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize() && m_RebaseStage!= REBASE_DONE)
\r
1101 if(m_CommitList.m_IsOldFirst)
\r
1102 m_RebaseStage = CRebaseDlg::REBASE_DONE;
\r
1104 m_RebaseStage = CRebaseDlg::REBASE_FINISH;
\r
1107 SetContinueButtonText();
\r
1108 SetControlEnable();
\r
1112 void CRebaseDlg::AddLogString(CString str)
\r
1114 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, FALSE);
\r
1115 CStringA sTextA = m_wndOutputRebase.StringForControl(str);//CUnicodeUtils::GetUTF8(str);
\r
1116 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)sTextA);
\r
1117 this->m_wndOutputRebase.SendMessage(SCI_REPLACESEL, 0, (LPARAM)(LPCSTR)"\n");
\r
1118 this->m_wndOutputRebase.SendMessage(SCI_SETREADONLY, TRUE);
\r
1121 int CRebaseDlg::GetCurrentCommitID()
\r
1123 if(m_CommitList.m_IsOldFirst)
\r
1125 return this->m_CurrentRebaseIndex+1;
\r
1129 return m_CommitList.GetItemCount()-m_CurrentRebaseIndex;
\r
1133 int CRebaseDlg::DoRebase()
\r
1136 if(m_CurrentRebaseIndex <0)
\r
1138 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
1141 GitRev *pRev = (GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
1142 int mode=pRev->m_Action & CTGitPath::LOGACTIONS_REBASE_MODE_MASK;
\r
1145 if( mode== CTGitPath::LOGACTIONS_REBASE_SKIP)
\r
1147 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
1151 if( mode != CTGitPath::LOGACTIONS_REBASE_PICK )
\r
1153 this->m_SquashMessage+= pRev->m_Subject;
\r
1154 this->m_SquashMessage+= _T("\n");
\r
1155 this->m_SquashMessage+= pRev->m_Body;
\r
1158 this->m_SquashMessage.Empty();
\r
1160 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
1161 nocommit=_T(" --no-commit ");
\r
1164 log.Format(_T("%s %d:%s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString());
\r
1165 AddLogString(log);
\r
1166 AddLogString(pRev->m_Subject);
\r
1167 cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash.ToString());
\r
1169 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1171 AddLogString(out);
\r
1172 CTGitPathList list;
\r
1173 if(g_Git.ListConflictFile(list))
\r
1175 AddLogString(_T("Get conflict files fail"));
\r
1178 if(list.GetCount() == 0 )
\r
1180 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
1182 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
1185 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
1187 this->m_RebaseStage = REBASE_EDIT ;
\r
1188 return -1; // Edit return -1 to stop rebase.
\r
1191 if(CheckNextCommitIsSquash())
\r
1193 // let user edit last commmit message
\r
1194 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
1198 if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
\r
1199 m_RebaseStage = REBASE_SQUASH_CONFLICT;
\r
1201 m_RebaseStage = REBASE_CONFLICT;
\r
1206 AddLogString(out);
\r
1207 if(mode == CTGitPath::LOGACTIONS_REBASE_PICK)
\r
1209 pRev->m_Action|= CTGitPath::LOGACTIONS_REBASE_DONE;
\r
1212 if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)
\r
1214 this->m_RebaseStage = REBASE_EDIT ;
\r
1215 return -1; // Edit return -1 to stop rebase.
\r
1219 if(CheckNextCommitIsSquash())
\r
1221 // let user edit last commmit message
\r
1222 this->m_RebaseStage = REBASE_SQUASH_EDIT;
\r
1230 BOOL CRebaseDlg::IsEnd()
\r
1232 if(m_CommitList.m_IsOldFirst)
\r
1233 return m_CurrentRebaseIndex>= this->m_CommitList.GetItemCount();
\r
1235 return m_CurrentRebaseIndex<0;
\r
1238 int CRebaseDlg::RebaseThread()
\r
1243 if( m_RebaseStage == REBASE_START )
\r
1245 if( this->StartRebase() )
\r
1247 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1251 m_RebaseStage = REBASE_CONTINUE;
\r
1253 }else if( m_RebaseStage == REBASE_CONTINUE )
\r
1259 m_RebaseStage = REBASE_FINISH;
\r
1271 }else if( m_RebaseStage == REBASE_FINISH )
\r
1274 m_RebaseStage = REBASE_DONE;
\r
1281 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1282 //this->UpdateCurrentStatus();
\r
1285 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1286 this->PostMessage(MSG_REBASE_UPDATE_UI);
\r
1290 void CRebaseDlg::ListConflictFile()
\r
1292 this->m_FileListCtrl.Clear();
\r
1293 CTGitPathList list;
\r
1295 list.AddPath(path);
\r
1297 m_FileListCtrl.m_bIsRevertTheirMy = !m_IsCherryPick;
\r
1299 this->m_FileListCtrl.GetStatus(&list,true);
\r
1300 this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,
\r
1301 CTGitPath::LOGACTIONS_UNMERGED);
\r
1302 if( this->m_FileListCtrl.GetItemCount() == 0 )
\r
1308 LRESULT CRebaseDlg::OnRebaseUpdateUI(WPARAM,LPARAM)
\r
1310 UpdateCurrentStatus();
\r
1311 if(m_CurrentRebaseIndex <0)
\r
1313 if(m_CurrentRebaseIndex >= m_CommitList.GetItemCount() )
\r
1315 GitRev *curRev=(GitRev*)m_CommitList.m_arShownList[m_CurrentRebaseIndex];
\r
1317 switch(m_RebaseStage)
\r
1319 case REBASE_CONFLICT:
\r
1320 case REBASE_SQUASH_CONFLICT:
\r
1321 ListConflictFile();
\r
1322 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_CONFLICT);
\r
1323 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1326 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1327 this->m_LogMessageCtrl.SetText(curRev->m_Subject+_T("\n")+curRev->m_Body);
\r
1329 case REBASE_SQUASH_EDIT:
\r
1330 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_MESSAGE);
\r
1331 this->m_LogMessageCtrl.SetText(this->m_SquashMessage);
\r
1334 this->m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
\r
1338 void CRebaseDlg::OnCancel()
\r
1340 OnBnClickedAbort();
\r
1342 void CRebaseDlg::OnBnClickedAbort()
\r
1345 if(m_OrigUpstreamHash.IsEmpty())
\r
1347 __super::OnCancel();
\r
1350 if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)
\r
1355 if(CMessageBox::Show(NULL,_T("Are you sure you want to abort the rebase process?"),_T("TortoiseGit"),MB_YESNO) != IDYES)
\r
1358 if(this->m_IsFastForward)
\r
1360 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash.Left(40));
\r
1361 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1363 AddLogString(out);
\r
1366 __super::OnCancel();
\r
1369 cmd.Format(_T("git.exe checkout -f %s"),this->m_UpstreamCtrl.GetString());
\r
1370 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1372 AddLogString(out);
\r
1376 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash.Left(40));
\r
1377 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1379 AddLogString(out);
\r
1383 if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode
\r
1386 cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());
\r
1387 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1389 AddLogString(out);
\r
1393 cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash.Left(40));
\r
1394 if(g_Git.Run(cmd,&out,CP_UTF8))
\r
1396 AddLogString(out);
\r
1399 __super::OnCancel();
\r
1402 void CRebaseDlg::OnBnClickedButtonBrowse()
\r
1404 if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag))
\r
1405 OnCbnSelchangeUpstream();
\r
1408 void CRebaseDlg::OnBnClickedRebaseCheckForce()
\r
1410 // TODO: Add your control notification handler code here
\r
1411 this->UpdateData();
\r
1412 this->FetchLogList();
\r
1415 void CRebaseDlg::OnStnClickedStatusStatic()
\r
1417 // TODO: Add your control notification handler code here
\r
1420 void CRebaseDlg::OnBnClickedRebasePostButton()
\r
1422 // TODO: Add your control notification handler code here
\r
1423 this->m_Upstream=this->m_UpstreamCtrl.GetString();
\r
1424 this->m_Branch=this->m_BranchCtrl.GetString();
\r
1426 this->EndDialog(IDC_REBASE_POST_BUTTON+this->m_PostButton.GetCurrentEntry());
\r