Made revwalk push synchronous, fix segfault

tbranyen · tbranyen · commit cb83ac26d8c6 · 2014-07-02T17:15:08.000-04:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -381,7 +381,10 @@
         "isConstructorMethod": true,
         "jsFunctionName": "createRevwalk",
         "cppFunctionName": "CreateRevwalk",
-        "args": [{ "shouldAlloc": true }]
+        "args": [
+          { "isReturn": true },
+          { "isSelf": false }
+        ]
       },
 
       "git_revwalk_sorting": {
@@ -391,17 +394,8 @@
 
       "git_revwalk_push": {
         "ignore": false,
-        "isAsync": true,
-        "args": [
-          {
-            "isSelf": true,
-            "isReturn": false
-          },
-          {
-            "isReturn": false
-          }
-        ],
-
+        "isAsync": false,
+        "args": [{ "isSelf": true, "isReturn": false }],
         "return": {
           "isErrorCode": true
         }
diff --git a/lib/commit.js b/lib/commit.js
@@ -1,6 +1,7 @@
 var git = require('../');
 var Commit = git.Commit;
 var Oid = git.Oid;
+var Revwalk = git.Revwalk;
 var events = require('events');
 var Tree = require("./tree");
 
@@ -98,6 +99,7 @@ Commit.prototype.history = function() {
         event.emit('end', commits);
         return;
       }
+
       event.emit('commit', commit);
       commits.push(commit);
     });
diff --git a/lib/revwalk.js b/lib/revwalk.js
@@ -44,25 +44,24 @@ Revwalk.prototype.sorting = function() {
 Revwalk.prototype.walk = function(oid, callback) {
   var self = this;
 
-  this.push(oid, function revWalkPush(error) {
-    if (error) return callback(error);
+  this.push(oid);
 
-    function walk() {
-      self.next(function revWalkNext(error, oid) {
-        if (error) return callback(error);
-        if (!oid) return callback();
+  function walk() {
+    self.next(function revWalkNext(error, oid) {
+      if (error) return callback(error);
+      if (!oid) return callback();
 
-        self.repo.getCommit(oid, function revWalkCommitLookup(error, commit) {
-          if (error) return callback(error);
+      self.repo.getCommit(oid, function revWalkCommitLookup(error, commit) {
+        if (error) return callback(error);
 
-          callback(null, commit);
-          walk();
-        });
+        callback(null, commit);
+        walk();
       });
-    }
+    });
+  }
 
-    walk();
-  });
+  walk();
 };
-util.normalizeOid(Revwalk.prototype, 'getTag');
-util.makeSafe(Revwalk.prototype, 'getTag');
+
+util.normalizeOid(Revwalk.prototype, 'walk');
+util.makeSafe(Revwalk.prototype, 'walk');
diff --git a/test/commit.js b/test/commit.js
@@ -140,27 +140,27 @@ exports.improperCommitId = function(test) {
 /**
  * Test that retreiving walking a given commit's history works as expected.
  */
-//exports.history = function(test) {
-//  test.expect(4);
-//  git.Repo.open('repos/workdir/.git', function(error, repository) {
-//    repository.getCommit(historyCountKnownSHA, function(error, commit) {
-//      test.equals(null, error, 'Getting latest branch commit should not error');
-//      var historyCount = 0;
-//      var expectedHistoryCount = 364;
-//      commit.history().on('commit', function(commit) {
-//    //    historyCount++;
-//    //  }).on('end', function(commits) {
-//    //    test.equals(null, error, 'There should be no errors');
-//    //    test.equals(historyCount, expectedHistoryCount);
-//    //    test.equals(commits.length, expectedHistoryCount);
-//        test.done();
-//    //  }).on('error', function(error) {
-//    //    test.equals(null, error, 'There should be no errors');
-//    //    test.ok(false, 'There should be no errors');
-//      }).start();
-//    });
-//  });
-//};
+exports.history = function(test) {
+  test.expect(4);
+  git.Repo.open('repos/workdir/.git', function(error, repository) {
+    repository.getCommit(historyCountKnownSHA, function(error, commit) {
+      test.equals(null, error, 'Getting latest branch commit should not error');
+      var historyCount = 0;
+      var expectedHistoryCount = 364;
+      commit.history().on('commit', function(commit) {
+        historyCount++;
+      }).on('end', function(commits) {
+        test.equals(null, error, 'There should be no errors');
+        test.equals(historyCount, expectedHistoryCount);
+        test.equals(commits.length, expectedHistoryCount);
+        test.done();
+      }).on('error', function(error) {
+        test.equals(null, error, 'There should be no errors');
+        test.ok(false, 'There should be no errors');
+      }).start();
+    });
+  });
+};
 
 /**
  * Test that retreiving master branch's HEAD commit works as expected.
