Implement isOptional.

tbranyen · tbranyen · commit 89bc1a85dc4e · 2014-06-29T17:01:37.000-04:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -126,8 +126,17 @@
   "diff": {
     "functions": {
       "git_diff_tree_to_tree": {
-        "ignore": true,
-        "args": [{ "isReturn": true }, { "isSelf": true }]
+        "isAsync": true,
+        "args": [
+          { "isReturn": true },
+          { "isSelf": true },
+          {},
+          {},
+          { "isOptional": true }
+        ],
+        "return": {
+          "isErrorCode": true
+        }
       }
     }
   },
diff --git a/generate/setup.js b/generate/setup.js
@@ -247,6 +247,12 @@ Object.keys(descriptor).forEach(function(fileName, index) {
         return file.jsClassName === typeMap[arg.type].js;
       };
 
+      var isOptional = function() {
+        if (manualArgs[index] && typeof manualArgs[index].isOptional === "boolean") {
+          return manualArgs[index].isOptional;
+        }
+      };
+
       var isReturn = function() {
         if (manualArgs[index] && typeof manualArgs[index].isReturn === "boolean") {
           return manualArgs[index].isReturn;
@@ -273,6 +279,7 @@ Object.keys(descriptor).forEach(function(fileName, index) {
           cppClassName: typeMap[arg.type].cpp,
           jsClassName: typeMap[arg.type].js,
           comment: arg.comment,
+          isOptional: isOptional() || true,
           isReturn: isReturn() || false,
           isSelf: isSelf() || false,
           shouldAlloc: manualArgs[index] ? manualArgs[index].shouldAlloc || false : false
diff --git a/lib/tree.js b/lib/tree.js
@@ -1,5 +1,7 @@
 var git = require('../');
 var Tree = git.Tree;
+var Diff = git.Diff;
+var DiffOptions = git.DiffOptions;
 var TreeEntry = require('./tree_entry');
 var events = require('events');
 var path = require('path');
@@ -8,6 +10,7 @@ var oldBuilder = Tree.prototype.builder;
 var oldEntryByIndex = Tree.prototype.entryByindex;
 var oldEntryByName = Tree.prototype.entryByname;
 var oldGetEntry = Tree.prototype.entryBypath;
+var oldTreeToTree = Diff.prototype.treeToTree;
 
 // Backwards compatibility.
 Object.defineProperties(Tree.prototype, {
@@ -23,8 +26,8 @@ Object.defineProperties(Tree.prototype, {
  * @param {Function} callback
  * @return {DiffList}
  */
-Tree.prototype.diff = function(that, callback) {
-  this.diffTree(this.repo, that, null, callback);
+Tree.prototype.diff = function(tree, callback) {
+  oldTreeToTree.call(this.repo, tree, this, null, callback);
 };
 
 /**
diff --git a/test/commit.js b/test/commit.js
@@ -225,18 +225,17 @@ exports.tree = function(test) {
 /**
  * Test that getDiff works as expected.
  */
-//exports.getDiff = function(test) {
-//  test.expect(1);
-//  git.Repo.open('repos/workdir/.git', function(error, repository) {
-//    repository.getCommit(historyCountKnownSHA, function(error, commit) {
-//      commit.getDiff(function(error, diff) {
-//        console.log(error);
-//        test.equals(diff.length, 1, 'Should be one item in parents diff trees');
-//        test.done();
-//      });
-//    });
-//  });
-//};
+exports.getDiff = function(test) {
+  test.expect(1);
+  git.Repo.open('repos/workdir/.git', function(error, repository) {
+    repository.getCommit(historyCountKnownSHA, function(error, commit) {
+      commit.getDiff(function(error, diff) {
+        test.equals(diff.length, 1, 'Should be one item in parents diff trees');
+        test.done();
+      });
+    });
+  });
+};
 
 process.on('uncaughtException', function(err) {
   console.log(err.stack);
