Merge branch 'master' into pull

# Conflicts:
#	ObjectiveGitFramework.xcodeproj/project.pbxproj

Author: phatblat

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage/Checkouts/ZipArchive"]
+	path = Carthage/Checkouts/ZipArchive
+	url = https://github.com/ZipArchive/ZipArchive.git

Cartfile.private

@@ -1,3 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
 github "Quick/Quick" ~> 0.3
 github "Quick/Nimble" ~> 0.4
+github "ZipArchive/ZipArchive" ~> 0.3

Cartfile.resolved

@@ -1,3 +1,4 @@
 github "Quick/Nimble" "v0.4.2"
 github "Quick/Quick" "v0.3.1"
+github "ZipArchive/ZipArchive" "v0.3.2"
 github "jspahrsummers/xcconfigs" "0.7.2"

Carthage/Checkouts/ZipArchive

@@ -132,9 +132,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns whether the calculation was successful.
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error;
 
-#pragma mark Deprecations
-- (nullable GTCommit *)targetCommitAndReturnError:(NSError **)error __deprecated_msg("use targetCommitWithError: instead.");
-
 @end
 
 NS_ASSUME_NONNULL_END

External/libgit2

@@ -223,9 +223,4 @@ - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBra
 	return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];
 }
 
-#pragma mark Deprecations
-- (GTCommit *)targetCommitAndReturnError:(NSError **)error {
-	return [self targetCommitWithError:error];
-}
-
 @end

ObjectiveGit/GTBranch.h

@@ -74,6 +74,18 @@ NS_ASSUME_NONNULL_BEGIN
 /// Return a new GTCredential instance, or nil if an error occurred
 + (nullable instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(nullable NSURL *)publicKeyURL privateKeyURL:(NSURL *)privateKeyURL passphrase:(nullable NSString *)passphrase error:(NSError **)error;
 
+/// Create a credential object from a SSH keyfile data string
+///
+/// userName         - The username to authenticate as.
+/// publicKeyString  - The string containing the public key for that user.
+///                     Can be omitted to reconstruct the public key from the private key.
+/// privateKeyString - The URL to the private key for that user.
+/// passphrase       - The passPhrase for the private key. Optional if the private key has no password.
+/// error            - If not NULL, set to any errors that occur.
+///
+/// Return a new GTCredential instance, or nil if an error occurred
++ (nullable instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(nullable NSString *)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(nullable NSString *)passphrase error:(NSError **)error;
+
 /// The underlying `git_cred` object.
 - (git_cred *)git_cred __attribute__((objc_returns_inner_pointer));
 

ObjectiveGit/GTBranch.m

@@ -71,6 +71,19 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(NSURL
 	return [[self alloc] initWithGitCred:cred];
 }
 
++ (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSString *)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString *)passphrase error:(NSError **)error {
+	NSParameterAssert(privateKeyString != nil);
+	
+	git_cred *cred;
+	int gitError = git_cred_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);
+	if (gitError != GIT_OK) {
+		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@\nPrivate key: %@", userName, publicKeyString, privateKeyString];
+		return nil;
+	}
+	
+	return [[self alloc] initWithGitCred:cred];
+}
+
 - (instancetype)initWithGitCred:(git_cred *)cred {
 	NSParameterAssert(cred != nil);
 	self = [self init];

ObjectiveGit/GTCredential.h

@@ -219,7 +219,7 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 
 	git_remote_callbacks remote_callbacks = GIT_REMOTE_CALLBACKS_INIT;
 	remote_callbacks.credentials = (credProvider != nil ? GTCredentialAcquireCallback : NULL),
-	remote_callbacks.transfer_progress = GTRemoteFetchTransferProgressCallback,
+	remote_callbacks.push_transfer_progress = GTRemotePushTransferProgressCallback;
 	remote_callbacks.payload = &connectionInfo,
 
 	gitError = git_remote_connect(remote.git_remote, GIT_DIRECTION_PUSH, &remote_callbacks);
@@ -239,6 +239,8 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 		return NO;
 	}
 
+	push_options.callbacks = remote_callbacks;
+
 	const git_strarray git_refspecs = refspecs.git_strarray;
 
 	gitError = git_remote_upload(remote.git_remote, &git_refspecs, &push_options);

ObjectiveGit/GTCredential.m

@@ -19,6 +19,27 @@ typedef NS_OPTIONS(NSInteger, GTRepositoryStashFlag) {
 	GTRepositoryStashFlagIncludeIgnored = GIT_STASH_INCLUDE_IGNORED
 };
 
+/// Flags for -applyStashAtIndex:flags:error: and
+/// -popStashAtIndex:flags:error.
+/// 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
 
 @interface GTRepository (Stashing)
@@ -41,6 +62,24 @@ NS_ASSUME_NONNULL_BEGIN
 ///         will cause enumeration to stop after the block returns. Must not be nil.
 - (void)enumerateStashesUsingBlock:(void (^)(NSUInteger index, NSString * __nullable message, GTOID * __nullable oid, BOOL *stop))block;
 
