From 5f0eb91a8129753509be3bafdbd17bd502fe87e3 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Sat, 27 Jul 2013 04:24:58 +0900
Subject: [PATCH] (refs #2)Compare to its own branch if repository is not
 specified.

---
 .../scala/app/PullRequestsController.scala    | 22 ++++++++-----
 src/main/twirl/pulls/compare.scala.html       | 32 ++++++++++++-------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index 2b235df5a..2bb2312e1 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -138,6 +138,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
   private def checkConflict(userName: String, repositoryName: String, branch: String,
                             requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
+// TODO Are there more quick way?
 //    LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
 //      val remote = getRepositoryDir(userName, repositoryName)
 //      val tmpdir = new java.io.File(getTemporaryDir(userName, repositoryName), "merge-check")
@@ -167,22 +168,27 @@ trait PullRequestsControllerBase extends ControllerBase {
     true
   }
 
-  get("/:owner/:repository/pulls/compare")(collaboratorsOnly { newRepo =>
-    (newRepo.repository.originUserName, newRepo.repository.originRepositoryName) match {
-      case (None,_)|(_, None) => NotFound // TODO Compare to self branch?
+  get("/:owner/:repository/pulls/compare")(collaboratorsOnly { forkedRepository =>
+    (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
       case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName, baseUrl).map { oldRepo =>
+        getRepository(originUserName, originRepositoryName, baseUrl).map { originRepository =>
           withGit(
             getRepositoryDir(originUserName, originRepositoryName),
-            getRepositoryDir(params("owner"), params("repository"))
+            getRepositoryDir(forkedRepository.owner, forkedRepository.name)
           ){ (oldGit, newGit) =>
-            val oldBranch = JGitUtil.getDefaultBranch(oldGit, oldRepo).get._2
-            val newBranch = JGitUtil.getDefaultBranch(newGit, newRepo).get._2
+            val oldBranch = JGitUtil.getDefaultBranch(oldGit, originRepository).get._2
+            val newBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2
 
-            redirect(s"${context.path}/${newRepo.owner}/${newRepo.name}/pulls/compare/${originUserName}:${oldBranch}...${newBranch}")
+            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/pulls/compare/${originUserName}:${oldBranch}...${newBranch}")
           }
         } getOrElse NotFound
       }
+      case _ => {
+        JGitUtil.withGit(getRepositoryDir(forkedRepository.owner, forkedRepository.name)){ git =>
+          val defaultBranch = JGitUtil.getDefaultBranch(git, forkedRepository).get._2
+          redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/pulls/compare/${defaultBranch}...${defaultBranch}")
+        }
+      }
     }
   })
 
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
index c42793a8a..cdb924223 100644
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -21,9 +21,11 @@
     </div>
     <div id="compare-edit" style="display: none;">
       <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
-      @helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") {
-        @members.map { member =>
-          <li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
+      @if(members.nonEmpty){
+        @helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") {
+          @members.map { member =>
+            <li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
+          }
         }
       }
       @helper.html.dropdown(originId, "base") {
@@ -32,9 +34,11 @@
         }
       }
       ...
-      @helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") {
-        @members.map { member =>
-          <li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
+      @if(members.nonEmpty){
+        @helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") {
+          @members.map { member =>
+            <li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
+          }
         }
       }
       @helper.html.dropdown(forkedId, "compare") {
@@ -153,11 +157,17 @@ $(function(){
     e.find('i').attr('class', 'icon-ok');
     e.parents('div.btn-group').find('button strong').text(e.text());
 
-    location.href = '@url(repository)/pulls/compare/' +
-      $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ':' +
-      $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
-      $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ':' +
-      $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+    @if(members.isEmpty){
+      location.href = '@url(repository)/pulls/compare/' +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+    } else {
+      location.href = '@url(repository)/pulls/compare/' +
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ':' +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ':' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+    }
   });
 
   $('#show-form').click(function(){