Removed sha method from C++ commit, commit js uses commit's Oid sha method

faceleg · faceleg · commit 3467803b6d47 · 2013-04-03T22:11:48.000+13:00
diff --git a/include/commit.h b/include/commit.h
@@ -16,8 +16,6 @@
 #include "oid.h"
 #include "tree.h"
 
-#include "../include/functions/string.h"
-
 using namespace node;
 using namespace v8;
 
@@ -55,10 +53,6 @@ class GitCommit : public ObjectWrap {
 
     static Handle<Value> Oid(const Arguments& args);
 
-    static Handle<Value> Sha(const Arguments& args);
-    static void ShaWork(uv_work_t* req);
-    static void ShaAfterWork(uv_work_t* req);
-
     static Handle<Value> Message(const Arguments& args);
     static void MessageWork(uv_work_t* req);
     static void MessageAfterWork(uv_work_t* req);
@@ -103,15 +97,6 @@ class GitCommit : public ObjectWrap {
       Persistent<Function> callback;
     };
 
-    struct ShaBaton {
-      uv_work_t request;
-
-      git_oid* rawOid;
-      char sha[GIT_OID_HEXSZ + 1];
-
-      Persistent<Function> callback;
-    };
-
     struct MessageBaton {
       uv_work_t request;
 
diff --git a/lib/commit.js b/lib/commit.js
@@ -74,10 +74,16 @@ Commit.prototype.sha = function(callback) {
    * @param {GitError|null} error An Error or null if successful.
    * @param {String|null} sha Retrieved SHA.
    */
-  this.rawCommit.sha(function(error, sha) {
-    if (success(error, callback)) {
-      callback(null, sha);
+  this.oid(function(error, oid) {
+    if (!success(error, callback)) {
+      return;
     }
+    oid.sha(function(error, sha) {
+      if (!success(error, callback)) {
+        return;
+      }
+      callback(null, sha);
+    });
   });
 };
 
diff --git a/src/commit.cc b/src/commit.cc
@@ -5,9 +5,9 @@
  * Dual licensed under the MIT and GPL licenses.
  */
 
-#include <string.h>
 #include <v8.h>
 #include <node.h>
+#include <string.h>
 
 #include "git2.h"
 #include "cvv8/v8-convert.hpp"
@@ -21,6 +21,7 @@
 #include "../include/error.h"
 
 #include "../include/functions/utilities.h"
+#include "../include/functions/string.h"
 
 using namespace v8;
 using namespace cvv8;
@@ -36,7 +37,6 @@ void GitCommit::Initialize(Handle<Object> target) {
 
   NODE_SET_PROTOTYPE_METHOD(tpl, "lookup", Lookup);
   NODE_SET_PROTOTYPE_METHOD(tpl, "oid", Oid);
-  NODE_SET_PROTOTYPE_METHOD(tpl, "sha", Sha);
   NODE_SET_PROTOTYPE_METHOD(tpl, "message", Message);
   NODE_SET_PROTOTYPE_METHOD(tpl, "time", Time);
   NODE_SET_PROTOTYPE_METHOD(tpl, "offset", Offset);
@@ -162,45 +162,6 @@ Handle<Value> GitCommit::Oid(const Arguments& args) {
   return scope.Close(oid);
 }
 
-Handle<Value> GitCommit::Sha(const Arguments& args) {
-  HandleScope scope;
-
-  if(args.Length() == 0 || !args[0]->IsFunction()) {
-    return ThrowException(Exception::Error(String::New("Callback is required and must be a Function.")));
-  }
-
-  ShaBaton* baton = new ShaBaton;
-  baton->request.data = baton;
-  baton->rawOid = ObjectWrap::Unwrap<GitCommit>(args.This())->oid;
-  baton->callback = Persistent<Function>::New(Local<Function>::Cast(args[0]));
-
-  uv_queue_work(uv_default_loop(), &baton->request, ShaWork, (uv_after_work_cb)ShaAfterWork);
-
-  return Undefined();
-}
-void GitCommit::ShaWork(uv_work_t* req) {
-  ShaBaton *baton = static_cast<ShaBaton *>(req->data);
-
-  baton->sha[GIT_OID_HEXSZ] = '\0';
-  git_oid_fmt(baton->sha, baton->rawOid);
-}
-void GitCommit::ShaAfterWork(uv_work_t* req) {
-  HandleScope scope;
-  ShaBaton *baton = static_cast<ShaBaton *>(req->data);
-
-  Handle<Value> argv[2] = {
-    Local<Value>::New(Null()),
-    String::New(baton->sha)
-  };
-
-  TryCatch try_catch;
-  baton->callback->Call(Context::GetCurrent()->Global(), 2, argv);
-  if (try_catch.HasCaught()) {
-    node::FatalException(try_catch);
-  }
-  delete req;
-}
-
 Handle<Value> GitCommit::Message(const Arguments& args) {
   HandleScope scope;
 
