Merge pull request #235 from nodegit/pr/234

tbranyen · tbranyen · commit 746c559c0442 · 2014-10-09T19:21:41.000-04:00
Add revwalk.hide and revwalk.simplifyFirstParent
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -156,7 +156,7 @@
           {},
           {},
           {},
-          { 
+          {
             "cType": "const git_commit **",
             "arrayElementCppClassName": "GitCommit"
           }
@@ -709,6 +709,21 @@
         }
       },
 
+      "git_revwalk_hide": {
+        "ignore": false,
+        "isAsync": false,
+        "args": [{ "isSelf": true, "isReturn": false }],
+        "return": {
+          "isErrorCode": true
+        }
+      },
+
+      "git_revwalk_simplify_first_parent": {
+        "ignore": false,
+        "isAsync": false,
+        "args": [{ "isSelf": true, "isReturn": false }]
+      },
+
       "git_revwalk_next": {
         "ignore": false,
         "args": [
diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js
@@ -0,0 +1,60 @@
+var assert = require("assert");
+var path = require("path");
+
+describe("Revwalk", function() {
+  var reposPath = path.resolve("test/repos/workdir/.git");
+
+  var Repository = require("../../lib/repository");
+  var Revwalk = require("../../lib/revwalk");
+  var Oid = require("../../lib/oid");
+
+  before(function() {
+    var test = this;
+
+    return Repository.open(reposPath).then(function(repository) {
+      test.repository = repository;
+      test.walker = repository.createRevWalk();
+
+      return test.repository.getMaster().then(function(master) {
+        test.master = master;
+        test.walker.push(test.master.id());
+      });
+    });
+  });
+
+  it("can create a walker", function() {
+    assert.ok(this.walker instanceof Revwalk);
+  });
+
+  it("can push an object", function() {
+    var sha = this.master.sha();
+
+    return this.walker.next().then(function(commit) {
+      assert.equal(sha, commit);
+    });
+  });
+
+  it("can hide an object", function() {
+    var test = this;
+
+    this.walker.hide(Oid.fromstr("a03e044fcb45c654d4e15a4e495a6a0c6e632854"));
+
+    return test.walker.next().then(function(commit) {
+      return test.walker.next().then(function(commit) {
+        assert.equal(commit, "1efa3354299ede235f90880383176fb5d48aaa89");
+      });
+    });
+  });
+
+  it("can simplify to first parent", function() {
+    var test = this;
+
+    test.walker.simplifyFirstParent();
+
+    return test.walker.next().then(function(commit) {
+      return test.walker.next().then(function(commit) {
+        assert.equal(commit, "231c550f3ec28874b4c426fc9eebad9a742e1332");
+      });
+    });
+  });
+});
