Merge remote-tracking branch 'upstream/master'

Author: slavikus

ObjectiveGit/GTIndex.h

@@ -107,8 +107,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns a new GTIndexEntry, or nil if an error occurred.
 - (nullable GTIndexEntry *)entryAtIndex:(NSUInteger)index;
 
-/// Get the entry with the given path.
-- (GTIndexEntry *)entryWithPath:(NSString *)path;
+/// Get the entry with the given path, or nil if an error occurred.
+- (nullable GTIndexEntry *)entryWithPath:(NSString *)path;
 
 /// Get the entry with the given name.
 ///

ObjectiveGit/GTRepository+Pull.m

@@ -17,6 +17,7 @@
 #import "GTRepository+RemoteOperations.h"
 #import "GTTree.h"
 #import "NSError+Git.h"
+#import "GTIndexEntry.h"
 #import "git2/errors.h"
 
 @implementation GTRepository (Pull)
@@ -106,7 +107,17 @@ - (BOOL)pullBranch:(GTBranch *)branch fromRemote:(GTRemote *)remote withOptions:
 
 		// Check for conflict
 		if (index.hasConflicts) {
-			if (error != NULL) *error = [NSError git_errorFor:GIT_ECONFLICT description:@"Merge conflict, pull aborted"];
+			NSMutableArray <NSString *>*files = [NSMutableArray array];
+			[index enumerateConflictedFilesWithError:error usingBlock:^(GTIndexEntry * _Nonnull ancestor, GTIndexEntry * _Nonnull ours, GTIndexEntry * _Nonnull theirs, BOOL * _Nonnull stop) {
+				[files addObject:ours.path];
+			}];
+			if (error != NULL) {
+				if (files.count > 0) {
+					*error = [NSError git_errorFor:GIT_ECONFLICT description:@"Merge conflict in files: %@. Pull aborted.", [files componentsJoinedByString:@", "]];
+				} else {
+					*error = [NSError git_errorFor:GIT_ECONFLICT description:@"Merge conflict, pull aborted"];
+				}
+			}
 			return NO;
 		}
 

ObjectiveGit/GTRepository+Status.h

@@ -126,13 +126,23 @@ extern NSString *const GTRepositoryStatusOptionsPathSpecArrayKey;
 
 /// Tests the ignore rules to see if the file should be considered as ignored.
 ///
-/// fileURL  - A string path relative to the working copy. Must not be nil.
+/// fileURL  - A local file URL for a file in the repository. Must not be nil.
 /// success  - If not NULL, will be set to indicate success or fail.
 /// error    - If not nil, set to any error that occurs.
 ///
 /// Returns YES if the file should be ignored; NO otherwise.
 - (BOOL)shouldFileBeIgnored:(NSURL *)fileURL success:(nullable BOOL *)success error:(NSError **)error;
 
+/// An enum for use with shouldIgnoreFileURL:error: below
+typedef NS_ENUM(NSInteger, GTFileIgnoreState) {
+	GTFileIgnoreStateIgnoreCheckFailed = -1,
+	GTFileIgnoreStateShouldNotIgnore = 0,
+	GTFileIgnoreStateShouldIgnore = 1
+};
+
+/// Convenience wrapper for shouldFileBeIgnored:success:error:
+- (GTFileIgnoreState)shouldIgnoreFileURL:(NSURL *)fileURL error:(NSError **)error;
+
 @end
 
 NS_ASSUME_NONNULL_END

ObjectiveGit/GTRepository+Status.m

@@ -122,7 +122,16 @@ - (BOOL)shouldFileBeIgnored:(NSURL *)fileURL success:(BOOL *)success error:(NSEr
 	}
 
 	if (success != NULL) *success = YES;
-	return (ignoreState == 0 ? YES : NO);
+	return (ignoreState == 1 ? YES : NO);
+}
+
+- (GTFileIgnoreState)shouldIgnoreFileURL:(NSURL *)fileURL error:(NSError **)error {
+	BOOL success = NO;
+	BOOL ignore = [self shouldFileBeIgnored:fileURL success:&success error:error];
+	if (success) {
+		return (ignore ? GTFileIgnoreStateShouldIgnore : GTFileIgnoreStateShouldNotIgnore);
+	}
+	return GTFileIgnoreStateIgnoreCheckFailed;
 }
 
 @end

ObjectiveGitTests/GTRepository+StatusSpec.m

@@ -105,6 +105,24 @@
 		expect(@(enumerationSuccessful)).to(beTruthy());
 		expect(err).to(beNil());
 	});
+	
+	it(@"should report file should be ignored", ^{
+		__block NSError *err = nil;
+		NSURL *fileURL = [repository.fileURL URLByAppendingPathComponent:@".DS_Store"];
+		BOOL success = NO;
+		BOOL shouldIgnore = [repository shouldFileBeIgnored:fileURL success:&success error:&err];
+		expect(@(success)).to(beTrue());
+		expect(@(shouldIgnore)).to(beTrue());
+		expect(err).to(beNil());
+	});
+	
+	it(@"should report file should be ignored (convenience wrapper)", ^{
+		__block NSError *err = nil;
+		NSURL *fileURL = [repository.fileURL URLByAppendingPathComponent:@".DS_Store"];
+		GTFileIgnoreState ignore = [repository shouldIgnoreFileURL:fileURL error:&err];
+		expect(@(ignore)).to(equal(@(GTFileIgnoreStateShouldIgnore)));
+		expect(err).to(beNil());
+	});
 });
 
 afterEach(^{