Merge from feature_merge branch. Build TortoiseMerge successfully.

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

diff --git a/src/TortoiseProc/BlameDlg.cpp b/src/TortoiseProc/BlameDlg.cpp
index f1180c3..a5e13ec 100644 (file)
--- a/src/TortoiseProc/BlameDlg.cpp
+++ b/src/TortoiseProc/BlameDlg.cpp
@@ -21,17 +21,17 @@
 #include "BlameDlg.h"\r
 #include "Registry.h"\r
 \r
-IMPLEMENT_DYNAMIC(CBlameDlg, CStandAloneDialog)\r
+//IMPLEMENT_DYNAMIC(CBlameDlg, CStandAloneDialog)\r
 CBlameDlg::CBlameDlg(CWnd* pParent /*=NULL*/)\r
        : CStandAloneDialog(CBlameDlg::IDD, pParent)\r
-       , StartRev(1)\r
-       , EndRev(0)\r
-       , m_sStartRev(_T("1"))\r
+//     , StartRev(1)\r
+//     , EndRev(0)\r
+//     , m_sStartRev(_T("1"))\r
        , m_bTextView(FALSE)\r
        , m_bIgnoreEOL(TRUE)\r
        , m_bIncludeMerge(TRUE)\r
 {\r
-       m_regTextView = CRegDWORD(_T("Software\\TortoiseSVN\\TextBlame"), FALSE);\r
+       m_regTextView = CRegDWORD(_T("Software\\TortoiseGit\\TextBlame"), FALSE);\r
        m_bTextView = m_regTextView;\r
 }\r
 \r
@@ -70,14 +70,14 @@ BOOL CBlameDlg::OnInitDialog()
 \r
        m_bTextView = m_regTextView;\r
        // set head revision as default revision\r
-       if (EndRev.IsHead())\r
+//     if (EndRev.IsHead())\r
                CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_HEAD);\r
-       else\r
-       {\r
-               m_sEndRev = EndRev.ToString();\r
-               UpdateData(FALSE);\r
-               CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_N);\r
-       }\r
+//     else\r
+//     {\r
+//             m_sEndRev = EndRev.ToString();\r
+//             UpdateData(FALSE);\r
+//             CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_N);\r
+//     }\r
 \r
        CheckRadioButton(IDC_COMPAREWHITESPACES, IDC_IGNOREALLWHITESPACES, IDC_IGNOREALLWHITESPACES);\r
 \r
@@ -92,24 +92,24 @@ void CBlameDlg::OnOK()
                return; // don't dismiss dialog (error message already shown by MFC framework)\r
 \r
        m_regTextView = m_bTextView;\r
-       StartRev = SVNRev(m_sStartRev);\r
-       EndRev = SVNRev(m_sEndRev);\r
-       if (!StartRev.IsValid())\r
-       {\r
-               ShowBalloon(IDC_REVISON_START, IDS_ERR_INVALIDREV);\r
-               return;\r
-       }\r
-       EndRev = SVNRev(m_sEndRev);\r
-       if (GetCheckedRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N) == IDC_REVISION_HEAD)\r
-       {\r
-               EndRev = SVNRev(_T("HEAD"));\r
-       }\r
-       if (!EndRev.IsValid())\r
+//     StartRev = SVNRev(m_sStartRev);\r
+//     EndRev = SVNRev(m_sEndRev);\r
+//     if (!StartRev.IsValid())\r
+//     {\r
+///            ShowBalloon(IDC_REVISON_START, IDS_ERR_INVALIDREV);\r
+//             return;\r
+//     }\r
+//     EndRev = SVNRev(m_sEndRev);\r
+//     if (GetCheckedRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N) == IDC_REVISION_HEAD)\r
        {\r
-               ShowBalloon(IDC_REVISION_END, IDS_ERR_INVALIDREV);\r
-               return;\r
+               EndRev = _T("HEAD");\r
        }\r
-       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseSVN\\TextBlame"), FALSE);\r
+//     if (!EndRev.IsValid())\r
+//     {\r
+//             ShowBalloon(IDC_REVISION_END, IDS_ERR_INVALIDREV);\r
+//             return;\r
+//     }\r
+       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseGit\\TextBlame"), FALSE);\r
        if (extBlame)\r
                m_bTextView = true;\r
 \r
@@ -117,14 +117,14 @@ void CBlameDlg::OnOK()
        switch (rb)\r
        {\r
        case IDC_IGNOREWHITESPACECHANGES:\r
-               m_IgnoreSpaces = svn_diff_file_ignore_space_change;\r
+//             m_IgnoreSpaces = svn_diff_file_ignore_space_change;\r
                break;\r
        case IDC_IGNOREALLWHITESPACES:\r
-               m_IgnoreSpaces = svn_diff_file_ignore_space_all;\r
+//             m_IgnoreSpaces = svn_diff_file_ignore_space_all;\r
                break;\r
        case IDC_COMPAREWHITESPACES:\r
        default:\r
-               m_IgnoreSpaces = svn_diff_file_ignore_space_none;\r
+//             m_IgnoreSpaces = svn_diff_file_ignore_space_none;\r
                break;\r
        }\r
 \r