Read full diffs with ObjectiveGit

Author: nanotech

Classes/Controllers/PBWebHistoryController.m

@@ -165,6 +165,7 @@ - (void) changeContentToCommit:(PBGitCommit *)commit
 	}
 	if (isCanceled()) return nil;
 	NSMutableArray *fileDeltas = [NSMutableArray array];
+	NSMutableString *fullDiff = [NSMutableString string];
 	[d enumerateDeltasUsingBlock:^(GTDiffDelta *_Nonnull delta, BOOL *_Nonnull stop) {
 		if (isCanceled()) {
 			*stop = YES;
@@ -181,6 +182,20 @@ - (void) changeContentToCommit:(PBGitCommit *)commit
 		if (patch) {
 			numLinesAdded = patch.addedLinesCount;
 			numLinesRemoved = patch.deletedLinesCount;
+			NSData *patchData = patch.patchData;
+			if (patchData) {
+				NSString *patchString =
+				    [[NSString alloc] initWithData:patchData
+				                          encoding:NSUTF8StringEncoding];
+				if (!patchString) {
+					patchString =
+					    [[NSString alloc] initWithData:patchData
+					                          encoding:NSISOLatin1StringEncoding];
+				}
+				if (patchString) {
+					[fullDiff appendString:patchString];
+				}
+			}
 		} else {
 			NSLog(@"generatePatch error: %@", err);
 		}
@@ -198,6 +213,7 @@ - (void) changeContentToCommit:(PBGitCommit *)commit
 	if (isCanceled()) return nil;
 	return @{
 		@"filesInfo" : fileDeltas,
+		@"fullDiff" : fullDiff,
 	};
 }
 
@@ -208,38 +224,7 @@ - (void)commitSummaryLoaded:(NSString *)summaryJSON forOID:(GTOID *)summaryOID
 		return;
 	}
 
-	[self.view.windowScriptObject callWebScriptMethod:@"loadCommitSummary" withArguments:@[summaryJSON]];
-
-    // Now load the full diff
-	NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", currentOID.SHA, nil];
-
-	if (![PBGitDefaults showWhitespaceDifferences])
-		[taskArguments insertObject:@"-w" atIndex:1];
-
-	NSFileHandle *handle = [repository handleForArguments:taskArguments];
-	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-	// Remove notification, in case we have another one running
-	[nc removeObserver:self name:NSFileHandleReadToEndOfFileCompletionNotification object:nil];
-	[nc addObserver:self selector:@selector(commitFullDiffLoaded:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle];
-	[handle readToEndOfFileInBackgroundAndNotify];
-}
-
-- (void)commitFullDiffLoaded:(NSNotification *)notification
-{
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadToEndOfFileCompletionNotification object:nil];
-
-	NSData *data = [[notification userInfo] valueForKey:NSFileHandleNotificationDataItem];
-	if (!data)
-		return;
-
-	NSString *fullDiff = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-	if (!fullDiff)
-		fullDiff = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];
-
-	if (!fullDiff)
-		return;
-
-	[self.view.windowScriptObject callWebScriptMethod:@"loadCommitFullDiff" withArguments:[NSArray arrayWithObject:fullDiff]];
+	[self.view.windowScriptObject callWebScriptMethod:@"loadCommitDiff" withArguments:@[summaryJSON]];
 }
 
 - (void)selectCommit:(NSString *)sha

html/views/history/history.js

@@ -19,23 +19,6 @@ var Commit = function(obj) {
 	this.message = obj.message();
 	this.notificationID = null;
 
-	this.parseSummary = function(summary) {
-		this.filesInfo = summary.filesInfo;
-	}
-
-	// This can be called later with the output of
-	// 'git show' to get the full diff
-	this.parseFullDiff = function(fullDiff) {
-		this.fullDiffRaw = fullDiff;
-
-		var diffStart = this.fullDiffRaw.indexOf("\ndiff ");
-		if (diffStart > 0) {
-			this.diff = this.fullDiffRaw.substring(diffStart);
-		} else {
-			this.diff = "";
-		}
-	}
-
 	this.reloadRefs = function() {
 		this.refs = this.object.refs();
 	}
@@ -310,10 +293,12 @@ var enableFeatures = function()
 	enableFeature("gravatar", $("committer_gravatar").parentNode)
 }
 
-var loadCommitSummary = function(summaryJSON)
+var loadCommitDiff = function(jsonData)
 {
-	commit.parseSummary(JSON.parse(summaryJSON));
-	
+	var diffData = JSON.parse(jsonData)
+	commit.filesInfo = diffData.filesInfo;
+	commit.diff = diffData.fullDiff;
+
 	if (commit.notificationID)
 		clearTimeout(commit.notificationID)
 		else
@@ -411,11 +396,6 @@ var loadCommitSummary = function(summaryJSON)
 		}
 		$("files").style.display = "";
 	}
-}
-
-var loadCommitFullDiff = function(data)
-{
-	commit.parseFullDiff(data);
 
 	if (commit.diff.length < 200000)
 		showDiff();