FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix some things missed by the generating scripts by johnhaley81 · Pull Request #535 · nodegit/nodegit · GitHub

  1. nodegit
  2. nodegit

Repository navigation

Fix some things missed by the generating scripts #535

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
Apr 17, 2015
Conversation 0 Commits 3 Checks 0 Files changed
Merged

Fix some things missed by the generating scripts #535

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
2acd780
Set error on return for `git_branch_set_upstream`
Apr 10, 2015
84405fd
Fix `Status.file`
Apr 10, 2015
6995bf4
Fixed `Stash` tests
Apr 17, 2015
File filter

Filter by extension

Filter by extension .cc  (1) .js  (5) .json  (1) All 3 file types selected
Deleted files Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
21 changes: 19 additions & 2 deletions generate/input/descriptor.json
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@
}
},
"git_branch_upstream": {
"isAsync": false
"isAsync": false,
"return" : {
"isErrorCode": true
}
}
}
},
Expand Down Expand Up @@ -1092,7 +1095,11 @@
"shouldAlloc": true,
"functions": {
"git_oid_cpy": {
"ignore": true
"args": {
"out": {
"isReturn": true
}
}
},
"git_oid_fmt": {
"ignore": true
Expand Down Expand Up @@ -1601,6 +1608,16 @@
"git_status_byindex": {
"isAsync": false
},
"git_status_file": {
"args": {
"status_flags": {
"isReturn": true
},
"return": {
"isErrorCode": true
}
}
},
"git_status_foreach": {
"isAsync": true,
"return": {
Expand Down
2 changes: 1 addition & 1 deletion generate/scripts/generateNativeCode.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module.exports = function generateNativeCode() {
defaultValue: require("../templates/filters/default_value"),
fieldsInfo: require("../templates/filters/fields_info"),
hasReturnType: require("../templates/filters/has_return_type"),
hasReturns: require("../templates/filters/has_returns"),
hasReturnValue: require("../templates/filters/has_return_value"),
isDoublePointer: require("../templates/filters/is_double_pointer"),
isFixedLengthString: require("../templates/filters/is_fixed_length_string"),
isOid: require("../templates/filters/is_oid"),
Expand Down
9 changes: 9 additions & 0 deletions generate/templates/filters/has_return_value.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = function(fn) {
if (fn.return
&& !fn.return.isErrorCode
&& fn.return.cType != "void") {
return true
}

return false;
};
15 changes: 0 additions & 15 deletions generate/templates/filters/has_returns.js
Show comments
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions generate/templates/partials/sync_function.cc
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
if (ObjectWrap::Unwrap<{{ cppClassName }}>(args.This())->GetValue() != NULL) {
{% endif %}

{%if .|hasReturns %}
{%if .|hasReturnValue %}
{{ return.cType }} result = {%endif%}{{ cFunctionName }}(
{%each args|argsInfo as arg %}
{%if arg.isReturn %}
Expand All @@ -53,7 +53,7 @@ from_{{ arg.name }}
{%endeach%}
);

{%if return.isErrorCode %}
{%if .|hasReturnValue |and return.isErrorCode %}
if (result != GIT_OK) {
{%each args|argsInfo as arg %}
{%if arg.shouldAlloc %}
Expand Down
4 changes: 4 additions & 0 deletions lib/oid.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ Object.defineProperties(Oid.prototype, {
}
});

Oid.prototype.copy = function() {
return this.cpy(); // seriously???
};

Oid.prototype.inspect = function() {
return "[Oid " + this.allocfmt() + "]";
};
9 changes: 8 additions & 1 deletion lib/stash.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,12 @@ var Stash = NodeGit.Stash;
// Override Stash.foreach to eliminate the need to pass null payload
var foreach = Stash.foreach;
Stash.foreach = function(repo, callback) {
return foreach(repo, callback, null);
function wrappedCallback(index, message, oid) {
// We need to copy the OID since libgit2 types are getting cleaned up
// incorrectly right now in callbacks

return callback(index, message, oid.copy());
}

return foreach(repo, wrappedCallback, null);
};
Back | FazBrowse Home | New Git URL