Bug fixes

nkallen · nkallen · commit baee388649cf · 2013-08-21T13:39:46.000-04:00
diff --git a/include/reference.h b/include/reference.h
@@ -46,7 +46,7 @@ class GitReference : public ObjectWrap {
       const char * name;
       Persistent<Function> callback;
     };
-    static Handle<Value> Oid(const Arguments& args);
+    static Handle<Value> Target(const Arguments& args);
     static Handle<Value> SymbolicTarget(const Arguments& args);
     static Handle<Value> Type(const Arguments& args);
     static Handle<Value> Name(const Arguments& args);
diff --git a/lib/reference.js b/lib/reference.js
@@ -7,24 +7,42 @@ Reference.Type = {
   All: 3
 };
 
-Reference.prototype.isOid = function() {
+/**
+ * Returns true if this reference is not symbolic
+ */
+Reference.prototype.isConcrete = function() {
   return this.type() == Reference.Type.Oid;
 };
 
+/**
+ * Returns true if this reference is symbolic
+ */
 Reference.prototype.isSymbolic = function() {
   return this.type() == Reference.Type.Symbolic;
 };
 
+/**
+ * Returns the target of this symbolic reference.
+ * @throws if the target is not symbolic.
+ */
 var oldSymbolicTarget = Reference.prototype.symbolicTarget;
 Reference.prototype.symbolicTarget = function() {
   if (!this.isSymbolic()) throw this.name() + " is not symbolic";
 
   return oldSymbolicTarget.call(this);
 };
 
-var oldOid = Reference.prototype.oid;
-Reference.prototype.oid = function() {
-  if (!this.isOid()) throw this.name() + " is not oid";
+/**
+ * Returns the oid of this non-symbolic reference.
+ * @throws if the target is symbolic.
+ */
+var oldTarget = Reference.prototype.target;
+Reference.prototype.target = function() {
+  if (!this.isConcrete()) throw this.name() + " is symbolic";
 
-  return oldOid.call(this);
+  return oldTarget.call(this);
 };
+
+Reference.prototype.toString = function() {
+ return this.name();
+}
diff --git a/lib/repo.js b/lib/repo.js
@@ -20,7 +20,7 @@ Repo.prototype.getBranch = function(name, callback) {
   this.getReference('refs/heads/' + name, function referenceLookupCallback(error, reference) {
     if (error) return callback(error);
 
-    self.getCommit(reference.oid(), function commitLookupCallback(error, commit) {
+    self.getCommit(reference.target(), function commitLookupCallback(error, commit) {
       if (error) return callback(error);
 
       callback(null, commit);
diff --git a/lib/tree.js b/lib/tree.js
@@ -47,9 +47,8 @@ Tree.prototype.getEntry = function(path, callback) {
   oldGetEntry.call(this, path, function(error, entry) {
     if (error) return callback(error);
 
-    // This is unlikely to be the *direct* parent; some methods, like `path()`
-    // rely on directness.
     entry.parent = self;
+    entry.path = function() { return path };
     callback(null, entry);
   });
 };
diff --git a/lib/tree_builder.js b/lib/tree_builder.js
@@ -43,12 +43,16 @@ TreeBuilder.prototype.write = function(callback) {
   this.doInsertions(function(error) {
     if (error) return callback(error);
 
-    if (self.builders.length) writeNextLevel(self.repo, self.builders, function(error, previousName, previousTreeId) {
-      if (previousName && previousTreeId) {
-        oldInsert.call(self, previousName, previousTreeId, TreeEntry.FileMode.Tree);
-      }
+    if (self.builders && self.builders.length) {
+      writeNextLevel(self.repo, self.builders, function(error, previousName, previousTreeId) {
+        if (previousName && previousTreeId) {
+          oldInsert.call(self, previousName, previousTreeId, TreeEntry.FileMode.Tree);
+        }
+        oldWrite.call(self, self.repo, callback);
+      });
+    } else {
       oldWrite.call(self, self.repo, callback);
-    });
+    }
   })
 };
 
diff --git a/lib/tree_entry.js b/lib/tree_entry.js
@@ -27,6 +27,7 @@ TreeEntry.prototype.isTree = function() {
 };
 
 TreeEntry.prototype.isDirectory = TreeEntry.prototype.isTree;
+TreeEntry.prototype.isBlob = TreeEntry.prototype.isFile;
 
 /**
  * Retrieve the SHA for this TreeEntry.
@@ -63,5 +64,5 @@ TreeEntry.prototype.path = function(callback) {
 };
 
 TreeEntry.prototype.toString = function() {
-  return this.name();
+  return this.path();
 };
diff --git a/src/reference.cc b/src/reference.cc
@@ -34,7 +34,7 @@ void GitReference::Initialize(Handle<v8::Object> target) {
   tpl->SetClassName(String::NewSymbol("Reference"));
 
   NODE_SET_METHOD(tpl, "oidForName", OidForName);
-  NODE_SET_PROTOTYPE_METHOD(tpl, "oid", Oid);
+  NODE_SET_PROTOTYPE_METHOD(tpl, "target", Target);
   NODE_SET_PROTOTYPE_METHOD(tpl, "symbolicTarget", SymbolicTarget);
   NODE_SET_PROTOTYPE_METHOD(tpl, "type", Type);
   NODE_SET_PROTOTYPE_METHOD(tpl, "name", Name);
@@ -169,7 +169,7 @@ void GitReference::OidForNameAfterWork(uv_work_t *req) {
 /**
  * @return {GitOid} result
  */
-Handle<Value> GitReference::Oid(const Arguments& args) {
+Handle<Value> GitReference::Target(const Arguments& args) {
   HandleScope scope;
   
 
diff --git a/v0.18.0.json b/v0.18.0.json
@@ -7944,8 +7944,8 @@
         "isAsync": false,
         "isConstructorMethod": false,
         "isPrototypeMethod": true,
-        "jsFunctionName": "oid",
-        "cppFunctionName": "Oid",
+        "jsFunctionName": "target",
+        "cppFunctionName": "Target",
         "return": {
           "cType": "const git_oid *",
           "cppClassName": "GitOid",
