Merge pull request #439 from alehed/master

Add ability to cancel the remote part of the clone operation

Author: joshaber

ObjectiveGit/GTRepository.h

@@ -210,7 +210,7 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
 ///                         (if `GTRepositoryCloneOptionsCheckout` is YES).
 ///
 /// returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful.
-+ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock;
++ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock;
 
 /// Lookup objects in the repo by oid or sha1
 - (id)lookUpObjectByOID:(GTOID *)oid objectType:(GTObjectType)type error:(NSError **)error;

ObjectiveGit/GTRepository.m

@@ -184,7 +184,7 @@ - (id)initWithURL:(NSURL *)localFileURL error:(NSError **)error {
 }
 
 
-typedef void(^GTTransferProgressBlock)(const git_transfer_progress *progress);
+typedef void(^GTTransferProgressBlock)(const git_transfer_progress *progress, BOOL *stop);
 
 static void checkoutProgressCallback(const char *path, size_t completedSteps, size_t totalSteps, void *payload) {
 	if (payload == NULL) return;
@@ -197,8 +197,10 @@ static int transferProgressCallback(const git_transfer_progress *progress, void
 	if (payload == NULL) return 0;
 	struct GTClonePayload *pld = payload;
 	if (pld->transferProgressBlock == NULL) return 0;
-	pld->transferProgressBlock(progress);
-	return 0;
+	
+	BOOL stop = NO;
+	pld->transferProgressBlock(progress, &stop);
+	return (stop ? GIT_EUSER : 0);
 }
 
 struct GTClonePayload {
@@ -222,7 +224,7 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
 	git_remote_callbacks remoteCallbacks;
 };
 
-+ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
++ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
 
 	git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;