Address comments and new test case

Author: alehed

ObjectiveGit/GTRepository+Merging.h

@@ -63,7 +63,7 @@ typedef NS_OPTIONS(NSInteger, GTMergeAnalysis) {
 /// error    - The error if one occurred. Can be NULL.
 ///
 /// Returns The file content annotated with conflict markers or null on error
-- (NSString* _Nullable)stringForConflictWithAncestor:(GTIndexEntry *)ancestor ourSide:(GTIndexEntry *)ourSide theirSide:(GTIndexEntry *)theirSide withError:(NSError **)error;
+- (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourSide:(GTIndexEntry *)ourSide theirSide:(GTIndexEntry *)theirSide error:(NSError **)error;
 
 /// Analyze which merge to perform.
 ///

ObjectiveGit/GTRepository+Merging.m

@@ -172,7 +172,7 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er
 	return NO;
 }
 
-- (NSString* _Nullable)stringForConflictWithAncestor:(GTIndexEntry *)ancestor ourSide:(GTIndexEntry *)ourSide theirSide:(GTIndexEntry *)theirSide withError:(NSError **)error {
+- (NSString * _Nullable)contentsOfDiffWithAncestor:(GTIndexEntry *)ancestor ourSide:(GTIndexEntry *)ourSide theirSide:(GTIndexEntry *)theirSide error:(NSError **)error {
 
 	GTObjectDatabase *database = [self objectDatabaseWithError:error];
 	if (database == nil) {
@@ -193,9 +193,8 @@ - (NSString* _Nullable)stringForConflictWithAncestor:(GTIndexEntry *)ancestor ou
 	if (ancestorData == nil) {
 		return nil;
 	}
-	NSString *ancestorString = [[NSString alloc] initWithData: ancestorData encoding:NSUTF8StringEncoding];
-	ancestorInput.ptr = [ancestorString cStringUsingEncoding:NSUTF8StringEncoding];
-	ancestorInput.size = ancestorString.length;
+	ancestorInput.ptr = ancestorData.bytes;
+	ancestorInput.size = ancestorData.length;
 
 
 	// initialize our merge file input
@@ -212,9 +211,8 @@ - (NSString* _Nullable)stringForConflictWithAncestor:(GTIndexEntry *)ancestor ou
 	if (ourData == nil) {
 		return nil;
 	}
-	NSString *ourString = [[NSString alloc] initWithData: ourData encoding:NSUTF8StringEncoding];
-	ourInput.ptr = [ourString cStringUsingEncoding:NSUTF8StringEncoding];
-	ourInput.size = ourString.length;
+	ourInput.ptr = ourData.bytes;
+	ourInput.size = ourData.length;
 
 
 	// initialize their merge file input
@@ -231,15 +229,18 @@ - (NSString* _Nullable)stringForConflictWithAncestor:(GTIndexEntry *)ancestor ou
 	if (theirData == nil) {
 		return nil;
 	}
-	NSString *theirString = [[NSString alloc] initWithData: theirData encoding:NSUTF8StringEncoding];
-	theirInput.ptr = [theirString cStringUsingEncoding:NSUTF8StringEncoding];
-	theirInput.size = theirString.length;
+	theirInput.ptr = theirData.bytes;
+	theirInput.size = theirData.length;
 
 
 	git_merge_file_result result;
-	git_merge_file(&result, &ancestorInput, &ourInput, &theirInput, nil);
+	gitError = git_merge_file(&result, &ancestorInput, &ourInput, &theirInput, nil);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create merge file"];
+		return nil;
+	}
 
-	char * cString = malloc(result.len * sizeof(char*) + 1);
+	char *cString = malloc(result.len * sizeof(char *) + 1);
 	strncpy(cString, result.ptr, result.len);
 	cString[result.len] = '\0';
 

ObjectiveGitTests/GTRepositorySpec.m

@@ -260,6 +260,50 @@
 	});
 });
 
