Remove nodegit-promise

srajko · srajko · commit 8dae154aa00b · 2016-01-12T20:18:20.000-07:00
diff --git a/.jshintrc b/.jshintrc
@@ -18,7 +18,7 @@
   "maxlen": 80,
   "node": true,
   "predef": [
-    "-Promise"
+    "Promise"
   ],
   "proto": true,
   "quotmark": "double",
diff --git a/examples/general.js b/examples/general.js
@@ -1,6 +1,5 @@
 var nodegit = require("../");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var oid;
 var odb;
 var repo;
diff --git a/examples/index-add-and-remove.js b/examples/index-add-and-remove.js
@@ -1,6 +1,5 @@
 var nodegit = require("../");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
diff --git a/generate/index.js b/generate/index.js
@@ -1,4 +1,3 @@
-var Promise = require('nodegit-promise');
 var generateJson = require("./scripts/generateJson");
 var generateNativeCode = require("./scripts/generateNativeCode");
 var generateMissingTests = require("./scripts/generateMissingTests");
diff --git a/generate/scripts/generateMissingTests.js b/generate/scripts/generateMissingTests.js
@@ -1,5 +1,4 @@
 const path = require("path");
-const Promise = require("nodegit-promise");
 const promisify = require("promisify-node");
 const fse = promisify(require("fs-extra"));
 const utils = require("./utils");
diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js
@@ -1,4 +1,3 @@
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var rawApi;
 
diff --git a/lib/commit.js b/lib/commit.js
@@ -1,5 +1,4 @@
 var events = require("events");
-var Promise = require("nodegit-promise");
 var NodeGit = require("../");
 var Commit = NodeGit.Commit;
 var LookupWrapper = NodeGit.Utils.lookupWrapper;
diff --git a/lib/convenient_hunk.js b/lib/convenient_hunk.js
@@ -1,5 +1,4 @@
 var NodeGit = require("../");
