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

A wrapper for git_diff_blob_to_buffer by bleathem · Pull Request #550 · nodegit/nodegit · GitHub

  1. nodegit
  2. nodegit

Repository navigation

A wrapper for git_diff_blob_to_buffer #550

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
tbranyen merged 3 commits into from
Apr 21, 2015
Conversation 2 Commits 3 Checks 0 Files changed
Merged

A wrapper for git_diff_blob_to_buffer #550

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
b294842
An initial wrapper for git_diff_blob_to_buffer
bleathem Apr 20, 2015
a0a1654
Fix up `Diff.blobToBuffer`
Apr 21, 2015
75cbff0
Added a test for `Diff.blobToBuffer`
bleathem Apr 21, 2015
File filter

Filter by extension

Filter by extension .js  (2) .json  (1) All 2 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
34 changes: 33 additions & 1 deletion 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 @@ -524,7 +524,39 @@
],
"functions": {
"git_diff_blob_to_buffer": {
"ignore": true
"args": {
"old_blob" : {
"isOptional": true
},
"old_as_path" : {
"isOptional": true
},
"buffer" : {
"isOptional": true
},
"buffer_len" : {
"isOptional": true
},
"buffer_as_path" : {
"isOptional": true
},
"options" : {
"isOptional": true
},
"file_cb" : {
"isOptional": true
},
"hunk_cb" : {
"isOptional": true
},
"line_cb" : {
"isOptional": true
}
},
"return": {
"isErrorCode": true
},
"isAsync": true
},
"git_diff_blobs": {
"ignore": true
Expand Down
28 changes: 28 additions & 0 deletions lib/diff.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
Expand Up @@ -62,3 +62,31 @@ Diff.prototype.findSimilar = function(opts) {
opts = normalizeOptions(opts, NodeGit.DiffFindOptions);
return findSimilar.call(this, opts);
};

var blobToBuffer = Diff.blobToBuffer;
Diff.blobToBuffer= function(
old_blob,
old_as_path,
buffer,
buffer_as_path,
opts,
file_cb,
hunk_cb,
line_cb) {
var bufferLength = !buffer ? 0 : buffer.length;

opts = normalizeOptions(opts, NodeGit.DiffOptions);

return blobToBuffer.call(
this,
old_blob,
old_as_path,
buffer,
bufferLength,
buffer_as_path,
opts,
file_cb,
hunk_cb,
line_cb,
null);
};
32 changes: 32 additions & 0 deletions test/tests/diff.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
Expand Up @@ -145,6 +145,38 @@ describe("Diff", function() {
});
});

it("can diff the contents of a file to a string", function(done) {
this.repository.getBranchCommit("master")
.then(function(commit) {
return commit.getEntry("LICENSE");
})
.then(function(entry) {
var _entry = entry;
return _entry.getBlob();
})
.then(function(blob) {
var buffer = "New Text";
return Diff.blobToBuffer(
blob,
null,
buffer,
null,
null,
null,
function(delta, hunk, payload) {
assert.equal(hunk.oldStart(), 1);
assert.equal(hunk.oldLines(), 19);
assert.equal(hunk.newStart(), 1);
assert.equal(hunk.newLines(), 1);
assert.equal(
hunk.header().substring(0, hunk.headerLen() - 1),
"@@ -1,19 +1 @@"
);
done();
});
});
});

it("can diff with a null tree", function() {
var repo = this.repository;
var tree = this.masterCommitTree;
Expand Down
Back | FazBrowse Home | New Git URL