OSDN Git Service

Fix Compare with preview version crash problem at log dialog.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDlg.cpp
index 9552a37..e2bb8a1 100644 (file)
@@ -1,12 +1,9 @@
 // TortoiseGit - a Windows shell extension for easy version control\r
-\r
 // Copyright (C) 2003-2008 - TortoiseGit\r
-\r
 // This program is free software; you can redistribute it and/or\r
 // modify it under the terms of the GNU General Public License\r
 // as published by the Free Software Foundation; either version 2\r
 // of the License, or (at your option) any later version.\r
-\r
 // This program is distributed in the hope that it will be useful,\r
 // but WITHOUT ANY WARRANTY; without even the implied warranty of\r
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
@@ -25,7 +22,7 @@
 #include "ProgressDlg.h"\r
 //#include "RepositoryBrowser.h"\r
 //#include "CopyDlg.h"\r
-//#include "StatGraphDlg.h"\r
+#include "StatGraphDlg.h"\r
 #include "Logdlg.h"\r
 #include "MessageBox.h"\r
 #include "Registry.h"\r
 const UINT CLogDlg::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);\r
 \r
 \r
-\r
-\r
 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)\r
 CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)\r
        : CResizableStandAloneDialog(CLogDlg::IDD, pParent)\r
        , m_logcounter(0)\r
        , m_nSearchIndex(0)\r
        , m_wParam(0)\r
-       , m_nSelectedFilter(LOGFILTER_ALL)\r
-       , m_bNoDispUpdates(FALSE)\r
        , m_currentChangedArray(NULL)\r
        , m_nSortColumn(0)\r
        , m_bShowedAll(false)\r
@@ -72,14 +65,14 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
        , m_bSelectionMustBeContinuous(false)\r
        , m_bShowBugtraqColumn(false)\r
        , m_lowestRev(_T(""))\r
-       , m_bStrictStopped(false)\r
+       \r
        , m_sLogInfo(_T(""))\r
        , m_pFindDialog(NULL)\r
        , m_bCancelled(FALSE)\r
        , m_pNotifyWindow(NULL)\r
-       , m_bThreadRunning(FALSE)\r
+       \r
        , m_bAscending(FALSE)\r
-       , m_pStoreSelection(NULL)\r
+\r
        , m_limit(0)\r
        , m_childCounter(0)\r
        , m_maxChild(0)\r
@@ -93,15 +86,8 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
 \r
 CLogDlg::~CLogDlg()\r
 {\r
-       InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-    m_CurrentFilteredChangedArray.RemoveAll();\r
        \r
-\r
-       if ( m_pStoreSelection )\r
-       {\r
-               delete m_pStoreSelection;\r
-               m_pStoreSelection = NULL;\r
-       }\r
+    m_CurrentFilteredChangedArray.RemoveAll();\r
        \r
 }\r
 \r
@@ -114,7 +100,7 @@ void CLogDlg::DoDataExchange(CDataExchange* pDX)
        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_sFilterText);\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
        DDX_Control(pDX, IDC_HIDEPATHS, m_cHidePaths);\r
@@ -127,26 +113,26 @@ void CLogDlg::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)\r
        ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage) \r
        ON_BN_CLICKED(IDC_GETALL, OnBnClickedGetall)\r
-       ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)\r
+       //ON_NOTIFY(NM_DBLCLK, IDC_LOGMSG, OnNMDblclkChangedFileList)\r
        ON_WM_CONTEXTMENU()\r
        ON_WM_SETCURSOR()\r
        ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
        ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)\r
        ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)\r
        ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)\r
-       //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGLIST, OnNMCustomdrawLoglist)\r
+       \r
        ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)\r
        ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)\r
-       //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGLIST, OnLvnGetdispinfoLoglist)\r
+       \r
        ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)\r
        ON_WM_TIMER()\r
        ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)\r
        ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)\r
        ON_BN_CLICKED(IDC_NEXTHUNDRED, OnBnClickedNexthundred)\r
-       ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)\r
-       ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)\r
+       //ON_NOTIFY(NM_CUSTOMDRAW, IDC_LOGMSG, OnNMCustomdrawChangedFileList)\r
+       //ON_NOTIFY(LVN_GETDISPINFO, IDC_LOGMSG, OnLvnGetdispinfoChangedFileList)\r
        ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST   , OnLvnColumnclick)\r
-       ON_NOTIFY(LVN_COLUMNCLICK, IDC_LOGMSG, OnLvnColumnclickChangedFileList)\r
+       //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
@@ -223,30 +209,14 @@ BOOL CLogDlg::OnInitDialog()
        if ((!m_ProjectProperties.sUrl.IsEmpty())||(!m_ProjectProperties.sCheckRe.IsEmpty()))\r
                m_bShowBugtraqColumn = true;\r
 \r
-       theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);\r
-       theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);\r
+       //theme.SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);\r
+       //theme.SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);\r
 \r
        // set up the columns\r
        m_LogList.DeleteAllItems();\r
+       m_LogList.InsertGitColumn();\r
 \r
-       m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );\r
-       m_ChangedFileListCtrl.DeleteAllItems();\r
-       int c = ((CHeaderCtrl*)(m_ChangedFileListCtrl.GetDlgItem(0)))->GetItemCount()-1;\r
-       while (c>=0)\r
-               m_ChangedFileListCtrl.DeleteColumn(c--);\r
-       temp.LoadString(IDS_PROGRS_ACTION);\r
-       m_ChangedFileListCtrl.InsertColumn(this->FILELIST_ACTION, temp);\r
-       temp.LoadString(IDS_LOG_FILE_LINE_ADD);\r
-       m_ChangedFileListCtrl.InsertColumn(this->FILELIST_ADD, temp);\r
-       temp.LoadString(IDS_LOG_FILE_LINE_DEL);\r
-       m_ChangedFileListCtrl.InsertColumn(this->FILELIST_DEL, temp);\r
-       temp.LoadString(IDS_PROGRS_PATH);\r
-       m_ChangedFileListCtrl.InsertColumn(this->FILELIST_PATH, temp);\r
-       \r
-       m_ChangedFileListCtrl.SetRedraw(false);\r
-       CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);\r
-       m_ChangedFileListCtrl.SetRedraw(true);\r
-\r
+       m_ChangedFileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |IDS_STATUSLIST_COLADD|IDS_STATUSLIST_COLDEL , _T("LogDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
 \r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
 \r
@@ -367,7 +337,7 @@ BOOL CLogDlg::OnInitDialog()
        // set the choices for the "Show All" button\r
        temp.LoadString(IDS_LOG_SHOWALL);\r
        m_btnShow.AddEntry(temp);\r
-       temp.LoadString(IDS_LOG_SHOWRANGE);\r
+       temp.LoadString(IDS_LOG_SHOW_WHOLE);\r
        m_btnShow.AddEntry(temp);\r
        m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));\r
 \r
@@ -375,20 +345,68 @@ BOOL CLogDlg::OnInitDialog()
 \r
        // first start a thread to obtain the log messages without\r
        // blocking the dialog\r
-       m_tTo = 0;\r
-       m_tFrom = (DWORD)-1;\r
-       InterlockedExchange(&m_bThreadRunning, TRUE);\r
-       InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-       if (AfxBeginThread(LogThreadEntry, this)==NULL)\r
-       {\r
-               InterlockedExchange(&m_bThreadRunning, FALSE);\r
-               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
-               CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
-       }\r
+       //m_tTo = 0;\r
+       //m_tFrom = (DWORD)-1;\r
+\r
+       m_LogList.m_Path=m_path;\r
+       m_LogList.FetchLogAsync(LogCallBack,this);\r
+\r
        GetDlgItem(IDC_LOGLIST)->SetFocus();\r
        return FALSE;\r
 }\r
 \r
