pj-nodegit 0.27.12 → 0.28.1

package/src/revwalk.cc

@@ -12,7 +12,6 @@ extern "C" {
 #include "../include/functions/copy.h"
 #include "../include/revwalk.h"
 #include "nodegit_wrapper.cc"
-#include "../include/async_libgit2_queue_worker.h"
 
   #include "../include/commit.h"
   #include "../include/functions/copy.h"
@@ -31,38 +30,39 @@ using namespace node;
     // way of knowing to free these values.
                                                                            }
 
-  void GitRevwalk::InitializeComponent(v8::Local<v8::Object> target) {
+  void GitRevwalk::InitializeComponent(v8::Local<v8::Object> target, nodegit::Context *nodegitContext) {
     Nan::HandleScope scope;
 
-    v8::Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction);
+    v8::Local<v8::External> nodegitExternal = Nan::New<v8::External>(nodegitContext);
+    v8::Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
 
     tpl->InstanceTemplate()->SetInternalFieldCount(1);
     tpl->SetClassName(Nan::New("Revwalk").ToLocalChecked());
 
-          Nan::SetPrototypeMethod(tpl, "hide", Hide);
-            Nan::SetPrototypeMethod(tpl, "hideGlob", HideGlob);
-            Nan::SetPrototypeMethod(tpl, "hideHead", HideHead);
-            Nan::SetPrototypeMethod(tpl, "hideRef", HideRef);
-             Nan::SetMethod(tpl, "create", Create);
-            Nan::SetPrototypeMethod(tpl, "next", Next);
-            Nan::SetPrototypeMethod(tpl, "push", Push);
-            Nan::SetPrototypeMethod(tpl, "pushGlob", PushGlob);
-            Nan::SetPrototypeMethod(tpl, "pushHead", PushHead);
-            Nan::SetPrototypeMethod(tpl, "pushRange", PushRange);
-            Nan::SetPrototypeMethod(tpl, "pushRef", PushRef);
-            Nan::SetPrototypeMethod(tpl, "repository", Repository);
-            Nan::SetPrototypeMethod(tpl, "reset", Reset);
-            Nan::SetPrototypeMethod(tpl, "simplifyFirstParent", SimplifyFirstParent);
-            Nan::SetPrototypeMethod(tpl, "sorting", Sorting);
-            Nan::SetPrototypeMethod(tpl, "commitWalk", CommitWalk);
-            Nan::SetPrototypeMethod(tpl, "fastWalk", FastWalk);
-            Nan::SetPrototypeMethod(tpl, "fileHistoryWalk", FileHistoryWalk);
+          Nan::SetPrototypeMethod(tpl, "hide", Hide, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "hideGlob", HideGlob, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "hideHead", HideHead, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "hideRef", HideRef, nodegitExternal);
+             Nan::SetMethod(tpl, "create", Create, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "next", Next, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "push", Push, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "pushGlob", PushGlob, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "pushHead", PushHead, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "pushRange", PushRange, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "pushRef", PushRef, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "repository", Repository, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "reset", Reset, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "simplifyFirstParent", SimplifyFirstParent, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "sorting", Sorting, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "commitWalk", CommitWalk, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "fastWalk", FastWalk, nodegitExternal);
+            Nan::SetPrototypeMethod(tpl, "fileHistoryWalk", FileHistoryWalk, nodegitExternal);
     
     InitializeTemplate(tpl);
 
-    v8::Local<Function> _constructor_template = Nan::GetFunction(tpl).ToLocalChecked();
-    constructor_template.Reset(_constructor_template);
-    Nan::Set(target, Nan::New("Revwalk").ToLocalChecked(), _constructor_template);
+    v8::Local<Function> constructor_template = Nan::GetFunction(tpl).ToLocalChecked();
+    nodegitContext->SaveToPersistent("GitRevwalk::Template", constructor_template);
+    Nan::Set(target, Nan::New("Revwalk").ToLocalChecked(), constructor_template);
   }
 
   
@@ -103,7 +103,7 @@ from_commit_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[0]).To
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -120,11 +120,11 @@ from_commit_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[0]).To
         free((void *)from_commit_id);
       }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -155,7 +155,7 @@ NAN_METHOD(GitRevwalk::HideGlob) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -169,11 +169,11 @@ NAN_METHOD(GitRevwalk::HideGlob) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -186,7 +186,7 @@ NAN_METHOD(GitRevwalk::HideHead) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -197,11 +197,11 @@ NAN_METHOD(GitRevwalk::HideHead) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -232,7 +232,7 @@ NAN_METHOD(GitRevwalk::HideRef) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -246,11 +246,11 @@ NAN_METHOD(GitRevwalk::HideRef) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -273,7 +273,7 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               from_repo
