move oid from forced c++ method to javascript method

maxkorp · maxkorp · commit fd9b5f28611e · 2014-11-07T15:43:01.000-07:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -604,6 +604,7 @@
     "ignore": true
   },
   "oid": {
+    "shouldAlloc": true,
     "functions": {
       "git_oid_cpy": {
         "ignore": true
@@ -615,7 +616,8 @@
         "ignore": true
       },
       "git_oid_fromstr": {
-        "ignore": true
+        "jsFunctionName": "fromString",
+        "isAsync": false
       },
       "git_oid_fromstrn": {
         "ignore": true
@@ -639,7 +641,8 @@
         "ignore": true
       },
       "git_oid_tostr": {
-        "ignore": true
+        "ignore": true,
+        "jsFunctionName": "toString"
       }
     },
     "fields": {
diff --git a/generate/partials/async_function.cc b/generate/partials/async_function.cc
@@ -54,7 +54,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::Execute() {
     {%each args|argsInfo as arg %}
       {%-- turn the pointer into a ref --%}
     {%if arg.isReturn|and arg.cType|isDoublePointer %}&{%endif%}baton->{{ arg.name }}{%if not arg.lastArg %},{%endif%}
-    
+
     {%endeach%}
     );
 
@@ -113,7 +113,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
 
     {%each args as arg %}
       {%if arg.shouldAlloc %}
-    free(baton->{{ arg.name }});
+    free((void*)baton->{{ arg.name }});
       {%endif%}
     {%endeach%}
   }
diff --git a/lib/oid.js b/lib/oid.js
@@ -10,13 +10,6 @@ Object.defineProperties(Oid.prototype, {
   }
 });
 
-Object.defineProperties(Oid, {
-  "fromString": {
-    value: Oid.fromstr,
-    enumerable: false
-  }
-});
-
 Oid.prototype.inspect = function() {
   return "[Oid " + this.allocfmt() + "]";
 };
diff --git a/lib/repository.js b/lib/repository.js
@@ -115,7 +115,6 @@ Repository.prototype.getCommit = function(oid, callback) {
  */
 Repository.prototype.getBlob = function(oid, callback) {
   oid = normalizeOid(oid);
-
   var repository = this;
 
   return Blob.lookup(repository, oid).then(function(blob) {
diff --git a/lib/util/normalize_oid.js b/lib/util/normalize_oid.js
@@ -11,6 +11,7 @@ function normalizeOid(oid) {
     return typeof oid === "string" ? NodeGit.Oid.fromString(oid) : oid;
   }
   catch (ex) {
+    console.log(ex);
     return null;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ function normalizeOid(oid) {`
`11`	`11`	`return typeof oid === "string" ? NodeGit.Oid.fromString(oid) : oid;`
`12`	`12`	`}`
`13`	`13`	`catch (ex) {`
	`14`	`+ console.log(ex);`
`14`	`15`	`return null;`
`15`	`16`	`}`
`16`	`17`	`}`