Merge branch 'master' of https://github.com/takezoe/gitbucket.git

src/main/scala/app/AccountController.scala

@@ -76,7 +76,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
       updateImage(userName, form.fileId, form.clearImage)
       flash += "info" -> "Account information has been updated."
-      redirect("/%s/_edit".format(userName))
+      redirect(s"/${userName}/_edit")
 
     } getOrElse NotFound
   })

src/main/scala/app/CreateRepositoryController.scala

@@ -1,7 +1,7 @@
 package app
 
 import util.Directory._
-import util.UsersAuthenticator
+import util.{JGitUtil, UsersAuthenticator}
 import service._
 import java.io.File
 import org.eclipse.jgit.api.Git
@@ -56,13 +56,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
 
     // Create the actual repository
     val gitdir = getRepositoryDir(loginUserName, form.name)
-    val repository = new RepositoryBuilder().setGitDir(gitdir).setBare.build
-
-    repository.create
-
-    val config = repository.getConfig
-    config.setBoolean("http", null, "receivepack", true)
-    config.save
+    JGitUtil.initRepository(gitdir)
 
     if(form.createReadme){
       val tmpdir = getInitRepositoryDir(loginUserName, form.name)
@@ -73,9 +67,13 @@ trait CreateRepositoryControllerBase extends ControllerBase {
         // Create README.md
         FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
           if(form.description.nonEmpty){
-            form.name + "\n===============\n\n" + form.description.get
+            form.name + "\n" +
+            "===============\n" +
+            "\n" +
+            form.description.get
           } else {
-            form.name + "\n===============\n"
+            form.name + "\n" +
+            "===============\n"
           }, "UTF-8")
 
         val git = Git.open(tmpdir)
@@ -95,7 +93,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
     recordCreateRepositoryActivity(loginUserName, form.name, loginUserName)
 
     // redirect to the repository
-    redirect("/%s/%s".format(loginUserName, form.name))
+    redirect(s"/${loginUserName}/${form.name}")
   })
   
   /**

src/main/scala/app/IndexController.scala

@@ -9,10 +9,13 @@ trait IndexControllerBase extends ControllerBase { self: RepositoryService
   with SystemSettingsService with ActivityService =>
   
   get("/"){
+    val loginAccount = context.loginAccount
+
     html.index(getRecentActivities(),
-      getAccessibleRepositories(context.loginAccount, baseUrl),
+      getAccessibleRepositories(loginAccount, baseUrl),
       loadSystemSettings(),
-      context.loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil))
+      loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil)
+    )
   }
 
 }

src/main/scala/app/LabelsController.scala

@@ -24,7 +24,7 @@ trait LabelsControllerBase extends ControllerBase {
 
   post("/:owner/:repository/issues/label/new", newForm)(collaboratorsOnly { (form, repository) =>
     createLabel(repository.owner, repository.name, form.labelName, form.color.substring(1))
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/issues")
   })
 
   ajaxGet("/:owner/:repository/issues/label/edit")(collaboratorsOnly { repository =>
@@ -53,9 +53,9 @@ trait LabelsControllerBase extends ControllerBase {
   private def labelName: Constraint = new Constraint(){
     def validate(name: String, value: String): Option[String] =
       if(!value.matches("^[^,]+$")){
-        Some("%s contains invalid character.".format(name))
+        Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
-        Some("%s starts with invalid character.".format(name))
+        Some(s"${name} starts with invalid character.")
       } else {
         None
       }

src/main/scala/app/MilestonesController.scala

@@ -35,7 +35,7 @@ trait MilestonesControllerBase extends ControllerBase {
 
   post("/:owner/:repository/issues/milestones/new", milestoneForm)(collaboratorsOnly { (form, repository) =>
     createMilestone(repository.owner, repository.name, form.title, form.description, form.dueDate)
-    redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
@@ -45,28 +45,28 @@ trait MilestonesControllerBase extends ControllerBase {
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       closeMilestone(milestone)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       openMilestone(milestone)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
     getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
       deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
-      redirect("/%s/%s/issues/milestones".format(repository.owner, repository.name))
+      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
     } getOrElse NotFound
   })
 

src/main/scala/app/RepositorySettingsController.scala

@@ -31,7 +31,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    * Redirect to the Options page.
    */
   get("/:owner/:repository/settings")(ownerOnly { repository =>
-    redirect("/%s/%s/settings/options".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
   })
   
   /**
@@ -47,7 +47,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
   post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
     saveRepositoryOptions(repository.owner, repository.name, form.description, form.defaultBranch, form.isPrivate)
     flash += "info" -> "Repository settings has been updated."
-    redirect("/%s/%s/settings/options".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/options")
   })
   
   /**
@@ -70,7 +70,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    */
   post("/:owner/:repository/settings/collaborators/add", collaboratorForm)(ownerOnly { (form, repository) =>
     addCollaborator(repository.owner, repository.name, form.userName)
-    redirect("/%s/%s/settings/collaborators".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
   })
 
   /**
@@ -78,7 +78,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    */
   get("/:owner/:repository/settings/collaborators/remove")(ownerOnly { repository =>
     removeCollaborator(repository.owner, repository.name, params("name"))
-    redirect("/%s/%s/settings/collaborators".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
   })
 
   /**
@@ -98,7 +98,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     FileUtils.deleteDirectory(getWikiRepositoryDir(repository.owner, repository.name))
     FileUtils.deleteDirectory(getTemporaryDir(repository.owner, repository.name))
 
-    redirect("/%s".format(repository.owner))
+    redirect(s"/${repository.owner}")
   })
 
   /**

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)
-
-      repo.html.commits(Nil, branchName, repository, logs.splitWith{ (commit1, commit2) =>
-        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-      }, page, hasNext)
+      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)
-
-      repo.html.commits(path.split("/").toList, branchName, repository,
-        logs.splitWith{ (commit1, commit2) =>
-          view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-        }, page, hasNext)
+      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,27 +217,23 @@ 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)
         // 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)
-          }
-        }
-        // get files
-        val files = JGitUtil.getFileList(git, revision, path)
-        // process README.md
-        val readme = files.find(_.name == "README.md").map { file =>
-          new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
-        }
+        revisions.map { rev => (git.getRepository.resolve(rev), rev)}.find(_._1 != null).map { case (objectId, revision) =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
 
-        repo.html.files(revision, repository,
-          if(path == ".") Nil else path.split("/").toList, // current path
-          new JGitUtil.CommitInfo(revCommit), // latest commit
-          files, readme)
+          // get files
+          val files = JGitUtil.getFileList(git, revision, path)
+          // process README.md
+          val readme = files.find(_.name == "README.md").map { file =>
+            new String(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get, "UTF-8")
+          }
+
+          repo.html.files(revision, repository,
+            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

@@ -32,7 +32,7 @@ trait WikiControllerBase extends ControllerBase {
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
     getWikiPage(repository.owner, repository.name, "Home").map { page =>
       wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
-    } getOrElse redirect("/%s/%s/wiki/Home/_edit".format(repository.owner, repository.name))
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
   })
   
   get("/:owner/:repository/wiki/:page")(referrersOnly { repository =>
@@ -40,14 +40,17 @@ trait WikiControllerBase extends ControllerBase {
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
       wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
-    } getOrElse redirect("/%s/%s/wiki/%s/_edit".format(repository.owner, repository.name, pageName)) // TODO URLEncode
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${pageName}/_edit") // TODO URLEncode
   })
   
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     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
+      }
     }
   })
   
@@ -82,7 +85,7 @@ trait WikiControllerBase extends ControllerBase {
     updateLastActivityDate(repository.owner, repository.name)
     recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
 
-    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect(s"/${repository.owner}/${repository.name}/wiki/${form.pageName}")
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -98,16 +101,16 @@ trait WikiControllerBase extends ControllerBase {
     updateLastActivityDate(repository.owner, repository.name)
     recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
 
-    redirect("/%s/%s/wiki/%s".format(repository.owner, repository.name, form.pageName))
+    redirect(s"/${repository.owner}/${repository.name}/wiki/${form.pageName}")
   })
   
   get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
     val pageName = params("page")
     
-    deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, "Delete %s".format(pageName))
+    deleteWikiPage(repository.owner, repository.name, pageName, context.loginAccount.get.userName, s"Delete ${pageName}")
     updateLastActivityDate(repository.owner, repository.name)
 
-    redirect("/%s/%s/wiki".format(repository.owner, repository.name))
+    redirect(s"/${repository.owner}/${repository.name}/wiki")
   })
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
@@ -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
+      }
     }
   })