Added -[GTRepository checkoutTree:…]

libgit2 · pietbrauer · Feb 27, 2017 · Dec 16, 2016 · Dec 19, 2016 · Feb 27, 2017
commit 9886cf83973f1fea7aba477db50446dc1f57bed8
diff --git a/ObjectiveGit/GTRepository.h b/ObjectiveGit/GTRepository.h
@@ -548,7 +548,7 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 
 /// Checkout a reference
 ///
-/// targetCommit  - The reference to checkout.
+/// targetReference - The reference to checkout.
 /// strategy      - The checkout strategy to use.
 /// notifyFlags   - Flags that indicate which notifications should cause `notifyBlock`
 ///                 to be called.
@@ -559,6 +559,20 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 /// Returns YES if operation was successful, NO otherwise
 - (BOOL)checkoutReference:(GTReference *)targetReference strategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(nullable void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))progressBlock notifyBlock:(nullable int (^)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir))notifyBlock;
 
+/// Checkout a tree
+///
+/// targetTree    - The tree to checkout.
+/// strategy      - The checkout strategy to use.
+/// notifyFlags   - Flags that indicate which notifications should cause `notifyBlock`
+///                 to be called.
+/// error         - The error if one occurred. Can be NULL.
+/// notifyBlock   - The block to call back for notification handling. Can be nil.
+/// progressBlock - The block to call back for progress updates. Can be nil.
+///
+/// Returns YES if operation was successful, NO otherwise
+/// Note: this operation will NOT update HEAD to newly checked out tree.
+- (BOOL)checkoutTree:(GTTree *)targetTree strategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(nullable void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))progressBlock notifyBlock:(nullable int (^)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir))notifyBlock;
+
 /// Convenience wrapper for checkoutCommit:strategy:notifyFlags:error:notifyBlock:progressBlock without notifications
 - (BOOL)checkoutCommit:(GTCommit *)target strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(nullable void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))progressBlock;
 

diff --git a/ObjectiveGit/GTRepository.m b/ObjectiveGit/GTRepository.m
@@ -868,6 +868,10 @@ - (BOOL)checkoutReference:(GTReference *)targetReference strategy:(GTCheckoutStr
 	return [self moveHEADToReference:targetReference error:error];
 }
 
+- (BOOL)checkoutTree:(GTTree *)targetTree strategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock notifyBlock:(GTCheckoutNotifyBlock)notifyBlock {
+	return [self performCheckout:targetTree withStrategy:strategy notifyFlags:notifyFlags error:error progressBlock:progressBlock notifyBlock:notifyBlock];;
+}
+
 - (BOOL)checkoutCommit:(GTCommit *)target strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock {
 	return [self checkoutCommit:target strategy:strategy notifyFlags:GTCheckoutNotifyNone error:error progressBlock:progressBlock notifyBlock:nil];
 }