From 73d9e69e43bd6c2c989e477a1e8ece63832ff442 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 19 Sep 2013 02:40:07 +0900 Subject: [PATCH] (refs #74)Small fix for test hook. --- .../scala/app/RepositorySettingsController.scala | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/scala/app/RepositorySettingsController.scala b/src/main/scala/app/RepositorySettingsController.scala index 196f55ab9..5640e8ec5 100644 --- a/src/main/scala/app/RepositorySettingsController.scala +++ b/src/main/scala/app/RepositorySettingsController.scala @@ -133,20 +133,17 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo */ get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository => JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git => - // TODO Retrieve only specified branch logs. - val i = git.log.setMaxCount(3).call.iterator - // TODO Don't use ListBuffer!!!! - val list = new ListBuffer[CommitInfo]() - while(i.hasNext){ - val commit = i.next - list.append(new CommitInfo(commit)) - } + import scala.collection.JavaConverters._ + val commits = git.log + .add(git.getRepository.resolve(repository.repository.defaultBranch)) + .setMaxCount(3) + .call.iterator.asScala.map(new CommitInfo(_)) val payload = WebHookPayload( git, "refs/heads/" + repository.repository.defaultBranch, repository, - list.toList, + commits.toList, getAccountByUserName(repository.owner).get) callWebHook(repository.owner, repository.name, payload)