From d2cf4afc8144317fa969d7dc7210c565e7f3a25d Mon Sep 17 00:00:00 2001
From: nazoking <nazoking@gmail.com>
Date: Tue, 10 Mar 2015 00:54:57 +0900
Subject: [PATCH] add diff stat bar

---
 .../gitbucket/core/helper/diff.scala.html     | 46 +++++++++++++++++--
 .../webapp/assets/common/css/gitbucket.css    | 23 ++++++++++
 src/main/webapp/assets/common/js/gitbucket.js | 12 ++++-
 3 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index f936b07d9..01725be23 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -10,7 +10,7 @@
 @import gitbucket.core.view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @if(showIndex){
-  <div>
+  <div style="overflow: hidden;">
     <div class="pull-right" style="margin-bottom: 10px;">
       <div class="btn-group" data-toggle="buttons-radio">
         <input type="button" id="btn-unified" class="btn btn-default btn-small active" value="Unified">
@@ -22,6 +22,7 @@
   <ul id="commit-file-list" style="display: none;">
   @diffs.zipWithIndex.map { case (diff, i) =>
     <li@if(i > 0){ class="border"}>
+      <span class="pull-right diffstat" data-diff-id="@i"></span>
       <a href="#diff-@i">
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
           <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
@@ -46,7 +47,9 @@
     <tr>
       <th style="font-weight: normal; line-height: 27px;" class="box-header">
         @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-          <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
+          <span class="diffstat">
+            <img src="@assets/common/images/diff_move.png"/>
+          </span> @diff.oldPath -> @diff.newPath
           @if(newCommitId.isDefined){
             <div class="pull-right align-right">
               <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
@@ -56,11 +59,14 @@
           }
         }
         @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
+          <span class="diffstat">
           @if(diff.changeType == ChangeType.ADD){
             <img src="@assets/common/images/diff_add.png"/>
           }else{
             <img src="@assets/common/images/diff_edit.png"/>
-          } @diff.newPath
+          }
+          </span>
+          @diff.newPath
           @if(newCommitId.isDefined){
             <div class="pull-right align-right">
               <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="ignore-whitespace" value="1"/>Ignore Space</label>
@@ -70,7 +76,9 @@
           }
         }
         @if(diff.changeType == ChangeType.DELETE){
-          <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
+          <span class="diffstat">
+            <img src="@assets/common/images/diff_delete.png"/>
+          </span> @diff.oldPath
           @if(oldCommitId.isDefined){
             <div class="pull-right align-right">
               <label class="checkbox" style="display: inline-block;"><input type="checkbox" class="toggle-notes" checked><span>Show notes</span></label>
@@ -228,11 +236,41 @@ $(function(){
       tmp.hide();
     }
   }
+  function renderStatBar(add,del){
+    if(add+del>5){
+      if(add){
+        if(add<del){
+          add = Math.floor(1 + (add * 4 / (add+del)));
+        }else{
+          add = Math.ceil(1 + (add * 4 / (add+del)));
+        }
+      }
+      del = 5-add;
+    }
+    var ret = $('<div class="diffstat-bar">');
+    for(var i=0;i<5;i++){
+      if(add){
+        ret.append('<span class="text-diff-added">■</span>');
+        add --;
+      }else if(del){
+        ret.append('<span class="text-diff-deleted">■</span>');
+        del --;
+      }else{
+        ret.append('■');
+      }
+    }
+    return ret;
+  }
   function renderOneDiff(diffText, viewType){
     var table = diffText.closest("table[data-diff-id]");
     var i = table.data("diff-id");
     var ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
     diffUsingJS('oldText-'+i, 'newText-'+i, diffText.attr('id'), viewType, ignoreWhiteSpace);
+    var add = diffText.find("table").attr("add")*1;
+    var del = diffText.find("table").attr("del")*1;
+    table.find(".diffstat").text(add+del+" ").append(renderStatBar(add,del)).attr("title",add+" additions & "+del+" deletions").tooltip();
+    $('span.diffstat[data-diff-id="'+i+'"]').html('<span class="text-diff-added">+'+add+'</span><span class="text-diff-deleted">-'+del+'</span>').append(renderStatBar(add,del).attr('title',(add+del)+" lines changed").tooltip());
+
     @if(hasWritePermission) {
       diffText.find('.body').each(function(){ $('<b class="add-comment">+</b>').prependTo(this); });
     }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 26fb424e1..324e50aad 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1101,6 +1101,29 @@ table.diff tbody tr.not-diff:hover td{
     content: "..."
 }
 
+.diffstat-bar {
+    display: inline-block;
+    margin-left: 3px;
+    font-size: 16px;
+    color: #ddd;
+    letter-spacing: 1px;
+    text-align: left;
+    text-decoration: none;
+    -webkit-font-smoothing: antialiased;
+}
+.text-diff-added {
+    color: #55a532;
+}
+.text-diff-deleted {
+    color: #bd2c00;
+}
+.diffstat {
+    font-size: 12px;
+    font-weight: bold;
+    color: #666;
+    white-space: nowrap;
+    letter-spacing: 0px;
+}
 /****************************************************************************/
 /* Repository Settings */
 /****************************************************************************/
diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js
index 33e996c09..87ea23b07 100644
--- a/src/main/webapp/assets/common/js/gitbucket.js
+++ b/src/main/webapp/assets/common/js/gitbucket.js
@@ -133,6 +133,7 @@ $.extend(JsDiffRender.prototype,{
     return {
       split:function(){
         var table = $('<table class="diff">');
+        table.attr({add:oplines.add, del:oplines.del});
         var tbody = $('<tbody>').appendTo(table);
         for(var i=0;i<oplines.length;i++){
           var o = oplines[i];
@@ -165,6 +166,7 @@ $.extend(JsDiffRender.prototype,{
       },
       unified:function(){
         var table = $('<table class="diff inlinediff">');
+        table.attr({add:oplines.add, del:oplines.del});
         var tbody = $('<tbody>').appendTo(table);
         for(var i=0;i<oplines.length;i++){
           var o = oplines[i];
@@ -242,7 +244,7 @@ $.extend(JsDiffRender.prototype,{
     }
   },
   flatten: function(opcodes, headTextLines, baseTextLines, isIgnoreLine){
-    var ret = [];
+    var ret = [], add=0, del=0;
     for (var idx = 0; idx < opcodes.length; idx++) {
       var code = opcodes[idx];
       var change = code[0];
@@ -252,18 +254,22 @@ $.extend(JsDiffRender.prototype,{
       for (var i = 0; i < rowcnt; i++) {
         switch(change){
         case 'insert':
+          add++;
           ret.push({
             change:(isIgnoreLine(headTextLines[n]) ? 'equal' : change),
             head: ++n
           });
           break;
         case 'delete':
+          del++;
           ret.push({
             change: (isIgnoreLine(baseTextLines[b]) ? 'equal' : change),
             base: ++b
           });
           break;
         case 'replace':
+          add++;
+          del++;
           var r = {change: change};
           if(n<code[4]){
             r.head = ++n;
@@ -282,6 +288,8 @@ $.extend(JsDiffRender.prototype,{
         }
       }
     }
+    ret.add=add;
+    ret.del=del;
     return ret;
   },
   fold: function(oplines, contextSize){
@@ -316,6 +324,8 @@ $.extend(JsDiffRender.prototype,{
         end:skips[skips.length-contextSize]
       });
     }
+    ret.add = oplines.add;
+    ret.del = oplines.del;
     return ret;
   }
 });