(refs #36)Handle unresolved revision string.

src/main/scala/app/RepositoryViewerController.scala

@@ -58,13 +58,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository/commits/:branch")(referrersOnly { repository =>
     val branchName = params("branch")
     val page       = params.getOrElse("page", "1").toInt
-
     JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      val (logs, hasNext) = JGitUtil.getCommitLog(git, branchName, page, 30)
-
+      JGitUtil.getCommitLog(git, branchName, page, 30) match {
+        case Right((logs, hasNext)) =>
           repo.html.commits(Nil, branchName, repository, logs.splitWith{ (commit1, commit2) =>
             view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
           }, page, hasNext)
+        case Left(_) => NotFound
+      }
     }
   })
   
@@ -77,12 +78,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val page       = params.getOrElse("page", "1").toInt
 
     JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      val (logs, hasNext) = JGitUtil.getCommitLog(git, branchName, page, 30, path)
-
+      JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
+        case Right((logs, hasNext)) =>
           repo.html.commits(path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
               view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
             }, page, hasNext)
+        case Left(_) => NotFound
+      }
     }
   })
 
@@ -214,16 +217,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       repo.html.guide(repository)
     } else {
       JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+        val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
+        //val objectId = git.getRepository.resolve(revstr2)
+
         // get specified commit
-        val (revCommit, revision) = try {
-          val revision = if(revstr.isEmpty) repository.repository.defaultBranch else revstr
-          (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
-        } catch {
-          case e: NullPointerException => {
-            val revision = repository.branchList.head
-            (JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision)), revision)
-          }
-        }
+        revisions.map { rev => (git.getRepository.resolve(rev), rev)}.find(_._1 != null).map { case (objectId, revision) =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
+
           // get files
           val files = JGitUtil.getFileList(git, revision, path)
           // process README.md
@@ -235,6 +235,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             if(path == ".") Nil else path.split("/").toList, // current path
             new JGitUtil.CommitInfo(revCommit), // latest commit
             files, readme)
+        } getOrElse NotFound
       }
     }
   }

src/main/scala/app/WikiController.scala

@@ -47,7 +47,10 @@ trait WikiControllerBase extends ControllerBase {
     val pageName = params("page")
 
     JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.history(Some(pageName), JGitUtil.getCommitLog(git, "master", path = pageName + ".md")._1, repository)
+      JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
+        case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
+        case Left(_) => NotFound
+      }
     }
   })
   
@@ -117,7 +120,10 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
     JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.history(None, JGitUtil.getCommitLog(git, "master")._1, repository)
+      JGitUtil.getCommitLog(git, "master") match {
+        case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
+        case Left(_) => NotFound
+      }
     }
   })
 

src/main/scala/util/JGitUtil.scala

@@ -253,7 +253,7 @@ object JGitUtil {
    * @param path filters by this path. default is no filter.
    * @return a tuple of the commit list and whether has next
    */
-  def getCommitLog(git: Git, revision: String, page: Int = 1, limit: Int = 0, path: String = ""): (List[CommitInfo], Boolean) = {
+  def getCommitLog(git: Git, revision: String, page: Int = 1, limit: Int = 0, path: String = ""): Either[String, (List[CommitInfo], Boolean)] = {
     val fixedPage = if(page <= 0) 1 else page
     
     @scala.annotation.tailrec
@@ -267,7 +267,11 @@ object JGitUtil {
       }
     
     val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(revision)))
+    val objectId = git.getRepository.resolve(revision)
+    if(objectId == null){
+      Left(s"${revision} can't be resolved.")
+    } else {
+      revWalk.markStart(revWalk.parseCommit(objectId))
       if(path.nonEmpty){
         revWalk.setRevFilter(new RevFilter(){
           def include(walk: RevWalk, commit: RevCommit): Boolean = {
@@ -280,7 +284,8 @@ object JGitUtil {
       val commits = getCommitLog(revWalk.iterator, 0, Nil)
       revWalk.release
 
-    commits
+      Right(commits)
+    }
   }
   
   /**