Remove some more Subversion leftovers

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index b9f64a2..1135ae1 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Commands/LogCommand.cpp b/src/TortoiseProc/Commands/LogCommand.cpp
index 70cde22..82eea1e 100644 (file)
--- a/src/TortoiseProc/Commands/LogCommand.cpp
+++ b/src/TortoiseProc/Commands/LogCommand.cpp
@@ -64,17 +64,11 @@ bool LogCommand::Execute()
                CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                limit = (int)(LONG)reg;\r
        }\r
-       BOOL bStrict = (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE);\r
-       if (parser.HasKey(_T("strict")))\r
-       {\r
-               bStrict = TRUE;\r
-       }\r
-\r
        \r
        CLogDlg dlg;\r
        theApp.m_pMainWnd = &dlg;\r
        //dlg.SetParams(cmdLinePath);\r
-       dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit, bStrict);\r
+       dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit);\r
 //     dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));\r
 //     val = parser.GetVal(_T("propspath"));\r
 //     if (!val.IsEmpty())\r

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index c167113..43abebe 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1477,7 +1477,6 @@ UINT CGitLogListBase::LogThread()
 #endif\r
        InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
 \r
-       int index=0;\r
        unsigned int updated=0;\r
        int percent=0;\r
        CRect rect;\r

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 78d6677..fd68088 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -60,7 +60,6 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
        , m_nSortColumn(0)\r
        , m_bShowedAll(false)\r
        , m_bSelect(false)\r
-       , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)\r
        \r
        , m_bSelectionMustBeContinuous(false)\r
        , m_bShowBugtraqColumn(false)\r
@@ -99,7 +98,6 @@ void CLogDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);\r
        DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);\r
        DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);\r
-       DDX_Check(pDX, IDC_CHECK_STOPONCOPY, m_bStrict);\r
        DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);\r
        DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);\r
        DDX_Control(pDX, IDC_DATETO, m_DateTo);\r
@@ -138,7 +136,6 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
        //ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)\r
        ON_BN_CLICKED(IDC_HIDEPATHS, OnBnClickedHidepaths)\r
        \r
-       ON_BN_CLICKED(IDC_CHECK_STOPONCOPY, &CLogDlg::OnBnClickedCheckStoponcopy)\r
        ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)\r
        ON_NOTIFY(DTN_DROPDOWN, IDC_DATETO, &CLogDlg::OnDtnDropdownDateto)\r
        ON_WM_SIZE()\r
@@ -150,7 +147,7 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
        ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)\r
 END_MESSAGE_MAP()\r
 \r
-void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)\r
+void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit /* = FALSE */)\r
 {\r
        m_path = path;\r
        m_pegrev = pegrev;\r
@@ -158,8 +155,6 @@ void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, G
        m_LogRevision = startrev;\r
        m_endrev = endrev;\r
        m_hasWC = !path.IsUrl();\r
-       m_bStrict = bStrict;\r
-       m_bSaveStrict = bSaveStrict;\r
        m_limit = limit;\r
        if (::IsWindow(m_hWnd))\r
                UpdateData(FALSE);\r
@@ -180,8 +175,6 @@ BOOL CLogDlg::OnInitDialog()
        m_bVista = (fullver >= 0x0600);\r
 \r
        // use the state of the "stop on copy/rename" option from the last time\r
-       if (!m_bStrict)\r
-               m_bStrict = m_regLastStrict;\r
        UpdateData(FALSE);\r
        \r
        // set the font to use in the log message view, configured in the settings dialog\r
@@ -234,7 +227,6 @@ BOOL CLogDlg::OnInitDialog()
        m_cFilter.SetValidator(this);\r
        \r
        AdjustControlSize(IDC_HIDEPATHS);\r
-       AdjustControlSize(IDC_CHECK_STOPONCOPY);\r
        AdjustControlSize(IDC_INCLUDEMERGE);\r
 \r
        GetClientRect(m_DlgOrigRect);\r
@@ -262,7 +254,6 @@ BOOL CLogDlg::OnInitDialog()
 \r
        AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);      \r
        AddAnchor(IDC_HIDEPATHS, BOTTOM_LEFT);  \r
-       AddAnchor(IDC_CHECK_STOPONCOPY, BOTTOM_LEFT);\r
        AddAnchor(IDC_INCLUDEMERGE, BOTTOM_LEFT);\r
        AddAnchor(IDC_GETALL, BOTTOM_LEFT);\r
        AddAnchor(IDC_SHOWWHOLEPROJECT, BOTTOM_LEFT);\r
@@ -396,7 +387,6 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
 \r
                //DialogEnableWindow(IDC_GETALL, FALSE);\r
                //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);\r
-               DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);\r
                DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);\r
                DialogEnableWindow(IDC_STATBUTTON, FALSE);\r
                DialogEnableWindow(IDC_REFRESH, FALSE);\r
@@ -729,8 +719,6 @@ void CLogDlg::OnCancel()
                //m_LogList.TerminateThread();\r
        }\r
        UpdateData();\r
-       if (m_bSaveStrict)\r
-               m_regLastStrict = m_bStrict;\r
        \r
        CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
        reg = m_btnShow.GetCurrentEntry();\r
@@ -1235,8 +1223,6 @@ void CLogDlg::OnOK()
                }\r
        }\r
        UpdateData();\r
-       if (m_bSaveStrict)\r
-               m_regLastStrict = m_bStrict;\r
        CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
        reg = m_btnShow.GetCurrentEntry();\r
        SaveSplitterPos();\r
@@ -1790,7 +1776,7 @@ void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
                m_nSearchIndex = pNMLV->iItem;\r
                if (pNMLV->iSubItem != 0)\r
                        return;\r
-               if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))\r
+               if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount()))\r
                {\r
                        // remove the selected state\r
                        if (pNMLV->uChanged & LVIF_STATE)\r

diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h
index c023cea..287e7ff 100644 (file)
--- a/src/TortoiseProc/LogDlg.h
+++ b/src/TortoiseProc/LogDlg.h
@@ -82,8 +82,7 @@ public:
                FILELIST_PATH\r
        };\r
 \r
-       void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, \r
-               BOOL bStrict = CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE), BOOL bSaveStrict = TRUE);\r
+       void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit);\r
        void SetIncludeMerge(bool bInclude = true) {m_bIncludeMerges = bInclude;}\r
        void SetProjectPropertiesPath(const CTGitPath& path) {m_ProjectProperties.ReadProps(path);}\r
        bool IsThreadRunning() {return !!m_LogList.m_bThreadRunning;}\r
@@ -231,11 +230,8 @@ private:
        long                            m_logcounter;\r
        bool                            m_bCancelled;\r
        \r
-       BOOL                            m_bStrict;\r
-\r
        BOOL                            m_bIncludeMerges;\r
        git_revnum_t            m_lowestRev;\r
-       BOOL                            m_bSaveStrict;\r
        CTGitPathList   *   m_currentChangedArray;\r
        LogChangedPathArray m_CurrentFilteredChangedArray;\r
        CTGitPathList           m_currentChangedPathList;\r
@@ -264,7 +260,6 @@ private:
        bool                m_bAscending;\r
        static int                      m_nSortColumnPathList;\r
        static bool                     m_bAscendingPathList;\r
-       CRegDWORD                       m_regLastStrict;\r
        //CRegDWORD                     m_regMaxBugIDColWidth;\r
        CButton                         m_cHidePaths;\r
        bool                            m_bShowedAll;\r