Added tests for branch

John Haley · John Haley · commit e1caaa5a543f · 2014-11-20T14:43:15.000-07:00
create
delete
isHead
diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -85,9 +85,6 @@
     },
     "branch": {
       "functions": {
-        "git_branch_next": {
-          "ignore": true
-        },
         "git_branch_create": {
           "args": {
             "force": {
@@ -100,6 +97,20 @@
               "isOptional": true
             }
           }
+        },
+        "git_branch_next": {
+          "ignore": true
+        },
+        "git_branch_set_upstream": {
+          "isAsync": false,
+          "args": {
+            "upstream_name": {
+              "isOptional": true
+            }
+          }
+        },
+        "git_branch_upstream": {
+          "isAsync": false
         }
       }
     },
diff --git a/lib/branch.js b/lib/branch.js
@@ -0,0 +1,5 @@
+var NodeGit = require("../");
+
+var Branch = NodeGit.Branch;
+
+module.exports = Branch;
diff --git a/lib/refs.js b/lib/refs.js
@@ -1,6 +1,7 @@
 var NodeGit = require("../");
 
 var Reference = NodeGit.Refs;
+var Branch = NodeGit.Branch;
 
 Reference.Type = {
   Oid: 1,
@@ -32,4 +33,12 @@ Reference.prototype.toString = function() {
  return this.name();
 };
 
+/**
+ * Returns if the ref is pointed at by HEAD
+ * @return {bool}
+ */
+Reference.prototype.isHead = function() {
+  return Branch.isHead(this);
+};
+
 module.exports = Reference;
diff --git a/lib/repository.js b/lib/repository.js
@@ -18,16 +18,71 @@ Object.defineProperty(Repository.prototype, "openIndex", {
 });
 
 /**
- * Look up a branch"s most recent commit.
+ * Creates a branch with the passed in name pointing to the commit
+ *
+ * @param {String} name Branch name, e.g. "master"
+ * @param {Commit|String|Oid} commit The commit the branch will point to
+ * @param {bool} force Overwrite branch if it exists
+ * @param {Signature} signature Identity to use to populate reflog
+ * @param {String} logMessage One line message to be appended to the reflog
+ * @return {Ref}
+ */
+Repository.prototype.createBranch =
+function(name, commit, force, signature, logMessage) {
+  var repo = this;
+
+  if (commit instanceof Commit) {
+    return NodeGit.Branch.create(
+      repo,
+      name,
+      commit,
+      force ? 1 : 0,
+      signature,
+      logMessage);
+  }
+  else {
+    return repo.getCommit(commit).then(function(commit) {
+      return NodeGit.Branch.create(
+        repo,
+        name,
+        commit,
+        force ? 1 : 0,
+        signature,
+        logMessage);
+    });
+  }
+};
+
+/**
+ * Look up a branch
+ *
+ * @param {String} name Branch name, e.g. "master"
+ * @param {Function} callback
+ * @return {Ref}
+ */
+Repository.prototype.getBranch = function(name, callback) {
+  name = ~name.indexOf("refs/heads/") ? name : "refs/heads/" + name;
+
+  return this.getReference(name).then(function(reference) {
+    if (typeof callback === "function") {
+      callback(null, reference);
+    }
+
+    return reference;
+  }, callback);
+};
+
+/**
+ * Look up a branch's most recent commit.
  *
  * @param {String} name Branch name, e.g. "master"
  * @param {Function} callback
- * @return {Branch}
+ * @return {Commit}
  */
 Repository.prototype.getBranchCommit = function(name, callback) {
   var repository = this;
 
-  return this.getReference("refs/heads/" + name).then(function(reference) {
+  return this.getBranch(name).then(function(reference) {
     return repository.getCommit(reference.target()).then(function(commit) {
       if (typeof callback === "function") {
         callback(null, commit);
@@ -265,7 +320,7 @@ Repository.prototype.createRevWalk = function() {
  * Retrieve the master branch commit.
  *
  * @param {Function} callback
- * @return {Branch}
+ * @return {Commit}
  */
 Repository.prototype.getMasterCommit = function(callback) {
   return this.getBranchCommit("master", callback);
diff --git a/test/tests/branch.js b/test/tests/branch.js
@@ -0,0 +1,63 @@
+var assert = require("assert");
+var path = require("path");
+
+describe("Branch", function() {
+  var reposPath = path.resolve("test/repos/workdir/.git");
+
+  var Repository = require("../../lib/repository");
+  var Branch = require("../../lib/branch");
+  var branchName = "test-branch";
+  var fullBranchName = "refs/heads/" + branchName;
+
+  before(function() {
+    var test = this;
+
+    return Repository.open(reposPath).then(function(repository) {
+      test.repo = repository;
+    });
+  });
+
+  beforeEach(function() {
+    var test = this;
+    var repo = test.repo;
+
+    return repo.getMasterCommit().then(function(masterCommit) {
+      test.masterCommit = masterCommit;
+
+      return repo.createBranch(branchName, masterCommit, true)
+      .then(function(branch) {
+        test.branch = branch;
+      });
+    });
+  });
+
+  it("can create a branch", function() {
+    var branch = this.branch;
+    var masterCommit = this.masterCommit;
+
+    assert.equal(branch.name(), fullBranchName);
+    assert.equal(branch.target().toString(), masterCommit.sha());
+  });
+
+  it("can delete a branch", function() {
+    var repo = this.repo;
+
+    Branch.delete(this.branch);
+
+    return repo.getBranch(branchName).then(function() {
+      // branch wasn't deleted
+      assert.ok(false);
+    }, function() {
+      // branch was deleted!
+      assert.ok(true);
+    });
+  });
+
+  it("can see if the branch is pointed to by head", function() {
+    var repo = this.repo;
+
+    return repo.getBranch("master").then(function(branch) {
+      assert.ok(branch.isHead());
+    });
+  });
+});
