Updated diff-commits

nodegit · johnhaley81 · Nov 19, 2014 · Nov 14, 2014 · Nov 14, 2014 · Nov 15, 2014
commit 6dd55dd476e1b470c58545e8beedf131c78cba05
diff --git a/example/diff-commits.js b/example/diff-commits.js
@@ -1,33 +1,30 @@
-var git = require('../'),
-    path = require('path');
+var git = require('../');
+var path = require('path');
 
 // This code examines the diffs between a particular commit and all of its
 // parents. Since this commit is not a merge, it only has one parent. This is
 // similar to doing `git show`.
 
-git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) {
-  if (error) throw error;
+git.Repository.open(path.resolve(__dirname, '../.git'))
+.then(function(repo) {
+  return repo.getCommit('59b20b8d5c6ff8d09518454d4dd8b7b30f095ab5');
+})
+.then(function(commit) {
+  console.log('commit ' + commit.sha());
+  console.log('Author:', commit.author().name() + ' <' + commit.author().email() + '>');
+  console.log('Date:', commit.date());
+  console.log('\n    ' + commit.message());
 
-  repo.getCommit('59b20b8d5c6ff8d09518454d4dd8b7b30f095ab5', function(error, commit) {
-    if (error) throw error;
-
-    console.log('commit ' + commit.sha());
-    console.log('Author:', commit.author().name() + ' <' + commit.author().email() + '>');
-    console.log('Date:', commit.date());
-    console.log('\n    ' + commit.message());
-
-    commit.getDiff(function(error, diffList) {
-      if (error) throw error;
-
-      diffList.forEach(function(diff) {
-        diff.patches().forEach(function(patch) {
-          console.log("diff", patch.oldFile().path(), patch.newFile().path());
-          patch.hunks().forEach(function(hunk) {
-            console.log(hunk.header().trim());
-            hunk.lines().forEach(function(line) {
-              console.log(String.fromCharCode(line.lineOrigin) + line.content.trim());
-            });
-          });
+  return commit.getDiff();
+})
+.done(function(diffList) {
+  diffList.forEach(function(diff) {
+    diff.patches().forEach(function(patch) {
+      console.log("diff", patch.oldFile().path(), patch.newFile().path());
+      patch.hunks().forEach(function(hunk) {
+        console.log(hunk.header().trim());
+        hunk.lines().forEach(function(line) {
+          console.log(String.fromCharCode(line.origin()) + line.content().trim());
         });
       });
     });

diff --git a/generate/descriptor.json b/generate/descriptor.json
@@ -786,7 +786,15 @@
         "isAsync": false
       },
       "git_patch_get_hunk": {
-        "ignore": true
+        "args": {
+          "out": {
+            "returnName": "hunk"
+          },
+          "lines_in_hunk": {
+            "isReturn": true
+          }
+        },
+        "isAsync": false
       },
       "git_patch_get_line_in_hunk": {
         "isAsync": false

diff --git a/generate/filters/returns_info.js b/generate/filters/returns_info.js
@@ -12,7 +12,7 @@ module.exports = function(fn, argReturnsOnly, isAsync) {
     return_info.parsedName = isAsync ? "baton->" + return_info.name : return_info.name;
     return_info.isCppClassIntType = ~['Uint32', 'Int32'].indexOf(return_info.cppClassName);
     return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
-    return_info.jsNameOrName = return_info.jsName | return_info.name;
+    return_info.returnNameOrName = return_info.returnName || return_info.name;
     return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
 
     result.push(return_info);
@@ -29,7 +29,7 @@ module.exports = function(fn, argReturnsOnly, isAsync) {
     return_info.parsedName = return_info.name && isAsync ? "baton->" + return_info.name : "result";
     return_info.isCppClassIntType = ~['Uint32', 'Int32'].indexOf(return_info.cppClassName);
     return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
-    return_info.jsNameOrName = return_info.jsName | return_info.name;
+    return_info.returnNameOrName = return_info.returnName || return_info.name;
     return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
 
     result.push(return_info);

diff --git a/generate/libgit2-supplement.json b/generate/libgit2-supplement.json
@@ -11,6 +11,32 @@
         "int new_lines",
         "size_t header_len",
         "char header[128]"
+      ],
+      "fields": [
+        {
+          "name": "old_start",
+          "type": "int"
+        },
+        {
+          "name": "old_lines",
+          "type": "int"
+        },
+        {
+          "name": "new_start",
+          "type": "int"
+        },
+        {
+          "name": "new_lines",
+          "type": "int"
+        },
+        {
+          "name": "header_len",
+          "type": "size_t"
+        },
+        {
+          "name": "header",
+          "type": "char *"
+        }
       ]
     },
     "git_diff_line": {

diff --git a/generate/partials/async_function.cc b/generate/partials/async_function.cc
@@ -86,7 +86,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
       {%each .|returnsInfo 0 1 as _return %}
         {%partial convertToV8 _return %}
         {%if .|returnsCount > 1 %}
-    result->Set(NanNew<String>("{{ _return.jsNameOrName }}"), to);
+    result->Set(NanNew<String>("{{ _return.returnNameOrName }}"), to);
         {%endif%}
       {%endeach%}
       {%if .|returnsCount == 1 %}

diff --git a/generate/partials/sync_function.cc b/generate/partials/sync_function.cc
@@ -69,7 +69,7 @@ from_{{ arg.name }}
   {%each .|returnsInfo as _return %}
     {%partial convertToV8 _return %}
     {%if .|returnsCount > 1 %}
-  toReturn->Set(NanNew<String>("{{ _return.jsNameOrName }}"), to);
+  toReturn->Set(NanNew<String>("{{ _return.returnNameOrName }}"), to);
     {%endif%}
   {%endeach%}
   {%if .|returnsCount == 1 %}

diff --git a/lib/convenient_hunk.js b/lib/convenient_hunk.js
@@ -9,7 +9,7 @@ function ConvenientHunk(raw, i) {
  * @return {String}
  */
 ConvenientHunk.prototype.header = function() {
-  return this.raw.hunk(this.i).header;
+  return this.raw.getHunk(this.i).hunk.header();
 };
 
 /**