Add blame command at TortoiseProc

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index cb2e51a..50b3f34 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
-       <?define MinorVersion="2" ?>\r
+       <?define MinorVersion="3" ?>\r
        <?define MicroVersion="0" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index e4ef61f..dae0eb6 100644 (file)
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -592,13 +592,15 @@ bool CAppUtils::LaunchApplication(const CString& sCommandLine, UINT idErrMessage
 /**\r
 * Launch the external blame viewer\r
 */\r
-bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile, const CString& sLogFile, const CString& sOriginalFile, const CString& sParams)\r
+bool CAppUtils::LaunchTortoiseBlame(const CString& sBlameFile,CString Rev,const CString& sParams)\r
 {\r
        CString viewer = CPathUtils::GetAppDirectory();\r
-       viewer += _T("TortoiseBlame.exe");\r
+       viewer += _T("TortoiseGitBlame.exe");\r
        viewer += _T(" \"") + sBlameFile + _T("\"");\r
-       viewer += _T(" \"") + sLogFile + _T("\"");\r
-       viewer += _T(" \"") + sOriginalFile + _T("\"");\r
+       //viewer += _T(" \"") + sLogFile + _T("\"");\r
+       //viewer += _T(" \"") + sOriginalFile + _T("\"");\r
+       if(!Rev.IsEmpty())\r
+               viewer += CString(_T(" /rev:"))+Rev;\r
        viewer += _T(" ")+sParams;\r
        \r
        return LaunchApplication(viewer, IDS_ERR_EXTDIFFSTART, false);\r

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index d9d761b..0264563 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -112,7 +112,7 @@ public:
        * Launch the external blame viewer\r
        */\r
        static bool LaunchTortoiseBlame(\r
-               const CString& sBlameFile, const CString& sLogFile, const CString& sOriginalFile, const CString& sParams = CString());\r
+               const CString& sBlameFile, CString Rev, const CString& sParams = CString());\r
        \r
        /**\r
         * Resizes all columns in a list control. Considers also icons in columns\r

diff --git a/src/TortoiseProc/Commands/BlameCommand.cpp b/src/TortoiseProc/Commands/BlameCommand.cpp
index ad10847..3d889cb 100644 (file)
--- a/src/TortoiseProc/Commands/BlameCommand.cpp
+++ b/src/TortoiseProc/Commands/BlameCommand.cpp
@@ -28,12 +28,13 @@
 \r
 bool BlameCommand::Execute()\r
 {\r
-       bool bRet = false;\r
-       bool bShowDialog = true;\r
-       CBlameDlg dlg;\r
-       CString options;\r
-       dlg.DoModal();\r
+//     bool bRet = false;\r
+//     bool bShowDialog = true;\r
+//     CBlameDlg dlg;\r
+//     CString options;\r
+//     dlg.DoModal();\r
 //     dlg.EndRev = GitRev::REV_HEAD;\r
+       CAppUtils::LaunchTortoiseBlame(orgCmdLinePath.GetWinPath(), _T(""),_T(""));\r
 #if 0\r
        if (parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")))\r
        {\r
@@ -105,5 +106,5 @@ bool BlameCommand::Execute()
                }\r
        }\r
 #endif\r
-       return bRet;\r
+       return TRUE;\r
 }\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index a9acb41..16601c8 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:log /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
+                               CommandArguments="/command:blame /path:&quot;D:\\Profiles\\b20596\\git\\alloc.c&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r

diff --git a/src/version.h b/src/version.h
index ad4f8be..f4bbb31 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,10 +1,10 @@
-#define FILEVER        0,2,0,0\r
-#define PRODUCTVER     0,2,0,0\r
-#define STRFILEVER     "0, 2, 0, 0\0"\r
-#define STRPRODUCTVER  "0, 2, 0, 0\0"\r
+#define FILEVER        0,3,0,0\r
+#define PRODUCTVER     0,3,0,0\r
+#define STRFILEVER     "0, 3, 0, 0\0"\r
+#define STRPRODUCTVER  "0, 3, 0, 0\0"\r
 \r
 #define TSVN_VERMAJOR             0\r
-#define TSVN_VERMINOR             2\r
+#define TSVN_VERMINOR             3\r
 #define TSVN_VERMICRO             0\r
 #define TSVN_VERBUILD                    0\r
 #define TSVN_VERDATE                     "date unknown\n"\r