Merge branch 'feature/new-branches-ui' of https://github.com/team-lab/gitbucket into team-lab-feature/new-branches-ui

Conflicts:
	src/main/scala/service/PullRequestService.scala

src/main/scala/app/RepositoryViewerController.scala

@@ -322,14 +322,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Displays branches.
    */
   get("/:owner/:repository/branches")(referrersOnly { repository =>
-    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-      // retrieve latest update date of each branch
-      val branchInfo = repository.branchList.map { branchName =>
-        val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
-        (branchName, revCommit.getCommitterIdent.getWhen)
-      }
-      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
-    }
+    val branches = JGitUtil.getBranches(repository.owner, repository.name, repository.repository.defaultBranch)
+      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+      .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
+      .reverse
+    repo.html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
   })
 
   /**

src/main/scala/service/PullRequestService.scala

@@ -94,6 +94,26 @@ trait PullRequestService { self: IssuesService =>
         updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
       }
     }
+
+  def getPullRequestByRequestCommit(userName: String, repositoryName: String, toBranch:String, fromBranch: String, commitId: String)
+                              (implicit s: Session): Option[(PullRequest, Issue)] = {
+    if(toBranch == fromBranch){
+      None
+    } else {
+      PullRequests
+        .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
+        .filter { case (t1, t2) =>
+          (t1.userName              === userName.bind) &&
+          (t1.repositoryName        === repositoryName.bind) &&
+          (t1.branch                === toBranch.bind) &&
+          (t1.requestUserName       === userName.bind) &&
+          (t1.requestRepositoryName === repositoryName.bind) &&
+          (t1.requestBranch         === fromBranch.bind) &&
+          (t1.commitIdTo            === commitId.bind)
+        }
+        .firstOption
+    }
+  }
 }
 
 object PullRequestService {

src/main/scala/util/JGitUtil.scala

@@ -134,6 +134,10 @@ object JGitUtil {
    */
   case class SubmoduleInfo(name: String, path: String, url: String)
 
+  case class BranchMergeInfo(ahead: Int, behind: Int, isMerged: Boolean)
+
+  case class BranchInfo(name: String, committerName: String, commitTime: Date, committerEmailAddress:String, mergeInfo: Option[BranchMergeInfo], commitId: String)
+
   /**
    * Returns RevCommit from the commit or tag id.
    * 
@@ -705,4 +709,43 @@ object JGitUtil {
     return git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next
   }
 
+  def getBranches(owner: String, name: String, defaultBranch: String): Seq[BranchInfo] = {
+    using(Git.open(getRepositoryDir(owner, name))){ git =>
+      val repo = git.getRepository
+      val defaultObject = repo.resolve(defaultBranch)
+      git.branchList.call.asScala.map { ref =>
+        val walk = new RevWalk(repo)
+        try{
+          val defaultCommit = walk.parseCommit(defaultObject)
+          val branchName = ref.getName.stripPrefix("refs/heads/")
+          val branchCommit = if(branchName == defaultBranch){
+            defaultCommit
+          }else{
+            walk.parseCommit(ref.getObjectId)
+          }
+          val when = branchCommit.getCommitterIdent.getWhen
+          val committer = branchCommit.getCommitterIdent.getName
+          val committerEmail = branchCommit.getCommitterIdent.getEmailAddress
+          val mergeInfo = if(branchName==defaultBranch){
+            None
+          }else{
+            walk.reset()
+            walk.setRevFilter( RevFilter.MERGE_BASE )
+            walk.markStart(branchCommit)
+            walk.markStart(defaultCommit)
+            val mergeBase = walk.next()
+            walk.reset()
+            walk.setRevFilter(RevFilter.ALL)
+            Some(BranchMergeInfo(
+              ahead    = RevWalkUtils.count(walk, branchCommit, mergeBase),
+              behind   = RevWalkUtils.count(walk, defaultCommit, mergeBase),
+              isMerged = walk.isMergedInto(branchCommit, defaultCommit)))
+          }
+          BranchInfo(branchName, committer, when, committerEmail, mergeInfo, ref.getObjectId.name)
+        } finally {
+          walk.dispose();
+        }
+      }
+    }
+  }
 }