+void CLogDlg::LogRunStatus(int cur)\r
+{\r
+       if( cur == GITLOG_START )\r
+       {\r
+               CString temp;\r
+               temp.LoadString(IDS_PROGRESSWAIT);\r
+\r
+               // change the text of the close button to "Cancel" since now the thread\r
+               // is running, and simply closing the dialog doesn't work.\r
+               if (!GetDlgItem(IDOK)->IsWindowVisible())\r
+               {\r
+                       temp.LoadString(IDS_MSGBOX_CANCEL);\r
+                       SetDlgItemText(IDCANCEL, temp);\r
+               }\r
+\r
+               // We use a progress bar while getting the logs \r
+               m_LogProgress.SetRange32(0, 100);\r
+               m_LogProgress.SetPos(0);\r
+\r
+               GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
+\r
+               //DialogEnableWindow(IDC_GETALL, FALSE);\r
+               DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);\r
+               DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);\r
+               DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);\r
+               DialogEnableWindow(IDC_STATBUTTON, FALSE);\r
+               DialogEnableWindow(IDC_REFRESH, FALSE);\r
+               DialogEnableWindow(IDC_HIDEPATHS,FALSE);\r
+       }\r
+\r
+       if( cur == GITLOG_END)\r
+       {\r
+               \r
+               if (!m_bShowedAll)\r
+                       DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);\r
+\r
+               DialogEnableWindow(IDC_GETALL, TRUE);\r
+               //DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);\r
+               DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
+               DialogEnableWindow(IDC_REFRESH, TRUE);\r
+\r
+//             PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
+\r
+               //CTime time=m_LogList.GetOldestTime();\r
+               CTime begin,end;\r
+               m_LogList.GetTimeRange(begin,end);\r
+               m_DateFrom.SetTime(&begin);\r
+               m_DateTo.SetTime(&end);\r
+       }\r
+\r
+       m_LogProgress.SetPos(cur);\r
+}\r
 void CLogDlg::SetDlgTitle(bool bOffline)\r
 {\r
        if (m_sTitle.IsEmpty())\r
@@ -409,6 +427,8 @@ void CLogDlg::SetDlgTitle(bool bOffline)
        {\r
                if (m_path.IsUrl())\r
                        SetWindowText(m_sTitle + _T(" - ") + m_path.GetUIPathString());\r
+               else if (m_path.IsEmpty())\r
+                       SetWindowText(m_sTitle + _T(" - ") + CString(_T("Whole Project")));\r
                else if (m_path.IsDirectory())\r
                        SetWindowText(m_sTitle + _T(" - ") + m_path.GetWinPathString());\r
                else\r
@@ -453,12 +473,11 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
        pMsgView->SetWindowText(_T(" "));\r
        // empty the changed files list\r
        m_ChangedFileListCtrl.SetRedraw(FALSE);\r
-       InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
+//     InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
        m_currentChangedArray = NULL;\r
-       m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );\r
+       //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );\r
        m_ChangedFileListCtrl.DeleteAllItems();\r
-       m_ChangedFileListCtrl.SetItemCountEx(0);\r
-\r
+       \r
        // if we're not here to really show a selected revision, just\r
        // get out of here after clearing the views, which is what is intended\r
        // if that flag is not set.\r
@@ -466,7 +485,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
        {\r
                // force a redraw\r
                m_ChangedFileListCtrl.Invalidate();\r
-               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+//             InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
                m_ChangedFileListCtrl.SetRedraw(TRUE);\r
                return;\r
        }\r
@@ -477,7 +496,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
        if (selCount == 0)\r
        {\r
                // if nothing is selected, we have nothing more to do\r
-               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+//             InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
                m_ChangedFileListCtrl.SetRedraw(TRUE);\r
                return;\r
        }\r
@@ -488,24 +507,30 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
                // list fully.\r
                POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
                int selIndex = m_LogList.GetNextSelectedItem(pos);\r
-               if (selIndex >= m_arShownList.GetCount())\r
+               if (selIndex >= m_LogList.m_arShownList.GetCount())\r
                {\r
-                       InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+//                     InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
                        m_ChangedFileListCtrl.SetRedraw(TRUE);\r
                        return;\r
                }\r
-               GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(selIndex));\r
-\r
-               // set the log message text\r
-               pMsgView->SetWindowText(_T("*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);\r
-               // turn bug ID's into links if the bugtraq: properties have been set\r
-               // and we can find a match of those in the log message\r
-               m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);\r
-               CAppUtils::FormatTextInRichEditControl(pMsgView);\r
-               m_currentChangedArray = &(pLogEntry->m_Files);\r
-               if (m_currentChangedArray == NULL)\r
+               GitRev* pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(selIndex));\r
+\r
+               if(!pLogEntry->m_IsFull)\r
+               {\r
+                       pMsgView->SetWindowText(_T("load ..."));\r
+               }else\r
                {\r
-                       InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+                       // set the log message text\r
+                       pMsgView->SetWindowText(_T("Commit:")+pLogEntry->m_CommitHash+_T("\r\n\r\n*")+pLogEntry->m_Subject+_T("\n\n")+pLogEntry->m_Body);\r
+                       // turn bug ID's into links if the bugtraq: properties have been set\r
+                       // and we can find a match of those in the log message\r
+                       m_ProjectProperties.FindBugID(pLogEntry->m_Body, pMsgView);\r
+                       CAppUtils::FormatTextInRichEditControl(pMsgView);\r
+\r
+                       m_ChangedFileListCtrl.UpdateWithGitPathList(pLogEntry->m_Files);\r
+                       m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;\r
+                       m_ChangedFileListCtrl.Show(SVNSLC_SHOWVERSIONED);\r
+\r
                        m_ChangedFileListCtrl.SetRedraw(TRUE);\r
                        return;\r
                }\r
@@ -538,7 +563,8 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
        }\r
        \r
        // redraw the views\r
-       InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+//     InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+#if 0\r
        if (m_currentChangedArray)\r
        {\r
                m_ChangedFileListCtrl.SetItemCountEx(m_currentChangedArray->GetCount());\r
@@ -554,6 +580,7 @@ void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
                m_ChangedFileListCtrl.SetItemCountEx(0);\r
                m_ChangedFileListCtrl.Invalidate();\r
        }\r
+#endif\r
        CAppUtils::ResizeAllListCtrlCols(&m_ChangedFileListCtrl);\r
        // sort according to the settings\r
        if (m_nSortColumnPathList > 0)\r
