Revert d56bd92..5068116

This rolls back to commit d56bd92.

Author: jspahrsummers

ObjectiveGit.modulemap

@@ -47,6 +47,7 @@ framework module ObjectiveGit {
 	header "git2/status.h"
 	header "git2/submodule.h"
 	header "git2/tag.h"
+	header "git2/threads.h"
 	header "git2/transport.h"
 	header "git2/tree.h"
 	header "git2/types.h"

ObjectiveGit/GTRepository+RemoteOperations.h

@@ -0,0 +1,78 @@
+//
+//  GTRepository+RemoteOperations.h
+//  ObjectiveGitFramework
+//
+//  Created by Etienne on 18/11/13.
+//  Copyright (c) 2013 GitHub, Inc. All rights reserved.
+//
+
+#import "GTRepository.h"
+
+@class GTFetchHeadEntry;
+
+/// A `GTCredentialProvider`, that will be used to authenticate against the remote.
+extern NSString *const GTRepositoryRemoteOptionsCredentialProvider;
+
+@interface GTRepository (RemoteOperations)
+
+#pragma mark - Fetch
+
+/// Fetch a remote.
+///
+/// remote  - The remote to fetch from.
+/// options - Options applied to the fetch operation.
+///           Recognized options are :
+///           `GTRepositoryRemoteOptionsCredentialProvider`
+/// error   - The error if one occurred. Can be NULL.
+///
+/// Returns YES if the fetch was successful, NO otherwise (and `error`, if provided,
+/// will point to an error describing what happened).
+- (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(void (^)(const git_transfer_progress *stats, BOOL *stop))progressBlock;
+
+/// Enumerate all available fetch head entries.
+///
+/// error - The error if one ocurred. Can be NULL.
+/// block - A block to execute for each FETCH_HEAD entry. `fetchHeadEntry` will be the current
+///         fetch head entry. Setting `stop` to YES will cause enumeration to stop after the block returns.
+///
+/// Returns YES if the operation succedded, NO otherwise.
+- (BOOL)enumerateFetchHeadEntriesWithError:(NSError **)error usingBlock:(void (^)(GTFetchHeadEntry *fetchHeadEntry, BOOL *stop))block;
+
+/// Convenience method for -enumerateFetchHeadEntriesWithError:usingBlock: that retuns an NSArray with all the fetch head entries.
+///
+/// error - The error if one ocurred. Can be NULL.
+///
+/// Retruns an array with GTFetchHeadEntry objects
+- (NSArray *)fetchHeadEntriesWithError:(NSError **)error;
+
+#pragma mark - Push
+
+/// Push a single branch to a remote.
+///
+/// branch        - The branch to push.
+/// remote        - The remote to push to.
+/// options       - Options applied to the push operation.
+///                 Recognized options are:
+///                 `GTRepositoryRemoteOptionsCredentialProvider`
+/// error         - The error if one occurred. Can be NULL.
+/// progressBlock - An optional callback for monitoring progress.
+///
+/// Returns YES if the push was successful, NO otherwise (and `error`, if provided,
+/// will point to an error describing what happened).
+- (BOOL)pushBranch:(GTBranch *)branch toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
+
+/// Push an array of branches to a remote.
+///
+/// branches      - An array of branches to push.
+/// remote        - The remote to push to.
+/// options       - Options applied to the push operation.
+///                 Recognized options are:
+///                 `GTRepositoryRemoteOptionsCredentialProvider`
+/// error         - The error if one occurred. Can be NULL.
+/// progressBlock - An optional callback for monitoring progress.
+///
+/// Returns YES if the push was successful, NO otherwise (and `error`, if provided,
+/// will point to an error describing what happened).
+- (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(void (^)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop))progressBlock;
+
+@end

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -0,0 +1,296 @@
+//
+//  GTRepository+RemoteOperations.m
+//  ObjectiveGitFramework
+//
+//  Created by Etienne on 18/11/13.
+//  Copyright (c) 2013 GitHub, Inc. All rights reserved.
+//
+
+#import "GTRepository+RemoteOperations.h"
+
+#import "EXTScope.h"
+#import "GTCredential.h"
+#import "GTCredential+Private.h"
+#import "GTFetchHeadEntry.h"
+#import "GTOID.h"
+#import "GTRemote.h"
+#import "GTSignature.h"
+#import "NSError+Git.h"
+
+#import "git2/errors.h"
+#import "git2/remote.h"
+#import "git2/push.h"
+
+NSString *const GTRepositoryRemoteOptionsCredentialProvider = @"GTRepositoryRemoteOptionsCredentialProvider";
+
+typedef void (^GTRemoteFetchTransferProgressBlock)(const git_transfer_progress *stats, BOOL *stop);
+typedef void (^GTRemotePushTransferProgressBlock)(unsigned int current, unsigned int total, size_t bytes, BOOL *stop);
+
+@implementation GTRepository (RemoteOperations)
+
+#pragma mark -
+#pragma mark Common Remote code
+
+typedef struct {
+	GTCredentialAcquireCallbackInfo credProvider;
+	__unsafe_unretained GTRemoteFetchTransferProgressBlock fetchProgressBlock;
+	__unsafe_unretained GTRemotePushTransferProgressBlock pushProgressBlock;
+	git_direction direction;
+} GTRemoteConnectionInfo;
+
+int GTRemoteFetchTransferProgressCallback(const git_transfer_progress *stats, void *payload) {
+	GTRemoteConnectionInfo *info = payload;
+	BOOL stop = NO;
+
+	if (info->fetchProgressBlock != nil) {
+		info->fetchProgressBlock(stats, &stop);
+	}
+
+	return (stop == YES ? GIT_EUSER : 0);
+}
+
+int GTRemotePushTransferProgressCallback(unsigned int current, unsigned int total, size_t bytes, void *payload) {
+	GTRemoteConnectionInfo *pushPayload = payload;
+
+	BOOL stop = NO;
+	if (pushPayload->pushProgressBlock) {
+		pushPayload->pushProgressBlock(current, total, bytes, &stop);
+	}
+
+	return (stop == YES ? GIT_EUSER : 0);
+}
+
+static int GTRemotePushRefspecStatusCallback(const char *ref, const char *msg, void *data) {
+	if (msg != NULL) {
+		return GIT_ERROR;
+	}
+
+	return GIT_OK;
+}
+
+#pragma mark -
+#pragma mark Fetch
+
+- (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemoteFetchTransferProgressBlock)progressBlock {
+	GTCredentialProvider *credProvider = options[GTRepositoryRemoteOptionsCredentialProvider];
+	GTRemoteConnectionInfo connectionInfo = {
+		.credProvider = {credProvider},
+		.direction = GIT_DIRECTION_FETCH,
+		.fetchProgressBlock = progressBlock,
+	};
+	git_remote_callbacks remote_callbacks = {
+		.version = GIT_REMOTE_CALLBACKS_VERSION,
+		.credentials = (credProvider != nil ? GTCredentialAcquireCallback : NULL),
+		.transfer_progress = GTRemoteFetchTransferProgressCallback,
+		.payload = &connectionInfo,
+	};
+
+	int gitError = git_remote_set_callbacks(remote.git_remote, &remote_callbacks);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to set callbacks on remote"];
+		return NO;
+	}
+
+	__block git_strarray refspecs;
+	gitError = git_remote_get_fetch_refspecs(&refspecs, remote.git_remote);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get fetch refspecs for remote"];
+		return NO;
+	}
+
+	@onExit {
+		git_strarray_free(&refspecs);
+	};
+
+	gitError = git_remote_fetch(remote.git_remote, &refspecs, self.userSignatureForNow.git_signature, NULL);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to fetch from remote"];
+		return NO;
+	}
+
+	return YES;
+}
+
+#pragma mark -
+#pragma mark Fetch Head enumeration
+
+typedef void (^GTRemoteEnumerateFetchHeadEntryBlock)(GTFetchHeadEntry *entry, BOOL *stop);
+
+typedef struct {
+	__unsafe_unretained GTRepository *repository;
+	__unsafe_unretained GTRemoteEnumerateFetchHeadEntryBlock enumerationBlock;
+} GTEnumerateHeadEntriesPayload;
+
+int GTFetchHeadEntriesCallback(const char *ref_name, const char *remote_url, const git_oid *oid, unsigned int is_merge, void *payload) {
+	GTEnumerateHeadEntriesPayload *entriesPayload = payload;
+
+	GTRepository *repository = entriesPayload->repository;
+	GTRemoteEnumerateFetchHeadEntryBlock enumerationBlock = entriesPayload->enumerationBlock;
+
+	GTReference *reference = [GTReference referenceByLookingUpReferencedNamed:@(ref_name) inRepository:repository error:NULL];
+
+	GTFetchHeadEntry *entry = [[GTFetchHeadEntry alloc] initWithReference:reference remoteURLString:@(remote_url) targetOID:[GTOID oidWithGitOid:oid] isMerge:(BOOL)is_merge];
+
+	BOOL stop = NO;
+
+	enumerationBlock(entry, &stop);
+
+	return (stop == YES ? GIT_EUSER : 0);
+}
+
+- (BOOL)enumerateFetchHeadEntriesWithError:(NSError **)error usingBlock:(void (^)(GTFetchHeadEntry *fetchHeadEntry, BOOL *stop))block {
+	NSParameterAssert(block != nil);
+	
+	GTEnumerateHeadEntriesPayload payload = {
+		.repository = self,
+		.enumerationBlock = block,
+	};
+	int gitError = git_repository_fetchhead_foreach(self.git_repository, GTFetchHeadEntriesCallback, &payload);
+
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get fetchhead entries"];
+		return NO;
+	}
+	
+	return YES;
+}
+
+- (NSArray *)fetchHeadEntriesWithError:(NSError **)error {
+	NSMutableArray *entries = [NSMutableArray array];
+	
+	[self enumerateFetchHeadEntriesWithError:error usingBlock:^(GTFetchHeadEntry *fetchHeadEntry, BOOL *stop) {
+		[entries addObject:fetchHeadEntry];
+		
+		*stop = NO;
+	}];
+	
+	return entries;
+}
+
+#pragma mark - Push (Public)
+
+- (BOOL)pushBranch:(GTBranch *)branch toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+	NSParameterAssert(branch != nil);
+	NSParameterAssert(remote != nil);
+
+	return [self pushBranches:@[ branch ] toRemote:remote withOptions:options error:error progress:progressBlock];
+}
+
+- (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+	NSParameterAssert(branches != nil);
+	NSParameterAssert(branches.count != 0);
+	NSParameterAssert(remote != nil);
+
+	NSMutableArray *refspecs = nil;
+	// Build refspecs for the passed in branches
+	refspecs = [NSMutableArray arrayWithCapacity:branches.count];
+	for (GTBranch *branch in branches) {
+		// Default remote reference for when branch doesn't exist on remote - create with same short name
+		NSString *remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", branch.shortName];
+
+		BOOL success = NO;
+		GTBranch *trackingBranch = [branch trackingBranchWithError:error success:&success];
+
+		if (success && trackingBranch) {
+			// Use remote branch short name from trackingBranch, which could be different
+			// (e.g. refs/heads/master:refs/heads/my_master)
+			remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", trackingBranch.shortName];
+		}
+
+		[refspecs addObject:[NSString stringWithFormat:@"refs/heads/%@:%@", branch.shortName, remoteBranchReference]];
+	}
+
+	return [self pushRefspecs:refspecs toRemote:remote withOptions:options error:error progress:progressBlock];
+}
+
+#pragma mark - Push (Private)
+
+- (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error:(NSError **)error progress:(GTRemotePushTransferProgressBlock)progressBlock {
+	int gitError;
+	GTCredentialProvider *credProvider = options[GTRepositoryRemoteOptionsCredentialProvider];
+
+	GTRemoteConnectionInfo connectionInfo = {
+		.credProvider = { .credProvider = credProvider },
+		.direction = GIT_DIRECTION_PUSH,
+		.pushProgressBlock = progressBlock,
+	};
+
+	git_remote_callbacks remote_callbacks = GIT_REMOTE_CALLBACKS_INIT;
+	remote_callbacks.credentials = (credProvider != nil ? GTCredentialAcquireCallback : NULL),
+	remote_callbacks.transfer_progress = GTRemoteFetchTransferProgressCallback,
+	remote_callbacks.payload = &connectionInfo,
+
+	gitError = git_remote_set_callbacks(remote.git_remote, &remote_callbacks);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to set callbacks on remote"];
+		return NO;
+	}
+
+	gitError = git_remote_connect(remote.git_remote, GIT_DIRECTION_PUSH);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to connect remote"];
+		return NO;
+	}
+	@onExit {
+		git_remote_disconnect(remote.git_remote);
+		// Clear out callbacks by overwriting with an effectively empty git_remote_callbacks struct
+		git_remote_set_callbacks(remote.git_remote, &((git_remote_callbacks)GIT_REMOTE_CALLBACKS_INIT));
+	};
+
+	git_push *push;
+	gitError = git_push_new(&push, remote.git_remote);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Push object creation failed" failureReason:@"Failed to create push object for remote \"%@\"", self];
+		return NO;
+	}
+	@onExit {
+		git_push_free(push);
+	};
+
+	git_push_options push_options = GIT_PUSH_OPTIONS_INIT;
+
+	gitError = git_push_set_options(push, &push_options);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to add options"];
+		return NO;
+	}
+
+	GTRemoteConnectionInfo payload = {
+		.pushProgressBlock = progressBlock,
+	};
+	gitError = git_push_set_callbacks(push, NULL, NULL, GTRemotePushTransferProgressCallback, &payload);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Setting push callbacks failed"];
+		return NO;
+	}
+
+	for (NSString *refspec in refspecs) {
+		gitError = git_push_add_refspec(push, refspec.UTF8String);
+		if (gitError != GIT_OK) {
+			if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Adding reference failed" failureReason:@"Failed to add refspec \"%@\" to push object", refspec];
+			return NO;
+		}
+	}
+
+	gitError = git_push_finish(push);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Push to remote failed"];
+		return NO;
+	}
+
+	gitError = git_push_update_tips(push, self.userSignatureForNow.git_signature, NULL);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Update tips failed"];
+		return NO;
+	}
+
+	gitError = git_push_status_foreach(push, GTRemotePushRefspecStatusCallback, NULL);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"One or references failed to update"];
+		return NO;
+	}
+
+	return YES;
+}
+
+@end

ObjectiveGit/GTTreeBuilder.m

@@ -68,7 +68,7 @@ - (id)initWithTree:(GTTree *)treeOrNil repository:(GTRepository *)repository err
 	self = [super init];
 	if (self == nil) return nil;
 
-	int status = git_treebuilder_new(&_git_treebuilder, repository.git_repository, treeOrNil.git_tree);
+	int status = git_treebuilder_create(&_git_treebuilder, repository.git_repository, treeOrNil.git_tree);
 	if (status != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to create tree builder with tree %@.", treeOrNil.SHA];
 		return nil;