Fixing lastAction getter. Adding rev to the action object.

Author: jswartwood

lib/svn-log-parser.js

@@ -2,6 +2,7 @@
 
 var stream = require("stream")
   , util = require("util")
+  , path = require("path")
 ;
 
 module.exports = function createParser( callback, opts, logs ) {
@@ -45,11 +46,13 @@ Parser.prototype.pipe = function( dest, opts ) {
 Parser.prototype.write = function( data ) {
   var parser = this;
 
-  var lines = "".split.call(data, /[\n\r]+/)
-    , revInfo
-  ;
+  var lines = "".split.call(data, /[\n\r]+/);
 
   lines.forEach(function( line ) {
+    var revInfo
+      , actionInfo
+    ;
+
     switch (whatIsLine(line)) {
       case "sep":
         break;
@@ -62,7 +65,9 @@ Parser.prototype.write = function( data ) {
         parser.results.revs[parser.currRev] = revInfo;
         break;
       case "action":
-        updateFileInfo(parseActionInfo(line));
+        actionInfo = parseActionInfo(line);
+        actionInfo.rev = parser.currRev;
+        updateFileInfo(parser, actionInfo);
         break;
       default:
         // Assume revision message
@@ -71,43 +76,6 @@ Parser.prototype.write = function( data ) {
         }
     }
   });
-
-  function updateFileInfo( actionInfo ) {
-    var fileInfo;
-
-    if (!parser.results.files[actionInfo.file]) {
-      parser.results.files[actionInfo.file] = { revs: [] };
-      Object.defineProperty(parser.results.files[actionInfo.file], "lastAction", {
-          enumerable: true
-        , get: function() {
-            var lastRev = fileInfo.revs[fileInfo.revs.length - 1]
-              , actions = parser.results.revs[lastRev].actions
-              , lastAction = actions.length - 1
-            ;
-
-            while (~lastAction && actions[lastAction].file != actionInfo.file) {
-              lastAction--;
-            }
-
-            return actions[lastAction];
-          }
-      });
-    }
-    fileInfo = parser.results.files[actionInfo.file];
-
-    fileInfo.revs.unshift(parser.currRev);
-
-    parser.results.revs[parser.currRev].actions.unshift(actionInfo);
-
-    parser.emit("action", {
-        action: actionInfo.action
-      , file: actionInfo.file
-      , rev: parser.currRev
-    });
-
-    // Test to also add all files in ADDED directories
-    return fileInfo;
-  }
 };
 Parser.prototype.end = function( chunk ) {
   if (!this._ended) {
@@ -174,10 +142,10 @@ var sepTest = /^-+$|^Changed paths:$/
 function parseRevInfo( line ) {
   var revMatch = revMatcher.exec(line);
   return {
-      rev: revMatch[1]
+      rev: Number(revMatch[1])
     , author: revMatch[2]
     , timestamp: revMatch[3]
-    , actions: []
+    , actions: {}
     , message: ""
   };
 }
@@ -190,6 +158,57 @@ function parseActionInfo( line ) {
   };
 }
 
+function updateFileInfo( parser, actionInfo ) {
+  var fileInfo;
+
+  if (!parser.results.files[actionInfo.file]) {
+    parser.results.files[actionInfo.file] = { revs: [] };
+
+    Object.defineProperty(parser.results.files[actionInfo.file], "lastAction", {
+        enumerable: true
+      , get: function() {
+          var lastRev = fileInfo.revs[fileInfo.revs.length - 1]
+            , lastAction = parser.results.revs[lastRev].actions[actionInfo.file]
+            , pathName
+            , pathInfo
+            , lastPathRev
+            , lastPathAction
+            , pathSplit = actionInfo.file.split(path.sep)
+          ;
+
+          while (lastAction.action !== "D" && pathSplit.pop()) {
+            pathName = pathSplit.join(path.sep);
+            pathInfo = parser.results.files[pathName];
+
+            if (!pathInfo) continue;
+
+            lastPathAction = pathInfo.lastAction;
+
+            if (lastPathAction.rev > lastRev && lastPathAction.action === "D") {
+              lastAction = lastPathAction;
+            }
+          }
+
+          return lastAction;
+        }
+    });
+  }
+
+  fileInfo = parser.results.files[actionInfo.file];
+
+  fileInfo.revs.unshift(parser.currRev);
+
+  parser.results.revs[parser.currRev].actions[actionInfo.file] = actionInfo;
+
+  parser.emit("action", {
+      action: actionInfo.action
+    , file: actionInfo.file
+    , rev: parser.currRev
+  });
+
+  return fileInfo;
+}
+
 function whatIsLine( line ) {
   if (actionTest.test(line)) {
     return "action";