| Revisión | 9436671c17f2724c3f7d382277a9e794cb8b29f3 (tree) |
|---|---|
| Tiempo | 2010-01-14 15:15:18 |
| Autor | Frank Li <lznuaa@gmai...> |
| Commiter | Frank Li |
Fix don't using cache bug and disable filter when fetch log
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/GitLogCache.cpp (diff) src/TortoiseProc/GitLogListBase.cpp (diff) src/TortoiseProc/LogDlg.cpp (diff)| @@ -34,7 +34,7 @@ GitRev * CLogCache::GetCacheData(CGitHash &hash) | ||
| 34 | 34 | if(!LoadOneItem(rev,m_HashMapIndex[hash])) |
| 35 | 35 | { |
| 36 | 36 | m_HashMap[hash].CopyFrom(rev); |
| 37 | - rev.m_IsFull=true; | |
| 37 | + m_HashMap[hash].m_IsFull=true; | |
| 38 | 38 | |
| 39 | 39 | return &m_HashMap[hash]; |
| 40 | 40 | } |
| @@ -2125,7 +2125,7 @@ UINT CGitLogListBase::LogThread() | ||
| 2125 | 2125 | m_arShownList.Add(pRev); |
| 2126 | 2126 | this->m_critSec.Unlock(); |
| 2127 | 2127 | |
| 2128 | - if(t2-t1>500 ) | |
| 2128 | + if(t2-t1>500 || (m_logEntries.size()-oldsize >100)) | |
| 2129 | 2129 | { |
| 2130 | 2130 | //update UI |
| 2131 | 2131 | int percent=m_logEntries.size()*100/total + GITLOG_START+1; |
| @@ -365,9 +365,13 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/) | ||
| 365 | 365 | //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE); |
| 366 | 366 | //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE); |
| 367 | 367 | DialogEnableWindow(IDC_STATBUTTON, FALSE); |
| 368 | - DialogEnableWindow(IDC_REFRESH, FALSE); | |
| 368 | + //DialogEnableWindow(IDC_REFRESH, FALSE); | |
| 369 | 369 | DialogEnableWindow(IDC_HIDEPATHS,FALSE); |
| 370 | - | |
| 370 | + | |
| 371 | + DialogEnableWindow(IDC_DATEFROM,FALSE); | |
| 372 | + DialogEnableWindow(IDC_DATETO,FALSE); | |
| 373 | + | |
| 374 | + DialogEnableWindow(IDC_SEARCHEDIT,FALSE); | |
| 371 | 375 | |
| 372 | 376 | }else if( cur == GITLOG_END) |
| 373 | 377 | { |
| @@ -389,6 +393,11 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/) | ||
| 389 | 393 | DialogEnableWindow(IDC_REFRESH, TRUE); |
| 390 | 394 | DialogEnableWindow(IDC_HIDEPATHS,TRUE); |
| 391 | 395 | |
| 396 | + DialogEnableWindow(IDC_DATEFROM,TRUE); | |
| 397 | + DialogEnableWindow(IDC_DATETO,TRUE); | |
| 398 | + | |
| 399 | + DialogEnableWindow(IDC_SEARCHEDIT,TRUE); | |
| 400 | + | |
| 392 | 401 | // PostMessage(WM_TIMER, LOGFILTER_TIMER); |
| 393 | 402 | GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE); |
| 394 | 403 | //CTime time=m_LogList.GetOldestTime(); |
Fork