+/// Apply stashed changes.
+///
+/// index - The index of the stash to apply. 0 is the latest one.
+/// flags - The flags to use when applying the stash.
+/// 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:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
+
+/// Pop stashed changes.
+///
+/// index - The index of the stash to apply. 0 is the most recent stash.
+/// flags - The flags to use when applying the stash.
+/// 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:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock;
+
 /// Drop a stash from the repository's list of stashes.
 ///
 /// index - The index of the stash to drop, where 0 is the most recent stash.

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -50,10 +50,53 @@ - (void)enumerateStashesUsingBlock:(GTRepositoryStashEnumerationBlock)block {
 	git_stash_foreach(self.git_repository, &stashEnumerationCallback, (__bridge void *)block);
 }
 
+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 error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+	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:@"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:(GTRepositoryStashApplyFlag)flags error:(NSError **)error progressBlock:(nullable void (^)(GTRepositoryStashApplyProgress progress, BOOL *stop))progressBlock {
+	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:@"Stash pop failed" failureReason:@"The stash at index %ld couldn't be applied.", (unsigned long)index];
+		return NO;
+	}
+	return YES;
+}
+
 - (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;
 	}
 

ObjectiveGit/GTRepository+Stashing.h

@@ -78,7 +78,7 @@ - (BOOL)isWorkingDirectoryClean {
 		}
 
 		// any untracked files?
-		if (indexToWorkDirStatus == GTStatusDeltaStatusAdded) {
+		if (indexToWorkDirStatus == GTStatusDeltaStatusUntracked) {
 			clean = NO;
 			*stop = YES;
 		}

ObjectiveGit/GTRepository+Stashing.m

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

ObjectiveGit/GTRepository+Status.m

@@ -226,7 +226,7 @@ static int remoteCreate(git_remote **remote, git_repository *repo, const char *n
 	return GIT_OK;
 }
 
-+ (instancetype)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 {
++ (instancetype)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL options:(NSDictionary *)options error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *, BOOL *stop))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *__nullable path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
 
 	git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;
 
@@ -816,7 +816,7 @@ - (BOOL)moveHEADToCommit:(GTCommit *)commit error:(NSError **)error {
 	return gitError == GIT_OK;
 }
 
-- (BOOL)performCheckoutWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock notifyBlock:(GTCheckoutNotifyBlock)notifyBlock {
+- (BOOL)performCheckout:(GTObject *)target withStrategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock notifyBlock:(GTCheckoutNotifyBlock)notifyBlock {
 
 	git_checkout_options checkoutOptions = GIT_CHECKOUT_OPTIONS_INIT;
 
@@ -828,7 +828,7 @@ - (BOOL)performCheckoutWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags
 	checkoutOptions.notify_flags = notifyFlags;
 	checkoutOptions.notify_payload = (__bridge void *)notifyBlock;
 
-	int gitError = git_checkout_head(self.git_repository, &checkoutOptions);
+	int gitError = git_checkout_tree(self.git_repository, target.git_object, &checkoutOptions);
 	if (gitError < GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to checkout tree."];
 	}
@@ -837,17 +837,18 @@ - (BOOL)performCheckoutWithStrategy:(GTCheckoutStrategyType)strategy notifyFlags
 }
 
 - (BOOL)checkoutCommit:(GTCommit *)targetCommit strategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock notifyBlock:(GTCheckoutNotifyBlock)notifyBlock {
-	BOOL success = [self moveHEADToCommit:targetCommit error:error];
+	BOOL success = [self performCheckout:targetCommit withStrategy:strategy notifyFlags:notifyFlags error:error progressBlock:progressBlock notifyBlock:notifyBlock];
 	if (success == NO) return NO;
-
-	return [self performCheckoutWithStrategy:strategy notifyFlags:notifyFlags error:error progressBlock:progressBlock notifyBlock:notifyBlock];
+	return [self moveHEADToCommit:targetCommit error:error];
 }
 
 - (BOOL)checkoutReference:(GTReference *)targetReference strategy:(GTCheckoutStrategyType)strategy notifyFlags:(GTCheckoutNotifyFlags)notifyFlags error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock notifyBlock:(GTCheckoutNotifyBlock)notifyBlock {
-	BOOL success = [self moveHEADToReference:targetReference error:error];
+	GTOID *targetOID = [targetReference targetOID];
+	GTObject *target = [self lookUpObjectByOID:targetOID error:error];
+	if (target == nil) return NO;
+	BOOL success = [self performCheckout:target withStrategy:strategy notifyFlags:notifyFlags error:error progressBlock:progressBlock notifyBlock:notifyBlock];
 	if (success == NO) return NO;
-
-	return [self performCheckoutWithStrategy:strategy notifyFlags:notifyFlags error:error progressBlock:progressBlock notifyBlock:notifyBlock];
+	return [self moveHEADToReference:targetReference error:error];
 }
 
 - (BOOL)checkoutCommit:(GTCommit *)target strategy:(GTCheckoutStrategyType)strategy error:(NSError **)error progressBlock:(GTCheckoutProgressBlock)progressBlock {