Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e1ecafa
build: use pkg-config to find curl header
rsmarples Jul 16, 2017
3f24527
Move the pkg-config logic to the Linux, BSD and OSX cflags section.
rsmarples Jul 17, 2017
e204516
removed node v4 tests
Jul 24, 2017
f8ea1bf
Merge pull request #1330 from cjhoward92/remove-node-4-tests
implausible Jul 25, 2017
cdfd81a
Bump libgit2 to maintenance v0.26
implausible Jul 19, 2017
239c5ad
Merge pull request #1329 from implausible/bump/libgit2
implausible Jul 25, 2017
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
d9527b3
Add CI build config for node stable version
Jul 28, 2017
2db5a2b
Merge pull request #1337 from gucong3000/node_stable
implausible Jul 28, 2017
f913d50
Exposed libgit2 git_branch_remote_name method
Jul 31, 2017
debcf21
Updating with requested changes and refactors
mohseenrm Jul 26, 2017
92a570f
Merge pull request #1331 from mohseenrm/feature/git-filter
implausible Aug 1, 2017
113493a
Merge pull request #1340 from cjhoward92/feature/add_branch_remote_name
implausible Aug 1, 2017
7cd2f24
build: use pkg-config to find curl header
rsmarples Jul 16, 2017
9e6e237
Move the pkg-config logic to the Linux, BSD and OSX cflags section.
rsmarples Jul 17, 2017
7d34e46
find libcurl using pkg-config
rsmarples Aug 5, 2017
b1abc64
Merge branch 'find-libcurl' of github.com:rsmarples/nodegit into find…
rsmarples Aug 5, 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
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ sudo: false

env:
matrix:
- export NODE_VERSION="4" TARGET_ARCH="x64"
- export NODE_VERSION="6.5" TARGET_ARCH="x64"
- export NODE_VERSION="stable" TARGET_ARCH="x64"
- export NODE_VERSION="7.4" TARGET_ARCH="x64"
- export NODE_VERSION="6.5" TARGET_ARCH="x64"

matrix:
fast_finish: true
include:
- os: linux
env: export NODE_VERSION="4" TARGET_ARCH="ia32"
- os: linux
env: export NODE_VERSION="6.5" TARGET_ARCH="ia32"
env: export NODE_VERSION="stable" TARGET_ARCH="ia32"
- os: linux
env: export NODE_VERSION="7.4" TARGET_ARCH="ia32"
- os: linux
env: export NODE_VERSION="6.5" TARGET_ARCH="ia32"

git:
depth: 1
Expand Down Expand Up @@ -66,7 +66,7 @@ before_install:
fi

install:
- npm install;
- travis_retry npm install;

# This is a random private key used purely for testing.
before_script:
Expand All @@ -81,9 +81,9 @@ before_script:

script:
if [ -z "$TRAVIS_TAG" ] && [ $TRAVIS_OS_NAME == "linux" ] && [ $NODE_VERSION == "6" ]; then
npm test && npm run cov && npm run coveralls;
travis_retry npm test && npm run cov && npm run coveralls;
else
npm test;
travis_retry npm test;
fi

after_success:
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ environment:
GYP_MSVS_VERSION: 2013
matrix:
# Node.js
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "stable"
- nodejs_version: "7"
- nodejs_version: "6"

matrix:
fast_finish: true
Expand All @@ -40,12 +40,12 @@ install:
- ps: Start-Process c:\projects\nodegit\vendor\pageant.exe c:\projects\nodegit\vendor\private.ppk
- npm install -g npm
- cmd: npm install -g node-gyp
- npm install
- appveyor-retry call npm install

test_script:
- node --version
- npm --version
- cmd: npm test
- appveyor-retry call npm test

on_success:
- IF %APPVEYOR_REPO_TAG%==true npm install -g node-pre-gyp
Expand Down
96 changes: 96 additions & 0 deletions generate/input/callbacks.json
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
58 changes: 40 additions & 18 deletions generate/input/descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,32 @@
"git_branch_next": {
"ignore": true
},
"git_branch_remote_name": {
"cppFunctionName": "RemoteName",
"jsFunctionName": "remoteName",
"isAsync": true,
"args": {
"out": {
"isReturn": true,
"cppClassName": "GitBuf",
"jsClassName": "Buffer",
"cType": "git_buf *"
},
"repo": {
"cppClassName": "GitRepository",
"jsClassName": "Repo",
"cType": "git_repository *"
},
"canonical_branch_name": {
"cppClassName": "String",
"jsClassName": "String",
"cType": "const char *"
}
},
"return": {
"isErrorCode": true
}
},
"git_branch_set_upstream": {
"isAsync": true,
"args": {
Expand All @@ -221,7 +247,10 @@
"isErrorCode": true
}
}
}
},
"dependencies": [
"../include/buf.h"
]
},
"buf": {
"functions": {
Expand Down Expand Up @@ -879,6 +908,8 @@
}
},
"filter": {
"selfFreeing": false,
"hasConstructor": true,
"functions": {
"git_filter_list_apply_to_blob": {
"ignore": true
Expand Down Expand Up @@ -920,30 +951,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
35 changes: 34 additions & 1 deletion generate/input/libgit2-docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2632,6 +2632,38 @@
"comments": "<p>The name of the branch matches the definition of the name for git_branch_lookup. That is, if the returned name is given to git_branch_lookup() then the reference is returned that was given to this function.</p>\n",
"group": "branch"
},
"git_branch_remote_name": {
"type": "function",
"file": "branch.h",
"line": 274,
"lineto": 277,
"args": [
{
"name": "out",
"type": "git_buf *",
"comment": "where the name is stored."
},
{
"name": "repo",
"type": "git_respository *",
"comment": "the repo to check."
},
{
"name": "canonical_branch_name",
"type": "const char *",
"comment": "the ref name of the branch"
}
],
"argline": "git_buf *out, git_repository *repo, const char *canonical_branch_name",
"sig": "git_buf *::git_repository *::const char *",
"return": {
"type": "int",
"comment": " 0 on success; otherwise an error code (e.g., if the\n ref is no local or remote branch)."
},
"description": "<p>Return the name of the given remote branch.</p>\n",
"comments": "<p></p>\n",
"group": "branch"
},
"git_branch_upstream": {
"type": "function",
"file": "branch.h",
Expand Down Expand Up @@ -36087,6 +36119,7 @@
"git_branch_name",
"git_branch_next",
"git_branch_set_upstream",
"git_branch_remote_name",
"git_branch_upstream"
]
],
Expand Down Expand Up @@ -37149,4 +37182,4 @@
"ex/HEAD/tag.html"
]
]
}
}
Loading