Fix Show Log boundary show more than 1 log item when using --boundary & -n1

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / LogDataVector.cpp

diff --git a/src/TortoiseProc/LogDataVector.cpp b/src/TortoiseProc/LogDataVector.cpp
index 7852ca5..b7e4096 100644 (file)
--- a/src/TortoiseProc/LogDataVector.cpp
+++ b/src/TortoiseProc/LogDataVector.cpp
@@ -27,7 +27,7 @@
 
 #include "stdafx.h"
 #include "TortoiseProc.h"
-#include "GitLogList.h"
+#include "GitLogListBase.h"
 #include "GitRev.h"
 //#include "VssStyle.h"
 #include "IconMenu.h"
@@ -107,12 +107,12 @@ 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);
@@ -144,7 +144,7 @@ int CLogDataVector::ParserFromLog()
 
 void CLogDataVector::setLane(CString& sha) 
 {
-       Lanes* l = &(this->m_Lanes);
+       Lanes* l = &(this->m_Lns);
        int i = m_FirstFreeLane;
        
 //     QVector<QByteArray> ba;
@@ -203,7 +203,8 @@ void CLogDataVector::updateLanes(GitRev& c, Lanes& lns, CString &sha)
        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);