diff --git a/src/main/scala/app/RepositoryViewerServlet.scala b/src/main/scala/app/RepositoryViewerServlet.scala index ac48549..e975590 100644 --- a/src/main/scala/app/RepositoryViewerServlet.scala +++ b/src/main/scala/app/RepositoryViewerServlet.scala @@ -129,17 +129,21 @@ val dir = getBranchDir(owner, repository, branch) val git = Git.open(dir) - val rev = git.log.add(ObjectId.fromString(id)).call.iterator.next + val ite = git.log.add(ObjectId.fromString(id)).call.iterator + val rev = ite.next + val old = ite.next + + println(new String(rev.getRawBuffer())) // get diff val reader = git.getRepository.newObjectReader val oldTreeIter = new CanonicalTreeParser - oldTreeIter.reset(reader, git.getRepository.resolve(id + "^{tree}")) + oldTreeIter.reset(reader, git.getRepository.resolve(old.name + "^{tree}")) // TODO specify previous commit val newTreeIter = new CanonicalTreeParser - newTreeIter.reset(reader, git.getRepository.resolve("HEAD^{tree}")) + newTreeIter.reset(reader, git.getRepository.resolve(id + "^{tree}")) import scala.collection.JavaConverters._ val diffs = git.diff.setNewTree(newTreeIter).setOldTree(oldTreeIter).call.asScala.map { diff => diff --git a/src/main/twirl/commits.scala.html b/src/main/twirl/commits.scala.html index 0746aca..cbe8813 100644 --- a/src/main/twirl/commits.scala.html +++ b/src/main/twirl/commits.scala.html @@ -17,7 +17,7 @@
- @helpers.cut(commit.message, 100)
+ @helpers.cut(commit.message, 100)
@commit.committer @helpers.datetime(commit.time)