8000 Add Push by phatblat · Pull Request #419 · libgit2/objective-git · GitHub
[go: up one dir, main page]
Skip to content

Add Push #419

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
merged 18 commits into from
Dec 8, 2014
Merged

Add Push #419

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4a6f824
Add push methods to GTRepository+RemoteOperations
Nov 12, 2014
2a3975a
Remove unused completion member
Nov 12, 2014
5bd4ce1
Revise push doc comments (fetch->push)
Nov 12, 2014
5e77945
Inline block definitions in headers, move typedef to .m
Nov 13, 2014
5dc1415
Remove OP_ prefix from doc comments
Nov 13, 2014
deca60d
Have some style
Nov 13, 2014
e7ff5b5
Use initializers for git_remote_callbacks and git_push_options
Nov 13, 2014
4d166f3
Add GTRemotePushSpec.m
Nov 15, 2014
3f22954
Add test for pushing single new commit to remote
Nov 18, 2014
96b6365
Add transfer progress blocks to push tests
Nov 18, 2014
5afd124
Add commit count expectations
Nov 20, 2014
49dc932
Merge branch 'master' into ben/pr/push
Nov 20, 2014
c947b80
Clean up push tests
Nov 21, 2014
307936c
Further test revisions
Nov 21, 2014
8da6daf
Add example of pushing two branches
Nov 21, 2014
3d537fa
Fix up push test failures
Dec 2, 2014
7c9e2ee
Check branch, branches and remote with NSParameterAssert()
Dec 2, 2014
938c7e3
Remove assumption that local and remote branches have same shortName
Dec 4, 2014
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
Add transfer progress blocks to push tests 
Local transport doesn't currently call the progress callbacks
  • Loading branch information
Ben Chatelain committed Nov 18, 2014
commit 96b6365f879c23b8a496701ff22a579454148bfa
12 changes: 10 additions & 2 deletions ObjectiveGitTests/GTRemotePushSpec.m
View file
Open in desktop
401E
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,13 @@
it(@"pushes nothing when the branch on local and remote are in sync", ^{
NSError *error = nil;

BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:NULL];
__block BOOL transferProgressed = NO;
BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:^(unsigned int current, unsigned int total, size_t bytes, BOOL *stop) {
transferProgressed = YES;
}];
expect(error).to(beNil());
expect(@(result)).to(beTruthy());
expect(@(transferProgressed)).to(beFalse()); // Local transport doesn't currently call progress callbacks
});

it(@"pushes a new local commit to the remote", ^{
Expand All @@ -116,9 +120,13 @@
expect(testCommit).notTo(beNil());

// Push
BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:NULL];
__block BOOL transferProgressed = NO;
BOOL result = [localRepo pushBranch:masterBranch toRemote:remote withOptions:nil error:&error progress:^(unsigned int current, unsigned int total, size_t bytes, BOOL *stop) {
transferProgressed = YES;
}];
expect(error).to(beNil());
expect(@(result)).to(beTruthy());
expect(@(transferProgressed)).to(beFalse()); // Local transport doesn't currently call progress callbacks

// Verify commit is in remote
GTCommit *pushedCommit = [remoteRepo lookUpObjectByOID:testCommit.OID objectType:GTObjectTypeCommit error:&error];
Expand Down
0