getCommitLog is moved to JGitUtil and it get commit logs from only bared

repository.
This commit is contained in:
takezoe
2013-04-29 04:28:46 +09:00
parent 902b4ec699
commit 891c932358
2 changed files with 34 additions and 11 deletions

View File

@@ -78,16 +78,9 @@ class RepositoryViewerServlet extends ServletBase {
val repository = params("repository")
val branchName = params("branch")
val page = params.getOrElse("page", "1").toInt
val dir = getBranchDir(owner, repository, branchName)
@scala.annotation.tailrec
def getCommitLog(i: java.util.Iterator[RevCommit], count: Int, logs: List[CommitInfo]): (List[CommitInfo], Boolean) =
i.hasNext match {
case true if(logs.size < 30) => getCommitLog(i, count + 1, if((page - 1) * 30 < count) logs :+ new CommitInfo(i.next) else logs)
case _ => (logs, i.hasNext)
}
val (logs, hasNext) = getCommitLog(Git.open(dir).log.call.iterator, 0, Nil)
val (logs, hasNext) = JGitUtil.getCommitLog(
Git.open(getRepositoryDir(owner, repository)).getRepository, branchName, page)
html.commits(branchName, JGitUtil.getRepositoryInfo(owner, repository, servletContext),
logs.splitWith{ (commit1, commit2) =>