Skip to content

Adding git_filter support in nodegit #1331

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
implausible merged 9 commits into from
Aug 1, 2017
Merged

Adding git_filter support in nodegit #1331

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e34797
Adding filters to generator template
mohseenrm Jun 1, 2017
f4f7a4d
Adding Filter registration, clean build, passing test
mohseenrm Jun 6, 2017
3844f98
Added Filter callback support
mohseenrm Jun 9, 2017
172e4ad
Transition to manual templates
mohseenrm Jun 19, 2017
60c1866
Added Async functionality
mohseenrm Jun 26, 2017
339799e
Added more unit tests
mohseenrm Jul 6, 2017
718e101
Fixed field_accessors template
Jul 11, 2017
8c6d2a5
Fixing rouge console logs and bugs in tests
mohseenrm Jul 12, 2017
debcf21
Updating with requested changes and refactors
mohseenrm Jul 26, 2017
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
96 changes: 96 additions & 0 deletions generate/input/callbacks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,102 @@
"error": -1
}
},
"git_filter_apply_fn": {
"args": [
{
"name": "self",
"cType": "git_filter *"
},
{
"name": "payload",
"cType": "void **"
},
{
"name": "to",
"cType": "git_buf *"
},
{
"name": "from",
"cType": "const git_buf *"
},
{
"name": "src",
"cType": "const git_filter_source *"
}
],
"return": {
"type": "int",
"noResults": -30,
"success": 0,
"error": -1
}
},
"git_filter_check_fn": {
"args": [
{
"name": "self",
"cType": "git_filter *"
},
{
"name": "payload",
"cType": "void **"
},
{
"name": "src",
"cType": "const git_filter_source *"
},
{
"name": "attr_values",
"cType": "const char **"
}
],
"return": {
"type": "int",
"noResults": -30,
"success": 0,
"error": -1
}
},
"git_filter_cleanup_fn": {
"args": [
{
"name": "self",
"cType": "git_filter *"
},
{
"name": "payload",
"cType": "void *"
}
],
"return": {
"type": "void"
}
},
"git_filter_init_fn": {
"args": [
{
"name": "self",
"cType": "git_filter *"
}
],
"return": {
"type": "int",
"noResults": 0,
"success": 0,
"error": -1
}
},
"git_filter_shutdown_fn": {
"args": [
{
"name": "self",
"cType": "git_filter *"
}
],
"return": {
"type": "void"
}
},
"git_index_matched_path_cb": {
"args": [
{
Expand Down
27 changes: 10 additions & 17 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,8 @@
}
},
"filter": {
"selfFreeing": false,
"hasConstructor": true,
"functions": {
"git_filter_list_apply_to_blob": {
"ignore": true
Expand Down Expand Up @@ -920,30 +922,21 @@
"ignore": true
}
},
"cDependencies": [
"git2/sys/filter.h"
],
"fields": {
"initialize": {
"ignore": true
},
"shutdown": {
"ignore": true
},
"check": {
"ignore": true
},
"apply": {
"ignore": true
},
"cleanup": {
"stream": {
"ignore": true
}
},
}
},
"filter_source": {
"ignore": false,
"cDependencies": [
"git2/sys/filter.h"
]
},
"filter_source": {
"ignore": true
},
"graph": {
"functions": {
"git_graph_ahead_behind": {
Expand Down
67 changes: 45 additions & 22 deletions generate/input/libgit2-supplement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,17 @@
"git_annotated_commit_lookup"
]
],
[
"filter_source",
[
"git_filter_source_repo",
"git_filter_source_path",
"git_filter_source_filemode",
"git_filter_source_id",
"git_filter_source_mode",
"git_filter_source_flags"
]
],
[
"odb_object",
[
Expand Down Expand Up @@ -422,33 +433,23 @@
},
{
"type": "git_filter_init_fn",
"name": "initialize",
"ignore": true
"name": "initialize"
},
{
"type": "git_filter_shutdown_fn",
"name": "shutdown",
"ignore": true
"name": "shutdown"
},
{
"type": "git_filter_check_fn",
"name": "check",
"ignore": true
"name": "check"
},
{
"type": "git_filter_apply_fn",
"name": "apply",
"ignore": true
},
{
"type": "git_filter_stream_fn",
"name": "stream",
"ignore": true
"name": "apply"
},
{
"type": "git_filter_cleanup_fn",
"name": "cleanup",
"ignore": true
"name": "cleanup"
}
]
}
Expand Down Expand Up @@ -765,14 +766,26 @@
"git_annotated_commit_lookup"
]
},
"odb": {
"filter": {
"functions": [
"git_odb_object_data",
"git_odb_object_dup",
"git_odb_object_free",
"git_odb_object_id",
"git_odb_object_size",
"git_odb_object_type"
"git_filter_list_apply_to_blob",
"git_filter_list_apply_to_data",
"git_filter_list_apply_to_file",
"git_filter_list_contains",
"git_filter_list_free",
"git_filter_list_length",
"git_filter_list_load",
"git_filter_list_new",
"git_filter_list_push",
"git_filter_list_stream_blob",
"git_filter_list_stream_data",
"git_filter_list_stream_file",
"git_filter_source_filemode",
"git_filter_source_flags",
"git_filter_source_id",
"git_filter_source_mode",
"git_filter_source_path",
"git_filter_source_repo"
]
},
"merge": {
Expand All @@ -784,6 +797,16 @@
"git_merge_head_id"
]
},
"odb": {
"functions": [
"git_odb_object_data",
"git_odb_object_dup",
"git_odb_object_free",
"git_odb_object_id",
"git_odb_object_size",
"git_odb_object_type"
]
},
"reflog": {
"functions": [
"git_reflog_entry_committer",
Expand Down
11 changes: 10 additions & 1 deletion generate/scripts/generateJson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ module.exports = function generateJson() {
}, {}).valueOf();

// decorate the definitions with required data to build the C++ files
//TODO: add self ref tag here

@implausible implausible Jul 26, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this comment needed anymore?

types.forEach(function(typeDef) {
var typeName = typeDef.typeName;
typeDef.cType = typeName;
Expand Down Expand Up @@ -169,9 +170,18 @@ module.exports = function generateJson() {
}
};

var addSelfReferentialField = function(prop){
if (helpers.isSelfReferential(prop.type)) {
prop.isSelfReferential = true;
def.isExtendedStruct = true;
}
};

def.fields.forEach(addDependencies);
def.fields.forEach(addSelfReferentialField);
def.functions.forEach(addDependencies);


Object.keys(dependencies).forEach(function (dependencyFilename) {
def.dependencies.push("../include/" + dependencyFilename + ".h");
});
Expand All @@ -183,7 +193,6 @@ module.exports = function generateJson() {
fn.cppClassName = def.cppClassName;
});
});

