From 57696a3896ebab38b1c1a22191849d05b214083c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 25 Sep 2018 16:51:31 +0200 Subject: [PATCH] Drop unnecessary filter code The search string was always empty and thus the first condition was always true. Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListBase.cpp | 232 +----------------------------------- 1 file changed, 1 insertion(+), 231 deletions(-) diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index 97c1a861b..b7f97dc62 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -3552,238 +3552,8 @@ CString CGitLogListBase::GetTagInfo(GitRev* pLogEntry) void CGitLogListBase::RecalculateShownList(CThreadSafePtrArray * pShownlist) { pShownlist->SafeRemoveAll(); - - std::wregex pat;//(L"Remove", regex_constants::icase); - bool bRegex = false; - if (m_bFilterWithRegex) - bRegex = ValidateRegexp(m_sFilterText, pat, false); - - std::regex_constants::match_flag_type flags = std::regex_constants::match_any; - CString sRev; for (DWORD i=0; isBugIDs); - if (std::regex_search(std::wstring((LPCTSTR)m_logEntries[i]->sBugIDs), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(m_logEntries[i]); - continue; - } - } -#endif - if ((m_SelectedFilters & LOGFILTER_SUBJECT) || (m_SelectedFilters & LOGFILTER_MESSAGES)) - { - ATLTRACE(L"messge = \"%s\"\n", (LPCTSTR)m_logEntries.GetGitRevAt(i).GetSubject()); - if (std::regex_search(std::wstring((LPCTSTR)m_logEntries.GetGitRevAt(i).GetSubject()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_MESSAGES) - { - ATLTRACE("messge = \"%s\"\n", (LPCTSTR)m_logEntries.GetGitRevAt(i).GetBody()); - if (std::regex_search(std::wstring((LPCTSTR)m_logEntries.GetGitRevAt(i).GetBody()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_PATHS) - { - CTGitPathList pathList = m_logEntries.GetGitRevAt(i).GetFiles(this); - - bool bGoing = true; - for (INT_PTR cpPathIndex = 0; cpPathIndex < pathList.GetCount() && bGoing; ++cpPathIndex) - { - CTGitPath cpath = pathList[cpPathIndex]; - if (std::regex_search(std::wstring((LPCTSTR)cpath.GetGitOldPathString()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - if (std::regex_search(std::wstring((LPCTSTR)cpath.GetGitPathString()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - if (std::regex_search(std::wstring((LPCTSTR)cpath.GetActionName()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - } - } - if (m_SelectedFilters & LOGFILTER_AUTHORS) - { - if (std::regex_search(std::wstring((LPCTSTR)m_logEntries.GetGitRevAt(i).GetAuthorName()), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_EMAILS) - { - if (std::regex_search(std::wstring((LPCTSTR)m_logEntries.GetGitRevAt(i).GetAuthorEmail()), pat, flags) && IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_REVS) - { - sRev = m_logEntries.GetGitRevAt(i).m_CommitHash.ToString(); - if (std::regex_search(std::wstring((LPCTSTR)sRev), pat, flags)&&IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if ((m_SelectedFilters & LOGFILTER_REFNAME) && m_HashMap.find(m_logEntries.GetGitRevAt(i).m_CommitHash) != m_HashMap.cend()) - { - const STRING_VECTOR& refs = m_HashMap[m_logEntries.GetGitRevAt(i).m_CommitHash]; - for (auto it = refs.cbegin(); it != refs.cend(); ++it) - { - if (std::regex_search(std::wstring((LPCTSTR)*it), pat, flags) && IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - } - } // if (bRegex) - else - { - CString find = m_sFilterText; - if (!m_bFilterCaseSensitively) - find.MakeLower(); -#if 0 - if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID)) - { - CString sBugIDs = m_logEntries[i]->sBugIDs; - - if (!m_bFilterCaseSensitively) - sBugIDs = sBugIDs.MakeLower(); - if ((sBugIDs.Find(find) >= 0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(m_logEntries[i]); - continue; - } - } -#endif - if ((m_SelectedFilters & LOGFILTER_SUBJECT) || (m_SelectedFilters & LOGFILTER_MESSAGES)) - { - CString msg = m_logEntries.GetGitRevAt(i).GetSubject(); - - if (!m_bFilterCaseSensitively) - msg = msg.MakeLower(); - if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_MESSAGES) - { - CString msg = m_logEntries.GetGitRevAt(i).GetBody(); - - if (!m_bFilterCaseSensitively) - msg = msg.MakeLower(); - if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_PATHS) - { - CTGitPathList pathList = m_logEntries.GetGitRevAt(i).GetFiles(this); - - bool bGoing = true; - for (INT_PTR cpPathIndex = 0; cpPathIndex < pathList.GetCount() && bGoing; ++cpPathIndex) - { - CTGitPath cpath = pathList[cpPathIndex]; - CString path = cpath.GetGitOldPathString(); - if (!m_bFilterCaseSensitively) - path.MakeLower(); - if ((path.Find(find)>=0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - path = cpath.GetGitPathString(); - if (!m_bFilterCaseSensitively) - path.MakeLower(); - if ((path.Find(find)>=0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - path = cpath.GetActionName(); - if (!m_bFilterCaseSensitively) - path.MakeLower(); - if ((path.Find(find)>=0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - bGoing = false; - continue; - } - } - } - if (m_SelectedFilters & LOGFILTER_AUTHORS) - { - CString msg = m_logEntries.GetGitRevAt(i).GetAuthorName(); - if (!m_bFilterCaseSensitively) - msg = msg.MakeLower(); - if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_EMAILS) - { - CString msg = m_logEntries.GetGitRevAt(i).GetAuthorEmail(); - if (!m_bFilterCaseSensitively) - msg = msg.MakeLower(); - if ((msg.Find(find) >= 0) && (IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if (m_SelectedFilters & LOGFILTER_REVS) - { - sRev = m_logEntries.GetGitRevAt(i).m_CommitHash.ToString(); - if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i))) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - if ((m_SelectedFilters & LOGFILTER_REFNAME) && m_HashMap.find(m_logEntries.GetGitRevAt(i).m_CommitHash) != m_HashMap.cend()) - { - const STRING_VECTOR& refs = m_HashMap[m_logEntries.GetGitRevAt(i).m_CommitHash]; - for (auto it = refs.cbegin(); it != refs.cend(); ++it) - { - if (it->Find(find) >= 0 && IsEntryInDateRange(i)) - { - pShownlist->SafeAdd(&m_logEntries.GetGitRevAt(i)); - continue; - } - } - } - } // else (from if (bRegex)) - } // for (DWORD i=0; iSafeAdd(&m_logEntries.GetGitRevAt(i)); } void CGitLogListBase::StartFilter() -- 2.11.4.GIT