-var Promise = require("nodegit-promise");
 var ConvenientLine = NodeGit.ConvenientLine;
 
 function ConvenientHunk(hunk, linesInHunk, patch, i) {
diff --git a/lib/convenient_patch.js b/lib/convenient_patch.js
@@ -1,5 +1,4 @@
 var NodeGit = require("../");
-var Promise = require("nodegit-promise");
 var Diff = NodeGit.Diff;
 var ConvenientHunk = NodeGit.ConvenientHunk;
 
diff --git a/lib/diff.js b/lib/diff.js
@@ -1,5 +1,4 @@
 var NodeGit = require("../");
-var Promise = require("nodegit-promise");
 var Diff = NodeGit.Diff;
 var ConvenientPatch = NodeGit.ConvenientPatch;
 var normalizeOptions = NodeGit.Utils.normalizeOptions;
diff --git a/lib/merge.js b/lib/merge.js
@@ -1,6 +1,5 @@
 var NodeGit = require("../");
 var normalizeOptions = NodeGit.Utils.normalizeOptions;
-var Promise = require("nodegit-promise");
 
 var Merge = NodeGit.Merge;
 var mergeCommits = Merge.commits;
diff --git a/lib/repository.js b/lib/repository.js
@@ -1,4 +1,3 @@
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 var NodeGit = require("../");
diff --git a/lib/revwalk.js b/lib/revwalk.js
@@ -1,6 +1,5 @@
 var NodeGit = require("../");
 var Revwalk = NodeGit.Revwalk;
-var Promise = require("nodegit-promise");
 
 Object.defineProperty(Revwalk.prototype, "repo", {
   get: function () { return this.repository(); }
diff --git a/lib/utils/lookup_wrapper.js b/lib/utils/lookup_wrapper.js
@@ -1,4 +1,3 @@
-var Promise = require("nodegit-promise");
 var NodeGit = require("../../");
 
 /**
diff --git a/lifecycleScripts/configureLibssh2.js b/lifecycleScripts/configureLibssh2.js
@@ -1,4 +1,3 @@
-var Promise = require("nodegit-promise");
 var cp = require("child_process");
 var path = require("path");
 var rooted = path.join.bind(path, __dirname, "..");
diff --git a/lifecycleScripts/prepareForBuild.js b/lifecycleScripts/prepareForBuild.js
@@ -1,4 +1,3 @@
-var Promise = require("nodegit-promise");
 var cp = require("child_process");
 var path = require("path");
 
diff --git a/package.json b/package.json
@@ -39,7 +39,6 @@
   "dependencies": {
     "fs-extra": "~0.26.2",
     "node-pre-gyp": "~0.6.15",
-    "nodegit-promise": "~4.0.0",
     "promisify-node": "~0.3.0"
   },
   "devDependencies": {
diff --git a/test/tests/branch.js b/test/tests/branch.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var local = path.join.bind(path, __dirname);
 
 describe("Branch", function() {
@@ -46,7 +45,7 @@ describe("Branch", function() {
 
     return repo.getBranch(branchName)
       // Reverse the results, since if we found it it wasn't deleted
-      .then(Promise.reject, Promise.resolve);
+      .then(Promise.reject.bind(Promise), Promise.resolve.bind(Promise));
   });
 
   it("can see if the branch is pointed to by head", function() {
diff --git a/test/tests/checkout.js b/test/tests/checkout.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var fse = require("fs-extra");
 var local = path.join.bind(path, __dirname);
 
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
diff --git a/test/tests/diff.js b/test/tests/diff.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 
diff --git a/test/tests/index.js b/test/tests/index.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
diff --git a/test/tests/patch.js b/test/tests/patch.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var local = path.join.bind(path, __dirname);
 
 describe("Patch", function() {
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
@@ -1046,7 +1045,7 @@ describe("Rebase", function() {
 
             return repository.continueRebase(ourSignature, function(rebase) {
               assert.ok(rebase instanceof NodeGit.Rebase);
-              
+
               nextCalls++;
 
               return Promise.resolve();
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var local = path.join.bind(path, __dirname);
 
 describe("Remote", function() {
@@ -92,7 +91,7 @@ describe("Remote", function() {
       .then(function() {
         return Remote.lookup(repository, "origin3");
       })
-      .then(Promise.reject, Promise.resolve);
+      .then(Promise.reject.bind(Promise), Promise.resolve.bind(Promise));
   });
 
   it("can download from a remote", function() {
@@ -293,10 +292,10 @@ describe("Remote", function() {
           callbacks: {
             credentials: function(url, userName) {
               var test = Promise.resolve()
-                .then(Promise.resolve)
-                .then(Promise.resolve)
-                .then(Promise.resolve)
-                .then(Promise.reject);
+                .then(Promise.resolve.bind(Promise))
+                .then(Promise.resolve.bind(Promise))
+                .then(Promise.resolve.bind(Promise))
+                .then(Promise.reject.bind(Promise));
               return test;
             },
             certificateCheck: function() {
diff --git a/test/tests/repository.js b/test/tests/repository.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 
diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var Promise = require("nodegit-promise");
 
 describe("Revwalk", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/signature.js b/test/tests/signature.js
@@ -2,7 +2,6 @@ var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 
 // Have to wrap exec, since it has a weird callback signature.
 var exec = promisify(function(command, opts, callback) {
diff --git a/test/tests/stage.js b/test/tests/stage.js
@@ -1,6 +1,5 @@
 var assert = require("assert");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
diff --git a/test/tests/stash.js b/test/tests/stash.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 
diff --git a/test/tests/status.js b/test/tests/status.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 var exec = promisify(function(command, opts, callback) {
diff --git a/test/tests/status_list.js b/test/tests/status_list.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var promisify = require("promisify-node");
-var Promise = require("nodegit-promise");
 var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 var exec = promisify(function(command, opts, callback) {
diff --git a/test/tests/tag.js b/test/tests/tag.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
-var Promise = require("nodegit-promise");
 
 describe("Tag", function() {
   var NodeGit = require("../../");
diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js
@@ -1,5 +1,4 @@
 var assert = require("assert");
-var Promise = require("nodegit-promise");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
 
@@ -44,7 +43,7 @@ describe("TreeEntry", function() {
 	  .then(function(entry) {
               assert.equal(entry.filenameLen(), 9);
 	  });
-  });  
+  });
 
   it("provides the filename", function() {
     return this.commit.getEntry("test/raw-commit.js")
diff --git a/test/utils/repository_setup.js b/test/utils/repository_setup.js
@@ -1,7 +1,6 @@
 var assert = require("assert");
 var NodeGit = require("../../");
 var path = require("path");
-var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-var Promise = require('nodegit-promise');`
`2`	`1`	`var generateJson = require("./scripts/generateJson");`
`3`	`2`	`var generateNativeCode = require("./scripts/generateNativeCode");`
`4`	`3`	`var generateMissingTests = require("./scripts/generateMissingTests");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const path = require("path");`
`2`		`-const Promise = require("nodegit-promise");`
`3`	`2`	`const promisify = require("promisify-node");`
`4`	`3`	`const fse = promisify(require("fs-extra"));`
`5`	`4`	`const utils = require("./utils");`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-var Promise = require("nodegit-promise");`
`2`	`1`	`var promisify = require("promisify-node");`
`3`	`2`	`var rawApi;`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var events = require("events");`
`2`		`-var Promise = require("nodegit-promise");`
`3`	`2`	`var NodeGit = require("../");`
`4`	`3`	`var Commit = NodeGit.Commit;`
`5`	`4`	`var LookupWrapper = NodeGit.Utils.lookupWrapper;`