// Process enums
_(enums).forEach(function(enumerable) {
output.some(function(obj) {
Expand Down
2 changes: 2 additions & 0 deletions generate/scripts/generateNativeCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ module.exports = function generateNativeCode() {
replace: require("../templates/filters/replace"),
returnsCount: require("../templates/filters/returns_count"),
returnsInfo: require("../templates/filters/returns_info"),
subtract: require("../templates/filters/subtract"),
titleCase: require("../templates/filters/title_case"),
toBool: require('../templates/filters/to_bool'),
unPointer: require("../templates/filters/un_pointer"),
setUnsigned: require("../templates/filters/unsigned"),
upper: require("../templates/filters/upper")
};

Expand Down
7 changes: 6 additions & 1 deletion generate/scripts/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var callbackTypePattern = /\s*_cb/;
var callbackTypePattern = /\s*_(cb|fn)/,
selfReferentialTypePattern = /\s*_fn/;

var utils = require("./utils");
var _ = require("lodash");
Expand Down Expand Up @@ -93,6 +94,10 @@ var Helpers = {
&& ~cbField.name.indexOf(payloadName.replace("_payload", ""));
},

isSelfReferential: function(cType){
return selfReferentialTypePattern.test(cType);
},

getLibgitType: function(normalizedType, types) {
var libgitType;

Expand Down
6 changes: 6 additions & 0 deletions generate/templates/filters/args_info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,15 @@ module.exports = function(args) {

if (cArg === args.length -1) {
arg.lastArg = true;

@implausible implausible Jul 26, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This entire block is:

arg.lastArg = cArg === args.length - 1;
arg.firstArg = !arg.lastArg && cArg === 0;

arg.firstArg = false;
}
else if(cArg === 0){
arg.firstArg = true;
arg.lastArg = false;
}
else {
arg.lastArg = false;
arg.firstArg = false;
}

arg.cArg = cArg;
Expand Down
3 changes: 3 additions & 0 deletions generate/templates/filters/subtract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = function(value, other) {
return (value - other);

@implausible implausible Jul 26, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't need parentheses.

};
3 changes: 3 additions & 0 deletions generate/templates/filters/unsigned.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = function(value) {
return value < 0 ? 0 : value;
};
36 changes: 36 additions & 0 deletions generate/templates/manual/include/async_baton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,40 @@ struct AsyncBatonWithResult : public AsyncBaton {
}
};

struct AsyncBatonWithNoResult : public AsyncBaton {
/* ResultT result;
ResultT defaultResult;*/ // result returned if the callback doesn't return anything valid

@implausible implausible Jul 26, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment does not apply to this structure.

void (*onCompletion)(AsyncBaton *);

void Done() {
if (onCompletion) {
onCompletion(this);
} else {
// signal completion
uv_sem_post(&semaphore);
}
}

void ExecuteAsync(ThreadPool::Callback asyncCallback, void (*onCompletion)(AsyncBaton *) = NULL) {
this->onCompletion = onCompletion;
if (!onCompletion) {
uv_sem_init(&semaphore, 0);
}

{
LockMaster::TemporaryUnlock temporaryUnlock;

libgit2ThreadPool.ExecuteReverseCallback(asyncCallback, this);

if (!onCompletion) {
// wait for completion
uv_sem_wait(&semaphore);
uv_sem_destroy(&semaphore);
}
}

return;
}
};

#endif
Loading