git_remote_load is renamed to git_remote_lookup

John Haley · John Haley · commit 2d461d08c3c7 · 2015-02-13T10:38:33.000-07:00
diff --git a/lib/remote.js b/lib/remote.js
@@ -1,5 +1,6 @@
 var NodeGit = require("../");
 var normalizeOptions = require("./util/normalize_options");
+var lookupWrapper = require("./util/lookupWrapper");
 
 var Remote = NodeGit.Remote;
 var setCallbacks = Remote.prototype.setCallbacks;
@@ -10,4 +11,13 @@ Remote.prototype.setCallbacks = function(callbacks) {
   return setCallbacks.call(this, callbacks);
 };
 
+/**
+ * Retrieves the remote by name
+ * @param {Repository} repo The repo that the remote lives in
+ * @param {String|Remote} name The remote to lookup
+ * @param {Function} callback
+ * @return {Remote}
+ */
+Remote.lookup = lookupWrapper(Remote);
+
 module.exports = Remote;
diff --git a/lib/repository.js b/lib/repository.js
@@ -501,7 +501,7 @@ Repository.prototype.getRemote = function(remote, callback) {
     }, callback);
   }
 
-  return NodeGit.Remote.load(this, remote).then(function(remoteObj) {
+  return NodeGit.Remote.lookup(this, remote).then(function(remoteObj) {
     if (typeof callback === "function") {
       callback(null, remoteObj);
     }
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -19,7 +19,7 @@ describe("Remote", function() {
     ]).catch(function() {});
 
     function removeOrigin(origin) {
-      return Remote.load(repository, origin)
+      return Remote.lookup(repository, origin)
         .then(function(remote) {
           remote.delete();
         });
@@ -33,7 +33,7 @@ describe("Remote", function() {
       .then(function(repository) {
         test.repository = repository;
 
-        return Remote.load(repository, "origin");
+        return Remote.lookup(repository, "origin");
       })
       .then(function(remote) {
         test.remote = remote;
@@ -81,7 +81,7 @@ describe("Remote", function() {
 
     return Remote.create(repository, "origin2", url)
       .then(function() {
-        return Remote.load(repository, "origin2");
+        return Remote.lookup(repository, "origin2");
       })
       .then(function(remote) {
         assert(remote.url(), url);
@@ -98,7 +98,7 @@ describe("Remote", function() {
         remote.delete();
       })
       .then(function() {
-        return Remote.load(repository, "origin3");
+        return Remote.lookup(repository, "origin3");
       })
       .then(Promise.reject, Promise.resolve);
   });

Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ Repository.prototype.getRemote = function(remote, callback) {`
`501`	`501`	`}, callback);`
`502`	`502`	`}`
`503`	`503`
`504`		`- return NodeGit.Remote.load(this, remote).then(function(remoteObj) {`
	`504`	`+ return NodeGit.Remote.lookup(this, remote).then(function(remoteObj) {`
`505`	`505`	`if (typeof callback === "function") {`
`506`	`506`	`callback(null, remoteObj);`
`507`	`507`	`}`