@@ -571,53 +598,32 @@ void CLogDlg::OnBnClickedGetall()
 \r
 void CLogDlg::GetAll(bool bForceAll /* = false */)\r
 {\r
-#if 0\r
+\r
        // fetch all requested log messages, either the specified range or\r
        // really *all* available log messages.\r
-       UpdateData();\r
+       ///UpdateData();\r
        INT_PTR entry = m_btnShow.GetCurrentEntry();\r
        if (bForceAll)\r
                entry = 0;\r
 \r
        switch (entry)\r
        {\r
-       case 0: // show all\r
-       \r
-               m_endrev = 0;\r
-               m_startrev = m_LogRevision;\r
-               if (m_bStrict)\r
-                       m_bShowedAll = true;\r
-\r
+       case 0: // show all branch;\r
+               m_LogList.m_bAllBranch=true;\r
                break;\r
-       case 1: // show range\r
-               {\r
-\r
-                       // ask for a revision range\r
-                       CRevisionRangeDlg dlg;\r
-                       dlg.SetStartRevision(m_startrev);\r
-                       dlg.SetEndRevision( (m_endrev>=0) ? m_endrev : 0);\r
-                       if (dlg.DoModal()!=IDOK)\r
-                       {\r
-                               return;\r
-                       }\r
-                       m_endrev = dlg.GetEndRevision();\r
-                       m_startrev = dlg.GetStartRevision();\r
-                       if (((m_endrev.IsNumber())&&(m_startrev.IsNumber()))||\r
-                               (m_endrev.IsHead()||m_startrev.IsHead()))\r
-                       {\r
-                               if (((LONG)m_startrev < (LONG)m_endrev)||\r
-                                       (m_endrev.IsHead()))\r
-                               {\r
-                                       git_revnum_t temp = m_startrev;\r
-                                       m_startrev = m_endrev;\r
-                                       m_endrev = temp;\r
-                               }\r
-                       }\r
-                       m_bShowedAll = false;\r
-               }\r
-\r
+       case 1: // show whole project\r
+               m_LogList.m_Path.Reset();\r
+               SetWindowText(m_sTitle + _T(" - "));\r
                break;\r
        }\r
+       //m_LogList.m_bExitThread=TRUE;\r
+       //::WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);\r
+\r
+       m_LogList.TerminateThread();\r
+       \r
+       m_LogList.Clear();\r
+       m_LogList.FetchLogAsync(LogCallBack,this);\r
+#if 0\r
        m_ChangedFileListCtrl.SetItemCountEx(0);\r
        m_ChangedFileListCtrl.Invalidate();\r
        // We need to create CStoreSelection on the heap or else\r
@@ -662,58 +668,7 @@ void CLogDlg::OnBnClickedRefresh()
 \r
 void CLogDlg::Refresh (bool autoGoOnline)\r
 {\r
-#if 0\r
-       // refreshing means re-downloading the already shown log messages\r
-       UpdateData();\r
-       m_maxChild = 0;\r
-       m_childCounter = 0;\r
-\r
-       if ((m_limit == 0)||(m_bStrict)||(int(m_logEntries.size()-1) > m_limit))\r
-       {\r
-               if (m_logEntries.size() != 0)\r
-               {\r
-                       m_endrev = m_logEntries[m_logEntries.size()-1]->Rev;\r
-               }\r
-       }\r
-       m_startrev = -1;\r
-       m_bCancelled = FALSE;\r
-\r
-       // We need to create CStoreSelection on the heap or else\r
-       // the variable will run out of the scope before the\r
-       // thread ends. Therefore we let the thread delete\r
-       // the instance.\r
-       m_pStoreSelection = new CStoreSelection(this);\r
-       m_ChangedFileListCtrl.SetItemCountEx(0);\r
-       m_ChangedFileListCtrl.Invalidate();\r
-       m_LogList.SetItemCountEx(0);\r
-       m_LogList.Invalidate();\r
-       InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-       CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);\r
-       pMsgView->SetWindowText(_T(""));\r
-\r
-       SetSortArrow(&m_LogList, -1, true);\r
-\r
-       m_LogList.DeleteAllItems();\r
-       m_arShownList.RemoveAll();\r
-       m_logEntries.ClearAll();\r
-\r
-    // reset the cached HEAD property & go on-line\r
-\r
-    if (autoGoOnline)\r
-    {\r
-           SetDlgTitle (false);\r
-        logCachePool.GetRepositoryInfo().ResetHeadRevision (m_sUUID, m_sRepositoryRoot);\r
-    }\r
-\r
-       InterlockedExchange(&m_bThreadRunning, TRUE);\r
-       if (AfxBeginThread(LogThreadEntry, this)==NULL)\r
-       {\r
-               InterlockedExchange(&m_bThreadRunning, FALSE);\r
-               CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);\r
-       }\r
-       GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
-       InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
-#endif\r
+       m_LogList.Refresh();\r
 }\r
 \r
 void CLogDlg::OnBnClickedNexthundred()\r
@@ -793,10 +748,18 @@ void CLogDlg::OnCancel()
        CString temp, temp2;\r
        GetDlgItemText(IDOK, temp);\r
        temp2.LoadString(IDS_MSGBOX_CANCEL);\r
-       if ((temp.Compare(temp2)==0)||(m_bThreadRunning))\r
+       if ((temp.Compare(temp2)==0)||(this->IsThreadRunning()))\r
        {\r
-               m_bCancelled = true;\r
-               return;\r
+               //m_bCancelled = true;\r
+               //return;\r
+               if(m_LogList.m_bThreadRunning)\r
+               {\r
+                       //m_LogList.m_bExitThread=true;\r
+                       //WaitForSingleObject(m_LogList.m_LoadingThread->m_hThread,INFINITE);\r
+                       m_LogList.TerminateThread();\r
+               }\r
+\r
+               //m_LogList.TerminateThread();\r
        }\r
        UpdateData();\r
        if (m_bSaveStrict)\r
@@ -931,253 +894,9 @@ BOOL CLogDlg::Log(git_revnum_t rev, const CString& author, const CString& date,
        return TRUE;\r
 }\r
 \r
-//this is the thread function which calls the subversion function\r
-UINT CLogDlg::LogThreadEntry(LPVOID pVoid)\r
-{\r
-       return ((CLogDlg*)pVoid)->LogThread();\r
-}\r
-\r
 GitRev g_rev;\r
 //this is the thread function which calls the subversion function\r
