Got lookup reference working again in repo

tbranyen · tbranyen · commit 53d64cd4f183 · 2011-03-03T02:54:28.000-05:00
diff --git a/example/convenience-repo.js b/example/convenience-repo.js
@@ -1,17 +1,23 @@
 var git = require( '../' );
 
 // Read the current repository
-git.repo( '.git', function( err, path, repo ) {
+git.repo( './dummyrepo/.git', function( err, path, repo ) {
   if( err ) { throw err; }
  
   // Read a commit
-  this.commit( '75054b7130858db1c1cba13cf8a8febb26b14771', function( err, commit ) {
+  repo.commit( '2f6cbe055f1a6ca0a3ba524ba88a7806ba507a89', function( err, commit ) {
     if( err ) { throw err; }
 
-    console.log( this.msg() );
+    console.log( commit.msg() );
 
     var author = commit.author();
     console.log( author.name );
     console.log( author.email );
   });
+
+  repo.head( 'master', function( err ) {
+
+    console.log( err );
+
+  });
 });
diff --git a/lib/commit.js b/lib/commit.js
@@ -8,7 +8,7 @@ var _Commit = function( obj ) {
     self.repo = obj;
     self.commit = new git.git2.Commit( obj );
   }
-  else if ( obj instanceof git.git2.Commit ) {
+  else if( obj instanceof git.git2.Commit ) {
     self.commit = obj;
   }
 
diff --git a/lib/index.js b/lib/index.js
@@ -2,6 +2,7 @@ var util = require( './util.js' ).util,
     repo = require( './repo.js' ).repo,
     error = require( './error.js' ).error,
     sig = require( './sig.js' ).sig,
+    oid = require( './oid.js' ).oid,
     ref = require( './ref.js' ).ref,
     revwalk = require( './revwalk.js' ).revwalk,
     commit = require( './commit.js' ).commit;
@@ -10,6 +11,7 @@ exports.git2 = require( '../build/default/nodegit2.node' );
 exports.util = util;
 exports.repo = repo;
 exports.ref = ref;
+exports.oid = oid;
 exports.sig = sig;
 exports.error = error;
 exports.revwalk = revwalk;
diff --git a/lib/ref.js b/lib/ref.js
@@ -1,10 +1,15 @@
-var git2 = require( '../' );
+var git = require( '../' );
 
-var _Ref = function( ref ) {
+var _Ref = function( obj ) {
   var self = {};
 
-  // Internal reference to a Git reference
-  self.ref = ref || new git2.Ref();
+  if( obj instanceof git.git2.Repo ) {
+    self.repo = obj;
+    self.ref = new git.git2.Ref( obj );
+  }
+  else if( obj instanceof git.git2.Ref ) {
+    self.ref = obj;
+  }
 
   return self;
 };
diff --git a/lib/repo.js b/lib/repo.js
@@ -10,27 +10,26 @@ var _Repo = function( path, callback ) {
   // Internal reference to a Git repository
   self.repo = new git.git2.Repo();
 
-  // Work with a specific branch
-  //self.branch = function( name, callback ) {
-  //  var branch = new git.git2.Ref( self.repo );
-  //  
-  //  self.repo.lookupRef( branch, 'refs/heads/'+ name, function() {
-  //    var args = Array.prototype.slice.call( arguments );
-  //    args[0] = git.error().toString( args[0] );
-  //    callback.apply( branch, args.concat( branch ) );
-  //  });
-  //};
+  // Work with a specific head reference
+  self.head = function( name, callback ) {
+    var head = git.ref( self.repo );
+    
+    self.repo.lookupRef( head.ref, 'refs/heads/'+ name, function() {
+      var args = Array.prototype.slice.call( arguments );
+      args[0] = git.error().toString( args[0] );
+
+      callback.apply( head, args.concat( head ) );
+    });
+  };
 
   // Find a single commit
   self.commit = function( sha, callback ) {
-    var oid = new git.git2.Oid();
+    var oid = git.oid( sha );
 
     if( !callback ) { return; }
 
-    oid.mkstr( sha );
-
     var commit = git.commit( self.repo );
-    commit.lookup( oid, callback );
+    commit.lookup( oid.oid, callback );
   };
 
   //self.find = function( name, callback ) {
diff --git a/src/repo.cc b/src/repo.cc
@@ -339,13 +339,14 @@ int Repo::EIO_LookupRef(eio_req *req) {
   lookupref_request *ar = static_cast<lookupref_request *>(req->data);
 
   String::Utf8Value name(ar->name);
-  git_reference *ref;
+  git_reference* ref = ar->ref->GetValue();
+  git_reference** out = &ref;
 
-  int err = ar->repo->LookupRef((git_reference **)ref, *name);
+  int err = ar->repo->LookupRef(out, *name);
   ar->err = Persistent<Value>::New(Integer::New(err));
 
   if(Int32::Cast(*ar->err)->Value() == 0) {
-    ar->ref->SetValue(*&ref);
+    ar->ref->SetValue(*out);
   }
 
   return 0;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ var _Commit = function( obj ) {`
`8`	`8`	`self.repo = obj;`
`9`	`9`	`self.commit = new git.git2.Commit( obj );`
`10`	`10`	`}`
`11`		`- else if ( obj instanceof git.git2.Commit ) {`
	`11`	`+ else if( obj instanceof git.git2.Commit ) {`
`12`	`12`	`self.commit = obj;`
`13`	`13`	`}`
`14`	`14`