Merge branch 'master' into tests-to-specs

Conflicts:
	Classes/GTDiff.m

Author: tiennou

Classes/Categories/NSArray+StringArray.h

@@ -12,6 +12,15 @@
 
 @interface NSArray (StringArray)
 
+// Creates an `NSString` array from a `git_strarray`.
+//
+// The `git_strarray` must still be freed using `git_strarray_free` after use.
+//
+// strarray - The `git_strarray` to convert.
+//
+// Returns a new array with the contents of `strarray` converted to `NSString`s.
++ (instancetype)git_arrayWithStrarray:(git_strarray)strarray;
+
 // Creates and returns a `git_strarray` given an `NSArray` of `NSString`s.
 //
 // Must only be called with an array of `NSString`s, otherwise an assertion will

Classes/Categories/NSArray+StringArray.m

@@ -7,9 +7,37 @@
 //
 
 #import "NSArray+StringArray.h"
+#import "EXTScope.h"
 
 @implementation NSArray (StringArray)
 
++ (instancetype)git_arrayWithStrarray:(git_strarray)strarray {
+	__strong id *strings = (__strong id *)calloc(strarray.count, sizeof(*strings));
+	@onExit {
+		free(strings);
+	};
+
+	size_t stringsCount = 0;
+	for (size_t i = 0; i < strarray.count; i++) {
+		const char *cStr = strarray.strings[i];
+		if (cStr == NULL) continue;
+
+		strings[stringsCount++] = @(cStr);
+	}
+
+	@onExit {
+		// Make sure to set each entry in `strings` to nil, so ARC properly
+		// releases its references.
+		for (size_t i = 0; i < stringsCount; i++) {
+			strings[i] = nil;
+		}
+	};
+
+	// If any of the strings were nil, we may have fewer objects than
+	// `strarray`.
+	return [[self alloc] initWithObjects:strings count:stringsCount];
+}
+
 - (git_strarray)git_strarray {
 	if (self.count < 1) return (git_strarray){ .strings = NULL, .count = 0 };
 

Classes/GTDiff.m

@@ -151,7 +151,7 @@ + (GTDiff *)diffWorkingDirectoryFromTree:(GTTree *)tree inRepository:(GTReposito
 + (GTDiff *)diffWorkingDirectoryToHEADInRepository:(GTRepository *)repository options:(NSDictionary *)options error:(NSError **)error {
 	NSParameterAssert(repository != nil);
 
-	GTCommit *HEADCommit = [repository lookupObjectByRevspec:@"HEAD" error:NULL];
+	GTCommit *HEADCommit = [[repository headReferenceWithError:NULL] resolvedTarget];
 	GTDiff *HEADIndexDiff = [GTDiff diffIndexFromTree:HEADCommit.tree inRepository:repository options:options error:error];
 	if (HEADIndexDiff == nil) return nil;
 

Classes/GTRemote.m

@@ -9,6 +9,7 @@
 #import "GTRemote.h"
 
 #import "NSError+Git.h"
+#import "NSArray+StringArray.h"
 #import "EXTScope.h"
 
 @interface GTRemote ()
@@ -74,12 +75,8 @@ - (NSArray *)fetchRefspecs {
 		git_strarray_free(&refspecs);
 	};
 
-	NSMutableArray *fetchRefspecs = [NSMutableArray arrayWithCapacity:refspecs.count];
-	for (size_t i = 0; i < refspecs.count; i++) {
-		if (refspecs.strings[i] == NULL) continue;
-		[fetchRefspecs addObject:@(refspecs.strings[i])];
-	}
-	return [fetchRefspecs copy];
+	return [NSArray git_arrayWithStrarray:refspecs];
+
 }
 
 #pragma mark Update the remote

Classes/GTRepository+Status.h

@@ -10,6 +10,26 @@
 
 @class GTStatusDelta;
 
+// An enum representing the status of a file
+// See git_status_t
+typedef enum {
+	GTFileStatusCurrent = GIT_STATUS_CURRENT,
+
+	GTFileStatusNewInIndex         = GIT_STATUS_INDEX_NEW,
+	GTFileStatusModifiedInIndex    = GIT_STATUS_INDEX_MODIFIED,
+	GTFileStatusDeletedInIndex     = GIT_STATUS_INDEX_DELETED,
+	GTFileStatusRenamedInIndex     = GIT_STATUS_INDEX_RENAMED,
+	GTFileStatusTypeChangedInIndex = GIT_STATUS_INDEX_TYPECHANGE,
+
+	GTFileStatusNewInWorktree         = GIT_STATUS_WT_NEW,
+	GTFileStatusModifiedInWorktree    = GIT_STATUS_WT_MODIFIED,
+	GTFileStatusDeletedInWorktree     = GIT_STATUS_WT_DELETED,
+	GTFileStatusTypeChangedInWorktree = GIT_STATUS_WT_TYPECHANGE,
+	GTFileStatusRenamedInWorktree     = GIT_STATUS_WT_RENAMED,
+
+	GTFileStatusIgnored = GIT_STATUS_IGNORED,
+} GTFileStatusFlags;
+
 // An `NSNumber` wrapped `GTRepositoryStatusOptionsShow` bitmask.
 //
 // For extending the reporting of status. Using the flags documented below this
@@ -88,4 +108,10 @@ extern NSString *const GTRepositoryStatusOptionsPathSpecArrayKey;
 // successfully.
 - (BOOL)enumerateFileStatusWithOptions:(NSDictionary *)options error:(NSError **)error usingBlock:(void (^)(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop))block;
 
+// Query the status of one file
+- (GTFileStatusFlags)statusForFile:(NSURL *)fileURL success:(BOOL *)success error:(NSError **)error;
+
+// Should the file be considered as ignored ?
+- (BOOL)shouldFileBeIgnored:(NSURL *)fileURL success:(BOOL *)success error:(NSError **)error;
+
 @end

Classes/GTRepository+Status.m

@@ -92,4 +92,36 @@ - (BOOL)isWorkingDirectoryClean {
 	return clean;
 }
 
+- (GTFileStatusFlags)statusForFile:(NSURL *)fileURL success:(BOOL *)success error:(NSError **)error {
+	NSParameterAssert(fileURL != nil);
+
+	git_status_t status;
+
+	int gitError = git_status_file(&status, self.git_repository, fileURL.path.fileSystemRepresentation);
+	if (gitError != GIT_OK) {
+		if (error) *error = [NSError git_errorFor:gitError description:@"Status failed" failureReason:@"Failed to get status for file \"%@\" in \"%@\"", fileURL.path, self.gitDirectoryURL];
+		*success = NO;
+		return GTFileStatusCurrent;
+	}
+
+	*success = YES;
+	return (GTFileStatusFlags)status;
+}
+
+- (BOOL)shouldFileBeIgnored:(NSURL *)fileURL success:(BOOL *)success error:(NSError **)error {
+	NSParameterAssert(fileURL != nil);
+
+	int ignoreState = 0;
+
+	int gitError = git_status_should_ignore(&ignoreState, self.git_repository, fileURL.path.fileSystemRepresentation);
+	if (gitError != GIT_OK) {
+		if (error) *error = [NSError git_errorFor:gitError description:@"Ignore failed" failureReason:@"Failed to get ignore status for file \"%@\" in \"%@\"", fileURL.path, self.gitDirectoryURL];
+		*success = NO;
+		return YES;
+	}
+
+	*success = YES;
+	return (ignoreState == 0 ? YES : NO);
+}
+
 @end

Classes/GTRepository.m

@@ -47,6 +47,7 @@
 #import "GTTree.h"
 #import "GTCredential.h"
 #import "GTCredential+Private.h"
+#import "NSArray+StringArray.h"
 
 NSString *const GTRepositoryCloneOptionsBare = @"GTRepositoryCloneOptionsBare";
 NSString *const GTRepositoryCloneOptionsCheckout = @"GTRepositoryCloneOptionsCheckout";
@@ -436,17 +437,11 @@ - (NSArray *)referenceNamesWithError:(NSError **)error {
 		return nil;
 	}
 
-	NSMutableArray *references = [NSMutableArray arrayWithCapacity:array.count];
-	for (NSUInteger i = 0; i < array.count; i++) {
-		NSString *refName = @(array.strings[i]);
-		if (refName == nil) continue;
-
-		[references addObject:refName];
-	}
+	NSArray *referenceNames = [NSArray git_arrayWithStrarray:array];
 
 	git_strarray_free(&array);
 
-	return references;
+	return referenceNames;
 }
 
 - (NSURL *)fileURL {
@@ -465,11 +460,11 @@ - (NSURL *)gitDirectoryURL {
 }
 
 - (BOOL)isBare {
-	return self.git_repository && git_repository_is_bare(self.git_repository);
+	return (BOOL)git_repository_is_bare(self.git_repository);
 }
 
 - (BOOL)isHEADDetached {
-	return (BOOL) git_repository_head_detached(self.git_repository);
+	return (BOOL)git_repository_head_detached(self.git_repository);
 }
 
 - (BOOL)isHEADUnborn {

ObjectiveGitTests/GTRepository+StatusSpec.m

@@ -52,35 +52,35 @@
 		updateIndexForSubpathAndExpectStatus(subpath, status);
 	};
 
-	it(@"should recognise untracked files", ^{
+	it(@"should recognize untracked files", ^{
 		expectSubpathToHaveWorkDirStatus(@"UntrackedImage.png", GTStatusDeltaStatusUntracked);
 	});
 
-	it(@"should recognise added files", ^{
+	it(@"should recognize added files", ^{
 		updateIndexForSubpathAndExpectStatus(@"UntrackedImage.png", GTStatusDeltaStatusAdded);
 	});
 
-	it(@"should recognise modified files", ^{
+	it(@"should recognize modified files", ^{
 		expect([NSFileManager.defaultManager removeItemAtURL:targetFileURL error:&err]).to.beTruthy();
 		expect(err).to.beNil();
 		expect([testData writeToURL:targetFileURL atomically:YES]).to.beTruthy();
 		expectSubpathToHaveMatchingStatus(targetFileURL.lastPathComponent, GTStatusDeltaStatusModified);
 	});
 
-	it(@"should recognise copied files", ^{
+	it(@"should recognize copied files", ^{
 		NSURL *copyLocation = [repository.fileURL URLByAppendingPathComponent:@"main2.m"];
 		expect([NSFileManager.defaultManager copyItemAtURL:targetFileURL toURL:copyLocation error:&err]).to.beTruthy();
 		expect(err).to.beNil();
 		updateIndexForSubpathAndExpectStatus(copyLocation.lastPathComponent, GTStatusDeltaStatusCopied);
 	});
 
-	it(@"should recognise deleted files", ^{
+	it(@"should recognize deleted files", ^{
 		expect([NSFileManager.defaultManager removeItemAtURL:targetFileURL error:&err]).to.beTruthy();
 		expect(err).to.beNil();
 		expectSubpathToHaveMatchingStatus(targetFileURL.lastPathComponent, GTStatusDeltaStatusDeleted);
 	});
 
-	it(@"should recognise renamed files", ^{
+	it(@"should recognize renamed files", ^{
 		NSURL *moveLocation = [repository.fileURL URLByAppendingPathComponent:@"main-moved.m"];
 		expect([NSFileManager.defaultManager moveItemAtURL:targetFileURL toURL:moveLocation error:&err]).to.beTruthy();
 		expect(err).to.beNil();

ObjectiveGitTests/NSArray+StringArraySpec.m

@@ -9,52 +9,89 @@
 SpecBegin(StringArray)
 
 describe(@"String arrays", ^{
-	__block NSArray *originalArray = nil;
-	__block git_strarray strArray;
-	
-	beforeEach(^{
-		originalArray = @[ @"First", @"Second", @"Third", @"Fourth", @"Fifth", @"Sixth" ];
-		strArray = originalArray.git_strarray;
-	});
-	
-	afterEach(^{
-		git_strarray_free(&strArray);
-	});
-	
-	it(@"should return null for an empty array", ^{
-		NSArray *emptyArray = [NSArray array];
-		expect(emptyArray.git_strarray.count).to.equal(0);
-		expect(emptyArray.git_strarray.strings).to.beNil();
-	});
 
-	void (^validateStrArray)(git_strarray) = ^(git_strarray arrayToValidate) {
-		expect(arrayToValidate.count).to.equal(originalArray.count);
-		
-		for (NSUInteger idx = 0; idx < originalArray.count; idx++) {
-			const char *convertedString = arrayToValidate.strings[idx];
-			NSString *comparisonString = [NSString stringWithUTF8String:convertedString];
-			expect(originalArray[idx]).to.equal(comparisonString);
+	void (^validateStrArray)(NSArray *, git_strarray) = ^(NSArray *array, git_strarray strArray) {
+		expect(strArray.count).to.equal(array.count);
+
+		for (NSUInteger idx = 0; idx < array.count; idx++) {
+			const char *convertedString = strArray.strings[idx];
+			NSString *comparisonString = @(convertedString);
+			expect(array[idx]).to.equal(comparisonString);
 		}
 	};
-	
-	it(@"should correctly translate the strings", ^{
-		validateStrArray(strArray);
-	});
-	
-	it(@"should be able to be copied", ^{
-		git_strarray copiedArray;
-		git_strarray_copy(&copiedArray, &strArray);
-		validateStrArray(copiedArray);
-		git_strarray_free(&copiedArray);
+
+	describe(@"allow conversion to a git_strarray", ^{
+		__block NSArray *originalArray = nil;
+		__block git_strarray strArray;
+
+		beforeEach(^{
+			originalArray = @[ @"First", @"Second", @"Third", @"Fourth", @"Fifth", @"Sixth" ];
+			strArray = originalArray.git_strarray;
+		});
+
+		afterEach(^{
+			git_strarray_free(&strArray);
+		});
+
+		it(@"should return null for an empty array", ^{
+			NSArray *emptyArray = [NSArray array];
+			expect(emptyArray.git_strarray.count).to.equal(0);
+			expect(emptyArray.git_strarray.strings).to.beNil();
+		});
+
+		it(@"should correctly translate the strings", ^{
+			validateStrArray(originalArray, strArray);
+		});
+
+		it(@"should be able to be copied", ^{
+			git_strarray copiedArray;
+			git_strarray_copy(&copiedArray, &strArray);
+			validateStrArray(originalArray, copiedArray);
+			git_strarray_free(&copiedArray);
+		});
+
+		it(@"should stay valid outside of an autorelease pool", ^{
+			git_strarray dontAutoreleaseThis;
+			@autoreleasepool {
+				dontAutoreleaseThis = originalArray.git_strarray;
+			}
+
+			validateStrArray(originalArray, dontAutoreleaseThis);
+		});
 	});
-	
-	it(@"should stay valid outside of an autorelease pool", ^{
-		git_strarray dontAutoreleaseThis;
-		@autoreleasepool {
-			dontAutoreleaseThis = originalArray.git_strarray;
-		}
-		
-		validateStrArray(dontAutoreleaseThis);
+
+	describe(@"allows conversion from a git_strarray", ^{
+		__block git_strarray originalStrArray;
+
+		beforeEach(^{
+			originalStrArray.count = 3;
+			originalStrArray.strings = calloc(originalStrArray.count, sizeof(char *));
+			originalStrArray.strings[0] = "First";
+			originalStrArray.strings[1] = "Second";
+			originalStrArray.strings[2] = "Third";
+		});
+
+		afterEach(^{
+			free(originalStrArray.strings);
+		});
+
+		it(@"should return an empty array for an NULL strarray", ^{
+			git_strarray strarray = { .strings = NULL, .count = 0 };
+			NSArray *array = [NSArray git_arrayWithStrarray:strarray];
+			expect(array.count).to.equal(0);
+		});
+
+		it(@"should correctly translate the strarray", ^{
+			NSArray *array = [NSArray git_arrayWithStrarray:originalStrArray];
+			validateStrArray(array, originalStrArray);
+		});
+
+		it(@"should omit NULL strings", ^{
+			originalStrArray.strings[1] = NULL;
+
+			NSArray *array = [NSArray git_arrayWithStrarray:originalStrArray];
+			expect(array).to.equal((@[ @"First", @"Third" ]));
+		});
 	});
 });