#include "AppUtils.h"\r
#include "MessageBox.h"\r
#include "UnicodeUtils.h"\r
+#include "BrowseRefsDlg.h"\r
+#include "ProgressDlg.h"\r
// CRebaseDlg dialog\r
\r
IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\r
m_RebaseStage=CHOOSE_BRANCH;\r
m_CurrentRebaseIndex=-1;\r
m_bThreadRunning =FALSE;\r
+ this->m_IsCherryPick = FALSE;\r
}\r
\r
CRebaseDlg::~CRebaseDlg()\r
ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_BRANCH, &CRebaseDlg::OnCbnSelchangeBranch)\r
ON_CBN_SELCHANGE(IDC_REBASE_COMBOXEX_UPSTREAM, &CRebaseDlg::OnCbnSelchangeUpstream)\r
ON_MESSAGE(MSG_REBASE_UPDATE_UI, OnRebaseUpdateUI)\r
+ ON_BN_CLICKED(IDC_BUTTON_BROWSE, &CRebaseDlg::OnBnClickedButtonBrowse)\r
END_MESSAGE_MAP()\r
\r
void CRebaseDlg::AddRebaseAnchor()\r
AddAnchor(IDC_REBASE_COMBOXEX_BRANCH,TOP_LEFT);\r
AddAnchor(IDC_REBASE_STATIC_UPSTREAM,TOP_LEFT);\r
AddAnchor(IDC_REBASE_STATIC_BRANCH,TOP_LEFT);\r
- \r
+ AddAnchor(IDHELP, BOTTOM_RIGHT);\r
+ this->AddOthersToAnchor();\r
}\r
\r
BOOL CRebaseDlg::OnInitDialog()\r
\r
CWnd *pwnd=this->GetDlgItem(IDC_REBASE_DUMY_TAB);\r
pwnd->GetWindowRect(&rectDummy);\r
+ this->ScreenToClient(rectDummy);\r
\r
- rectDummy.top-=20;\r
- rectDummy.bottom-=20;\r
-\r
- rectDummy.left-=5;\r
- rectDummy.right-=5;\r
- \r
if (!m_ctrlTabCtrl.Create(CMFCTabCtrl::STYLE_FLAT, rectDummy, this, IDC_REBASE_TAB))\r
{\r
TRACE0("Failed to create output tab window\n");\r
\r
m_tooltips.Create(this);\r
\r
- m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
+ m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
\r
m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));\r
m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1);\r
// m_CommitList.m_IsOldFirst = TRUE;\r
m_CommitList.m_IsRebaseReplaceGraph = TRUE;\r
\r
- m_CommitList.DeleteAllItems();\r
m_CommitList.InsertGitColumn();\r
\r
- FetchLogList();\r
- SetContinueButtonText();\r
this->SetControlEnable();\r
\r
+ if(!this->m_PreCmd.IsEmpty())\r
+ {\r
+ CProgressDlg progress;\r
+ progress.m_GitCmd=m_PreCmd;\r
+ progress.m_bAutoCloseOnSuccess=true;\r
+ progress.DoModal();\r
+ }\r
+\r
+ if(m_IsCherryPick)\r
+ {\r
+ this->m_BranchCtrl.SetCurSel(-1);\r
+ this->m_BranchCtrl.EnableWindow(FALSE);\r
+ this->m_UpstreamCtrl.EnableWindow(FALSE);\r
+ this->SetWindowText(_T("Cherry Pick"));\r
+ this->m_CommitList.StartFilter();\r
+\r
+ }else\r
+ {\r
+ SetContinueButtonText();\r
+ m_CommitList.DeleteAllItems();\r
+ FetchLogList();\r
+ }\r
+\r
m_CommitList.m_ContextMenuMask &= ~(m_CommitList.GetContextMenuBit(CGitLogListBase::ID_CHERRY_PICK)|\r
m_CommitList.GetContextMenuBit(CGitLogListBase::ID_SWITCHTOREV)|\r
m_CommitList.GetContextMenuBit(CGitLogListBase::ID_RESET)|\r
m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTREV)|\r
- m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV));\r
+ m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_TO_VERSION)|\r
+ m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REVERTTOREV)|\r
+ m_CommitList.GetContextMenuBit(CGitLogListBase::ID_COMBINE_COMMIT));\r
+\r
+ if(m_CommitList.m_IsOldFirst)\r
+ this->m_CurrentRebaseIndex = -1;\r
+ else\r
+ this->m_CurrentRebaseIndex = m_CommitList.m_logEntries.size();\r
+\r
\r
return TRUE;\r
}\r
AddBranchToolTips(&m_BranchCtrl);\r
AddBranchToolTips(&m_UpstreamCtrl);\r
\r
+ if(!m_Upstream.IsEmpty())\r
+ {\r
+ m_UpstreamCtrl.AddString(m_Upstream);\r
+ m_UpstreamCtrl.SetCurSel(m_UpstreamCtrl.GetCount()-1);\r
+ }\r
+ else\r
+ {\r
+ //Select pull-remote from current branch\r
+ CString currentBranch = g_Git.GetSymbolicRef();\r
+ CString configName;\r
+ configName.Format(L"branch.%s.remote", currentBranch);\r
+ CString pullRemote = g_Git.GetConfigValue(configName);\r
+\r
+ //Select pull-branch from current branch\r
+ configName.Format(L"branch.%s.merge", currentBranch);\r
+ CString pullBranch = CGit::StripRefName(g_Git.GetConfigValue(configName));\r
+\r
+ CString defaultUpstream;\r
+ defaultUpstream.Format(L"remotes/%s/%s", pullRemote, pullBranch);\r
+ int found = m_UpstreamCtrl.FindStringExact(0, defaultUpstream);\r
+ if(found >= 0)\r
+ m_UpstreamCtrl.SetCurSel(found);\r
+ }\r
}\r
\r
void CRebaseDlg::OnCbnSelchangeBranch()\r
m_CommitList.Clear();\r
this->m_CommitList.FillGitLog(NULL,0,&m_UpstreamCtrl.GetString(),&m_BranchCtrl.GetString());\r
if( m_CommitList.GetItemCount() == 0 )\r
- m_CommitList.ShowText(_T("Nothing Rebase"));\r
+ m_CommitList.ShowText(_T("Nothing to Rebase"));\r
\r
CString hash=g_Git.GetHash(m_UpstreamCtrl.GetString());\r
\r
return -1;\r
\r
//Todo call pre_rebase_hook\r
+ return 0;\r
}\r
int CRebaseDlg::StartRebase()\r
{\r
CString cmd,out;\r
- //Todo call comment_for_reflog\r
- cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());\r
- this->AddLogString(cmd);\r
\r
- if(g_Git.Run(cmd,&out,CP_UTF8))\r
- return -1;\r
+ if(!this->m_IsCherryPick)\r
+ {\r
+ //Todo call comment_for_reflog\r
+ cmd.Format(_T("git.exe checkout %s"),this->m_BranchCtrl.GetString());\r
+ this->AddLogString(cmd);\r
\r
- this->AddLogString(out);\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ return -1;\r
+\r
+ this->AddLogString(out);\r
+ }\r
\r
cmd=_T("git.exe rev-parse --verify HEAD");\r
if(g_Git.Run(cmd,&out,CP_UTF8))\r
return -1;\r
}\r
\r
- cmd.Format(_T("git.exe update-ref ORIG_HEAD HEAD"));\r
-\r
- cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());\r
- this->AddLogString(cmd);\r
-\r
- out.Empty();\r
- if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ if( !this->m_IsCherryPick )\r
{\r
- return -1;\r
+ cmd.Format(_T("git.exe checkout %s"),this->m_UpstreamCtrl.GetString());\r
+ this->AddLogString(cmd);\r
+\r
+ out.Empty();\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ return -1;\r
+ }\r
}\r
\r
- cmd.Format(_T("git.exe rev-parse %s"),this->m_UpstreamCtrl.GetString());\r
- if(g_Git.Run(cmd,&this->m_OrigUpstreamHash,CP_UTF8))\r
+ m_OrigUpstreamHash.Empty();\r
+ m_OrigUpstreamHash= g_Git.GetHash(this->m_UpstreamCtrl.GetString());\r
+ if(m_OrigUpstreamHash.IsEmpty())\r
{\r
this->AddLogString(m_OrigUpstreamHash);\r
return -1;\r
}\r
\r
- cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());\r
- if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))\r
+ if( !this->m_IsCherryPick )\r
{\r
- this->AddLogString(m_OrigBranchHash);\r
- return -1;\r
- }\r
+ cmd.Format(_T("git.exe rev-parse %s"),this->m_BranchCtrl.GetString());\r
+ if(g_Git.Run(cmd,&this->m_OrigBranchHash,CP_UTF8))\r
+ {\r
+ this->AddLogString(m_OrigBranchHash);\r
+ return -1;\r
+ }\r
+ this->AddLogString(_T("Start Rebase\r\n"));\r
\r
- this->AddLogString(_T("Start Rebase\r\n"));\r
+ }else\r
+ this->AddLogString(_T("Start Cherry-pick\r\n"));\r
+ \r
return 0;\r
}\r
int CRebaseDlg::VerifyNoConflict()\r
return 0;\r
\r
}\r
+int CRebaseDlg::FinishRebase()\r
+{\r
+ if(this->m_IsCherryPick) //cherry pick mode no "branch", working at upstream branch\r
+ return 0;\r
+\r
+ CString cmd,out;\r
+ cmd.Format(_T("git.exe branch -f %s"),this->m_BranchCtrl.GetString());\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ AddLogString(out);\r
+ return -1;\r
+ }\r
+ out.Empty();\r
+ cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash);\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ AddLogString(out);\r
+ return -1;\r
+ }\r
+ out.Empty();\r
+ cmd.Format(_T("git.exe checkout -f %s"),this->m_BranchCtrl.GetString());\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ AddLogString(out);\r
+ return -1;\r
+ }\r
+ return 0;\r
+}\r
void CRebaseDlg::OnBnClickedContinue()\r
{\r
if( m_RebaseStage == CHOOSE_BRANCH|| m_RebaseStage == CHOOSE_COMMIT_PICK_MODE )\r
m_RebaseStage = REBASE_START;\r
}\r
\r
+ if( m_RebaseStage == REBASE_DONE)\r
+ {\r
+ OnOK();\r
+ }\r
+\r
if( m_RebaseStage == REBASE_FINISH )\r
{\r
- CString cmd,out;\r
- cmd.Format(_T("git branch -f %s"),this->m_BranchCtrl.GetString());\r
- if(g_Git.Run(cmd,&out,CP_UTF8))\r
- {\r
- AddLogString(out);\r
+ if(FinishRebase())\r
return ;\r
- }\r
- cmd.Format(_T("git reset --hard %s"),this->m_OrigUpstreamHash);\r
- if(g_Git.Run(cmd,&out,CP_UTF8))\r
- {\r
- AddLogString(out);\r
- return ;\r
- }\r
+\r
OnOK();\r
}\r
\r
GitRev *curRev;\r
do\r
{\r
+ if(index<0)\r
+ return -1;\r
+ if(index>= m_CommitList.GetItemCount())\r
+ return -1;\r
+\r
curRev=(GitRev*)m_CommitList.m_arShownList[index];\r
\r
if( curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SQUASH )\r
else\r
index--;\r
}else\r
- return -1;\r
-\r
- if(index<0)\r
- return -1;\r
- if(index>= m_CommitList.GetItemCount())\r
- return -1;\r
+ return -1; \r
\r
}while(curRev->m_Action&CTGitPath::LOGACTIONS_REBASE_SKIP);\r
\r
case REBASE_FINISH:\r
Text = _T("Finish");\r
break;\r
+\r
+ case REBASE_DONE:\r
+ Text = _T("Done");\r
+ break;\r
}\r
this->GetDlgItem(IDC_REBASE_CONTINUE)->SetWindowText(Text);\r
}\r
this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(TRUE);\r
this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(TRUE);\r
this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(TRUE);\r
- this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);\r
- this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);\r
+ if(!m_IsCherryPick)\r
+ {\r
+ this->GetDlgItem(IDC_REBASE_COMBOXEX_BRANCH)->EnableWindow(TRUE);\r
+ this->GetDlgItem(IDC_REBASE_COMBOXEX_UPSTREAM)->EnableWindow(TRUE);\r
+ }\r
//this->m_CommitList.m_IsEnableRebaseMenu=TRUE;\r
this->m_CommitList.m_ContextMenuMask |= m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_PICK)|\r
m_CommitList.GetContextMenuBit(CGitLogListBase::ID_REBASE_SQUASH)|\r
case REBASE_CONFLICT:\r
case REBASE_EDIT:\r
case REBASE_SQUASH_CONFLICT:\r
+ case REBASE_DONE:\r
this->GetDlgItem(IDC_PICK_ALL)->EnableWindow(FALSE);\r
this->GetDlgItem(IDC_EDIT_ALL)->EnableWindow(FALSE);\r
this->GetDlgItem(IDC_SQUASH_ALL)->EnableWindow(FALSE);\r
m_ProgressBar.SetRange(1,m_CommitList.GetItemCount());\r
m_ProgressBar.SetPos(index);\r
\r
- if(m_CurrentRebaseIndex>0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())\r
+ if(m_CurrentRebaseIndex>=0 && m_CurrentRebaseIndex< m_CommitList.GetItemCount())\r
{\r
CString text;\r
text.Format(_T("Rebasing...(%d/%d)"),index,m_CommitList.GetItemCount());\r
\r
void CRebaseDlg::UpdateCurrentStatus()\r
{\r
- if( m_CurrentRebaseIndex < 0)\r
+ if( m_CurrentRebaseIndex < 0 && m_RebaseStage!= REBASE_DONE)\r
{\r
if(m_CommitList.m_IsOldFirst)\r
m_RebaseStage = CRebaseDlg::REBASE_START;\r
m_RebaseStage = CRebaseDlg::REBASE_FINISH;\r
}\r
\r
- if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize())\r
+ if( m_CurrentRebaseIndex == m_CommitList.m_arShownList.GetSize() && m_RebaseStage!= REBASE_DONE)\r
{\r
if(m_CommitList.m_IsOldFirst)\r
- m_RebaseStage = CRebaseDlg::REBASE_FINISH;\r
+ m_RebaseStage = CRebaseDlg::REBASE_DONE;\r
else\r
- m_RebaseStage = CRebaseDlg::REBASE_START;\r
+ m_RebaseStage = CRebaseDlg::REBASE_FINISH;\r
}\r
\r
SetContinueButtonText();\r
return 0;\r
}\r
if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+ {\r
+ this->m_RebaseStage = REBASE_EDIT ;\r
return -1; // Edit return -1 to stop rebase. \r
- \r
+ }\r
// Squash Case\r
if(CheckNextCommitIsSquash())\r
{ // no squash\r
return 0;\r
}\r
if(mode == CTGitPath::LOGACTIONS_REBASE_EDIT)\r
+ {\r
+ this->m_RebaseStage = REBASE_EDIT ;\r
return -1; // Edit return -1 to stop rebase. \r
+ }\r
\r
// Squash Case\r
if(CheckNextCommitIsSquash())\r
{\r
ret = 0;\r
m_RebaseStage = REBASE_FINISH;\r
- break;\r
- }\r
-\r
- ret = DoRebase();\r
+ \r
+ }else\r
+ {\r
+ ret = DoRebase();\r
\r
- if( ret )\r
- { \r
- break;\r
+ if( ret )\r
+ { \r
+ break;\r
+ }\r
}\r
\r
+ }else if( m_RebaseStage == REBASE_FINISH )\r
+ { \r
+ FinishRebase();\r
+ m_RebaseStage = REBASE_DONE;\r
+ break;\r
+ \r
}else\r
+ {\r
break;\r
+ }\r
this->PostMessage(MSG_REBASE_UPDATE_UI);\r
//this->UpdateCurrentStatus();\r
}\r
CTGitPath path;\r
list.AddPath(path);\r
\r
- this->m_FileListCtrl.GetStatus(list,true);\r
- this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED,CTGitPath::LOGACTIONS_UNMERGED);\r
+ this->m_FileListCtrl.GetStatus(&list,true);\r
+ this->m_FileListCtrl.Show(CTGitPath::LOGACTIONS_UNMERGED|CTGitPath::LOGACTIONS_MODIFIED|CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_DELETED,\r
+ CTGitPath::LOGACTIONS_UNMERGED);\r
if( this->m_FileListCtrl.GetItemCount() == 0 )\r
{\r
\r
} \r
return 0;\r
}\r
-\r
+void CRebaseDlg::OnCancel()\r
+{\r
+ OnBnClickedAbort();\r
+}\r
void CRebaseDlg::OnBnClickedAbort()\r
{\r
CString cmd,out;\r
if(m_OrigUpstreamHash.IsEmpty())\r
{\r
- this->OnCancel();\r
+ __super::OnCancel();\r
+ }\r
+ \r
+ if(m_RebaseStage == CHOOSE_BRANCH || m_RebaseStage== CHOOSE_COMMIT_PICK_MODE)\r
+ {\r
+ return;\r
}\r
- if(CMessageBox::Show(NULL,_T("Are you sure abort rebase"),_T("TortoiseGit"),MB_YESNO) != IDYES)\r
+\r
+ if(CMessageBox::Show(NULL,_T("Are you sure you want to abort the rebase process?"),_T("TortoiseGit"),MB_YESNO) != IDYES)\r
return;\r
\r
+ cmd.Format(_T("git.exe checkout -f %s"),this->m_UpstreamCtrl.GetString());\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ AddLogString(out);\r
+ return ;\r
+ }\r
+\r
cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigUpstreamHash.Left(40));\r
if(g_Git.Run(cmd,&out,CP_UTF8))\r
{\r
return ;\r
}\r
\r
+ if(this->m_IsCherryPick) //there are not "branch" at cherry pick mode\r
+ return;\r
+\r
cmd.Format(_T("git checkout -f %s"),this->m_BranchCtrl.GetString());\r
if(g_Git.Run(cmd,&out,CP_UTF8))\r
{\r
AddLogString(out);\r
return ;\r
}\r
- this->OnCancel();\r
+ \r
+ cmd.Format(_T("git.exe reset --hard %s"),this->m_OrigBranchHash.Left(40));\r
+ if(g_Git.Run(cmd,&out,CP_UTF8))\r
+ {\r
+ AddLogString(out);\r
+ return ;\r
+ }\r
+ __super::OnCancel();\r
+}\r
+\r
+void CRebaseDlg::OnBnClickedButtonBrowse()\r
+{\r
+ if(CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag))\r
+ OnCbnSelchangeUpstream();\r
}\r
OSDN Git Service
