Move analyse to GTRepository+Merging

Author: pietbrauer

ObjectiveGit/GTRepository+Merging.h

@@ -7,9 +7,23 @@
 //
 
 #import "GTRepository.h"
+#import "git2/merge.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
+/// UserInfo key for conflicted files when pulling fails with a merge conflict
+extern NSString * const GTPullMergeConflictedFiles;
+
+/// An enum describing the result of the merge analysis.
+/// See `git_merge_analysis_t`.
+typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {
+	GTMergeAnalysisNone = GIT_MERGE_ANALYSIS_NONE,
+	GTMergeAnalysisNormal = GIT_MERGE_ANALYSIS_NORMAL,
+	GTMergeAnalysisUpToDate = GIT_MERGE_ANALYSIS_UP_TO_DATE,
+	GTMergeAnalysisUnborn = GIT_MERGE_ANALYSIS_UNBORN,
+	GTMergeAnalysisFastForward = GIT_MERGE_ANALYSIS_FASTFORWARD,
+};
+
 @interface GTRepository (Merging)
 
 /// Enumerate all available merge head entries.
@@ -29,6 +43,16 @@ NS_ASSUME_NONNULL_BEGIN
 /// Retruns a (possibly empty) array with GTCommit objects. Will not be nil.
 - (NSArray <GTCommit *>*)mergeHeadEntriesWithError:(NSError **)error;
 
+/// Analyze which merge to perform.
+///
+/// analysis   - The resulting analysis.
+/// fromBranch - The branch to merge from.
+/// error      - The error if one occurred. Can be NULL.
+///
+/// Returns YES if the analysis was successful, NO otherwise (and `error`, if provided,
+/// will point to an error describing what happened).
+- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

ObjectiveGit/GTRepository+Merging.m

@@ -67,4 +67,32 @@ - (NSArray *)mergeHeadEntriesWithError:(NSError **)error {
 	return entries;
 }
 
+- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error {
+	NSParameterAssert(analysis != NULL);
+	NSParameterAssert(fromBranch != nil);
+
+	GTCommit *fromCommit = [fromBranch targetCommitWithError:error];
+	if (!fromCommit) {
+		return NO;
+	}
+
+	git_annotated_commit *annotatedCommit;
+	[self annotatedCommit:&annotatedCommit fromCommit:fromCommit error:error];
+
+	// Allow fast-forward or normal merge
+	git_merge_preference_t preference = GIT_MERGE_PREFERENCE_NONE;
+
+	// Merge analysis
+	int gitError = git_merge_analysis((git_merge_analysis_t *)analysis, &preference, self.git_repository, (const git_annotated_commit **) &annotatedCommit, 1);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to analyze merge"];
+		return NO;
+	}
+
+	// Cleanup
+	git_annotated_commit_free(annotatedCommit);
+
+	return YES;
+}
+
 @end

ObjectiveGit/GTRepository+Pull.h

@@ -7,23 +7,9 @@
 //
 
 #import "GTRepository.h"
-#import "git2/merge.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-/// UserInfo key for conflicted files when pulling fails with a merge conflict
-extern NSString * const GTPullMergeConflictedFiles;
-
-/// An enum describing the result of the merge analysis.
-/// See `git_merge_analysis_t`.
-typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {
-	GTMergeAnalysisNone = GIT_MERGE_ANALYSIS_NONE,
-	GTMergeAnalysisNormal = GIT_MERGE_ANALYSIS_NORMAL,
-	GTMergeAnalysisUpToDate = GIT_MERGE_ANALYSIS_UP_TO_DATE,
-	GTMergeAnalysisUnborn = GIT_MERGE_ANALYSIS_UNBORN,
-	GTMergeAnalysisFastForward = GIT_MERGE_ANALYSIS_FASTFORWARD,
-};
-
 typedef void (^GTRemoteFetchTransferProgressBlock)(const git_transfer_progress *progress, BOOL *stop);
 
 @interface GTRepository (Pull)
@@ -44,16 +30,6 @@ typedef void (^GTRemoteFetchTransferProgressBlock)(const git_transfer_progress *
 /// will point to an error describing what happened).
 - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:(nullable NSDictionary *)options error:(NSError **)error progress:(nullable GTRemoteFetchTransferProgressBlock)progressBlock;
 
-/// Analyze which merge to perform.
-///
-/// analysis   - The resulting analysis.
-/// fromBranch - The branch to merge from.
-/// error      - The error if one occurred. Can be NULL.
-///
-/// Returns YES if the analysis was successful, NO otherwise (and `error`, if provided,
-/// will point to an error describing what happened).
-- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error;
-
 @end
 
 NS_ASSUME_NONNULL_END

ObjectiveGit/GTRepository+Pull.m

@@ -163,33 +163,6 @@ - (BOOL)annotatedCommit:(git_annotated_commit **)annotatedCommit fromCommit:(GTC
 
 	return YES;
 }
-
-- (BOOL)analyzeMerge:(GTMergeAnalysis *)analysis fromBranch:(GTBranch *)fromBranch error:(NSError **)error {
-	NSParameterAssert(analysis != NULL);
-	NSParameterAssert(fromBranch != nil);
-
-	GTCommit *fromCommit = [fromBranch targetCommitWithError:error];
-	if (!fromCommit) {
-		return NO;
-	}
-
-	git_annotated_commit *annotatedCommit;
-	[self annotatedCommit:&annotatedCommit fromCommit:fromCommit error:error];
-
-	// Allow fast-forward or normal merge
-	git_merge_preference_t preference = GIT_MERGE_PREFERENCE_NONE;
-
-	// Merge analysis
-	int gitError = git_merge_analysis((git_merge_analysis_t *)analysis, &preference, self.git_repository, (const git_annotated_commit **) &annotatedCommit, 1);
-	if (gitError != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to analyze merge"];
-		return NO;
-	}
-
-	// Cleanup
-	git_annotated_commit_free(annotatedCommit);
-
-	return YES;
 }
 
 @end