#include "stdafx.h"
#include "TortoiseProc.h"
-#include "GitLogList.h"
+#include "GitLogListBase.h"
#include "GitRev.h"
//#include "VssStyle.h"
#include "IconMenu.h"
//#include "EditPropertiesDlg.h"
#include "FileDiffDlg.h"
-int CLogDataVector::ParserShortLog(CTGitPath *path ,int count )
+
+int CLogDataVector::ParserShortLog(CTGitPath *path ,CString &hash,int count ,int mask )
{
CString log;
GitRev rev;
+ if(g_Git.IsInitRepos())
+ return 0;
+
CString begin;
begin.Format(_T("#<%c>"),LOG_REV_ITEM_BEGIN);
- g_Git.GetShortLog(log,path,count);
+ //g_Git.GetShortLog(log,path,count);
+
+ g_Git.GetLog(log,hash,path,count,mask);
+
if(log.GetLength()==0)
return 0;
}
return 0;
- return 0;
}
int CLogDataVector::FetchFullInfo(int i)
return at(i).SafeFetchFullInfo(&g_Git);
}
//CLogDataVector Class
-int CLogDataVector::ParserFromLog()
+int CLogDataVector::ParserFromLog(CTGitPath *path ,int count ,int infomask)
{
CString log;
GitRev rev;
CString emptyhash;
- g_Git.GetLog(log,emptyhash);
+ g_Git.GetLog(log,emptyhash,path,count,infomask);
CString begin;
begin.Format(_T("#<%c>"),LOG_REV_ITEM_BEGIN);
void CLogDataVector::setLane(CString& sha)
{
- Lanes* l = &(this->m_Lanes);
+ Lanes* l = &(this->m_Lns);
int i = m_FirstFreeLane;
// QVector<QByteArray> ba;
if (isDiscontinuity)
lns.changeActiveLane(sha); // uses previous isBoundary state
- lns.setBoundary(0/*c.isBoundary()*/); // update must be here
+ lns.setBoundary(c.IsBoundary()); // update must be here
+ TRACE(_T("%s %d"),c.m_CommitHash,c.IsBoundary());
if (isFork)
lns.setFork(sha);