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

Adds support for strarray in structs by orderedlist · Pull Request #461 · nodegit/nodegit · GitHub

  1. nodegit
  2. nodegit

Repository navigation

Adds support for strarray in structs #461

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 2 commits into from
Mar 5, 2015
Conversation 8 Commits 2 Checks 0 Files changed
Merged

Adds support for strarray in structs #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5047566
Adds support for strarray in structs
orderedlist Mar 4, 2015
b09fa02
Add test for struct strarray in checkout
orderedlist Mar 5, 2015
File filter

Filter by extension

Filter by extension .cc  (1) .js  (1) .json  (1) All 3 file types selected
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
5 changes: 5 additions & 0 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 @@ -1605,6 +1605,11 @@
}
}
},
"strarray": {
"dependencies": [
"../include/str_array_converter.h"
]
},
"stream": {
"ignore": true,
"cDependencies": [
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/partials/field_accessors.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 @@ -43,7 +43,7 @@

NanAssignPersistent(wrapper->{{ field.name }}, {{ field.name }});

wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue();
wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert({{ field.name }}->ToObject()){% else %}ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue(){% endif %};

{% elsif field.isCallbackFunction %}
if (wrapper->{{ field.name }} != NULL) {
Expand Down
41 changes: 41 additions & 0 deletions test/tests/checkout.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
@@ -1,14 +1,19 @@
var assert = require("assert");
var path = require("path");
var fse = require("fs-extra");
var local = path.join.bind(path, __dirname);

describe("Checkout", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
var Checkout = NodeGit.Checkout;

var readMeName = "README.md";
var packageJsonName = "package.json";
var packageJsonOid = "0fa56e90e096a4c24c785206b826ab914ea3de1e";
var reposPath = local("../repos/workdir");
var readMePath = local("../repos/workdir/" + readMeName);
var packageJsonPath = local("../repos/workdir/" + packageJsonName);

beforeEach(function() {
var test = this;
Expand All @@ -33,6 +38,42 @@ describe("Checkout", function() {
});
});

it("can force checkout a single file", function() {
var test = this;

var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
var readmeContent = fse.readFileSync(readMePath, "utf-8");

assert.notEqual(packageContent, "");
assert.notEqual(readmeContent, "");

fse.outputFileSync(readMePath, "");
fse.outputFileSync(packageJsonPath, "");

var opts = {
checkoutStrategy: Checkout.STRATEGY.FORCE,
paths: packageJsonName
};

return Checkout.head(test.repository, opts)
.then(function() {
var resetPackageContent = fse.readFileSync(packageJsonPath, "utf-8");
var resetReadmeContent = fse.readFileSync(readMePath, "utf-8");

assert.equal(resetPackageContent, packageContent);
assert.equal(resetReadmeContent, "");

var resetOpts = {
checkoutStrategy: Checkout.STRATEGY.FORCE
};

return Checkout.head(test.repository, resetOpts);
}).then(function() {
var resetContent = fse.readFileSync(readMePath, "utf-8");
assert.equal(resetContent, readmeContent);
});
});

it("can checkout by tree", function() {
var test = this;

Expand Down
Back | FazBrowse Home | New Git URL