Increased support for Push, Remote and Direction enums

John Haley · John Haley · commit 9d13f09d64af · 2014-11-24T13:10:28.000-07:00
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -946,9 +946,6 @@
     "push": {
       "cType": "git_push",
       "functions": {
-        "git_push_new": {
-          "ignore": true
-        },
         "git_push_set_callbacks": {
           "ignore": true
         },
diff --git a/generate/libgit2-supplement.json b/generate/libgit2-supplement.json
@@ -115,7 +115,22 @@
       [
         "git_direction",
         {
-          "type": "enum"
+          "type": "enum",
+          "description": "Enum to indicate the direction that a remote connection is going to go",
+          "fields": [
+            {
+              "type": "int",
+              "name": "GIT_DIRECTION_FETCH",
+              "comments": "Fetching from the remote repository",
+              "value": 0
+            },
+            {
+              "type": "int",
+              "name": "GIT_DIRECTION_PUSH",
+              "comments": "Pushing to a remote repository",
+              "value": 1
+            }
+          ]
         }
       ],
       [
diff --git a/lib/remote.js b/lib/remote.js
@@ -1,5 +1,13 @@
 var NodeGit = require("../");
+var normalizeOptions = require("./util/normalize_options");
 
 var Remote = NodeGit.Remote;
+var setCallbacks = Remote.prototype.setCallbacks;
+
+Remote.prototype.setCallbacks = function(callbacks) {
+  callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
+
+  return setCallbacks.call(this, callbacks);
+};
 
 module.exports = Remote;
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -4,6 +4,7 @@ var path = require("path");
 describe("Remote", function() {
   var reposPath = path.resolve("test/repos/workdir/.git");
 
+  var NodeGit = require("../../");
   var Repository = require("../../lib/repository");
   var Remote = require("../../lib/remote");
 
@@ -91,8 +92,8 @@ describe("Remote", function() {
     var repo = this.repository;
 
     return Remote.load(repo, "origin")
-    .then(function(remote) {
-      remote.connect(0);
+    .then(function(remote)
+      remote.connect(NodeGit.Enums.DIRECTION.FETCH);
       return remote.download();
     })
     .then(function() {

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,22 @@`
`115`	`115`	`[`
`116`	`116`	`"git_direction",`
`117`	`117`	`{`
`118`		`- "type": "enum"`
	`118`	`+ "type": "enum",`
	`119`	`+ "description": "Enum to indicate the direction that a remote connection is going to go",`
	`120`	`+ "fields": [`
	`121`	`+ {`
	`122`	`+ "type": "int",`
	`123`	`+ "name": "GIT_DIRECTION_FETCH",`
	`124`	`+ "comments": "Fetching from the remote repository",`
	`125`	`+ "value": 0`
	`126`	`+ },`
	`127`	`+ {`
	`128`	`+ "type": "int",`
	`129`	`+ "name": "GIT_DIRECTION_PUSH",`
	`130`	`+ "comments": "Pushing to a remote repository",`
	`131`	`+ "value": 1`
	`132`	`+ }`
	`133`	`+ ]`
`119`	`134`	`}`
`120`	`135`	`],`
`121`	`136`	`[`