diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 5a1242d..54dfe7c 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -163,11 +163,7 @@ val repositoryInfo = JGitUtil.getRepositoryInfo(owner, repository, servletContext) val git = Git.open(getRepositoryDir(owner, repository)) - val commitId = git.getRepository.resolve(id) - - val revWalk = new RevWalk(git.getRepository) - val revCommit = revWalk.parseCommit(commitId) - revWalk.dispose + val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) @scala.annotation.tailrec def getPathObjectId(path: String, walk: TreeWalk): ObjectId = walk.next match { @@ -205,11 +201,7 @@ val id = params("id") val git = Git.open(getRepositoryDir(owner, repository)) - - val revWalk = new RevWalk(git.getRepository) - val objectId = git.getRepository.resolve(id) - val revCommit = revWalk.parseCommit(objectId) - revWalk.dispose + val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id)) repo.html.commit(id, new CommitInfo(revCommit), JGitUtil.getRepositoryInfo(owner, repository, servletContext), JGitUtil.getDiffs(git, id)) } @@ -243,10 +235,7 @@ val git = Git.open(getRepositoryDir(owner, repository)) // get latest commit - val revWalk = new RevWalk(git.getRepository) - val objectId = git.getRepository.resolve(revision) - val revCommit = revWalk.parseCommit(objectId) - revWalk.dispose + val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)) val files = JGitUtil.getFileList(git, revision, path) diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala index e703a3b..4e53eec 100644 --- a/src/main/scala/util/JGitUtil.scala +++ b/src/main/scala/util/JGitUtil.scala @@ -34,9 +34,9 @@ * @param commitId the ObjectId of the commit * @return the RevCommit for the specified commit */ - def getRevCommitFromId(git: Git, commmitId: ObjectId): RevCommit = { + def getRevCommitFromId(git: Git, commitId: ObjectId): RevCommit = { val revWalk = new RevWalk(git.getRepository) - val revCommit = revWalk.parseCommit(commmitId) + val revCommit = revWalk.parseCommit(commitId) revWalk.dispose revCommit }