Sync Dialog progress command output correct handle \r

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

diff --git a/src/TortoiseProc/FileDiffDlg.cpp b/src/TortoiseProc/FileDiffDlg.cpp
index 6bf152a..94f518d 100644 (file)
--- a/src/TortoiseProc/FileDiffDlg.cpp
+++ b/src/TortoiseProc/FileDiffDlg.cpp
@@ -252,24 +252,9 @@ UINT CFileDiffDlg::DiffThread()
 //             return 0;\r
 //     }\r
 #endif\r
-       CString cmd;\r
-       CString rev1=m_rev1.m_CommitHash;\r
-       if(this->m_rev1.m_CommitHash == GIT_REV_ZERO || this->m_rev2.m_CommitHash == GIT_REV_ZERO)\r
-       {\r
-               rev1=+_T("");\r
-               if(this->m_rev1.m_CommitHash == GIT_REV_ZERO)\r
-                       cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),m_rev2.m_CommitHash);\r
-               else\r
-                       cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),m_rev1.m_CommitHash);\r
-       }else\r
-       {\r
-               cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),rev1,m_rev2.m_CommitHash);\r
-       }\r
 \r
-       BYTE_VECTOR out;\r
-       g_Git.Run(cmd,&out);\r
-       this->m_arFileList.ParserFromLog(out);\r
-       \r
+       g_Git.GetCommitDiffList(m_rev1.m_CommitHash,m_rev2.m_CommitHash,m_arFileList);\r
+               \r
        CString sFilterText;\r
        m_cFilter.GetWindowText(sFilterText);\r
        m_cFileList.SetRedraw(false);\r
@@ -865,7 +850,8 @@ void CFileDiffDlg::OnBnClickedSwitchleftright()
                        fd.m_Action = CTGitPath::LOGACTIONS_DELETED;\r
                else if (fd.m_Action == CTGitPath::LOGACTIONS_DELETED)\r
                        fd.m_Action = CTGitPath::LOGACTIONS_ADDED;\r
-               ( CTGitPath)m_arFileList[i] = ( CTGitPath)fd;\r
+               std::swap(fd.m_StatAdd, fd.m_StatDel);\r
+               (CTGitPath&)m_arFileList[i] = fd;\r
        }\r
        Filter(sFilterString);\r
 \r
@@ -889,8 +875,10 @@ void CFileDiffDlg::SetURLLabels()
        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
+       m_tooltips.AddTool(IDC_FIRSTURL,  \r
+               CAppUtils::FormatDateAndTime( m_rev1.m_AuthorDate, DATE_SHORTDATE, false )+_T("  ")+m_rev1.m_AuthorName);\r
+       m_tooltips.AddTool(IDC_SECONDURL, \r
+               CAppUtils::FormatDateAndTime( m_rev2.m_AuthorDate, DATE_SHORTDATE, false )+_T("  ")+m_rev2.m_AuthorName);\r
 \r
 }\r
 \r