\r
m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS , _T("RebaseDlg"));\r
\r
- m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Modified File"));\r
+ m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));\r
m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Log Message"),1);\r
AddRebaseAnchor();\r
\r
this->m_UpstreamCtrl.EnableWindow(FALSE);\r
}\r
\r
+ m_CommitList.DeleteAllItems();\r
+ m_CommitList.InsertGitColumn();\r
+\r
+ FetchLogList();\r
return TRUE;\r
}\r
// CRebaseDlg message handlers\r
\r
void CRebaseDlg::OnCbnSelchangeBranch()\r
{\r
-\r
+ FetchLogList();\r
}\r
\r
void CRebaseDlg::OnCbnSelchangeUpstream()\r
{\r
+ FetchLogList();\r
+}\r
+\r
+void CRebaseDlg::FetchLogList()\r
+{\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
\r
+ m_CommitList.Invalidate();\r
}\r
\r
void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)\r