Add git_reset with test cases

John Haley · John Haley · commit c01531ee7b6e · 2015-02-19T14:58:15.000-07:00
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -1416,6 +1416,17 @@
     "reset": {
       "functions": {
         "git_reset": {
+          "args": {
+            "checkout_opts": {
+              "isOptional": true
+            },
+            "log_message": {
+              "isOptional": true
+            },
+            "signature": {
+              "isOptional": true
+            }
+          },
           "isAsync": true,
           "return": {
             "isErrorCode": true
diff --git a/lib/reset.js b/lib/reset.js
@@ -9,11 +9,17 @@ Reset.default = function(repo, target, pathspecs) {
 };
 
 var reset = Reset.reset;
-Reset.reset = function(target, resetType, checkoutOpts, signature, logMessage) {
+Reset.reset = function( repo,
+                        target,
+                        resetType,
+                        checkoutOpts,
+                        signature,
+                        logMessage) {
   checkoutOpts = normalizeOptions(checkoutOpts, NodeGit.CheckoutOptions);
 
   return reset.call(
     this,
+    repo,
     target,
     resetType,
     checkoutOpts,
diff --git a/test/tests/reset.js b/test/tests/reset.js
@@ -1,6 +1,8 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
+var promisify = require("promisify-node");
+var fse = promisify(require("fs-extra"));
 
 describe("Reset", function() {
   var Repository = require(local("../../lib/repository"));
@@ -72,6 +74,146 @@ describe("Reset", function() {
 
       assert(resetContents != currentCommitContents);
       assert(resetContents == previousCommitContents);
+    })
+    .then(function() {
+      return Reset.default(test.repo, test.currentCommit, filePath);
+    })
+    .then(function() {
+      return test.repo.openIndex();
+    })
+    .then(function(index) {
+      return index.writeTree();
+    })
+    .then(function(oid) {
+      return test.repo.getTree(oid);
+    })
+    .then(function(tree) {
+      return tree.getEntry(filePath);
+    })
+    .then(function(entry) {
+      return entry.getBlob();
+    })
+    .then(function(blob) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+      var previousCommitContents = test.previousCommitBlob.toString();
+      var resetContents = blob.toString();
+
+      assert(resetContents == currentCommitContents);
+      assert(resetContents != previousCommitContents);
+    });
+  });
+
+  it("can perform a soft reset", function() {
+    var test = this;
+
+    return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.SOFT)
+    .then(function() {
+      return test.repo.openIndex();
+    })
+    .then(function(index) {
+      return index.writeTree();
+    })
+    .then(function(oid) {
+      return test.repo.getTree(oid);
+    })
+    .then(function(tree) {
+      return tree.getEntry(filePath);
+    })
+    .then(function(entry) {
+      return entry.getBlob();
+    })
+    .then(function(blob) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+      var previousCommitContents = test.previousCommitBlob.toString();
+      var resetContents = blob.toString();
+
+      // With a soft reset all of the changes should be in the index
+      // still so the index should still == what we had at the current
+      // commit and not the one we reset to
+      assert(resetContents == currentCommitContents);
+      assert(resetContents != previousCommitContents);
+
+      return Reset.reset(test.repo, test.currentCommit, Reset.TYPE.HARD);
+    });
+  });
+
+  it("can perform a mixed reset", function() {
+    var test = this;
+
+    return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.MIXED)
+    .then(function() {
+      return test.repo.openIndex();
+    })
+    .then(function(index) {
+      return index.writeTree();
+    })
+    .then(function(oid) {
+      return test.repo.getTree(oid);
+    })
+    .then(function(tree) {
+      return tree.getEntry(filePath);
+    })
+    .then(function(entry) {
+      return entry.getBlob();
+    })
+    .then(function(blob) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+      var previousCommitContents = test.previousCommitBlob.toString();
+      var resetContents = blob.toString();
+
+      // With a mixed reset all of the changes should removed from the index
+      // but still in the working directory. (i.e. unstaged)
+      assert(resetContents != currentCommitContents);
+      assert(resetContents == previousCommitContents);
+
+      return fse.readFile(path.join(test.repo.workdir(), filePath));
+    })
+    .then(function(fileContents) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+
+      assert(fileContents == currentCommitContents);
+
+      return Reset.reset(test.repo, test.currentCommit, Reset.TYPE.HARD);
+    });
+  });
+
+  it("can perform a hard reset", function() {
+    var test = this;
+
+    return Reset.reset(test.repo, test.previousCommit, Reset.TYPE.HARD)
+    .then(function() {
+      return test.repo.openIndex();
+    })
+    .then(function(index) {
+      return index.writeTree();
+    })
+    .then(function(oid) {
+      return test.repo.getTree(oid);
+    })
+    .then(function(tree) {
+      return tree.getEntry(filePath);
+    })
+    .then(function(entry) {
+      return entry.getBlob();
+    })
+    .then(function(blob) {
+      var currentCommitContents = test.currentCommitBlob.toString();
+      var previousCommitContents = test.previousCommitBlob.toString();
+      var resetContents = blob.toString();
+
+      // With a hard reset all of the changes should removed from the index
+      // and also removed from the working directory
+      assert(resetContents != currentCommitContents);
+      assert(resetContents == previousCommitContents);
+
+      return fse.readFile(path.join(test.repo.workdir(), filePath));
+    })
+    .then(function(fileContents) {
+      var previousCommitContents = test.previousCommitBlob.toString();
+
+      assert(fileContents == previousCommitContents);
+
+      return Reset.reset(test.repo, test.currentCommit, Reset.TYPE.HARD);
     });
   });
 });
