\r
m_IsIDReplaceAction=FALSE;\r
\r
+ this->m_critSec.Init();\r
m_wcRev.m_CommitHash.Empty();\r
m_wcRev.m_Subject=_T("Working dir changes");\r
m_wcRev.m_ParentHash.clear();\r
\r
CGitHash hash = (char*)commit.m_hash ;\r
\r
- m_logEntries.push_back(hash);\r
- \r
+ \r
GitRev *pRev = m_LogCache.GetCacheData(hash);\r
\r
if(pRev == NULL || !pRev->m_IsFull)\r
pRev->ParserParentFromCommit(&commit);\r
}\r
\r
+ this->m_critSec.Lock();\r
+ m_logEntries.push_back(hash);\r
m_arShownList.Add(pRev);\r
+ this->m_critSec.Unlock();\r
\r
- if(t2-t1>500 && m_logEntries.size()>(oldsize+100) )\r
+ if(t2-t1>500 )\r
{\r
//update UI\r
oldsize = m_logEntries.size();\r
if(this->m_LogList.HasText())\r
{\r
this->m_LogList.ClearText();\r
- //UpdateLogInfoLabel();\r
+ \r
}\r
+ UpdateLogInfoLabel();\r
\r
#if 0\r
//if (!m_bShowedAll)\r
git_revnum_t rev2 ;\r
long selectedrevs = 0;\r
int count =m_LogList.m_arShownList.GetCount();\r
+ int start = 0;\r
if (count)\r
{\r
- rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(0)))->m_CommitHash;\r
+ if(this->m_LogList.m_bShowWC)\r
+ start = 1;\r
+ rev1 = (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.GetAt(start)))->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(_T("Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected"), count, rev2.Left(6), rev1.Left(6), selectedrevs);\r
+ sTemp.Format(_T("Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected"), count - start, rev2.Left(6), rev1.Left(6), selectedrevs);\r
m_sLogInfo = sTemp;\r
\r
UpdateData(FALSE);\r