Bring API in line with current libgit2 version

Author: tiennou

ObjectiveGit/GTRepository+Stashing.h

@@ -21,10 +21,23 @@ typedef NS_OPTIONS(NSInteger, GTRepositoryStashFlag) {
 
 /// Flags for -applyStashAtIndex:flags:error: and
 /// -popStashAtIndex:flags:error.
-/// Those can be ORed together. See git_apply_flags for additional information.
-typedef NS_OPTIONS(NSInteger, GTRepositoryApplyFlag) {
-	GTRepositoryApplyFlagDefault = GIT_APPLY_DEFAULT,
-	GTRepositoryApplyFlagReinstateIndex = GIT_APPLY_REINSTATE_INDEX,
+/// Those can be ORed together. See git_stash_apply_flags for additional information.
+typedef NS_OPTIONS(NSInteger, GTRepositoryStashApplyFlag) {
+	GTRepositoryStashApplyFlagDefault = GIT_STASH_APPLY_DEFAULT,
+	GTRepositoryStashApplyFlagReinstateIndex = GIT_STASH_APPLY_REINSTATE_INDEX,
+};
+
+/// Enum representing the current state of a stash apply/pop operation.
+/// See git_stash_apply_progress_t for additional information.
+typedef NS_ENUM(NSInteger, GTRepositoryStashApplyProgress) {
+	GTRepositoryStashApplyProgressNone = GIT_STASH_APPLY_PROGRESS_NONE,
+	GTRepositoryStashApplyProgressLoadingStash = GIT_STASH_APPLY_PROGRESS_LOADING_STASH,
+	GTRepositoryStashApplyProgressAnalyzeIndex = GIT_STASH_APPLY_PROGRESS_ANALYZE_INDEX,
+	GTRepositoryStashApplyProgressAnalyzeModified = GIT_STASH_APPLY_PROGRESS_ANALYZE_MODIFIED,
+	GTRepositoryStashApplyProgressAnalyzeUntracked = GIT_STASH_APPLY_PROGRESS_ANALYZE_UNTRACKED,
+	GTRepositoryStashApplyProgressGheckoutUntracked = GIT_STASH_APPLY_PROGRESS_CHECKOUT_UNTRACKED,
+	GTRepositoryStashApplyProgressCheckoutModified = GIT_STASH_APPLY_PROGRESS_CHECKOUT_MODIFIED,
+	GTRepositoryStashApplyProgressDone = GIT_STASH_APPLY_PROGRESS_DONE,
 };
 
 NS_ASSUME_NONNULL_BEGIN
@@ -56,7 +69,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// error - If not NULL, set to any error that occurred.
 ///
 /// Returns YES if the requested stash was successfully applied, NO otherwise.
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryApplyFlag)flags error:(NSError **)error;
+- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock error:(NSError **)error;
 
 /// Pop stashed changes.
 ///
@@ -65,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// error - If not NULL, set to any error that occurred.
 ///
 /// Returns YES if the requested stash was successfully applied, NO otherwise.
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryApplyFlag)flags error:(NSError **)error;
+- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock error:(NSError **)error;
 
 /// Drop a stash from the repository's list of stashes.
 ///

ObjectiveGit/GTRepository+Stashing.m

@@ -50,19 +50,44 @@ - (void)enumerateStashesUsingBlock:(GTRepositoryStashEnumerationBlock)block {
 	git_stash_foreach(self.git_repository, &stashEnumerationCallback, (__bridge void *)block);
 }
 
-- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryApplyFlag)flags error:(NSError **)error {
-	int gitError = git_stash_apply(self.git_repository, index, flags);
+static int stashApplyProgressCallback(git_stash_apply_progress_t progress, void *payload) {
+	void (^block)(GTRepositoryStashApplyProgress, BOOL *) = (__bridge id)payload;
+
+	BOOL stop = NO;
+	block((GTRepositoryStashApplyProgress)progress, &stop);
+
+	return (stop ? GIT_EUSER : 0);
+}
+
+- (BOOL)applyStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock error:(NSError **)error {
+	git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;
+
+	stash_options.flags = (git_stash_apply_flags)flags;
+	if (progressBlock != nil) {
+		stash_options.progress_cb = stashApplyProgressCallback;
+		stash_options.progress_payload = (__bridge void *)progressBlock;
+	}
+
+	int gitError = git_stash_apply(self.git_repository, index, &stash_options);
 	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to apply stash" failureReason:@"The stash at index %ld couldn't be applied.", index];
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash apply failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
 		return NO;
 	}
 	return YES;
 }
 
-- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryApplyFlag)flags error:(NSError **)error {
-	int gitError = git_stash_pop(self.git_repository, index, flags);
+- (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryStashApplyFlag)flags progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock error:(NSError **)error {
+	git_stash_apply_options stash_options = GIT_STASH_APPLY_OPTIONS_INIT;
+
+	stash_options.flags = (git_stash_apply_flags)flags;
+	if (progressBlock != nil) {
+		stash_options.progress_cb = stashApplyProgressCallback;
+		stash_options.progress_payload = (__bridge void *)progressBlock;
+	}
+
+	int gitError = git_stash_pop(self.git_repository, index, &stash_options);
 	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to pop stash" failureReason:@"The stash at index %ld couldn't be applied.", index];
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash pop failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
 		return NO;
 	}
 	return YES;
@@ -71,7 +96,7 @@ - (BOOL)popStashAtIndex:(NSUInteger)index flags:(GTRepositoryApplyFlag)flags err
 - (BOOL)dropStashAtIndex:(NSUInteger)index error:(NSError **)error {
 	int gitError = git_stash_drop(self.git_repository, index);
 	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to drop stash."];
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Stash drop failed" failureReason:@"The stash at index %ld couldn't be dropped", (unsigned long)index];
 		return NO;
 	}