Fix Repository.prototype.fetchAll

John Haley · John Haley · commit 23562fe3c761 · 2015-07-27T13:04:07.000-07:00
It turns out that the promise chain was messed up with doing a fetch-all
with multiple remotes. This should fix it.

Additionally it will append the name of the remote onto all of the callbacks
so the caller can know which callback is for what remote.
diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js
@@ -71,6 +71,7 @@ var importExtension = function(name) {
 rawApi.Utils = {};
 require("./utils/lookup_wrapper");
 require("./utils/normalize_options");
+require("./utils/shallow_clone");
 
 // Load up extra types;
 require("./convenient_line");
diff --git a/lib/repository.js b/lib/repository.js
@@ -4,6 +4,7 @@ var Blob = NodeGit.Blob;
 var Checkout = NodeGit.Checkout;
 var Commit = NodeGit.Commit;
 var normalizeOptions = NodeGit.Utils.normalizeOptions;
+var shallowClone = NodeGit.Utils.shallowClone;
 var Reference = NodeGit.Reference;
 var Remote = NodeGit.Remote;
 var Repository = NodeGit.Repository;
@@ -648,22 +649,49 @@ Repository.prototype.fetchAll = function(
 {
   var repo = this;
 
-  return repo.getRemotes().then(function(remotes) {
-    var fetchPromise = Promise.resolve();
+  function createCallbackWrapper(fn, remote) {
+    return function() {
+      var args = Array.prototype.slice.call(arguments);
+      args.push(remote);
 
-    remotes.forEach(function(remote) {
-      fetchPromise.then(function() {
-        repo.fetch(remote, remoteCallbacks, autoTag, pruneAfter, callback);
-      });
-    });
+      return fn.apply(this, args);
+    }.bind(this);
+  }
 
-    return fetchPromise
-      .then(function() {
-        if (typeof callback === "function") {
-          callback();
+  remoteCallbacks = remoteCallbacks || {};
+
+  var credentials = remoteCallbacks.credentials;
+  var certificateCheck = remoteCallbacks.certificateCheck;
+  var transferProgress = remoteCallbacks.transferProgress;
+
+  return repo.getRemotes()
+    .then(function(remotes) {
+      return Promise.all(remotes.map(function(remote) {
+        var wrappedRemoteCallbacks = shallowClone(remoteCallbacks);
+
+        if (credentials) {
+          wrappedRemoteCallbacks.credentials =
+            createCallbackWrapper(credentials, remote);
         }
-      });
-  }, callback);
+
+        if (certificateCheck) {
+          wrappedRemoteCallbacks.certificateCheck =
+            createCallbackWrapper(certificateCheck, remote);
+        }
+
+        if (transferProgress) {
+          wrappedRemoteCallbacks.transferProgress =
+            createCallbackWrapper(transferProgress, remote);
+        }
+
+        return repo.fetch(remote, wrappedRemoteCallbacks, autoTag, pruneAfter);
+      }));
+    })
+    .then(function() {
+      if (typeof callback === "function") {
+        callback();
+      }
+    });
 };
 
 /**
diff --git a/lib/utils/shallow_clone.js b/lib/utils/shallow_clone.js
@@ -1,4 +1,6 @@
-module.exports = function(obj) {
+var NodeGit = require("../../");
+
+function shallowClone(obj) {
   var merges = Array.prototype.slice.call(arguments, 1);
 
   return merges.reduce(function(obj, merge) {
@@ -7,4 +9,6 @@ module.exports = function(obj) {
       return obj;
     }, obj);
   }, obj || {});
-};
+}
+
+NodeGit.Utils.shallowClone = module.exports = shallowClone;
