#include "AppUtils.h"\r
#include "MessageBox.h"\r
#include "UnicodeUtils.h"\r
+#include "BrowseRefsDlg.h"\r
// CRebaseDlg dialog\r
\r
IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\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
+ this->AddOthersToAnchor();\r
}\r
\r
BOOL CRebaseDlg::OnInitDialog()\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.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
// CRebaseDlg message handlers\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
- }\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
m_OrigUpstreamHash.Empty();\r
m_OrigUpstreamHash= g_Git.GetHash(this->m_UpstreamCtrl.GetString());\r
if(m_OrigUpstreamHash.IsEmpty())\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
}\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
if(CMessageBox::Show(NULL,_T("Are you sure abort rebase"),_T("TortoiseGit"),MB_YESNO) != IDYES)\r
return;\r
\r
- cmd.Format(_T("git checkout -f %s"),this->m_UpstreamCtrl.GetString());\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
+ 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
}\r
__super::OnCancel();\r
}\r
+\r
+void CRebaseDlg::OnBnClickedButtonBrowse()\r
+{\r
+ CBrowseRefsDlg::PickRefForCombo(&m_UpstreamCtrl, gPickRef_NoTag);\r
+}\r