-UINT CLogDlg::LogThread()\r
-{\r
-\r
-       InterlockedExchange(&m_bThreadRunning, TRUE);\r
-\r
-    //does the user force the cache to refresh (shift or control key down)?\r
-    bool refresh =    (GetKeyState (VK_CONTROL) < 0) \r
-                   || (GetKeyState (VK_SHIFT) < 0);\r
-\r
-       //disable the "Get All" button while we're receiving\r
-       //log messages.\r
-       DialogEnableWindow(IDC_GETALL, FALSE);\r
-       DialogEnableWindow(IDC_NEXTHUNDRED, FALSE);\r
-       DialogEnableWindow(IDC_CHECK_STOPONCOPY, FALSE);\r
-       DialogEnableWindow(IDC_INCLUDEMERGE, FALSE);\r
-       DialogEnableWindow(IDC_STATBUTTON, FALSE);\r
-       DialogEnableWindow(IDC_REFRESH, FALSE);\r
-       \r
-       CString temp;\r
-       temp.LoadString(IDS_PROGRESSWAIT);\r
-       m_LogList.ShowText(temp, true);\r
-       // change the text of the close button to "Cancel" since now the thread\r
-       // is running, and simply closing the dialog doesn't work.\r
-       if (!GetDlgItem(IDOK)->IsWindowVisible())\r
-       {\r
-               temp.LoadString(IDS_MSGBOX_CANCEL);\r
-               SetDlgItemText(IDCANCEL, temp);\r
-       }\r
-       // We use a progress bar while getting the logs\r
-       m_LogProgress.SetRange32(0, 100);\r
-       m_LogProgress.SetPos(0);\r
-       GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
-//     git_revnum_t r = -1;\r
-       \r
-       // get the repository root url, because the changed-files-list has the\r
-       // paths shown there relative to the repository root.\r
-//     CTGitPath rootpath;\r
-//  BOOL succeeded = GetRootAndHead(m_path, rootpath, r);\r
-\r
-//    m_sRepositoryRoot = rootpath.GetGitPathString();\r
-//    m_sURL = m_path.GetGitPathString();\r
-\r
-    // we need the UUID to unambigously identify the log cache\r
-//    if (logCachePool.IsEnabled())\r
-//        m_sUUID = logCachePool.GetRepositoryInfo().GetRepositoryUUID (rootpath);\r
-\r
-    // if the log dialog is started from a working copy, we need to turn that\r
-    // local path into an url here\r
-//    if (succeeded)\r
-//    {\r
-//        if (!m_path.IsUrl())\r
-//        {\r
-//             m_sURL = GetURLFromPath(m_path);\r
-\r
-               // The URL is escaped because Git::logReceiver\r
-               // returns the path in a native format\r
-//             m_sURL = CPathUtils::PathUnescape(m_sURL);\r
-  //      }\r
-//        m_sRelativeRoot = m_sURL.Mid(CPathUtils::PathUnescape(m_sRepositoryRoot).GetLength());\r
-//             m_sSelfRelativeURL = m_sRelativeRoot;\r
-  //  }\r
-#if 0\r
-    if (succeeded && !m_mergePath.IsEmpty() && m_mergedRevs.empty())\r
-    {\r
-           // in case we got a merge path set, retrieve the merge info\r
-           // of that path and check whether one of the merge URLs\r
-           // match the URL we show the log for.\r
-           GitPool localpool(pool);\r
-           git_error_clear(Err);\r
-           apr_hash_t * mergeinfo = NULL;\r
-           if (git_client_mergeinfo_get_merged (&mergeinfo, m_mergePath.GetGitApiPath(localpool), GitRev(GitRev::REV_WC), m_pctx, localpool) == NULL)\r
-           {\r
-                   // now check the relative paths\r
-                   apr_hash_index_t *hi;\r
-                   const void *key;\r
-                   void *val;\r
-\r
-                   if (mergeinfo)\r
-                   {\r
-                           for (hi = apr_hash_first(localpool, mergeinfo); hi; hi = apr_hash_next(hi))\r
-                           {\r
-                                   apr_hash_this(hi, &key, NULL, &val);\r
-                                   if (m_sURL.Compare(CUnicodeUtils::GetUnicode((char*)key)) == 0)\r
-                                   {\r
-                                           apr_array_header_t * arr = (apr_array_header_t*)val;\r
-                                           if (val)\r
-                                           {\r
-                                                   for (long i=0; i<arr->nelts; ++i)\r
-                                                   {\r
-                                                           git_merge_range_t * pRange = APR_ARRAY_IDX(arr, i, git_merge_range_t*);\r
-                                                           if (pRange)\r
-                                                           {\r
-                                                                   for (git_revnum_t r=pRange->start+1; r<=pRange->end; ++r)\r
-                                                                   {\r
-                                                                           m_mergedRevs.insert(r);\r
-                                                                   }\r
-                                                           }\r
-                                                   }\r
-                                           }\r
-                                           break;\r
-                                   }\r
-                           }\r
-                   }\r
-           }\r
-    }\r
-\r
-    m_LogProgress.SetPos(1);\r
-    if (m_startrev == GitRev::REV_HEAD)\r
-    {\r
-           m_startrev = r;\r
-    }\r
-    if (m_endrev == GitRev::REV_HEAD)\r
-    {\r
-           m_endrev = r;\r
-    }\r
 \r
-    if (m_limit != 0)\r
-    {\r
-           m_limitcounter = m_limit;\r
-           m_LogProgress.SetRange32(0, m_limit);\r
-    }\r
-    else\r
-           m_LogProgress.SetRange32(m_endrev, m_startrev);\r
-       \r
-    if (!m_pegrev.IsValid())\r
-           m_pegrev = m_startrev;\r
-    size_t startcount = m_logEntries.size();\r
-    m_lowestRev = -1;\r
-    m_bStrictStopped = false;\r
-\r
-    if (succeeded)\r
-    {\r
-        succeeded = ReceiveLog (CTGitPathList(m_path), m_pegrev, m_startrev, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
-        if ((!succeeded)&&(!m_path.IsUrl()))\r
-        {\r
-               // try again with REV_WC as the start revision, just in case the path doesn't\r
-               // exist anymore in HEAD\r
-               succeeded = ReceiveLog(CTGitPathList(m_path), GitRev(), GitRev::REV_WC, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
-        }\r
-    }\r
-       m_LogList.ClearText();\r
-    if (!succeeded)\r
-       {\r
-               m_LogList.ShowText(GetLastErrorMessage(), true);\r
-       }\r
-       else\r
-       {\r
-               if (!m_wcRev.IsValid())\r
-               {\r
-                       // fetch the revision the wc path is on so we can mark it\r
-                       CTGitPath revWCPath = m_ProjectProperties.GetPropsPath();\r
-                       if (!m_path.IsUrl())\r
-                               revWCPath = m_path;\r
-                       if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RecursiveLogRev"), FALSE)))\r
-                       {\r
-                               git_revnum_t minrev, maxrev;\r
-                               bool switched, modified, sparse;\r
-                               GetWCRevisionStatus(revWCPath, true, minrev, maxrev, switched, modified, sparse);\r
-                               if (maxrev)\r
-                                       m_wcRev = maxrev;\r
-                       }\r
-                       else\r
-                       {\r
-                               CTGitPath dummypath;\r
-                               GitStatus status;\r
-                               git_wc_status2_t * stat = status.GetFirstFileStatus(revWCPath, dummypath, false, git_depth_empty);\r
-                               if (stat && stat->entry && stat->entry->cmt_rev)\r
-                                       m_wcRev = stat->entry->cmt_rev;\r
-                               if (stat && stat->entry && (stat->entry->kind == git_node_dir))\r
-                                       m_wcRev = stat->entry->revision;\r
-                       }\r
-               }\r
-       }\r
-    if (m_bStrict && (m_lowestRev>1) && ((m_limit>0) ? ((startcount + m_limit)>m_logEntries.size()) : (m_endrev<m_lowestRev)))\r
-               m_bStrictStopped = true;\r
-       m_LogList.SetItemCountEx(ShownCountWithStopped());\r
-\r
-       m_timFrom = (__time64_t(m_tFrom));\r
-       m_timTo = (__time64_t(m_tTo));\r
-       m_DateFrom.SetRange(&m_timFrom, &m_timTo);\r
-       m_DateTo.SetRange(&m_timFrom, &m_timTo);\r
-       m_DateFrom.SetTime(&m_timFrom);\r
-       m_DateTo.SetTime(&m_timTo);\r
-#endif\r
-       DialogEnableWindow(IDC_GETALL, TRUE);\r
-       m_LogList.FillGitLog();\r
-       \r
-#if 0  \r
-       if (!m_bShowedAll)\r
-               DialogEnableWindow(IDC_NEXTHUNDRED, TRUE);\r
-#endif\r
-       DialogEnableWindow(IDC_CHECK_STOPONCOPY, TRUE);\r
-       DialogEnableWindow(IDC_INCLUDEMERGE, TRUE);\r
-       DialogEnableWindow(IDC_STATBUTTON, TRUE);\r
-       DialogEnableWindow(IDC_REFRESH, TRUE);\r
-\r
-#if 0\r
-       LogCache::CRepositoryInfo& cachedProperties = logCachePool.GetRepositoryInfo();\r
-       SetDlgTitle(cachedProperties.IsOffline (m_sUUID, m_sRepositoryRoot, false));\r
-\r
-       GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);\r
-       m_bCancelled = true;\r
-#endif\r
-       InterlockedExchange(&m_bThreadRunning, FALSE);\r
-       m_LogList.RedrawItems(0, m_arShownList.GetCount());\r
-       m_LogList.SetRedraw(false);\r
-       m_LogList.ResizeAllListCtrlCols();\r
-       m_LogList.SetRedraw(true);\r
-       if ( m_pStoreSelection )\r
-       {\r
-               // Deleting the instance will restore the\r
-               // selection of the CLogDlg.\r
-               delete m_pStoreSelection;\r
-               m_pStoreSelection = NULL;\r
-       }\r
-       else\r
-       {\r
-               // If no selection has been set then this must be the first time\r
-               // the revisions are shown. Let's preselect the topmost revision.\r
-               if ( m_LogList.GetItemCount()>0 )\r
-               {\r
-                       m_LogList.SetSelectionMark(0);\r
-                       m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);\r
-               }\r
-       }\r
-\r
-       if (!GetDlgItem(IDOK)->IsWindowVisible())\r
-       {\r
-               temp.LoadString(IDS_MSGBOX_OK);\r
-               SetDlgItemText(IDCANCEL, temp);\r
-       }\r
-\r
-       RefreshCursor();\r
-       // make sure the filter is applied (if any) now, after we refreshed/fetched\r
-       // the log messages\r
-       PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
-\r
-       return 0;\r
-}\r
 \r
 \r
 \r
