Skip to content

Allow null trees on Diff.treeToTree #370

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 5 commits into from
Jan 28, 2015
Merged

Allow null trees on Diff.treeToTree #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f3615da
Write some failing tests
orderedlist Jan 28, 2015
6dce290
Set git_diff_tree_to_tree params as optional
orderedlist Jan 28, 2015
6ea5688
Don't commit coverage folder
orderedlist Jan 28, 2015
9d04b12
Update commit.getDiff to handle no parents
orderedlist Jan 28, 2015
82940a2
Update diff.js tests
orderedlist Jan 28, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/include/
/lib/enums.js
/lib/nodegit.js
/coverage/


/vendor/Release
Expand Down
6 changes: 6 additions & 0 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,12 @@
},
"git_diff_tree_to_tree": {
"args": {
"old_tree": {
"isOptional": true
},
"new_tree": {
"isOptional": true
},
"opts": {
"isOptional": true
}
Expand Down
21 changes: 13 additions & 8 deletions lib/commit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,21 @@ Commit.prototype.parents = function() {
Commit.prototype.getDiff = function(callback) {
var commit = this;

return commit.getParents().then(function(parents) {
var diffs = parents.map(function(parent) {
return parent.getTree().then(function(parentTree) {
return commit.getTree().then(function(thisTree) {
return thisTree.diff(parentTree);
return commit.getTree().then(function(thisTree) {
return commit.getParents().then(function(parents) {
var diffs;
if (parents.length) {
diffs = parents.map(function(parent) {
return parent.getTree().then(function(parentTree) {
return thisTree.diff(parentTree);
});
});
});
});
} else {
diffs = [thisTree.diff(null)];
}

return Promise.all(diffs);
return Promise.all(diffs);
});
}).then(function(diffs) {
if (typeof callback === "function") {
callback(null, diffs);
Expand Down
18 changes: 18 additions & 0 deletions test/tests/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,22 @@ describe("Diff", function() {
"1 line\n"
);
});

it("can diff with a null tree", function() {
var repo = this.repository;
var tree = this.masterCommitTree;
return Diff.treeToTree(repo, null, tree, null).then(function(diff) {
assert.equal(diff.patches().length, 85);
});
});

it("can diff the initial commit of a repository", function() {
var repo = this.repository;
var oid = "99c88fd2ac9c5e385bd1fe119d89c83dce326219"; // First commit
return repo.getCommit(oid).then(function(commit) {
return commit.getDiff().then(function(diffs) {
assert.equal(diffs[0].patches().length, 8);
});
});
});
});