Fix commit log presentation.

2025-10-31 02:25:59 +01:00 · 2013-06-19 04:27:57 +09:00
parent 1679fb98d0
commit 7a3512ee18
9 changed files with 66 additions and 25 deletions
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -75,7 +75,7 @@ class CommitLogHook(owner: String, repository: String) extends PostReceiveHook {
      commands.asScala.foreach { command =>
        JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name).foreach { commit =>
          // TODO extract issue id and add comment to issue
-          logger.debug(commit.id + ":" + commit.message)
+          logger.debug(commit.id + ":" + commit.shortMessage)
        }
      }
    }
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -50,11 +50,22 @@ object JGitUtil {
   * @param id the commit id
   * @param time the commit time
   * @param committer  the commiter name
-   * @param message the commit message
+   * @param shortMessage the short message
+   * @param fullMessage the full message
   */
-  case class CommitInfo(id: String, time: Date, committer: String, message: String){
+  case class CommitInfo(id: String, time: Date, committer: String, shortMessage: String, fullMessage: String){
    def this(rev: org.eclipse.jgit.revwalk.RevCommit) =
-      this(rev.getName, rev.getCommitterIdent.getWhen, rev.getCommitterIdent.getName, rev.getFullMessage)
+      this(rev.getName, rev.getCommitterIdent.getWhen, rev.getCommitterIdent.getName, rev.getShortMessage, rev.getFullMessage)
+
+    val description = {
+      val i = fullMessage.trim.indexOf("\n")
+      if(i >= 0){
+        Some(fullMessage.trim.substring(i).trim)
+      } else {
+        None
+      }
+    }
+
  }

  case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -15,9 +15,26 @@ object helpers {
   */
  def date(date: Date): String = new SimpleDateFormat("yyyy/MM/dd").format(date)

+  def format(value: String): Html =
+    Html(value.replaceAll(" ", "&nbsp;").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;").replaceAll("\n", "<br>"))
+
  // TODO escape html tags using HtmlEscapeUtils (Commons Lang)
-  def format(value: String): Html = Html(
-    value.replaceAll(" ", "&nbsp;").replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;").replaceAll("\n", "<br>"))
+  def formatCommitLog(message: String): Html = {
+    val i = message.trim.indexOf("\n")
+    val (firstLine, description) = if(i >= 0){
+      (message.trim.substring(0, i).trim, Some(message.trim.substring(i).trim))
+    } else {
+      (message.trim, None)
+    }
+
+    val sb = new StringBuilder()
+    sb.append("<div class=\"summary\">").append(format(firstLine).text).append("</div>")
+    if(description.isDefined){
+      sb.append("<div class=\"description\">").append(format(description.get).text).append("</div>")
+    }
+
+    Html(sb.toString)
+  }

  /**
   * Converts Markdown of Wiki pages to HTML.
@@ -27,15 +44,15 @@ object helpers {
    Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
  }
  
-  /**
-   * Cut the given string by specified length.
-   */
-  def cut(message: String, length: Int): String = {
-    if(message.length > length){
-      message.substring(0, length) + "..."
-    } else {
-      message
-    }
-  }
+//  /**
+//   * Cut the given string by specified length.
+//   */
+//  def cut(message: String, length: Int): String = {
+//    if(message.length > length){
+//      message.substring(0, length) + "..."
+//    } else {
+//      message
+//    }
+//  }
  
 }
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -21,7 +21,7 @@
        <div class="pull-left">
          <a href="@path/@latestCommit.committer">@latestCommit.committer</a>
          <span class="description">@helpers.datetime(latestCommit.time)</span>
-          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.cut(latestCommit.message, 100)</a>
+          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@latestCommit.shortMessage</a>
        </div>
        <div class="btn-group pull-right">
          <a class="btn btn-mini" href="?raw=true">Raw</a>
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -2,13 +2,13 @@
@import context._
@import view.helpers
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@html.main(helpers.cut(commit.message, 20)){
+@html.main(commit.shortMessage){
  @html.header("code", repository)
  @navtab(branch, repository, "commits")
  <table class="table table-bordered">
    <tr>
      <th>
-        <div>@helpers.format(commit.message)</div>
+        <div class="commit-log">@helpers.formatCommitLog(commit.fullMessage)</div>
        <div class="small" style="font-weight: normal;"><span class="description">@branch</span></div>
      </th>
    </tr>
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -30,7 +30,16 @@
      <tr>
        <td>
          <div class="pull-left">
-            <a href="@path/@repository.owner/@repository.name/commit/@commit.id"><strong>@helpers.cut(commit.message, 100)</strong></a><br>
+            <a href="@path/@repository.owner/@repository.name/commit/@commit.id"><strong>@commit.shortMessage</strong></a>
+            @if(commit.description.isDefined){
+              <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();">...</a>
+            }
+            <br>
+            @if(commit.description.isDefined){
+              <div class="small" id="description-@commit.id" style="display: none;">
+                @helpers.format(commit.description.get)
+              </div>
+            }
            <div class="small">
              <a href="@path/@commit.committer">@commit.committer</a>
              <span class="description">@helpers.datetime(commit.time)</span>
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -16,7 +16,7 @@
        <th colspan="4" style="font-weight: normal;">
          <div>
            <strong><a href="@path/@repository.owner/@repository.name/@latestCommit.committer">@latestCommit.committer</a></strong> 
-            <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.cut(latestCommit.message, 100)</a>
+            <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@latestCommit.shortMessage</a>
            <div class="pull-right align-right">
              @helpers.datetime(latestCommit.time)
              <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id">@latestCommit.id.substring(0, 10)</a>
@@ -49,7 +49,7 @@
        }
        </td>
        <td>@helpers.datetime(file.time)</td>
-        <td><a href="@path/@repository.owner/@repository.name/commit/@file.commitId" class="commit-message">@helpers.cut(file.message, 60)</a> [<a href="@path/@file.committer">@file.committer</a>]</td>
+        <td><a href="@path/@repository.owner/@repository.name/commit/@file.commitId" class="commit-message">@file.message</a> [<a href="@path/@file.committer">@file.committer</a>]</td>
      </tr>
      }
    </table>
--- a/src/main/twirl/wiki/wikihistory.scala.html
+++ b/src/main/twirl/wiki/wikihistory.scala.html
@@ -36,7 +36,7 @@
        <td><a href="@path/@commit.committer">@commit.committer</a></td>
        <td width="80%">
          <span class="description">@helpers.datetime(commit.time):</span>
-          @commit.message
+          @commit.shortMessage
        </td>
      </tr>
    }
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -97,6 +97,10 @@ div.block {
  border-bottom: 1px solid silver;
 }

+div.commit-log div.description {
+  font-weight: normal;
+}
+
 h1.wiki-title {
  margin-top: 0px;
 }