@@ -1270,7 +989,7 @@ void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
        }\r
        else if (pWnd == &m_ChangedFileListCtrl)\r
        {\r
-               ShowContextMenuForChangedpaths(pWnd, point);\r
+               //ShowContextMenuForChangedpaths(pWnd, point);\r
        }\r
        else if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))\r
        {\r
@@ -1295,12 +1014,12 @@ void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                        sMenuItemText.LoadString(IDS_SCIEDIT_SELECTALL);\r
                        popup.AppendMenu(MF_STRING | MF_ENABLED, EM_SETSEL, sMenuItemText);\r
 \r
-                       if (selIndex >= 0)\r
-                       {\r
-                               popup.AppendMenu(MF_SEPARATOR);\r
-                               sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);\r
-                               popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);\r
-                       }\r
+                       //if (selIndex >= 0)\r
+                       //{\r
+                       //      popup.AppendMenu(MF_SEPARATOR);\r
+                       //      sMenuItemText.LoadString(IDS_LOG_POPUP_EDITLOG);\r
+                       //      popup.AppendMenu(MF_STRING | MF_ENABLED, CGitLogList::ID_EDITAUTHOR, sMenuItemText);\r
+                       //}\r
 \r
                        int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);\r
                        switch (cmd)\r
@@ -1711,9 +1430,9 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, GitRev* rev1, GitRev* rev2, bool b
 \r
        CString cmd;\r
 \r
