Update last few "trivial" uses to PBTask

Author: tiennou

Classes/Controllers/PBServicesController.m

@@ -18,28 +18,36 @@ - (NSString *)completeSHA1For:(NSString *)sha error:(NSString **)error
 	NSArray *documents = [[NSApplication sharedApplication] orderedDocuments];
 	for (PBGitRepositoryDocument *doc in documents)
 	{
-		int ret = 1;
-		NSString *s = [doc.repository outputForArguments:[NSArray arrayWithObjects:@"log", @"-1", @"--pretty=format:%h (%s)", sha, nil] retValue:&ret];
-		if (!ret)
+		NSError *error = nil;
+		NSString *s = [doc.repository outputOfTaskWithArguments:@[@"log", @"-1", @"--pretty=format:%h (%s)", sha] error:&error];
+		if (s) {
 			return s;
+		}
 	}
 
 	if (error) *error = @"Unable to resolve SHA in opened repositories";
 	return nil;
 }
 
-- (NSString *)runNameRevFor:(NSString *)s error:(NSString **)error
+- (NSString *)runNameRevFor:(NSString *)s error:(NSString **)errorStr
 {
 	NSArray *repositories = [[NSApplication sharedApplication] orderedDocuments];
 	if ([repositories count] == 0)
 		return s;
 	PBGitRepositoryDocument *doc = [repositories objectAtIndex:0];
-	int ret = 1;
-	NSString *returnString = [doc.repository outputForArguments:[NSArray arrayWithObjects:@"name-rev", @"--stdin", nil] inputString:s retValue:&ret];
-	if (!ret)
-		return returnString;
 
-	if (error) *error = @"Unable to resolve SHA in opened repositories";
+	NSError *error = nil;
+	PBTask *task = [doc.repository taskWithArguments:@[]];
+	task.standardInputData = [s dataUsingEncoding:NSUTF8StringEncoding];
+	BOOL success = [task launchTask:&error];
+
+	if (success) {
+		return task.standardOutputString;
+	} else {
+		PBLogError(error);
+	}
+
+	if (errorStr) *errorStr = @"Unable to resolve SHA in opened repositories";
 	return nil;
 }
 

Classes/git/PBGitCommit.m

@@ -195,7 +195,13 @@ - (NSString *) patch
 	if (self->_patch != nil)
 		return _patch;
 
-	NSString *p = [self.repository outputForArguments:[NSArray arrayWithObjects:@"format-patch",  @"-1", @"--stdout", self.SHA, nil]];
+	NSError *error = nil;
+	NSString *p = [self.repository outputOfTaskWithArguments:@[@"format-patch",  @"-1", @"--stdout", self.SHA] error:&error];
+	if (!p) {
+		PBLogError(error);
+		return nil;
+	}
+
 	// Add a GitX identifier to the patch ;)
 	self.patch = [[p substringToIndex:[p length] -1] stringByAppendingString:@"+GitX"];
 	return self->_patch;

Classes/git/PBGitRepository.m

@@ -1000,10 +1000,10 @@ - (NSString *)performDiff:(PBGitCommit *)startCommit against:(PBGitCommit *)diff
 		[arguments addObjectsFromArray:filePaths];
 	}
 
-	int retValue;
-	NSString *diff = [startCommit.repository outputInWorkdirForArguments:arguments retValue:&retValue];
-	if (retValue) {
-		NSLog(@"diff failed with retValue: %d   for command: '%@'    output: '%@'", retValue, [arguments componentsJoinedByString:@" "], diff);
+	NSError *error = nil;
+	NSString *diff = [self outputOfTaskWithArguments:arguments error:&error];
+	if (!diff) {
+		PBLogError(error);
 		return @"";
 	}
 	return diff;
@@ -1036,9 +1036,12 @@ - (BOOL) deleteRef:(PBGitRef *)ref error:(NSError **)error
 }
 
 - (BOOL)updateReference:(PBGitRef *)ref toPointAtCommit:(PBGitCommit *)newCommit {
-	int retValue = 1;
-	[self outputForArguments:@[@"update-ref", @"-mUpdate from GitX", ref.ref, newCommit.SHA] retValue:&retValue];
-	return retValue != 0;
+	NSError *error = nil;
+	BOOL success = [self launchTaskWithArguments:@[@"update-ref", @"-mUpdate from GitX", ref.ref, newCommit.SHA] error:&error];
+	if (!success) {
+		PBLogError(error);
+	}
+	return success;
 }
 
 - (GTSubmodule *)submoduleAtPath:(NSString *)path error:(NSError **)error;