Use new way to convert multi to wide char.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitBlame / TortoiseGitBlameDoc.cpp

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp
index 5fececb..20c1a09 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp
+++ b/src/TortoiseGitBlame/TortoiseGitBlameDoc.cpp
@@ -12,6 +12,7 @@
 #include "MainFrm.h"\r
 #include "TGitPath.h"\r
 #include "TortoiseGitBlameView.h"\r
+#include "CmdLineParser.h"\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
@@ -48,13 +49,27 @@ BOOL CTortoiseGitBlameDoc::OnNewDocument()
 \r
        return TRUE;\r
 }\r
-\r
 BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName)\r
 {\r
+       CCmdLineParser parser(AfxGetApp()->m_lpCmdLine);\r
+       if(parser.HasVal(_T("rev")))\r
+       {\r
+               m_Rev=parser.GetVal(_T("rev"));\r
+       }else\r
+       {\r
+               m_Rev.Empty();\r
+       }\r
+\r
+       return OnOpenDocument(lpszPathName,m_Rev);\r
+}\r
+\r
+BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName,CString Rev)\r
+{\r
        if (!CDocument::OnOpenDocument(lpszPathName))\r
                return FALSE;\r
 \r
        m_CurrentFileName=lpszPathName;\r
+       m_Rev=Rev;\r
 \r
        // TODO: add reinitialization code here\r
        // (SDI documents will reuse this document)\r
@@ -73,26 +88,57 @@ BOOL CTortoiseGitBlameDoc::OnOpenDocument(LPCTSTR lpszPathName)
        {\r
                m_IsGitFile=TRUE;\r
                g_Git.m_CurrentDir=topdir;\r
-               GetMainFrame()->m_wndOutput.LoadHistory(lpszPathName);\r
+\r
+               CString PathName=lpszPathName;\r
+               PathName=PathName.Right(PathName.GetLength()-g_Git.m_CurrentDir.GetLength()-1);\r
+               CTGitPath path;\r
+               path.SetFromWin(PathName);\r
+\r
+               if(!g_Git.m_CurrentDir.IsEmpty())\r
+                       SetCurrentDirectory(g_Git.m_CurrentDir);\r
                \r
+               GetMainFrame()->m_wndOutput.LoadHistory(path.GetGitPathString());\r
+       \r
                CString cmd;\r
-               CTGitPath path;\r
-               path.SetFromWin(lpszPathName);\r
-               cmd.Format(_T("git.exe blame -s -l -- \"%s\""),path.GetGitPathString());\r
+               \r
+               cmd.Format(_T("git.exe blame -s -l %s -- \"%s\""),Rev,path.GetGitPathString());\r
                m_BlameData.Empty();\r
-               if(g_Git.Run(cmd,&m_BlameData))\r
+               if(g_Git.Run(cmd,&m_BlameData,CP_UTF8))\r
                {\r
                        CMessageBox::Show(NULL,CString(_T("Blame Error"))+m_BlameData,_T("TortoiseGitBlame"),MB_OK);\r
 \r
                }\r
                CTortoiseGitBlameView *pView=DYNAMIC_DOWNCAST(CTortoiseGitBlameView,GetMainFrame()->GetActiveView());\r
-               pView->UpdateInfo();\r
-               \r
+               if(pView == NULL)\r
+               {\r
+                       CWnd* pWnd = GetMainFrame()->GetDescendantWindow(AFX_IDW_PANE_FIRST, TRUE);\r
+                       if (pWnd != NULL && pWnd->IsKindOf(RUNTIME_CLASS(CTortoiseGitBlameView)))\r
+                       {\r
+                               pView = (CTortoiseGitBlameView*)pWnd;\r
+                       }\r
+                       else\r
+                       {\r
+                               return FALSE;\r
+                       }\r
+               }\r
+               pView->UpdateInfo();            \r
        }\r
 \r
        return TRUE;\r
 }\r
 \r
+void CTortoiseGitBlameDoc::SetPathName(LPCTSTR lpszPathName, BOOL bAddToMRU)\r
+{\r
+       CDocument::SetPathName(lpszPathName,bAddToMRU);\r
+\r
+       CString title;\r
+       if(m_Rev.IsEmpty())\r
+               title=CString(lpszPathName)+_T(":HEAD");\r
+       else\r
+               title=CString(lpszPathName)+_T(":")+m_Rev;\r
+\r
+       this->SetTitle(title);\r
+}\r
 \r
 // CTortoiseGitBlameDoc serialization\r
 \r