Address Comments, fix ReachableFromAny

zawata · zawata · commit f7d63bb9fcb9 · 2022-04-04T10:02:45.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1679,7 +1679,7 @@
           },
           "isAsync": true,
           "return": {
-            "isErrorCode": true
+            "isResultOrError": true
           }
         }
       }
diff --git a/generate/templates/partials/configurable_callbacks.cc b/generate/templates/partials/configurable_callbacks.cc
@@ -1,4 +1,3 @@
-#include <git2/oid.h>
 {% each fields|fieldsInfo as field %}
   {% if not field.ignore %}
     {% if field.isCallbackFunction %}
diff --git a/generate/templates/partials/convert_from_v8.cc b/generate/templates/partials/convert_from_v8.cc
@@ -49,12 +49,31 @@
 
   v8::Local<v8::Array> tmp_{{ name }} = v8::Local<v8::Array>::Cast(info[{{ jsArg }}]);
   from_{{ name }} = ({{ cType }})malloc(tmp_{{ name }}->Length() * sizeof({{ cType|unPointer }}));
-      for (unsigned int i = 0; i < tmp_{{ name }}->Length(); i++) {
+  for (unsigned int i = 0; i < tmp_{{ name }}->Length(); i++) {
     {%--
       // FIXME: should recursively call convertFromv8.
     --%}
-      from_{{ name }}[i] = {%if not cType|isDoublePointer %}*{%endif%}Nan::ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(Nan::To<v8::Object>(Nan::Get(tmp_{{ name }}, Nan::New(static_cast<double>(i))).ToLocalChecked()).ToLocalChecked())->GetValue();
+    const v8::Local<v8::Value> arrayVal = Nan::Get(tmp_{{ name }},i).ToLocalChecked();
+    {%if arrayElementCppClassName == 'GitOid'%}
+      if (arrayVal->IsString()) {
+        // Try and parse in a string to a git_oid
+        Nan::Utf8String oidString(Nan::To<v8::String>(arrayVal).ToLocalChecked());
+
+        if (git_oid_fromstr(&from_{{ name }}[i], (const char *) strdup(*oidString)) != GIT_OK) {
+          if (git_error_last()) {
+            return Nan::ThrowError(git_error_last()->message);
+          } else {
+            return Nan::ThrowError("Unknown Error");
+          }
+        }
+      }
+      else {
+        git_oid_cpy(&from_{{ name }}[i], Nan::ObjectWrap::Unwrap<GitOid>(Nan::To<v8::Object>(arrayVal).ToLocalChecked())->GetValue());
       }
+    {%else%}
+      from_{{ name }}[i] = Nan::ObjectWrap::Unwrap<{{ arrayElementCppClassName }}>(Nan::To<v8::Object>(arrayVal).ToLocalChecked())->GetValue();
+    {%endif%}
+  }
   {%elsif cppClassName == 'Function'%}
   {%elsif cppClassName == 'Buffer'%}
 
diff --git a/lib/graph.js b/lib/graph.js
@@ -0,0 +1,15 @@
+var NodeGit = require("../");
+
+var Graph = NodeGit.Graph;
+
+var _reachableFromAny = Graph.reachableFromAny;
+
+/**
+ * Determine if a commit is reachable from any of a list of commits by following parent edges.
+ * @param {repository} the repository where the commits exist
+ * @param {commit} a previously loaded commit
+ * @param {descendant_array} oids of the commits
+ */
+Graph.reachableFromAny = function(repository, commit, descendant_array) {
+  return _reachableFromAny(repository, commit, descendant_array, descendant_array.length);
+};
diff --git a/lib/rebase.js b/lib/rebase.js
@@ -11,7 +11,7 @@ function defaultRebaseOptions(repository, options, checkoutStrategy) {
      // options object is later re-used.
     options = Object.assign({}, options);
 
-    if(options.signingCb && !options.commitCreateCb) {
+    if (options.signingCb && !options.commitCreateCb) {
       console.warn("signingCb is deperecated, use commitCreateCb instead.");
 
       let signingCb = options.signingCb;
@@ -32,7 +32,6 @@ function defaultRebaseOptions(repository, options, checkoutStrategy) {
           tree,
           parents,
           signingCb).then((oid) => {
-            console.log(oid.toString());
             return oid;
           });
       };
diff --git a/test/tests/graph.js b/test/tests/graph.js
@@ -61,4 +61,18 @@ describe("Graph", function() {
         assert(~result.message.indexOf("object not found - no match for id"));
       });
   });
+
+  it("can tell if a commit is reachable from any of a list of commits", function() {
+    return Graph.reachableFromAny(
+      this.repository,
+      "32789a79e71fbc9e04d3eff7425e1771eb595150",
+      [
+        "1729c73906bb8467f4095c2f4044083016b4dfde",
+        "e0aeedcff0584ebe00aed2c03c8ecd10839df908"
+      ]
+    )
+      .then(function(result) {
+        assert.equal(result, 0);
+      });
+  });
 });
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -2528,7 +2528,6 @@ describe("Rebase", function() {
         assert.fail("should throw");
       })
       .catch((error) => {
-        console.log(error);
         assert(error.errno === NodeGit.Error.CODE.ITEROVER);
         assert.strictEqual(rebase.finish(ourSignature), 0);
         return NodeGit.Commit.extractSignature(

Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,7 @@`
`1679`	`1679`	`},`
`1680`	`1680`	`"isAsync": true,`
`1681`	`1681`	`"return": {`
`1682`		`- "isErrorCode": true`
	`1682`	`+ "isResultOrError": true`
`1683`	`1683`	`}`
`1684`	`1684`	`}`
`1685`	`1685`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include <git2/oid.h>`
`2`	`1`	`{% each fields\|fieldsInfo as field %}`
`3`	`2`	`{% if not field.ignore %}`
`4`	`3`	`{% if field.isCallbackFunction %}`