Skip to content

Expose libgit2 error code to clients when a promise fails #1209

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
Feb 28, 2017
Merged

Expose libgit2 error code to clients when a promise fails #1209

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
8f91110
Expose libgit2 error code to clients when a promise fails
rcjsuen Jan 31, 2017
6182e14
Merge branch 'master' into errno
rcjsuen Feb 26, 2017
b40ee03
Fix error message assertion to match libgit2 changes
rcjsuen Feb 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
9 changes: 8 additions & 1 deletion generate/templates/manual/patches/convenient_patches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,15 @@ void GitPatch::ConvenientFromDiffWorker::HandleOKCallback() {
}

if (baton->error) {
Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
} else {
err = Nan::Error("Method convenientFromDiff has thrown an error.")->ToObject();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
Local<v8::Value> argv[1] = {
Nan::Error(baton->error->message)
err
};
callback->Call(1, argv);
if (baton->error->message)
Expand Down
9 changes: 8 additions & 1 deletion generate/templates/manual/revwalk/fast_walk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,15 @@ void GitRevwalk::FastWalkWorker::HandleOKCallback()
{
if (baton->error)
{
Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
} else {
err = Nan::Error("Method fastWalk has thrown an error.")->ToObject();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
Local<v8::Value> argv[1] = {
Nan::Error(baton->error->message)
err
};
callback->Call(1, argv);
if (baton->error->message)
Expand Down
9 changes: 8 additions & 1 deletion generate/templates/manual/revwalk/file_history_walk.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,15 @@ void GitRevwalk::FileHistoryWalkWorker::HandleOKCallback()
}

if (baton->error) {
Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
} else {
err = Nan::Error("Method fileHistoryWalk has thrown an error.")->ToObject();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
Local<v8::Value> argv[1] = {
Nan::Error(baton->error->message)
err
};
callback->Call(1, argv);
if (baton->error->message)
Expand Down
9 changes: 8 additions & 1 deletion generate/templates/partials/async_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,15 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
callback->Call(2, argv);
} else {
if (baton->error) {
v8::Local<v8::Object> err;
if (baton->error->message) {
err = Nan::Error(baton->error->message)->ToObject();
} else {
err = Nan::Error("Method {{ jsFunctionName }} has thrown an error.")->ToObject();
}
err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
v8::Local<v8::Value> argv[1] = {
Nan::Error(baton->error->message)
err
};
callback->Call(1, argv);
if (baton->error->message)
Expand Down
22 changes: 22 additions & 0 deletions test/tests/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,4 +1298,26 @@ describe("Merge", function() {
assert.ok(repository.isDefaultState());
});
});

it("can retrieve error code on if common merge base not found", function() {
var repo;
return NodeGit.Repository.open(local("../repos/workdir"))
.then(function(r) {
repo = r;
return repo.getCommit("4bd806114ce26503c103c85dcc985021951bbc18");
})
.then(function(commit) {
return commit.getParents(commit.parentcount());
})
.then(function(parents) {
return NodeGit.Merge.base(repo, parents[0], parents[1])
.then(function() {
return Promise.reject(new Error(
"should not be able to retrieve common merge base"));
}, function(err) {
assert.equal("no merge base found", err.message);
assert.equal(NodeGit.Error.CODE.ENOTFOUND, err.errno);
});
});
});
});