Commit File List can show file and sort

[tortoisegit/TortoiseGitJp.git] / TortoiseProc / FileDiffDlg.cpp

diff --git a/TortoiseProc/FileDiffDlg.cpp b/TortoiseProc/FileDiffDlg.cpp
index 2c9b5fb..dd328af 100644 (file)
--- a/TortoiseProc/FileDiffDlg.cpp
+++ b/TortoiseProc/FileDiffDlg.cpp
@@ -841,15 +841,16 @@ void CFileDiffDlg::OnBnClickedSwitchleftright()
 \r
 void CFileDiffDlg::SetURLLabels()\r
 {\r
-#if 0\r
-       m_cRev1Btn.SetWindowText(m_rev1.ToString());\r
-       m_cRev2Btn.SetWindowText(m_rev2.ToString());\r
 \r
-       SetDlgItemText(IDC_FIRSTURL, m_path1.GetGitPathString());\r
-       SetDlgItemText(IDC_SECONDURL, m_bDoPegDiff ? m_path1.GetGitPathString() : m_path2.GetGitPathString());\r
-       m_tooltips.AddTool(IDC_FIRSTURL, m_path1.GetGitPathString());\r
-       m_tooltips.AddTool(IDC_SECONDURL, m_bDoPegDiff ? m_path1.GetGitPathString() : m_path2.GetGitPathString());\r
-#endif\r
+       m_cRev1Btn.SetWindowText(m_rev1.m_CommitHash.Left(6));\r
+       m_cRev2Btn.SetWindowText(m_rev2.m_CommitHash.Left(6));\r
+\r
+       SetDlgItemText(IDC_FIRSTURL, m_rev1.m_Subject+CString(_T("\r\n"))+m_rev1.m_CommitHash);\r
+       SetDlgItemText(IDC_SECONDURL,m_rev2.m_Subject+CString(_T("\r\n"))+m_rev2.m_CommitHash);\r
+\r
+       m_tooltips.AddTool(IDC_FIRSTURL,  m_rev1.m_AuthorDate.Format(_T("%Y-%m-%d  "))+m_rev1.m_AuthorName);\r
+       m_tooltips.AddTool(IDC_SECONDURL, m_rev2.m_AuthorDate.Format(_T("%Y-%m-%d  "))+m_rev2.m_AuthorName);\r
+\r
 }\r
 \r
 BOOL CFileDiffDlg::PreTranslateMessage(MSG* pMsg)\r