Skip to content

Status and StatusList #374

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
orderedlist merged 21 commits into from
Feb 4, 2015
Merged

Status and StatusList #374

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
462675f
WIP for status lists
orderedlist Jan 30, 2015
f84ff24
Adding status_options to the descriptor
orderedlist Jan 30, 2015
6a51573
Move git_status_options to suppliment.json
orderedlist Jan 30, 2015
c89d436
move status list methods off of status
maxkorp Jan 30, 2015
b345eb5
add other methods that refer to git_status_options
maxkorp Jan 30, 2015
e5dbacb
un-async git_status_list_new
orderedlist Jan 30, 2015
da612cb
Fix merge_tree_flat to status_opt
orderedlist Jan 30, 2015
262d2fa
Enable git_status_foreach
orderedlist Jan 30, 2015
c09c4f5
Started getting callback functions working in classes
Feb 1, 2015
7601f97
Fixed typos in combyne partials
Feb 2, 2015
107f023
Fixed error in callback_helpers.cc
Feb 2, 2015
3e357c5
Callbacks in classes build now
Feb 3, 2015
511699f
Removed payload from callbacks since js can just use closure scope
Feb 3, 2015
a843a9a
Add override methods for Status
orderedlist Feb 3, 2015
8801670
Test status.js
orderedlist Feb 3, 2015
5b4c1ec
Add StatusFile
orderedlist Feb 3, 2015
01fbc0c
Add getStatus convenience method to repository
orderedlist Feb 3, 2015
572ae33
Status example
orderedlist Feb 3, 2015
a33e3ae
Merging master
orderedlist Feb 3, 2015
1c97062
Add a bunch of missing callbacks
orderedlist Feb 4, 2015
c396aa5
More callbacks
orderedlist Feb 4, 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
Prev Previous commit
Next Next commit
Fixed error in callback_helpers.cc
  • Loading branch information
John Haley committed Feb 2, 2015
commit 107f023fedd7d3e1b8a298c340e4cfa92e9a09b2
16 changes: 8 additions & 8 deletions generate/combyne/partials/callback_helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
baton->req.data = baton;
baton->done = false;

uv_queue_work(uv_default_loop(), &baton->req, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncAfter);
uv_queue_work(uv_default_loop(), &baton->req, {{ cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ cppFunctionName }}_{{ cbArg.name }}_asyncAfter);

while(!baton->done) {
this_thread::sleep_for(chrono::milliseconds(1));
Expand All @@ -28,16 +28,16 @@
return baton->result;
}

void {{ cppClassName }}::{{ function.cppFunctionName }}_{{ cbArg.name }}_asyncWork(uv_work_t* req) {
void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbArg.name }}_asyncWork(uv_work_t* req) {
// We aren't doing any work on a seperate thread, just need to
// access the main node thread in the async after method.
// However, this worker method is still needed
}

void {{ cppClassName }}::{{ function.cppFunctionName }}_{{ cbArg.name }}_asyncAfter(uv_work_t* req, int status) {
void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbArg.name }}_asyncAfter(uv_work_t* req, int status) {
NanScope();

{{ function.cppFunctionName }}_{{ cbArg.name|titleCase }}Baton* baton = static_cast<{{ function.cppFunctionName }}_{{ cbArg.name|titleCase }}Baton*>(req->data);
{{ cppFunctionName }}_{{ cbArg.name|titleCase }}Baton* baton = static_cast<{{ cppFunctionName }}_{{ cbArg.name|titleCase }}Baton*>(req->data);
{{ cppClassName }}* instance = static_cast<{{ cppClassName }}*>(baton->payload);

if (instance->{{ cbArg.name }}->IsEmpty()) {
Expand Down Expand Up @@ -83,7 +83,7 @@ void {{ cppClassName }}::{{ function.cppFunctionName }}_{{ cbArg.name }}_asyncAf

NanAssignPersistent(baton->promise, promise);

uv_queue_work(uv_default_loop(), &baton->req, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling);
uv_queue_work(uv_default_loop(), &baton->req, {{ cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling);
return;
}
}
Expand All @@ -108,17 +108,17 @@ void {{ cppClassName }}::{{ function.cppFunctionName }}_{{ cbArg.name }}_asyncAf
baton->done = true;
}

void {{ cppClassName }}::{{ function.cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling(uv_work_t* req, int status) {
void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling(uv_work_t* req, int status) {
NanScope();

{{ function.cppFunctionName }}_{{ cbArg.name|titleCase }}Baton* baton = static_cast<{{ function.cppFunctionName }}_{{ cbArg.name|titleCase }}Baton*>(req->data);
{{ cppFunctionName }}_{{ cbArg.name|titleCase }}Baton* baton = static_cast<{{ cppFunctionName }}_{{ cbArg.name|titleCase }}Baton*>(req->data);
Local<Object> promise = NanNew<Object>(baton->promise);
NanCallback* isPendingFn = new NanCallback(promise->Get(NanNew("isPending")).As<Function>());
Local<Value> argv[1]; // MSBUILD won't assign an array of length 0
Local<Boolean> isPending = isPendingFn->Call(0, argv)->ToBoolean();

if (isPending->Value()) {
uv_queue_work(uv_default_loop(), &baton->req, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ function.cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling);
uv_queue_work(uv_default_loop(), &baton->req, {{ cppFunctionName }}_{{ cbArg.name }}_asyncWork, {{ cppFunctionName }}_{{ cbArg.name }}_asyncPromisePolling);
return;
}

Expand Down