+describe(@"-contentsOfDiffWithAncestor:ourSide:theirSide:error:", ^{
+	it(@"should produce a nice merge conflict description", ^{
+		NSURL *mainURL = [repository.fileURL URLByAppendingPathComponent:@"main.m"];
+		NSData *mainData = [[NSFileManager defaultManager] contentsAtPath:mainURL.path];
+		expect(mainData).notTo(beNil());
+
+		NSString *mainString = [[NSString alloc] initWithData:mainData encoding:NSUTF8StringEncoding];
+		NSData *masterData = [[mainString stringByReplacingOccurrencesOfString:@"return" withString:@"//The meaning of life is 41\n    return"] dataUsingEncoding:NSUTF8StringEncoding];
+		NSData *otherData = [[mainString stringByReplacingOccurrencesOfString:@"return" withString:@"//The meaning of life is 42\n    return"] dataUsingEncoding:NSUTF8StringEncoding];
+
+		expect(@([[NSFileManager defaultManager] createFileAtPath:mainURL.path contents:masterData attributes:nil])).to(beTruthy());
+
+		GTIndex *index = [repository indexWithError:NULL];
+		expect(@([index addFile:mainURL.lastPathComponent error:NULL])).to(beTruthy());
+		GTReference *head = [repository headReferenceWithError:NULL];
+		GTCommit *parent = [repository lookUpObjectByOID:head.targetOID objectType:GTObjectTypeCommit error:NULL];
+		expect(parent).toNot(beNil());
+		GTCommit *masterCommit = [repository createCommitWithTree:[index writeTree:NULL] message:@"MOLTAE is 41" parents:[NSArray arrayWithObject:parent] updatingReferenceNamed:head.name error:NULL];
+		expect(masterCommit).toNot(beNil());
+
+		GTBranch *otherBranch = [repository lookUpBranchWithName:@"other-branch" type:GTBranchTypeLocal success:NULL error:NULL];
+		expect(otherBranch).toNot(beNil());
+		expect(@([repository checkoutReference:otherBranch.reference options:nil error:NULL])).to(beTruthy());
+
+		expect(@([[NSFileManager defaultManager] createFileAtPath:mainURL.path contents:otherData attributes:nil])).to(beTruthy());
+
+		index = [repository indexWithError:NULL];
+		expect(@([index addFile:mainURL.lastPathComponent error:NULL])).to(beTruthy());
+		parent = [repository lookUpObjectByOID:otherBranch.OID objectType:GTObjectTypeCommit error:NULL];
+		expect(parent).toNot(beNil());
+		GTCommit *otherCommit = [repository createCommitWithTree:[index writeTree:NULL] message:@"MOLTAE is 42!" parents:[NSArray arrayWithObject:parent] updatingReferenceNamed:otherBranch.name error:NULL];
+		expect(otherCommit).toNot(beNil());
+
+		GTIndex *conflictIndex = [otherCommit merge:masterCommit error:NULL];
+		expect(@([conflictIndex hasConflicts])).to(beTruthy());
+
+		[conflictIndex enumerateConflictedFilesWithError:NULL usingBlock:^(GTIndexEntry * _Nonnull ancestor, GTIndexEntry * _Nonnull ours, GTIndexEntry * _Nonnull theirs, BOOL * _Nonnull stop) {
+
+			NSString *conflictString = [repository contentsOfDiffWithAncestor:ancestor ourSide:ours theirSide:theirs error:NULL];
+			expect(conflictString).to(equal(@"//\n//  main.m\n//  Test\n//\n//  Created by Joe Ricioppo on 9/28/10.\n//  Copyright 2010 __MyCompanyName__. All rights reserved.\n//\n\n#import <Cocoa/Cocoa.h>\n\nint main(int argc, char *argv[])\n{\n<<<<<<< file.txt\n    //The meaning of life is 42\n=======\n    //The meaning of life is 41\n>>>>>>> file.txt\n    return NSApplicationMain(argc,  (const char **) argv);\n}\n123456789\n123456789\n123456789\n123456789!blah!\n"));
+		}];
+	});
+});
+
 describe(@"-mergeBaseBetweenFirstOID:secondOID:error:", ^{
 	it(@"should find the merge base between two branches", ^{
 		NSError *error = nil;