-       cmd.Format(_T("git.cmd cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
+       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev1->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
        g_Git.RunLogFile(cmd,file1);\r
-       cmd.Format(_T("git.cmd cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
+       cmd.Format(_T("git.exe cat-file -p %s:%s"),rev2->m_CommitHash,(*m_currentChangedArray)[selIndex].GetGitPathString());\r
        g_Git.RunLogFile(cmd,file2);\r
 \r
        CAppUtils::DiffFlags flags;\r
@@ -2060,7 +1779,8 @@ BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
 \r
 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
 {\r
-       if (m_bThreadRunning)\r
+       //if (this->IsThreadRunning())\r
+       if(m_LogList.m_bNoDispUpdates)\r
        {\r
                // only show the wait cursor over the list control\r
                if ((pWnd)&&\r
@@ -2090,14 +1810,15 @@ void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
 {\r
        LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
        *pResult = 0;\r
-       if (m_bThreadRunning)\r
+       //if (this->IsThreadRunning())\r
+       if(m_LogList.m_bNoDispUpdates)\r
                return;\r
        if (pNMLV->iItem >= 0)\r
        {\r
                m_nSearchIndex = pNMLV->iItem;\r
                if (pNMLV->iSubItem != 0)\r
                        return;\r
-               if ((pNMLV->iItem == m_arShownList.GetCount())&&(m_bStrict)&&(m_bStrictStopped))\r
+               if ((pNMLV->iItem == m_LogList.m_arShownList.GetCount())&&(m_bStrict)&&(1/*m_bStrictStopped*/))\r
                {\r
                        // remove the selected state\r
                        if (pNMLV->uChanged & LVIF_STATE)\r
@@ -2146,30 +1867,30 @@ void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
 \r
 void CLogDlg::OnBnClickedStatbutton()\r
 {\r
-#if 0\r
-       if (m_bThreadRunning)\r
+\r
+       if (this->IsThreadRunning())\r
                return;\r
-       if (m_arShownList.IsEmpty())\r
+       if (m_LogList.m_arShownList.IsEmpty())\r
                return;         // nothing is shown, so no statistics.\r
        // the statistics dialog expects the log entries to be sorted by date\r
        SortByColumn(3, false);\r
        CPtrArray shownlist;\r
-       RecalculateShownList(&shownlist);\r
+       m_LogList.RecalculateShownList(&shownlist);\r
        // create arrays which are aware of the current filter\r
        CStringArray m_arAuthorsFiltered;\r
        CDWordArray m_arDatesFiltered;\r
        CDWordArray m_arFileChangesFiltered;\r
        for (INT_PTR i=0; i<shownlist.GetCount(); ++i)\r
        {\r
-               PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(shownlist.GetAt(i));\r
-               CString strAuthor = pLogEntry->sAuthor;\r
+               GitRev* pLogEntry = reinterpret_cast<GitRev*>(shownlist.GetAt(i));\r
+               CString strAuthor = pLogEntry->m_AuthorName;\r
                if ( strAuthor.IsEmpty() )\r
                {\r
                        strAuthor.LoadString(IDS_STATGRAPH_EMPTYAUTHOR);\r
                }\r
                m_arAuthorsFiltered.Add(strAuthor);\r
-               m_arDatesFiltered.Add(static_cast<DWORD>(pLogEntry->tmDate));\r
-               m_arFileChangesFiltered.Add(pLogEntry->dwFileChanges);\r
+               m_arDatesFiltered.Add(pLogEntry->m_AuthorDate.GetTime());\r
+               m_arFileChangesFiltered.Add(pLogEntry->m_Files.GetCount());\r
        }\r
        CStatGraphDlg dlg;\r
        dlg.m_parAuthors = &m_arAuthorsFiltered;\r
@@ -2180,7 +1901,7 @@ void CLogDlg::OnBnClickedStatbutton()
        // restore the previous sorting\r
        SortByColumn(m_nSortColumn, m_bAscending);\r
        OnTimer(LOGFILTER_TIMER);\r
-#endif\r
+\r
 }\r
 \r
 #if 0\r
@@ -2377,8 +2098,8 @@ void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
        // Take the default processing unless we set this to something else below.\r
        *pResult = CDRF_DODEFAULT;\r
 \r
-       if (m_bNoDispUpdates)\r
-               return;\r
+//     if (m_bNoDispUpdates)\r
+//             return;\r
 \r
        // First thing - check the draw stage. If it's the control's prepaint\r
        // stage, then tell Windows we want messages for every item.\r
@@ -2542,7 +2263,7 @@ LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
        CPoint point;\r
        CString temp;\r
        point = CPoint(rect->left, rect->bottom);\r
-#define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))\r
+#define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_nSelectedFilter == x ? MF_CHECKED : MF_UNCHECKED))\r
        CMenu popup;\r
        if (popup.CreatePopupMenu())\r
        {\r
@@ -2581,7 +2302,7 @@ LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
                        }\r
                        else\r
                        {\r
-                               m_nSelectedFilter = selection;\r
+                               m_LogList.m_nSelectedFilter = selection;\r
                                SetFilterCueText();\r
                        }\r
                        SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
@@ -2592,42 +2313,28 @@ LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
 \r
 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
 {\r
-#if 0\r
+\r
        KillTimer(LOGFILTER_TIMER);\r
 \r
-       m_sFilterText.Empty();\r
+       m_LogList.m_sFilterText.Empty();\r
        UpdateData(FALSE);\r
        theApp.DoWaitCursor(1);\r
        CStoreSelection storeselection(this);\r
        FillLogMessageCtrl(false);\r
-       InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-       m_arShownList.RemoveAll();\r
 \r
-       // reset the time filter too\r
-       m_timFrom = (__time64_t(m_tFrom));\r
-       m_timTo = (__time64_t(m_tTo));\r
-       m_DateFrom.SetTime(&m_timFrom);\r
-       m_DateTo.SetTime(&m_timTo);\r
-       m_DateFrom.SetRange(&m_timFrom, &m_timTo);\r
-       m_DateTo.SetRange(&m_timFrom, &m_timTo);\r
+       m_LogList.RemoveFilter();\r
+\r
+       CTime begin,end;\r
+       m_LogList.GetTimeRange(begin,end);\r
+       m_DateFrom.SetTime(&begin);\r
+       m_DateTo.SetTime(&end);\r
 \r
-       for (DWORD i=0; i<m_logEntries.size(); ++i)\r
-       {\r
-               m_arShownList.Add(m_logEntries[i]);\r
-       }\r
-       InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
-       m_LogList.DeleteAllItems();\r
-       m_LogList.SetItemCountEx(ShownCountWithStopped());\r
-       m_LogList.RedrawItems(0, ShownCountWithStopped());\r
-       m_LogList.SetRedraw(false);\r
-       ResizeAllListCtrlCols();\r
-       m_LogList.SetRedraw(true);\r
        theApp.DoWaitCursor(-1);\r
        GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
        GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
        GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
        UpdateLogInfoLabel();\r
-#endif\r
+\r
        return 0L;      \r
 }\r
 \r
@@ -2635,7 +2342,7 @@ LRESULT CLogDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
 void CLogDlg::SetFilterCueText()\r
 {\r
        CString temp;\r
-       switch (m_nSelectedFilter)\r
+       switch (m_LogList.m_nSelectedFilter)\r
        {\r
        case LOGFILTER_ALL:\r
                temp.LoadString(IDS_LOG_FILTER_ALL);\r
@@ -2657,376 +2364,21 @@ void CLogDlg::SetFilterCueText()
        temp = _T("   ")+temp;\r
        m_cFilter.SetCueBanner(temp);\r
 }\r
-#if 0\r
-void CLogDlg::OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
-{\r
-       NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);\r
-\r
-       // Create a pointer to the item\r
-       LV_ITEM* pItem = &(pDispInfo)->item;\r
-\r
-       // Do the list need text information?\r
-       if (!(pItem->mask & LVIF_TEXT))\r
-               return;\r
-\r
-       // By default, clear text buffer.\r
-       lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-\r
-       bool bOutOfRange = pItem->iItem >= ShownCountWithStopped();\r
-       \r
-       *pResult = 0;\r
-       if (m_bNoDispUpdates || m_bThreadRunning || bOutOfRange)\r
-               return;\r
-\r
-       // Which item number?\r
-       int itemid = pItem->iItem;\r
-       GitRev * pLogEntry = NULL;\r
-       if (itemid < m_arShownList.GetCount())\r
-               pLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(pItem->iItem));\r
-    \r
-       // Which column?\r
-       switch (pItem->iSubItem)\r
-       {\r
-       case this->LOGLIST_GRAPH:       //Graphic\r
-               if (pLogEntry)\r
-               {\r
-               }\r
-               break;\r
-       case this->LOGLIST_ACTION: //action -- no text in the column\r
-               break;\r
-       case this->LOGLIST_MESSAGE: //Message\r
-               if (pLogEntry)\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_Subject, pItem->cchTextMax);\r
-               break;\r
-       case this->LOGLIST_AUTHOR: //Author\r
-               if (pLogEntry)\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorName, pItem->cchTextMax);\r
-               break;\r
-       case this->LOGLIST_DATE: //Date\r
-               if (pLogEntry)\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)pLogEntry->m_AuthorDate.Format(_T("%Y-%m-%d %H:%M")), pItem->cchTextMax);\r
-               break;\r
-               \r
-       case 5:\r
-\r
-               break;\r
-       default:\r
-               ASSERT(false);\r
-       }\r
-}\r
-#endif\r
-void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)\r
-{\r
-\r
-       NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);\r
-\r
-       //Create a pointer to the item\r
-       LV_ITEM* pItem= &(pDispInfo)->item;\r
-\r
-       *pResult = 0;\r
-       if ((m_bNoDispUpdates)||(m_bThreadRunning))\r
-       {\r
-               if (pItem->mask & LVIF_TEXT)\r
-                       lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-               return;\r
-       }\r
-       if ((m_currentChangedArray!=NULL)&&(pItem->iItem >= m_currentChangedArray->GetCount()))\r
-       {\r
-               if (pItem->mask & LVIF_TEXT)\r
-                       lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-               return;\r
-       }\r
-       if ((m_currentChangedArray==NULL)&&(pItem->iItem >= m_currentChangedPathList.GetCount()))\r
-       {\r
-               if (pItem->mask & LVIF_TEXT)\r
-                       lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-               return;\r
-       }\r
-       CTGitPath lcpath = NULL;\r
-       if (m_currentChangedArray)\r
-               lcpath = (*m_currentChangedArray)[pItem->iItem];\r
-       //Does the list need text information?\r
-       if (pItem->mask & LVIF_TEXT)\r
-       {\r
-               //Which column?\r
-               switch (pItem->iSubItem)\r
-               {\r
-               case this->FILELIST_ACTION:     //Action\r
-#if 0\r
-                       if (lcpath)\r
-                               lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->GetAction(), pItem->cchTextMax);\r
-                       else\r
-                               lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);                            \r
-#endif\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetActionName(), pItem->cchTextMax);\r
-\r
-                       break;\r
-\r
-               case this->FILELIST_ADD: //add\r
-#if 0\r
-                       if (lcpath)\r
-                               lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sPath, pItem->cchTextMax);\r
-                       else\r
-                               lstrcpyn(pItem->pszText, (LPCTSTR)m_currentChangedPathList[pItem->iItem].GetGitPathString(), pItem->cchTextMax);\r
-#endif\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatAdd, pItem->cchTextMax);\r
-                       break;\r
-\r
-               case this->FILELIST_DEL: //del\r
-#if 0\r
-                       if (lcpath)\r
-                               lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sCopyFromPath, pItem->cchTextMax);\r
-                       else\r
-                               lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-#endif\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.m_StatDel, pItem->cchTextMax);\r
-                       break;\r
-               case this->FILELIST_PATH: //path\r
-#if 0\r
-                       if ((lcpath==NULL)||(lcpath->sCopyFromPath.IsEmpty()))\r
-                               lstrcpyn(pItem->pszText, _T(""), pItem->cchTextMax);\r
-                       else\r
-                               _stprintf_s(pItem->pszText, pItem->cchTextMax, _T("%ld"), lcpath->lCopyFromRev);\r
-#endif\r
-                       lstrcpyn(pItem->pszText, (LPCTSTR)lcpath.GetGitPathString(), pItem->cchTextMax);\r
-                       break;\r
-               }\r
-       }\r
-\r
-       *pResult = 0;\r
-}\r
-\r
-void CLogDlg::OnEnChangeSearchedit()\r
-{\r
-#if 0\r
-       UpdateData();\r
-       if (m_sFilterText.IsEmpty())\r
-       {\r
-               CStoreSelection storeselection(this);\r
-               // clear the filter, i.e. make all entries appear\r
-               theApp.DoWaitCursor(1);\r
-               KillTimer(LOGFILTER_TIMER);\r
-               FillLogMessageCtrl(false);\r
-               InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-               m_arShownList.RemoveAll();\r
-               for (DWORD i=0; i<m_logEntries.size(); ++i)\r
-               {\r
-                       if (IsEntryInDateRange(i))\r
-                               m_arShownList.Add(m_logEntries[i]);\r
-               }\r
-               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
-               m_LogList.DeleteAllItems();\r
-               m_LogList.SetItemCountEx(ShownCountWithStopped());\r
-               m_LogList.RedrawItems(0, ShownCountWithStopped());\r
-               m_LogList.SetRedraw(false);\r
-               ResizeAllListCtrlCols();\r
-               m_LogList.SetRedraw(true);\r
-               theApp.DoWaitCursor(-1);\r
-               GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
-               GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
-               GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
-               DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));\r
-               return;\r
-       }\r
-       if (Validate(m_sFilterText))\r
-               SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
-       else\r
-               KillTimer(LOGFILTER_TIMER);\r
-#endif\r
-}\r
-\r
-bool CLogDlg::ValidateRegexp(LPCTSTR regexp_str, tr1::wregex& pat, bool bMatchCase /* = false */)\r
-{\r
-       try\r
-       {\r
-               tr1::regex_constants::syntax_option_type type = tr1::regex_constants::ECMAScript;\r
-               if (!bMatchCase)\r
-                       type |= tr1::regex_constants::icase;\r
-               pat = tr1::wregex(regexp_str, type);\r
-               return true;\r
-       }\r
-       catch (exception) {}\r
-       return false;\r
-}\r
 \r
 bool CLogDlg::Validate(LPCTSTR string)\r
 {\r
        if (!m_bFilterWithRegex)\r
                return true;\r
        tr1::wregex pat;\r
-       return ValidateRegexp(string, pat, false);\r
+       return m_LogList.ValidateRegexp(string, pat, false);\r
 }\r
 \r
