Merge branch 'master' into instant-display

Conflicts:
	lib/controllers/blameViewController.js
	lib/views/blame-line-view.coffee

Author: dmnd

lib/util/blameFormatter.js

@@ -36,6 +36,17 @@ function parseDate(line) {
   return moment.unix(dateStamp).format(formatString);
 }
 
+/**
+ * Parses the summary line from the blame data for a line of code
+ *
+ * @param {string} line - the blame data for a particular line of code
+ * @return {string} - the summary line for the last commit for a line of code
+ */
+function parseSummary(line) {
+  var summaryMatcher = /^summary\s(.*)$/m;
+  return line.match(summaryMatcher)[1];
+}
+
 /**
  * Parses the blame --porcelain output for a particular line of code into a
  * usable object with properties:
@@ -44,6 +55,7 @@ function parseDate(line) {
  * line: the line number (1 indexed)
  * committer: name of the committer of that line
  * date: the date of the commit
+ * summary: the summary of the commit
  *
  * @param {string} blameData - the blame --porcelain output for a line of code
  * @param {number} index - the index that the data appeared in an array of line
@@ -55,7 +67,8 @@ function parseBlameLine(blameData, index) {
     hash: parseRevision(blameData),
     line: index + 1,
     committer: parseCommitter(blameData),
-    date: parseDate(blameData)
+    date: parseDate(blameData),
+    summary: parseSummary(blameData)
   });
 }
 
@@ -78,14 +91,18 @@ function markIfNoCommit(parsedBlame) {
  * @param {string} blameOutput - output from 'git blame --porcelain <file>'
  */
 function parseBlameOutput(blameOut) {
-  // Matches new lines only when followed by a line with commit hash info that
-  // are followed by autor line. This is the 1st and 2nd line of the blame
-  // --porcelain output.
-  var singleLineDataSplitRegex = /\n(?=\w+\s(?:\d+\s)+\d+\nauthor)/g;
+  // Matches the info lines for a specific line in the blame --porcelain output,
+  // which is up to the line after the one that begins with filename.
+  var blameChunkRegex = /(?:.*\n)*?filename .*?\n\t.*?\n/g;
 
   // Split the blame output into data for each line and parse out desired
   // data from each into an object.
-  return blameOut.split(singleLineDataSplitRegex).map(parseBlameLine);
+  var results = [];
+  var match;
+  while ((match = blameChunkRegex.exec(blameOut))) {
+    results.push(parseBlameLine(match[0]));
+  }
+  return results;
 }
 
 // EXPORTS

lib/views/blame-line-view.coffee

@@ -1,4 +1,4 @@
-{React, Reactionary} = require 'atom'
+{$, React, Reactionary} = require 'atom'
 RP = React.PropTypes
 {div, span, a} = Reactionary
 RemoteRevision = require '../util/RemoteRevision'
@@ -38,6 +38,16 @@ BlameLineComponent = React.createClass
         span className: 'committer text-highlight',
           @props.committer.split(' ').slice(-1)[0]
 
+  componentDidMount: ->
+    $el = $(@getDOMNode())
+    if @props.summary
+      $el.setTooltip
+        title: @props.summary
+        placement: "auto left"
+
+  componentWillUnmount: ->
+    $(@getDOMNode()).tooltip "destroy"
+
   shouldComponentUpdate: ->
     false