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 =>
+    val branches = JGitUtil.getBranches(repository.owner, repository.name, repository.repository.defaultBranch)
-      // retrieve latest update date of each branch
+      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
-      val branchInfo = repository.branchList.map { branchName =>
+      .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
-        val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
+      .reverse
-        (branchName, revCommit.getCommitterIdent.getWhen)
+    repo.html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
-      }
-      repo.html.branches(branchInfo, 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();
+        }
+      }
+    }
+  }
 }

src/main/twirl/pulls/compare.scala.html

@@ -126,6 +126,9 @@ $(function(){
     $(this).hide();
     $('#pull-request-form').show();
   });
+  if(location.search.substr(1).split("&").indexOf("expand=1")!=-1){
+    $('#show-form').click();
+  }
 
   @if(hasWritePermission){
     function checkConflict(from, to, noConflictHandler, hasConflictHandler){

src/main/twirl/repo/branches.scala.html

@@ -1,4 +1,4 @@
-@(branchInfo: Seq[(String, java.util.Date)],
+@(branchInfo: Seq[(util.JGitUtil.BranchInfo, Option[(model.PullRequest, model.Issue)])],
   hasWritePermission: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
@@ -6,35 +6,67 @@
 @html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
   @html.menu("code", repository){
     <h1>Branches</h1>
-    <table class="table table-bordered">
+    <table class="table table-bordered table-hover table-issues branches">
-      <tr>
+      <thead>
-        <th width="40%">Branch</th>
-        <th width="20%">Last update</th>
-        <th width="20%">Compare</th>
-        <th width="20%">Download</th>
-      </tr>
-      @branchInfo.map { case (branchName, latestUpdateDate) =>
         <tr>
-          <td>
+          <th style="background: #f5f5f5;color: #666;">All branches</th>
-            <a href="@url(repository)/tree/@encodeRefName(branchName)">@branchName</a>
+        </tr>
-            @if(hasWritePermission && repository.repository.defaultBranch != branchName){
+      </thead>
-              <a href="@url(repository)/delete/@encodeRefName(branchName)" class="btn btn-danger btn-mini pull-right delete-branch" data-name="@branchName">Delete branch</a>
+      <tbody>
+      @branchInfo.map { case (branch, prs) =>
+        <tr><td style="padding: 12px;">
+          <div class="branch-action">
+              @branch.mergeInfo.map{ info =>
+                @prs.map{ case (pull, issue) =>
+                  <a href="@url(repository)/pull/@issue.issueId" title="@issue.title">#@issue.issueId</a>
+                  @if(issue.closed) {
+                    @if(info.isMerged){
+                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-info">Merged</a>
+                    }else{
+                      <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-important">Closed</a>
+                    }
+                  } else {
+                    <a href="@url(repository)/pull/@issue.issueId" title="@issue.title" class="label label-success">Open</a>
+                  }
+                }.getOrElse{
+                  @if(context.loginAccount.isDefined){
+                    <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-small">New Pull Request</a>
+                  }else{
+                    <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branch.name)}" class="btn btn-small">Compare</a>
+                  }
+                }
+                @if(hasWritePermission){
+                  @if(prs.map(!_._2.closed).getOrElse(false)){
+                    <a class="btn disabled btn-mini" data-toggle="tooltip" title="You can’t delete this branch because it has an open pull request"><i class="icon icon-trash icon-white"></i></a>
+                  }else{
+                    <a href="@url(repository)/delete/@encodeRefName(branch.name)" class="btn  @if(info.isMerged){ btn-warning }else{ btn-danger } delete-branch btn-mini" data-name="@branch.name" @if(info.isMerged){ data-toggle="tooltip" title="this branch is merged" }><i class="icon icon-trash icon-white"></i></a>
+                  }
+                }
+              }
+          </div>
+          <div class="branch-details">
+            <a href="@url(repository)/tree/@encodeRefName(branch.name)" class="branch-name">@branch.name</a>
+            <span class="branch-meta">
+              <span>Updated @helper.html.datetimeago(branch.commitTime, false)
+                by <span>@user(branch.committerName, branch.committerEmailAddress, "muted-link")</span>
+              </span>
+            </span>
+          </div>
+          <div class="branch-a-b-count">
+            @if(branch.mergeInfo.isEmpty){
+              <span class="label">Default</span>
+            }else{
+              @branch.mergeInfo.map{ info =>
+                <div data-toggle="tooltip" title="@info.ahead commits ahead, @info.behind commits behind @repository.repository.defaultBranch">
+                  <div class="a-b-count-widget">
+                    <div class="count-half"><div class="count-value">@info.ahead</div></div>
+                    <div class="count-half"><div class="count-value">@info.behind</div></div>
+                    </div>
+                  </div>
+                </div>
+              }
             }
-          </td>
+          </div>
-          <td>
-            @helper.html.datetimeago(latestUpdateDate, false)
-          </td>
-          <td>
-            @if(repository.repository.defaultBranch == branchName){
-              Base branch
-            } else {
-              <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branchName)}">to @{repository.repository.defaultBranch}</a>
-            }
-          </td>
-          <td>
-            <a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a>
-            <a href="@url(repository)/archive/@{encodeRefName(branchName)}.tar.gz">TAR.GZ</a>
-          </td>
         </tr>
       }
     </table>
@@ -46,5 +78,6 @@ $(function(){
     var branchName = $(e.target).data('name');
     return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
   });
+  $('*[data-toggle=tooltip]').tooltip().css("white-space","nowrap");
 });
-</script>
+</script>

src/main/webapp/assets/common/css/gitbucket.css

@@ -472,6 +472,62 @@ div.repository-content {
     margin-left: 40px;
 }
 
+.branches .muted-link{
+  color: #777;
+}
+.branches .muted-link:hover{
+  color: #4183c4;
+}
+.branches .branch-details{
+  display: inline-block;
+  width: 490px;
+  margin-right: 10px;
+}
+.branches .branch-name{
+  color: #4183c4;
+  display: inline-block;
+  padding: 2px 6px;
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  background-color: rgba(209,227,237,0.5);
+  border-radius: 3px;
+}
+.branches .branch-meta{
+  color: #aaa;
+  font-size: 12px;
+  line-height: 20px;
+}
+.branches .branch-action{
+  display: inline-block;
+  float: right;
+  position: relative;
+  top: -3px;
+  height: 20px;
+}
+.branches .branch-a-b-count{
+  display: inline-block;
+  vertical-align: middle;
+  width: 181px;
+  text-align: center;
+  color: rgba(0,0,0,0.5);
+}
+.branches .a-b-count-widget{
+  font-size: 10px;
+}
+.branches .a-b-count-widget .count-half{
+  width:90px;
+  position: relative;
+  text-align: right;
+  float: left;
+}
+.branches .a-b-count-widget .count-half:last-child {
+  text-align: left;
+  border-left: 1px solid #bbb;
+}
+.branches .a-b-count-widget .count-half .count-value{
+  padding: 0 3px;
+}
+
+
 /****************************************************************************/
 /* Activity */
 /****************************************************************************/