-void CLogDlg::RecalculateShownList(CPtrArray * pShownlist)\r
-{\r
-#if 0\r
-       pShownlist->RemoveAll();\r
-       tr1::wregex pat;//(_T("Remove"), tr1::regex_constants::icase);\r
-       bool bRegex = false;\r
-       if (m_bFilterWithRegex)\r
-               bRegex = ValidateRegexp(m_sFilterText, pat, false);\r
-\r
-       tr1::regex_constants::match_flag_type flags = tr1::regex_constants::match_any;\r
-       CString sRev;\r
-       for (DWORD i=0; i<m_logEntries.size(); ++i)\r
-       {\r
-               if ((bRegex)&&(m_bFilterWithRegex))\r
-               {\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))\r
-                       {\r
-                               ATLTRACE(_T("bugID = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sBugIDs);\r
-                               if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sBugIDs), pat, flags)&&IsEntryInDateRange(i))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))\r
-                       {\r
-                               ATLTRACE(_T("messge = \"%s\"\n"), (LPCTSTR)m_logEntries[i]->sMessage);\r
-                               if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sMessage), pat, flags)&&IsEntryInDateRange(i))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))\r
-                       {\r
-                               LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;\r
-\r
-                               bool bGoing = true;\r
-                               for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)\r
-                               {\r
-                                       LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
-                                       if (regex_search(wstring((LPCTSTR)cpath->sCopyFromPath), pat, flags)&&IsEntryInDateRange(i))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                                       if (regex_search(wstring((LPCTSTR)cpath->sPath), pat, flags)&&IsEntryInDateRange(i))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                                       if (regex_search(wstring((LPCTSTR)cpath->GetAction()), pat, flags)&&IsEntryInDateRange(i))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                               }\r
-                               if (!bGoing)\r
-                                       continue;\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))\r
-                       {\r
-                               if (regex_search(wstring((LPCTSTR)m_logEntries[i]->sAuthor), pat, flags)&&IsEntryInDateRange(i))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))\r
-                       {\r
-                               sRev.Format(_T("%ld"), m_logEntries[i]->Rev);\r
-                               if (regex_search(wstring((LPCTSTR)sRev), pat, flags)&&IsEntryInDateRange(i))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-               } // if (bRegex)\r
-               else\r
-               {\r
-                       CString find = m_sFilterText;\r
-                       find.MakeLower();\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_BUGID))\r
-                       {\r
-                               CString sBugIDs = m_logEntries[i]->sBugIDs;\r
-\r
-                               sBugIDs = sBugIDs.MakeLower();\r
-                               if ((sBugIDs.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_MESSAGES))\r
-                       {\r
-                               CString msg = m_logEntries[i]->sMessage;\r
-\r
-                               msg = msg.MakeLower();\r
-                               if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_PATHS))\r
-                       {\r
-                               LogChangedPathArray * cpatharray = m_logEntries[i]->pArChangedPaths;\r
-\r
-                               bool bGoing = true;\r
-                               for (INT_PTR cpPathIndex = 0; cpPathIndex<cpatharray->GetCount() && bGoing; ++cpPathIndex)\r
-                               {\r
-                                       LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
-                                       CString path = cpath->sCopyFromPath;\r
-                                       path.MakeLower();\r
-                                       if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                                       path = cpath->sPath;\r
-                                       path.MakeLower();\r
-                                       if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                                       path = cpath->GetAction();\r
-                                       path.MakeLower();\r
-                                       if ((path.Find(find)>=0)&&(IsEntryInDateRange(i)))\r
-                                       {\r
-                                               pShownlist->Add(m_logEntries[i]);\r
-                                               bGoing = false;\r
-                                               continue;\r
-                                       }\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_AUTHORS))\r
-                       {\r
-                               CString msg = m_logEntries[i]->sAuthor;\r
-                               msg = msg.MakeLower();\r
-                               if ((msg.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-                       if ((m_nSelectedFilter == LOGFILTER_ALL)||(m_nSelectedFilter == LOGFILTER_REVS))\r
-                       {\r
-                               sRev.Format(_T("%ld"), m_logEntries[i]->Rev);\r
-                               if ((sRev.Find(find) >= 0)&&(IsEntryInDateRange(i)))\r
-                               {\r
-                                       pShownlist->Add(m_logEntries[i]);\r
-                                       continue;\r
-                               }\r
-                       }\r
-               } // else (from if (bRegex))    \r
-       } // for (DWORD i=0; i<m_logEntries.size(); ++i) \r
-#endif\r
-}\r
 \r
 void CLogDlg::OnTimer(UINT_PTR nIDEvent)\r
 {\r
        if (nIDEvent == LOGFILTER_TIMER)\r
        {\r
-               if (m_bThreadRunning)\r
+               if (this->IsThreadRunning())\r
                {\r
                        // thread still running! So just restart the timer.\r
                        SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
@@ -3035,9 +2387,9 @@ void CLogDlg::OnTimer(UINT_PTR nIDEvent)
                CWnd * focusWnd = GetFocus();\r
                bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))\r
                        && (focusWnd != GetDlgItem(IDC_LOGLIST)));\r
-               if (m_sFilterText.IsEmpty())\r
+               if (m_LogList.m_sFilterText.IsEmpty())\r
                {\r
-                       DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));\r
+                       DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
                        // do not return here!\r
                        // we also need to run the filter if the filter text is empty:\r
                        // 1. to clear an existing filter\r
@@ -3049,18 +2401,8 @@ void CLogDlg::OnTimer(UINT_PTR nIDEvent)
                FillLogMessageCtrl(false);\r
 \r
                // now start filter the log list\r
-               InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
-               RecalculateShownList(&m_arShownList);\r
-               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
-\r
+               m_LogList.StartFilter();\r
 \r
-               m_LogList.DeleteAllItems();\r
-               m_LogList.SetItemCountEx(m_LogList.ShownCountWithStopped());\r
-               m_LogList.RedrawItems(0, m_LogList.ShownCountWithStopped());\r
-               m_LogList.SetRedraw(false);\r
-               m_LogList.ResizeAllListCtrlCols();\r
-               m_LogList.SetRedraw(true);\r
-               m_LogList.Invalidate();\r
                if ( m_LogList.GetItemCount()==1 )\r
                {\r
                        m_LogList.SetSelectionMark(0);\r
@@ -3073,7 +2415,7 @@ void CLogDlg::OnTimer(UINT_PTR nIDEvent)
                        GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
                UpdateLogInfoLabel();\r
        } // if (nIDEvent == LOGFILTER_TIMER)\r
