Various api improvements, updated readme

tbranyen · tbranyen · commit 2a900f56b6dc · 2011-03-08T17:36:50.000-05:00
diff --git a/Makefile b/Makefile
@@ -7,6 +7,11 @@ INSTALL_PATH = $(NODE_LIB_PATH)/nodegit
 
 all: build_bindings
 
+update: clean config build_bindings uninstall install
+
+config:
+	@@$(BASE)/configure
+
 build_bindings:
 	@@$(NODE_BLD) build
 
diff --git a/README.md b/README.md
@@ -47,6 +47,20 @@ __ Reading a repository and commit data: __
         // If success err will be 0, else throw an error message.
         if( err ) { throw err; }
 
+        // Work within the master branch
+        repo.branch( 'master', function( err, branch ) {
+            // If success err will be 0, else throw an error message.
+            if( err ) { throw err; }
+
+            // Iterate over the revision history
+            branch.history.each( function( i, commit ) {
+                // Emulator git log 
+                console.log( 'Author:', commit.author().name, '<' + commit.author().email + '>' );
+                console.log( 'Date:', commit.time().toDateString() );
+                console.log( commit.message() );
+            });
+        });
+
         // Read a commit with a SHA1
         this.commit( '5f2aa9407f7b3aeb531c621c3358953841ccfc98', function( err, commit ) {
             // If success err will be 0, else throw an error message.
diff --git a/example/convenience-repo.js b/example/convenience-repo.js
@@ -1,12 +1,12 @@
 var git = require( '../' );
 
-git.repo( '/home/tim/Projects/nodegit2/.git', function( err, repo ) {
+git.repo( require('path').normalize('../.git'), function( err, repo ) {
   if( err ) { throw err; }
  
   // Read a commit when you know the sha1
-  //repo.commit( 'd29b7fecf71d0ef4887071ac18dc87f40c2fd4e1', function( err, commit ) {
-  //  console.log( commit.tree() );
-  //});
+  repo.commit( 'd29b7fecf71d0ef4887071ac18dc87f40c2fd4e1', function( err, commit ) {
+    console.log( commit.tree() );
+  });
 
   // Read a commit when you know the name
   repo.head( 'master', function( err, head ) {
diff --git a/example/dummyrepo b/example/dummyrepo
diff --git a/lib/commit.js b/lib/commit.js
@@ -3,6 +3,21 @@ var git = require( '../' );
 var _Commit = function( obj ) {
   var self = {};
 
+  Object.defineProperty( self, 'history', {
+    get: function() {
+      // Partially apply the commit
+      var revwalk = git.revwalk( self.repo );
+      revwalk.each = function( callback ) {
+        return function( callback ) {
+          return revwalk.walk.apply( self.commit, [ self.commit, callback ] );
+        };
+      }();
+
+      return revwalk;
+    },
+    enumerable: true
+  });
+
   if( obj instanceof git.raw.Repo ) {
     self.repo = obj;
     self.commit = new git.raw.Commit( obj );
@@ -41,17 +56,17 @@ var _Commit = function( obj ) {
     return git.sig( sig );
   };
 
-  self.tree = function() {
-    var tree = new git.raw.Tree( self.repo );
-    if( tree.error ) {
-      throw git.error( tree.error );
-    }
-    else {
-      self.commit.tree( tree );
-    }
+  //self.tree = function() {
+  //  var tree = new git.raw.Tree( self.repo );
+  //  if( tree.error ) {
+  //    throw git.error( tree.error );
+  //  }
+  //  else {
+  //    self.commit.tree( tree );
+  //  }
 
-    return git.tree( tree );
-  };
+  //  return git.tree( tree );
+  //};
 
   return self;
 };
diff --git a/lib/repo.js b/lib/repo.js
@@ -10,26 +10,44 @@ var _Repo = function( path, callback ) {
   // Internal reference to a Git repository
   self.repo = new git.raw.Repo();
 
+
+  // Look up a branch and find its tree
+  self.branch = function( name, callback ) {
+    if( !callback ) { return; }
+
+    self.ref( 'refs/heads/' + name, function( err, ref ) {
+      if( err ) { throw err; }
+
+      git.commit( self.repo ).lookup( ref.oid().oid, function() {
+        var args = Array.prototype.slice.call( arguments );
+        args[0] = git.util().error( args[0] );
+
+        callback.apply( this, args.concat( this ) );
+      });
+    });
+  };
+
   // Work with a specific head reference
-  self.head = function( name, callback ) {
-    var head = git.ref( self.repo );
+  self.ref = function( name, callback ) {
+    if( !callback ) { return; }
+
+    var ref = git.ref( self.repo );
     
-    self.repo.lookupRef( head.ref, 'refs/heads/'+ name, function() {
+    self.repo.lookupRef( ref.ref, name, function() {
       var args = Array.prototype.slice.call( arguments );
       args[0] = git.util().error( args[0] );
 
-      callback.apply( head, args.concat( head ) );
+      callback.apply( ref, args.concat( ref ) );
     });
   };
 
   // Find a single commit
   self.commit = function( sha, callback ) {
-    var oid = git.oid( sha );
-
     if( !callback ) { return; }
 
-    var commit = git.commit( self.repo );
-    commit.lookup( oid.oid, callback );
+    var oid = git.oid( sha );
+
+    git.commit( self.repo ).lookup( oid.oid, callback );
   };
 
   //self.find = function( name, callback ) {
diff --git a/lib/revwalk.js b/lib/revwalk.js
@@ -1,24 +1,28 @@
 var git = require( '../' );
 
-var _RevWalk = function( repo ) {
+var _RevWalk = function( obj ) {
   var self = {};
 
-  // Internal reference to a Git reference
-  self.revwalk = revwalk || new git.raw.RevWalk( repo );
+  if( obj instanceof git.raw.Repo ) {
+    self.repo = obj;
+    self.revwalk = new git.raw.RevWalk( obj );
+  }
+  else if( obj instanceof git.raw.RevWalk ) {
+    self.revwalk = obj;
+  }
 
   // Walk will map to the next method
   self.walk = function( commit, callback ) {
     if( !callback ) { return; }
 
     self.revwalk.push( commit );
 
-    revwalk.next( commit, function() {
+    var _tmp = git.commit( self.repo );
+    self.revwalk.next( _tmp.commit, function() {
       var args = Array.prototype.slice.call( arguments );
-
       args[0] = git.util().error( args[0] );
 
-
-      callback.apply( commit, args.concat( commit ) );
+      callback.apply( _tmp, args.concat( _tmp ) );
     });
   };
 
diff --git a/lib/tree.js b/lib/tree.js
@@ -1,18 +1,31 @@
 var git = require( '../' );
 
-var _Tree = function( obj ) {
+var _Tree = function( obj, tree ) {
   var self = {};
 
-  Object.defineProperty( self, 'length', {
-    get: function() {
-      return self.tree.entryCount();
-    },
-    enumerable: true
-  });
+  //Object.defineProperty( self, 'length', {
+  //  get: function() {
+  //    return self.tree.entryCount();
+  //  },
+  //  enumerable: true
+  //});
+
+  self.each = function( callback ) {
+    if( !callback ) { return; }
+
+    var commit, i;
+    for(i=0, len=self.length; i<len; i++) {
+      commit = git.commit( self.repo );
+      git.commit( self.tree.entryByIndex( commit.commit, i ) );
+      callback.apply( commit, [ i, commit ] );
+    }
+  };
 
   // Internal references to Git references
   if( obj instanceof git.raw.Repo ) {
     // TODO: Add support for creation
+    self.repo = obj;
+    self.tree = tree;
   }
   else if ( obj instanceof git.raw.Tree ) {
     self.tree = obj;
