X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseProc%2FLogDataVector.cpp;h=b7e40968c9cb6efa6c17050007b46417da53f85c;hb=4c70ba4ad1f2a2787cd93b818f748f09ca34bafb;hp=626fad4d2984e843ecd6ee503714aff17dc04965;hpb=45f2d6f8c44c2d585ebd3474e96cd3e4a8cee594;p=tortoisegit%2FTortoiseGitJp.git diff --git a/src/TortoiseProc/LogDataVector.cpp b/src/TortoiseProc/LogDataVector.cpp index 626fad4..b7e4096 100644 --- 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); @@ -204,6 +204,7 @@ void CLogDataVector::updateLanes(GitRev& c, Lanes& lns, CString &sha) lns.changeActiveLane(sha); // uses previous isBoundary state lns.setBoundary(c.IsBoundary()); // update must be here + TRACE(_T("%s %d"),c.m_CommitHash,c.IsBoundary()); if (isFork) lns.setFork(sha);