-       DialogEnableWindow(IDC_STATBUTTON, !(((m_bThreadRunning)||(m_arShownList.IsEmpty()))));\r
+       DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
        __super::OnTimer(nIDEvent);\r
 }\r
 \r
@@ -3084,9 +2426,9 @@ void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
        try\r
        {\r
                CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);\r
-               if (time.GetTime() != m_tTo)\r
+               if (time.GetTime() != m_LogList.m_To.GetTime())\r
                {\r
-                       m_tTo = (DWORD)time.GetTime();\r
+                       m_LogList.m_To = (DWORD)time.GetTime();\r
                        SetTimer(LOGFILTER_TIMER, 10, NULL);\r
                }\r
        }\r
@@ -3104,9 +2446,9 @@ void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
        try\r
        {\r
                CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);\r
-               if (time.GetTime() != m_tFrom)\r
+               if (time.GetTime() != m_LogList.m_From.GetTime())\r
                {\r
-                       m_tFrom = (DWORD)time.GetTime();\r
+                       m_LogList.m_From = (DWORD)time.GetTime();\r
                        SetTimer(LOGFILTER_TIMER, 10, NULL);\r
                }\r
        }\r
@@ -3117,16 +2459,7 @@ void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
        *pResult = 0;\r
 }\r
 \r
-BOOL CLogDlg::IsEntryInDateRange(int i)\r
-{\r
-#if 0\r
-       __time64_t time = m_logEntries[i]->tmDate;\r
-       if ((time >= m_tFrom)&&(time <= m_tTo))\r
-               return TRUE;\r
-#endif\r
-       return FALSE;\r
 \r
-}\r
 \r
 CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)\r
 {\r
@@ -3236,7 +2569,7 @@ void CLogDlg::SortByColumn(int nSortColumn, bool bAscending)
 \r
 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)\r
 {\r
-       if (m_bThreadRunning)\r
+       if (this->IsThreadRunning())\r
                return;         //no sorting while the arrays are filled\r
        LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
        const int nColumn = pNMLV->iSubItem;\r
@@ -3296,7 +2629,8 @@ void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
 }\r
 void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)\r
 {\r
-       if (m_bThreadRunning)\r
+#if 0\r
+       if (this->IsThreadRunning())\r
                return;         //no sorting while the arrays are filled\r
        if (m_currentChangedArray == NULL)\r
                return;\r
@@ -3309,6 +2643,7 @@ void CLogDlg::OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
        SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);\r
        m_ChangedFileListCtrl.Invalidate();\r
        *pResult = 0;\r
+#endif\r
 }\r
 \r
 int CLogDlg::m_nSortColumnPathList = 0;\r
@@ -3470,25 +2805,26 @@ void CLogDlg::OnBnClickedIncludemerge()
 \r
 void CLogDlg::UpdateLogInfoLabel()\r
 {\r
-#if 0\r
-       git_revnum_t rev1 = 0;\r
-       git_revnum_t rev2 = 0;\r
+\r
+       git_revnum_t rev1 ;\r
+       git_revnum_t rev2 ;\r
        long selectedrevs = 0;\r
-       if (m_arShownList.GetCount())\r
+       int count =m_LogList.m_arShownList.GetCount();\r
+       if (count)\r
        {\r
-               PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(0));\r
-               rev1 = pLogEntry->Rev;\r
-               pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));\r
-               rev2 = pLogEntry->Rev;\r
+               rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;\r
+               //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_arShownList.GetCount()-1));\r
+               rev2 =  (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(count-1)))->m_CommitHash;\r
                selectedrevs = m_LogList.GetSelectedCount();\r
        }\r
        CString sTemp;\r
-       sTemp.Format(IDS_LOG_LOGINFOSTRING, m_arShownList.GetCount(), rev2, rev1, selectedrevs);\r
+       sTemp.Format(_T("Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected"), count, rev2.Left(6), rev1.Left(6), selectedrevs);\r
        m_sLogInfo = sTemp;\r
-#endif\r
+\r
        UpdateData(FALSE);\r
 }\r
 \r
+#if 0\r
 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)\r
 {\r
 \r
@@ -3513,9 +2849,9 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
 \r
        bool bOneRev = true;\r
        int sel=m_LogList.GetNextSelectedItem(pos);\r
-       GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_arShownList.GetAt(sel));\r
+       GitRev * pLogEntry = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel));\r
        GitRev * rev1 = pLogEntry;\r
-       GitRev * rev2 = reinterpret_cast<GitRev *>(m_arShownList.GetAt(sel+1));\r
+       GitRev * rev2 = reinterpret_cast<GitRev *>(m_LogList.m_arShownList.GetAt(sel+1));\r
 #if 0\r
        bool bOneRev = true;\r
        if (pos)\r
@@ -4024,6 +3360,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
 \r
        } // if (popup.CreatePopupMenu())\r
 }\r
+#endif\r
 \r
 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
 {\r
@@ -4115,35 +3452,43 @@ CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
 }\r
 \r
 \r
-int CLogDataVector::ParserFromLog()\r
+void CLogDlg::OnEnChangeSearchedit()\r
 {\r
-       CString log;\r
-       GitRev rev;\r
-       g_Git.GetLog(log);\r
-\r
-       CString begin;\r
-       begin.Format(_T("#<%c>"),LOG_REV_ITEM_BEGIN);\r
-       \r
-       if(log.GetLength()==0)\r
-               return 0;\r
-       \r
-       int start=4;\r
-       int length;\r
-       int next =1;\r
-       while( next>0 )\r
+       UpdateData();\r
+       if (m_LogList.m_sFilterText.IsEmpty())\r
        {\r
-               next=log.Find(begin,start);\r
-               if(next >0 )\r
-                       length = next - start+4;\r
-               else\r
-                       length = log.GetLength()-start+4;\r
-\r
-               CString onelog =log;\r
-               onelog=log.Mid(start -4,length);\r
-               rev.ParserFromLog(onelog);\r
-               this->push_back(rev);\r
-               start = next +4;\r
+               CStoreSelection storeselection(this);\r
+               // clear the filter, i.e. make all entries appear\r
+               theApp.DoWaitCursor(1);\r
+               KillTimer(LOGFILTER_TIMER);\r
+               FillLogMessageCtrl(false);\r
+               m_LogList.StartFilter();\r
+#if 0\r
+               InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
+               m_arShownList.RemoveAll();\r
+               for (DWORD i=0; i<m_logEntries.size(); ++i)\r
+               {\r
+                       if (IsEntryInDateRange(i))\r
+                               m_arShownList.Add(m_logEntries[i]);\r
+               }\r
+               InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+               m_LogList.DeleteAllItems();\r
+               m_LogList.SetItemCountEx(ShownCountWithStopped());\r
+               m_LogList.RedrawItems(0, ShownCountWithStopped());\r
+               m_LogList.SetRedraw(false);\r
+               ResizeAllListCtrlCols();\r
+               m_LogList.SetRedraw(true);\r
+#endif\r
+               theApp.DoWaitCursor(-1);\r
+               GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);\r
+               GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);\r
+               GetDlgItem(IDC_SEARCHEDIT)->SetFocus();\r
+               DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));\r
+               return;\r
        }\r
+       if (Validate(m_LogList.m_sFilterText))\r
+               SetTimer(LOGFILTER_TIMER, 1000, NULL);\r
+       else\r
+               KillTimer(LOGFILTER_TIMER);\r
 \r
-       return 0;\r
-}\r
+}
\ No newline at end of file