@@ -293,7 +293,7 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
         }
       } // lock master scope end
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (out != NULL) {
       v8::Local<v8::Array> owners = Nan::New<Array>(0);
@@ -305,17 +305,17 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
             true
           )).ToLocalChecked()
         );
-         to = GitRevwalk::New(
+         v8ConversionSlot = GitRevwalk::New(
         out,
         true
           , owners
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
   
@@ -324,37 +324,44 @@ from_repo = Nan::ObjectWrap::Unwrap<GitRepository>(Nan::To<v8::Object>(info[0]).
    */
 NAN_METHOD(GitRevwalk::Next) {
 
-  if (info.Length() == 0 || !info[0]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  NextBaton* baton = new NextBaton;
+  NextBaton* baton = new NextBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
 
+
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+
       baton->out = (git_oid *)malloc(sizeof(git_oid ));
         baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
 
-  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[0]));
-  NextWorker *worker = new NextWorker(baton, callback);
+  Nan::Callback *callback = new Nan::Callback(v8::Local<Function>::Cast(info[info.Length() - 1]));
+  NextWorker *worker = new NextWorker(baton, callback, cleanupHandles);
 
-        worker->SaveToPersistent("walk", info.This());
+        worker->Reference<GitRevwalk>("walk", info.This());
 
-  AsyncLibgit2QueueWorker(worker);
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRevwalk::NextWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(
+    /*asyncAction: */true
+          ,baton->out
+          ,baton->walk
+  );
+
+  return lockMaster;
+}
+
 void GitRevwalk::NextWorker::Execute() {
   git_error_clear();
 
-  {
-    LockMaster lockMaster(
-      /*asyncAction: */true
-            ,baton->out
-            ,baton->walk
-    );
-
     int result = git_revwalk_next(
 baton->out,baton->walk  );
 
@@ -364,25 +371,46 @@ baton->out,baton->walk  );
         baton->error = git_error_dup(git_error_last());
       }
 
+}
+
+void GitRevwalk::NextWorker::HandleErrorCallback() {
+  if (!GetIsCancelled()) {
+    v8::Local<v8::Object> err = Nan::To<v8::Object>(Nan::Error(ErrorMessage())).ToLocalChecked();
+    Nan::Set(err, Nan::New("errorFunction").ToLocalChecked(), Nan::New("Revwalk.next").ToLocalChecked());
+    v8::Local<v8::Value> argv[1] = {
+      err
+    };
+    callback->Call(1, argv, async_resource);
+  }
+
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
   }
+
+
+  delete baton;
 }
 
 void GitRevwalk::NextWorker::HandleOKCallback() {
     if (baton->error_code == GIT_OK) {
-    v8::Local<v8::Value> to;
+    v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (baton->out != NULL) {
-        to = GitOid::New(
+        v8ConversionSlot = GitOid::New(
         baton->out,
         true
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-      v8::Local<v8::Value> result = to;
-
+      v8::Local<v8::Value> result = v8ConversionSlot;
+     
     v8::Local<v8::Value> argv[2] = {
       Nan::Null(),
       result
@@ -406,44 +434,15 @@ void GitRevwalk::NextWorker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
-      std::queue< v8::Local<v8::Value> > workerArguments;
       bool callbackFired = false;
-      while(!workerArguments.empty()) {
-        v8::Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        ) {
-          continue;
-        }
-
-        v8::Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        v8::Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined()) {
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
           v8::Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        v8::Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex) {
-          v8::Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          v8::Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined()) {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -504,7 +503,7 @@ from_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[0]).ToLocalCh
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -521,11 +520,11 @@ from_id = Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(info[0]).ToLocalCh
         free((void *)from_id);
       }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -556,7 +555,7 @@ NAN_METHOD(GitRevwalk::PushGlob) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -570,11 +569,11 @@ NAN_METHOD(GitRevwalk::PushGlob) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -587,7 +586,7 @@ NAN_METHOD(GitRevwalk::PushHead) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -598,11 +597,11 @@ NAN_METHOD(GitRevwalk::PushHead) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -633,7 +632,7 @@ NAN_METHOD(GitRevwalk::PushRange) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -647,11 +646,11 @@ NAN_METHOD(GitRevwalk::PushRange) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -682,7 +681,7 @@ NAN_METHOD(GitRevwalk::PushRef) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -696,11 +695,11 @@ NAN_METHOD(GitRevwalk::PushRef) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -713,7 +712,7 @@ NAN_METHOD(GitRevwalk::Repository) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -728,19 +727,19 @@ NAN_METHOD(GitRevwalk::Repository) {
           return info.GetReturnValue().Set(scope.Escape(Nan::Undefined()));
         }
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
     if (result != NULL) {
-        to = GitRepository::New(
+        v8ConversionSlot = GitRepository::New(
         result,
         true
        );
    }
   else {
-    to = Nan::Null();
+    v8ConversionSlot = Nan::Null();
   }
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -753,7 +752,7 @@ NAN_METHOD(GitRevwalk::Reset) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -764,11 +763,11 @@ NAN_METHOD(GitRevwalk::Reset) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -781,7 +780,7 @@ NAN_METHOD(GitRevwalk::SimplifyFirstParent) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -792,11 +791,11 @@ NAN_METHOD(GitRevwalk::SimplifyFirstParent) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
    
@@ -818,7 +817,7 @@ NAN_METHOD(GitRevwalk::Sorting) {
   git_error_clear();
 
   { // lock master scope start
-    LockMaster lockMaster(
+    nodegit::LockMaster lockMaster(
       /*asyncAction: */false
             ,
               Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue()
@@ -830,11 +829,11 @@ NAN_METHOD(GitRevwalk::Sorting) {
     );
 
 
-      v8::Local<v8::Value> to;
+      v8::Local<v8::Value> v8ConversionSlot;
 // start convert_to_v8 block
-     to = Nan::New<Number>( result);
+     v8ConversionSlot = Nan::New<Number>( result);
   // end convert_to_v8 block
-        return info.GetReturnValue().Set(scope.Escape(to));
+        return info.GetReturnValue().Set(scope.Escape(v8ConversionSlot));
   }
 }
         #define SET_ON_OBJECT(obj, field, data) Nan::Set(obj, Nan::New(field).ToLocalChecked(), data)
@@ -879,6 +878,11 @@ public:
     }
   }
 
+  CommitModel(const CommitModel &) = delete;
+  CommitModel(CommitModel &&) = delete;
+  CommitModel &operator=(const CommitModel &) = delete;
+  CommitModel &operator=(CommitModel &&) = delete;
+
   v8::Local<v8::Value> toJavascript() {
     if (!fetchSignature) {
       v8::Local<v8::Value> commitObject = GitCommit::New(
@@ -946,21 +950,15 @@ NAN_METHOD(GitRevwalk::CommitWalk) {
     return Nan::ThrowError("Max count is required and must be a number.");
   }
 
-  if (info.Length() == 1 || (info.Length() == 2 && !info[1]->IsFunction())) {
-    return Nan::ThrowError("Callback is required and must be a Function.");
+  if (info.Length() >= 3 && !info[1]->IsNull() && !info[1]->IsUndefined() && !info[1]->IsObject()) {
+    return Nan::ThrowError("Options must be an object, null, or undefined.");
   }
 
-  if (info.Length() >= 3) {
-    if (!info[1]->IsNull() && !info[1]->IsUndefined() && !info[1]->IsObject()) {
-      return Nan::ThrowError("Options must be an object, null, or undefined.");
-    }
-
-    if (!info[2]->IsFunction()) {
-      return Nan::ThrowError("Callback is required and must be a Function.");
-    }
+  if (!info[info.Length() - 1]->IsFunction()) {
+    return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  CommitWalkBaton* baton = new CommitWalkBaton;
+  CommitWalkBaton* baton = new CommitWalkBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
@@ -980,14 +978,21 @@ NAN_METHOD(GitRevwalk::CommitWalk) {
     baton->returnPlainObjects = false;
   }
   baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
-  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[1]->IsFunction() ? info[1] : info[2]));
-  CommitWalkWorker *worker = new CommitWalkWorker(baton, callback);
-  worker->SaveToPersistent("commitWalk", info.This());
+  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[info.Length() - 1]));
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+  CommitWalkWorker *worker = new CommitWalkWorker(baton, callback, cleanupHandles);
+  worker->Reference<GitRevwalk>("commitWalk", info.This());
 
-  Nan::AsyncQueueWorker(worker);
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRevwalk::CommitWalkWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(true);
+  return lockMaster;
+}
+
 void GitRevwalk::CommitWalkWorker::Execute() {
   giterr_clear();
 
@@ -1040,6 +1045,26 @@ void GitRevwalk::CommitWalkWorker::Execute() {
   }
 }
 
+void GitRevwalk::CommitWalkWorker::HandleErrorCallback() {
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+  auto out = static_cast<std::vector<CommitModel *> *>(baton->out);
+  while (out->size()) {
+    delete out->back();
+    out->pop_back();
+  }
+
+  delete out;
+
+  delete baton;
+}
+
 void GitRevwalk::CommitWalkWorker::HandleOKCallback() {
   if (baton->out != NULL) {
     std::vector<CommitModel *> *out = static_cast<std::vector<CommitModel *> *>(baton->out);
@@ -1083,6 +1108,8 @@ void GitRevwalk::CommitWalkWorker::HandleOKCallback() {
   } else {
     callback->Call(0, NULL, async_resource);
   }
+
+  delete baton;
 }
 
         NAN_METHOD(GitRevwalk::FastWalk)
@@ -1091,11 +1118,11 @@ void GitRevwalk::CommitWalkWorker::HandleOKCallback() {
     return Nan::ThrowError("Max count is required and must be a number.");
   }
 
-  if (info.Length() == 1 || !info[1]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  FastWalkBaton* baton = new FastWalkBaton;
+  FastWalkBaton* baton = new FastWalkBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
@@ -1104,14 +1131,21 @@ void GitRevwalk::CommitWalkWorker::HandleOKCallback() {
   baton->out->reserve(baton->max_count);
   baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
 
-  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[1]));
-  FastWalkWorker *worker = new FastWalkWorker(baton, callback);
-  worker->SaveToPersistent("fastWalk", info.This());
+  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[info.Length() - 1]));
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+  FastWalkWorker *worker = new FastWalkWorker(baton, callback, cleanupHandles);
+  worker->Reference<GitRevwalk>("fastWalk", info.This());
 
-  Nan::AsyncQueueWorker(worker);
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRevwalk::FastWalkWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(true);
+  return lockMaster;
+}
+
 void GitRevwalk::FastWalkWorker::Execute()
 {
   for (int i = 0; i < baton->max_count; i++)
@@ -1153,6 +1187,25 @@ void GitRevwalk::FastWalkWorker::Execute()
   }
 }
 
+void GitRevwalk::FastWalkWorker::HandleErrorCallback() {
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+  while(!baton->out->empty()) {
+    free(baton->out->back());
+    baton->out->pop_back();
+  }
+
+  delete baton->out;
+
+  delete baton;
+}
+
 void GitRevwalk::FastWalkWorker::HandleOKCallback()
 {
   if (baton->out != NULL)
@@ -1196,50 +1249,15 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
     }
     else if (baton->error_code < 0)
     {
-      std::queue< Local<v8::Value> > workerArguments;
       bool callbackFired = false;
-
-      while(!workerArguments.empty())
-      {
-        Local<v8::Value> node = workerArguments.front();
-        workerArguments.pop();
-
-        if (
-          !node->IsObject()
-          || node->IsArray()
-          || node->IsBooleanObject()
-          || node->IsDate()
-          || node->IsFunction()
-          || node->IsNumberObject()
-          || node->IsRegExp()
-          || node->IsStringObject()
-        )
-        {
-          continue;
-        }
-
-        Local<v8::Object> nodeObj = Nan::To<v8::Object>(node).ToLocalChecked();
-        Local<v8::Value> checkValue = GetPrivate(nodeObj, Nan::New("NodeGitPromiseError").ToLocalChecked());
-
-        if (!checkValue.IsEmpty() && !checkValue->IsNull() && !checkValue->IsUndefined())
-        {
-          Local<v8::Value> argv[1] = {
-            Nan::To<v8::Object>(checkValue).ToLocalChecked()
+      if (!callbackErrorHandle.IsEmpty()) {
+        v8::Local<v8::Value> maybeError = Nan::New(callbackErrorHandle);
+        if (!maybeError->IsNull() && !maybeError->IsUndefined()) {
+          v8::Local<v8::Value> argv[1] = {
+            maybeError
           };
           callback->Call(1, argv, async_resource);
           callbackFired = true;
-          break;
-        }
-
-        Local<v8::Array> properties = Nan::GetPropertyNames(nodeObj).ToLocalChecked();
-        for (unsigned int propIndex = 0; propIndex < properties->Length(); ++propIndex)
-        {
-          Local<v8::String> propName = Nan::To<v8::String>(Nan::Get(properties, propIndex).ToLocalChecked()).ToLocalChecked();
-          Local<v8::Value> nodeToQueue = Nan::Get(nodeObj, propName).ToLocalChecked();
-          if (!nodeToQueue->IsUndefined())
-          {
-            workerArguments.push(nodeToQueue);
-          }
         }
       }
 
@@ -1259,6 +1277,8 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
       callback->Call(0, NULL, async_resource);
     }
   }
+
+  delete baton;
 }
 
         // Note: commit is not owned by this class (must be freed elsewhere)
@@ -1285,6 +1305,11 @@ public:
     }
   }
 
+  FileHistoryEvent(const FileHistoryEvent &) = delete;
+  FileHistoryEvent(FileHistoryEvent &&) = delete;
+  FileHistoryEvent &operator=(const FileHistoryEvent &) = delete;
+  FileHistoryEvent &operator=(FileHistoryEvent &&) = delete;
+
   ~FileHistoryEvent() {
     if (commit != NULL) {
       git_commit_free(commit);
@@ -1293,7 +1318,7 @@ public:
 
   v8::Local<v8::Value> toJavascript() {
     v8::Local<v8::Object> historyEntry = Nan::New<v8::Object>();
-    v8::Local<v8::Array> owners = Nan::New<Array>(1);
+    v8::Local<v8::Array> owners = Nan::New<Array>(0);
     Nan::Set(
       owners,
       Nan::New<v8::Number>(owners->Length()),
@@ -1451,11 +1476,11 @@ NAN_METHOD(GitRevwalk::FileHistoryWalk)
     return Nan::ThrowError("Max count is required and must be a number.");
   }
 
-  if (info.Length() == 2 || !info[2]->IsFunction()) {
+  if (!info[info.Length() - 1]->IsFunction()) {
     return Nan::ThrowError("Callback is required and must be a Function.");
   }
 
-  FileHistoryWalkBaton* baton = new FileHistoryWalkBaton;
+  FileHistoryWalkBaton* baton = new FileHistoryWalkBaton();
 
   baton->error_code = GIT_OK;
   baton->error = NULL;
@@ -1466,14 +1491,21 @@ NAN_METHOD(GitRevwalk::FileHistoryWalk)
   baton->out->reserve(baton->max_count);
   baton->walk = Nan::ObjectWrap::Unwrap<GitRevwalk>(info.This())->GetValue();
 
-  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[2]));
-  FileHistoryWalkWorker *worker = new FileHistoryWalkWorker(baton, callback);
-  worker->SaveToPersistent("fileHistoryWalk", info.This());
+  Nan::Callback *callback = new Nan::Callback(Local<Function>::Cast(info[info.Length() - 1]));
+  std::map<std::string, std::shared_ptr<nodegit::CleanupHandle>> cleanupHandles;
+  FileHistoryWalkWorker *worker = new FileHistoryWalkWorker(baton, callback, cleanupHandles);
+  worker->Reference<GitRevwalk>("fileHistoryWalk", info.This());
 
-  Nan::AsyncQueueWorker(worker);
+  nodegit::Context *nodegitContext = reinterpret_cast<nodegit::Context *>(info.Data().As<External>()->Value());
+  nodegitContext->QueueWorker(worker);
   return;
 }
 
+nodegit::LockMaster GitRevwalk::FileHistoryWalkWorker::AcquireLocks() {
+  nodegit::LockMaster lockMaster(true);
+  return lockMaster;
+}
+
 void GitRevwalk::FileHistoryWalkWorker::Execute()
 {
   git_repository *repo = git_revwalk_repository(baton->walk);
@@ -1681,6 +1713,26 @@ void GitRevwalk::FileHistoryWalkWorker::Execute()
   baton->file_path = NULL;
 }
 
+void GitRevwalk::FileHistoryWalkWorker::HandleErrorCallback() {
+  if (baton->error) {
+    if (baton->error->message) {
+      free((void *)baton->error->message);
+    }
+
+    free((void *)baton->error);
+  }
+
+  for (unsigned int i = 0; i < baton->out->size(); ++i) {
+    delete static_cast<FileHistoryEvent *>(baton->out->at(i));
+  }
+
+  delete baton->out;
+
+  free((void *)baton->file_path);
+
+  delete baton;
+}
+
 void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
 {
   if (baton->out != NULL) {
@@ -1738,6 +1790,8 @@ void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
   }
 
   callback->Call(0, NULL, async_resource);
+
+  delete baton;
 }
 
     // force base class template instantiation, to make sure we get all the