Skip to content

Enable transfer progress #325

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 10 commits into from
Feb 19, 2015
Merged

Enable transfer progress #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b3b2eab
Adds in support for transferProgress callback
tbranyen Dec 9, 2014
afd5b09
Add test for transferProgress
tbranyen Feb 13, 2015
e786cc7
Updated to match new API
tbranyen Feb 17, 2015
b9b5bb3
Fix transfer progress test
Feb 18, 2015
1c03a4b
Increase the timeout on the transfer progress test
Feb 18, 2015
e732c98
Delete test2 remote after remote tests finish running
Feb 18, 2015
f15a5a7
Remove the "test2" remote immediately after the test
johnhaley81 Feb 18, 2015
b746bea
Return true from certificateCheck in transfer test
Feb 18, 2015
4bee8a8
Add credential callback for transfer test
Feb 18, 2015
3a81d9d
Increase timeout for transfer progress test
Feb 19, 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
3 changes: 0 additions & 3 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,9 +1348,6 @@
"sideband_progress": {
"ignore": true
},
"transfer_progress": {
"ignore": true
},
"update_tips": {
"ignore": true
}
Expand Down
1 change: 1 addition & 0 deletions generate/templates/partials/field_accessors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
baton->{{ arg.name }} = {{ arg.name }};
{% endeach %}

baton->result = 0;
baton->req.data = baton;
baton->done = false;

Expand Down
36 changes: 36 additions & 0 deletions test/tests/remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ describe("Remote", function() {

var reposPath = local("../repos/workdir/.git");
var url = "https://github.com/nodegit/test";
var url2 = "https://github.com/nodegit/test2";

function removeOrigins(repository) {
Remote.delete(repository, "origin1");
Remote.delete(repository, "origin2");
Remote.delete(repository, "origin3");
Remote.delete(repository, "test2");
}

before(function() {
Expand Down Expand Up @@ -110,6 +112,40 @@ describe("Remote", function() {
});
});

it("can monitor transfer progress while downloading", function() {
// Set a reasonable timeout here now that our repository has grown.
this.timeout(600000);

var repo = this.repository;
var wasCalled = false;

return Remote.create(repo, "test2", url2)
.then(function() {
return repo.getRemote("test2");
})
.then(function(remote) {
remote.setCallbacks({
credentials: function(url, userName) {
return NodeGit.Cred.sshKeyFromAgent(userName);
},
certificateCheck: function() {
return 1;
},

transferProgress: function() {
wasCalled = true;
}
});

return remote.fetch(null, repo.defaultSignature(), null);
})
.then(function() {
assert.ok(wasCalled);

Remote.delete(repo, "test2");
});
});

it("can fetch from a remote", function() {
return this.repository.fetch("origin", {
credentials: function(url, userName) {
Expand Down