Skip to content

Add Graph.aheadBehind and tests #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 3 commits into from
Mar 27, 2015
Merged

Add Graph.aheadBehind and tests #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd9882a
Add `Graph.aheadBehind` and tests
Mar 27, 2015
860b8f1
Remove `.only`
Mar 27, 2015
d0a018f
Allocate return values on `git_graph_ahead_behind`
Mar 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,20 @@
"graph": {
"functions": {
"git_graph_ahead_behind": {
"ignore": true
"args": {
"ahead": {
"shouldAlloc": true,
"isReturn": true
},
"behind": {
"shouldAlloc": true,
"isReturn": true
}
},
"isAsync": true,
"return": {
"isErrorCode": true
}
}
}
},
Expand Down
6 changes: 6 additions & 0 deletions generate/templates/filters/returns_info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
var isPointer = require("./is_pointer");

module.exports = function(fn, argReturnsOnly, isAsync) {
var result = [];
var args = fn.args || [];
Expand All @@ -11,6 +13,10 @@ 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.needsDereference
= isAsync &&
return_info.cppClassName == "Number" &&
isPointer(return_info.cType);
return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
return_info.returnNameOrName = return_info.returnName || return_info.name;
return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/partials/convert_to_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% if isCppClassIntType %}
to = NanNew<{{ cppClassName }}>(({{ parsedClassName }}){{= parsedName =}});
{% else %}
to = NanNew<{{ cppClassName }}>({{= parsedName =}});
to = NanNew<{{ cppClassName }}>({% if needsDereference %}*{% endif %}{{= parsedName =}});
{% endif %}

{% elsif cppClassName == 'External' %}
Expand Down
31 changes: 31 additions & 0 deletions test/tests/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
var assert = require("assert");
var path = require("path");
var local = path.join.bind(path, __dirname);

describe("Graph", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
var Graph = NodeGit.Graph;

var reposPath = local("../repos/workdir");

beforeEach(function() {
var test = this;

return Repository.open(reposPath)
.then(function(repository) {
test.repository = repository;
});
});

it("can get commits ahead/behind for 2 different commits", function() {
return Graph.aheadBehind(
this.repository,
"32789a79e71fbc9e04d3eff7425e1771eb595150",
"1729c73906bb8467f4095c2f4044083016b4dfde")
.then(function(result) {
assert.equal(result.ahead, 1);
assert.equal(result.behind, 1);
});
});
});