RebaseDlg: Show Commit List at oldest is first

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / RebaseDlg.cpp

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 11d3b4a..636c30f 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -114,7 +114,7 @@ BOOL CRebaseDlg::OnInitDialog()
        m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS , _T("RebaseDlg"));\r
 \r
        m_ctrlTabCtrl.AddTab(&m_FileListCtrl,_T("Conflict File"));\r
-       m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Log Message"),1);\r
+       m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1);\r
        AddRebaseAnchor();\r
 \r
 \r
@@ -150,6 +150,9 @@ BOOL CRebaseDlg::OnInitDialog()
                this->m_UpstreamCtrl.EnableWindow(FALSE);\r
        }\r
 \r
+       m_CommitList.m_IsIDReplaceAction = TRUE;\r
+       m_CommitList.m_IsOldFirst = TRUE;\r
+\r
        m_CommitList.DeleteAllItems();\r
        m_CommitList.InsertGitColumn();\r
 \r
@@ -297,7 +300,23 @@ void CRebaseDlg::FetchLogList()
        if( m_CommitList.GetItemCount() == 0 )\r
                m_CommitList.ShowText(_T("Nothing Rebase"));\r
 \r
+       CString hash=g_Git.GetHash(m_UpstreamCtrl.GetString());\r
+       \r
+       if(m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash.size() >=0 )\r
+       {\r
+               if(hash ==  m_CommitList.m_logEntries[m_CommitList.m_logEntries.size()-1].m_ParentHash[0])\r
+               {\r
+                       m_CommitList.Clear();\r
+                       m_CommitList.ShowText(_T("Nothing Rebase"));\r
+               }\r
+       }\r
+       \r
        m_CommitList.Invalidate();\r
+\r
+       m_tooltips.Pop();\r
+       AddBranchToolTips(&this->m_BranchCtrl);\r
+       AddBranchToolTips(&this->m_UpstreamCtrl);\r
+       \r
 }\r
 \r
 void CRebaseDlg::AddBranchToolTips(CHistoryCombo *pBranch)\r