Pull #464
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| // | ||
| // GTRepository+Pull.h | ||
| // ObjectiveGitFramework | ||
| // | ||
| // Created by Ben Chatelain on 6/17/15. | ||
| // Copyright © 2015 GitHub, Inc. All rights reserved. | ||
| // | ||
|
|
||
| #import "GTRepository.h" | ||
| #import "git2/merge.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /// An enum describing the result of the merge analysis. | ||
| /// See `git_merge_analysis_t`. | ||
| typedef NS_ENUM(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) | ||
|
|
||
| #pragma mark - Pull | ||
|
|
||
| /// Pull a single branch from a remote. | ||
| /// | ||
| /// branch - The branch to pull. | ||
| /// remote - The remote to pull from. | ||
| /// options - Options applied to the fetch 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 pull was successful, NO otherwise (and `error`, if provided, | ||
| /// 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; | ||
|
|
||
| /// Analyse which merge to perform | ||
| /// | ||
| /// toBranch - The current branch. | ||
| /// fromBranch - The remote to pull from. | ||
| /// error - The error if one occurred. Can be NULL. | ||
| /// | ||
| /// Returns the result as a GTMergeAnalysis. | ||
| - (GTMergeAnalysis)analyseMerge:(GTBranch *)toBranch fromBranch:(GTBranch *)fromBranch error:(NSError **)error; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // | ||
| // GTRepository+Pull.m | ||
| // ObjectiveGitFramework | ||
| // | ||
| // Created by Ben Chatelain on 6/17/15. | ||
| // Copyright © 2015 GitHub, Inc. All rights reserved. | ||
| // | ||
|
|
||
| #import "GTRepository+Pull.h" | ||
|
|
||
| #import "GTCommit.h" | ||
| #import "GTRemote.h" | ||
| #import "GTRepository+Committing.h" | ||
| #import "GTRepository+RemoteOperations.h" | ||
| #import "git2/merge.h" | ||
|
|
||
| @implementation GTRepository (Pull) | ||
|
|
||
| #pragma mark - Pull | ||
|
|
||
| - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:(NSDictionary *)options | ||
| error:(NSError **)error progress:(GTRemoteFetchTransferProgressBlock)progressBlock | ||
| { | ||
|
There was a problem hiding this comment. Nit: opening curly on the preceding line. |
||
| NSParameterAssert(branch); | ||
|
There was a problem hiding this comment. Nit: explicit comparison to |
||
| NSParameterAssert(remote); | ||
|
|
||
| GTRepository *repo = remote.repository; | ||
|
|
||
| GTBranch *remoteBranch; | ||
| if (branch.branchType == GTBranchTypeLocal) { | ||
| BOOL success; | ||
| remoteBranch = [branch trackingBranchWithError:error success:&success]; | ||
| if (!success) { | ||
| return NO; | ||
| } | ||
| } | ||
| else { | ||
| remoteBranch = branch; | ||
| } | ||
|
|
||
| if (![self fetchRemote:remote withOptions:options error:error progress:progressBlock]) { | ||
| return NO; | ||
| } | ||
|
|
||
| // Check if merge is necessary | ||
| GTBranch *localBranch = [repo currentBranchWithError:error]; | ||
| if (*error) { | ||
|
There was a problem hiding this comment. I think you should be checking for the return value, not the error — I fear a nice SEGV if I was to pass There was a problem hiding this comment. Good catch. Using the user-supplied error pointer for control flow is messy, and dangerous 💥 . |
||
| return NO; | ||
| } | ||
|
|
||
| GTCommit *localCommit = [localBranch targetCommitAndReturnError:error]; | ||
| if (*error) { | ||
| return NO; | ||
| } | ||
|
|
||
| GTCommit *remoteCommit = [remoteBranch targetCommitAndReturnError:error]; | ||
| if (*error) { | ||
| return NO; | ||
| } | ||
|
|
||
| if ([localCommit.SHA isEqualToString:remoteCommit.SHA]) { | ||
| return YES; | ||
| } | ||
|
|
||
| GTMergeAnalysis analysis = [self analyseMerge:branch fromBranch:remoteBranch error:error]; | ||
|
|
||
| if (*error) { | ||
| return NO; | ||
| } | ||
|
|
||
| if (analysis & GTMergeAnalysisUpToDate) { | ||
| // Nothing to do | ||
| return YES; | ||
| } else if (analysis & GTMergeAnalysisFastForward) { | ||
| // Do FastForward | ||
| NSLog(@"Fast-Forward merge is not yet supported"); | ||
| return NO; | ||
| } else if (analysis & GTMergeAnalysisNormal) { | ||
| // Do normal merge | ||
| GTTree *remoteTree = remoteCommit.tree; | ||
| NSString *message = [NSString stringWithFormat:@"Merge branch '%@'", localBranch.shortName]; | ||
| NSArray *parents = @[ localCommit, remoteCommit ]; | ||
| GTCommit *mergeCommit = [repo createCommitWithTree:remoteTree message:message | ||
| parents:parents updatingReferenceNamed:localBranch.name | ||
| error:error]; | ||
| if (!mergeCommit) { | ||
| return NO; | ||
| } | ||
|
|
||
| return YES; | ||
| } else if (analysis & GTMergeAnalysisUnborn) { | ||
| // Do unborn merge | ||
| NSLog(@"Unborn merge is not yet supported"); | ||
| return NO; | ||
| } | ||
|
|
||
| return NO; | ||
| } | ||
|
|
||
| - (GTMergeAnalysis)analyseMerge:(GTBranch *)toBranch fromBranch:(GTBranch *)fromBranch error:(NSError **)error | ||
| { | ||
| git_merge_analysis_t analysis; | ||
|
There was a problem hiding this comment.
Do note that I find the There was a problem hiding this comment. Yep, agreed. There was a problem hiding this comment. FYI (because you had me wondering) : https://github.com/libgit2/libgit2/blob/master/src/merge.c#L2672. Not that it really matters though, it's just a default value. There was a problem hiding this comment. I see, I was just reading the docks, not looking into the code. Then I will probably make a PR for |
||
| git_merge_preference_t preference; | ||
| git_annotated_commit *annotatedCommit; | ||
|
|
||
| GTCommit *fromCommit = [fromBranch targetCommitAndReturnError:error]; | ||
| if (*error) { | ||
| return GTMergeAnalysisNone; | ||
| } | ||
|
|
||
| git_annotated_commit_lookup(&annotatedCommit, self.git_repository, git_object_id(fromCommit.git_object)); | ||
| git_merge_analysis(&analysis, &preference, self.git_repository, (const git_annotated_commit **) &annotatedCommit, 1); | ||
| git_annotated_commit_free(annotatedCommit); | ||
|
|
||
| return (GTMergeAnalysis)analysis; | ||
| } | ||
|
|
||
| @end | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/pull/merge?