Merge pull request #581 from libgit2/dry-delta-types

pietbrauer · web-flow · commit deb6e4eea765 · 2016-08-04T13:54:33.000+02:00
DRY delta types
diff --git a/ObjectiveGit/GTDiff.h b/ObjectiveGit/GTDiff.h
@@ -308,7 +308,7 @@ typedef NS_OPTIONS(NSInteger, GTDiffFindOptionsFlags) {
 - (git_diff *)git_diff __attribute__((objc_returns_inner_pointer));
 
 /// The number of deltas of the given type that are contained in the diff.
-- (NSUInteger)numberOfDeltasWithType:(GTDiffDeltaType)deltaType;
+- (NSUInteger)numberOfDeltasWithType:(GTDeltaType)deltaType;
 
 /// Enumerate the deltas in a diff.
 ///
diff --git a/ObjectiveGit/GTDiff.m b/ObjectiveGit/GTDiff.m
@@ -234,7 +234,7 @@ - (NSUInteger)deltaCount {
 	return git_diff_num_deltas(self.git_diff);
 }
 
-- (NSUInteger)numberOfDeltasWithType:(GTDiffDeltaType)deltaType {
+- (NSUInteger)numberOfDeltasWithType:(GTDeltaType)deltaType {
 	return git_diff_num_deltas_of_type(self.git_diff, (git_delta_t)deltaType);
 }
 
diff --git a/ObjectiveGit/GTDiffDelta.h b/ObjectiveGit/GTDiffDelta.h
@@ -17,35 +17,38 @@
 
 /// The type of change that this delta represents.
 ///
-/// GTDiffFileDeltaUnmodified - No Change.
-/// GTDiffFileDeltaAdded      - The file was added to the index.
-/// GTDiffFileDeltaDeleted    - The file was removed from the working directory.
-/// GTDiffFileDeltaModified   - The file was modified.
-/// GTDiffFileDeltaRenamed    - The file has been renamed.
-/// GTDiffFileDeltaCopied     - The file was duplicated.
-/// GTDiffFileDeltaIgnored    - The file was ignored by git.
-/// GTDiffFileDeltaUntracked  - The file has been added to the working directory
+/// GTDeltaTypeUnmodified - No Change.
+/// GTDeltaTypeAdded      - The file was added to the index.
+/// GTDeltaTypeDeleted    - The file was removed from the working directory.
+/// GTDeltaTypeModified   - The file was modified.
+/// GTDeltaTypeRenamed    - The file has been renamed.
+/// GTDeltaTypeCopied     - The file was duplicated.
+/// GTDeltaTypeIgnored    - The file was ignored by git.
+/// GTDeltaTypeUntracked  - The file has been added to the working directory
 ///                             and is therefore currently untracked.
-/// GTDiffFileDeltaTypeChange - The file has changed from a blob to either a
+/// GTDeltaTypeTypeChange - The file has changed from a blob to either a
 ///                             submodule, symlink or directory. Or vice versa.
-typedef NS_ENUM(NSInteger, GTDiffDeltaType) {
-	GTDiffFileDeltaUnmodified = GIT_DELTA_UNMODIFIED,
-	GTDiffFileDeltaAdded = GIT_DELTA_ADDED,
-	GTDiffFileDeltaDeleted = GIT_DELTA_DELETED,
-	GTDiffFileDeltaModified = GIT_DELTA_MODIFIED,
-	GTDiffFileDeltaRenamed = GIT_DELTA_RENAMED,
-	GTDiffFileDeltaCopied = GIT_DELTA_COPIED,
-	GTDiffFileDeltaIgnored = GIT_DELTA_IGNORED,
-	GTDiffFileDeltaUntracked = GIT_DELTA_UNTRACKED,
-	GTDiffFileDeltaTypeChange = GIT_DELTA_TYPECHANGE,
+/// GTDeltaTypeConflicted - The file is conflicted in the working directory.
+typedef NS_ENUM(NSInteger, GTDeltaType) {
+	GTDeltaTypeUnmodified = GIT_DELTA_UNMODIFIED,
+	GTDeltaTypeAdded = GIT_DELTA_ADDED,
+	GTDeltaTypeDeleted = GIT_DELTA_DELETED,
+	GTDeltaTypeModified = GIT_DELTA_MODIFIED,
+	GTDeltaTypeRenamed = GIT_DELTA_RENAMED,
+	GTDeltaTypeCopied = GIT_DELTA_COPIED,
+	GTDeltaTypeIgnored = GIT_DELTA_IGNORED,
+	GTDeltaTypeUntracked = GIT_DELTA_UNTRACKED,
+	GTDeltaTypeTypeChange = GIT_DELTA_TYPECHANGE,
+	GTDeltaTypeUnreadable = GIT_DELTA_UNREADABLE,
+	GTDeltaTypeConflicted = GIT_DELTA_CONFLICTED,
 };
 
 NS_ASSUME_NONNULL_BEGIN
 
 /// A class representing a single change within a diff.
 ///
 /// The change may not be simply a change of text within a given file, it could
-/// be that the file was renamed, or added to the index. See `GTDiffDeltaType`
+/// be that the file was renamed, or added to the index. See `GTDeltaType`
 /// for the types of change represented.
 @interface GTDiffDelta : NSObject
 
@@ -68,7 +71,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// The type of change that this delta represents.
 ///
 /// Think "status" as in `git status`.
-@property (nonatomic, readonly) GTDiffDeltaType type;
+@property (nonatomic, readonly) GTDeltaType type;
+
+@property (nonatomic, readonly, assign) double similarity;
 
 /// Diffs the given blob and data buffer.
 ///
diff --git a/ObjectiveGit/GTDiffDelta.m b/ObjectiveGit/GTDiffDelta.m
@@ -56,8 +56,12 @@ - (GTDiffFile *)newFile {
 	return [[GTDiffFile alloc] initWithGitDiffFile:self.git_diff_delta.new_file];
 }
 
-- (GTDiffDeltaType)type {
-	return (GTDiffDeltaType)self.git_diff_delta.status;
+- (GTDeltaType)type {
+	return (GTDeltaType)self.git_diff_delta.status;
+}
+
+- (double)similarity {
+	return (double)(self.git_diff_delta.similarity / 100.0);
 }
 
 #pragma mark Lifecycle
diff --git a/ObjectiveGit/GTRepository+Status.m b/ObjectiveGit/GTRepository+Status.m
@@ -68,23 +68,23 @@ - (BOOL)enumerateFileStatusWithOptions:(NSDictionary *)options error:(NSError **
 - (BOOL)isWorkingDirectoryClean {
 	__block BOOL clean = YES;
 	[self enumerateFileStatusWithOptions:nil error:NULL usingBlock:^(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop) {
-		GTStatusDeltaStatus headToIndexStatus = headToIndex.status;
-		GTStatusDeltaStatus indexToWorkDirStatus = indexToWorkingDirectory.status;
+		GTDeltaType headToIndexStatus = headToIndex.status;
+		GTDeltaType indexToWorkDirStatus = indexToWorkingDirectory.status;
 		
 		// first, have items been deleted?
-		if (indexToWorkDirStatus == GTStatusDeltaStatusDeleted || headToIndexStatus == GTStatusDeltaStatusDeleted) {
+		if (indexToWorkDirStatus == GTDeltaTypeDeleted || headToIndexStatus == GTDeltaTypeDeleted) {
 			clean = NO;
 			*stop = YES;
 		}
 		
 		// any untracked files?
-		if (indexToWorkDirStatus == GTStatusDeltaStatusUntracked) {
+		if (indexToWorkDirStatus == GTDeltaTypeUntracked) {
 			clean = NO;
 			*stop = YES;
 		}
 		
 		// next, have items been modified?
-		if (indexToWorkDirStatus == GTStatusDeltaStatusModified || headToIndexStatus == GTStatusDeltaStatusModified) {
+		if (indexToWorkDirStatus == GTDeltaTypeModified || headToIndexStatus == GTDeltaTypeModified) {
 			clean = NO;
 			*stop = YES;
 		}
diff --git a/ObjectiveGit/GTStatusDelta.h b/ObjectiveGit/GTStatusDelta.h
@@ -8,24 +8,10 @@
 
 #import <Foundation/Foundation.h>
 #import "git2/diff.h"
+#import <ObjectiveGit/GTDiffDelta.h>
 
 @class GTDiffFile;
 
-/// An enum representing the status of the file.
-///
-/// See diff.h for documentation of individual flags.
-typedef NS_ENUM(NSInteger, GTStatusDeltaStatus) {
-	GTStatusDeltaStatusUnmodified = GIT_DELTA_UNMODIFIED,
-	GTStatusDeltaStatusAdded = GIT_DELTA_ADDED,
-	GTStatusDeltaStatusDeleted = GIT_DELTA_DELETED,
-	GTStatusDeltaStatusModified = GIT_DELTA_MODIFIED,
-	GTStatusDeltaStatusRenamed = GIT_DELTA_RENAMED,
-	GTStatusDeltaStatusCopied = GIT_DELTA_COPIED,
-	GTStatusDeltaStatusIgnored = GIT_DELTA_IGNORED,
-	GTStatusDeltaStatusUntracked = GIT_DELTA_UNTRACKED,
-	GTStatusDeltaStatusTypeChange = GIT_DELTA_TYPECHANGE,
-};
-
 NS_ASSUME_NONNULL_BEGIN
 
 /// Represents the status of a file in a repository.
@@ -38,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, copy, nullable) GTDiffFile *newFile __attribute__((ns_returns_not_retained));
 
 /// The status of the file.
-@property (nonatomic, readonly) GTStatusDeltaStatus status;
+@property (nonatomic, readonly) GTDeltaType status;
 
 /// A float between 0 and 1 describing how similar the old and new
 /// files are (where 0 is not at all and 1 is identical).
diff --git a/ObjectiveGit/GTStatusDelta.m b/ObjectiveGit/GTStatusDelta.m
@@ -23,7 +23,7 @@ - (instancetype)initWithGitDiffDelta:(const git_diff_delta *)delta {
 	
 	_oldFile = [[GTDiffFile alloc] initWithGitDiffFile:delta->old_file];
 	_newFile = [[GTDiffFile alloc] initWithGitDiffFile:delta->new_file];
-	_status = (GTStatusDeltaStatus)delta->status;
+	_status = (GTDeltaType)delta->status;
 	_similarity = (double)(delta->similarity / 100.0);
 	
 	return self;
diff --git a/ObjectiveGitTests/GTDiffSpec.m b/ObjectiveGitTests/GTDiffSpec.m
@@ -90,7 +90,7 @@
 		setupDiffFromCommitSHAsAndOptions(@"be0f001ff517a00b5b8e3c29ee6561e70f994e17", @"fe89ea0a8e70961b8a6344d9660c326d3f2eb0fe", nil);
 
 		expect(@(diff.deltaCount)).to(equal(@1));
-		expect(@([diff numberOfDeltasWithType:GTDiffFileDeltaModified])).to(equal(@1));
+		expect(@([diff numberOfDeltasWithType:GTDeltaTypeModified])).to(equal(@1));
 
 		[diff enumerateDeltasUsingBlock:^(GTDiffDelta *delta, BOOL *stop) {
 			NSError *error = nil;
@@ -101,7 +101,7 @@
 			expect(delta.oldFile.path).to(equal(@"TestAppWindowController.h"));
 			expect(delta.oldFile.path).to(equal(delta.newFile.path));
 			expect(@(delta.flags & GTDiffFileFlagBinaryMask)).to(equal(@(GTDiffFileFlagNotBinary)));
-			expect(@(delta.type)).to(equal(@(GTDiffFileDeltaModified)));
+			expect(@(delta.type)).to(equal(@(GTDeltaTypeModified)));
 
 			expect(patch.delta).to(beIdenticalTo(delta));
 			expect(@(patch.hunkCount)).to(equal(@1));
@@ -155,7 +155,7 @@
 		expect(@(diff.deltaCount)).to(equal(@1));
 		[diff enumerateDeltasUsingBlock:^(GTDiffDelta *delta, BOOL *stop) {
 			expect(delta.newFile.path).to(equal(@"REAME")); //loltypo
-			expect(@(delta.type)).to(equal(@(GTDiffFileDeltaAdded)));
+			expect(@(delta.type)).to(equal(@(GTDeltaTypeAdded)));
 
 			*stop = YES;
 		}];
@@ -166,7 +166,7 @@
 
 		expect(@(diff.deltaCount)).to(equal(@1));
 		[diff enumerateDeltasUsingBlock:^(GTDiffDelta *delta, BOOL *stop) {
-			expect(@(delta.type)).to(equal(@(GTDiffFileDeltaDeleted)));
+			expect(@(delta.type)).to(equal(@(GTDeltaTypeDeleted)));
 
 			*stop = YES;
 		}];
@@ -193,7 +193,7 @@
 
 		expect(@(diff.deltaCount)).to(equal(@1));
 		[diff enumerateDeltasUsingBlock:^(GTDiffDelta *delta, BOOL *stop) {
-			expect(@(delta.type)).to(equal(@(GTDiffFileDeltaRenamed)));
+			expect(@(delta.type)).to(equal(@(GTDeltaTypeRenamed)));
 			expect(delta.oldFile.path).to(equal(@"README"));
 			expect(delta.newFile.path).to(equal(@"README_renamed"));
 
diff --git a/ObjectiveGitTests/GTIndexSpec.m b/ObjectiveGitTests/GTIndexSpec.m
@@ -202,7 +202,7 @@
 
 	NSDictionary *renamedOptions = @{ GTRepositoryStatusOptionsFlagsKey: @(GTRepositoryStatusFlagsIncludeIgnored | GTRepositoryStatusFlagsIncludeUntracked | GTRepositoryStatusFlagsRecurseUntrackedDirectories | GTRepositoryStatusFlagsRenamesHeadToIndex | GTRepositoryStatusFlagsIncludeUnmodified) };
 
-	BOOL (^fileStatusEqualsExpected)(NSString *filename, GTStatusDeltaStatus headToIndexStatus, GTStatusDeltaStatus indexToWorkingDirectoryStatus) = ^(NSString *filename, GTStatusDeltaStatus headToIndexStatus, GTStatusDeltaStatus indexToWorkingDirectoryStatus) {
+	BOOL (^fileStatusEqualsExpected)(NSString *filename, GTDeltaType headToIndexStatus, GTDeltaType indexToWorkingDirectoryStatus) = ^(NSString *filename, GTDeltaType headToIndexStatus, GTDeltaType indexToWorkingDirectoryStatus) {
 		return [index.repository enumerateFileStatusWithOptions:renamedOptions error:NULL usingBlock:^(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop) {
 			if (![headToIndex.newFile.path isEqualToString:filename]) return;
 			expect(@(headToIndex.status)).to(equal(@(headToIndexStatus)));
@@ -230,32 +230,32 @@
 	it(@"it preserves decomposed Unicode in index paths with precomposeunicode disabled", ^{
 		NSString *decomposedFilename = [filename decomposedStringWithCanonicalMapping];
 		GTIndexEntry *entry = [index entryWithPath:decomposedFilename error:NULL];
-		expect(@(fileStatusEqualsExpected(entry.path, GTStatusDeltaStatusUnmodified, GTStatusDeltaStatusUnmodified))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(entry.path, GTDeltaTypeUnmodified, GTDeltaTypeUnmodified))).to(beTruthy());
 
 		expect(@([[NSFileManager defaultManager] moveItemAtURL:fileURL toURL:renamedFileURL error:NULL])).to(beTruthy());
 
 		entry = [index entryWithPath:decomposedFilename error:NULL];
-		expect(@(fileStatusEqualsExpected(entry.path, GTStatusDeltaStatusUnmodified, GTStatusDeltaStatusDeleted))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(entry.path, GTDeltaTypeUnmodified, GTDeltaTypeDeleted))).to(beTruthy());
 
 		[index removeFile:filename error:NULL];
 		[index addFile:renamedFilename error:NULL];
 		[index write:NULL];
 
 		entry = [index entryWithPath:[renamedFilename decomposedStringWithCanonicalMapping] error:NULL];
-		expect(@(fileStatusEqualsExpected(entry.path, GTStatusDeltaStatusRenamed, GTStatusDeltaStatusUnmodified))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(entry.path, GTDeltaTypeRenamed, GTDeltaTypeUnmodified))).to(beTruthy());
 	});
 
 	it(@"it preserves precomposed Unicode in index paths with precomposeunicode enabled", ^{
 		GTIndexEntry *fileEntry = [index entryWithPath:[filename decomposedStringWithCanonicalMapping] error:NULL];
 		expect(fileEntry).notTo(beNil());
-		expect(@(fileStatusEqualsExpected(fileEntry.path, GTStatusDeltaStatusUnmodified, GTStatusDeltaStatusUnmodified))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(fileEntry.path, GTDeltaTypeUnmodified, GTDeltaTypeUnmodified))).to(beTruthy());
 
 		[configuration setBool:true forKey:@"core.precomposeunicode"];
 		expect(@([configuration boolForKey:@"core.precomposeunicode"])).to(beTruthy());
 
 		GTIndexEntry *decomposedFileEntry = [index entryWithPath:[filename decomposedStringWithCanonicalMapping] error:NULL];
 		expect(decomposedFileEntry).notTo(beNil());
-		expect(@(fileStatusEqualsExpected(decomposedFileEntry.path, GTStatusDeltaStatusUnmodified, GTStatusDeltaStatusDeleted))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(decomposedFileEntry.path, GTDeltaTypeUnmodified, GTDeltaTypeDeleted))).to(beTruthy());
 
 		expect(@([[NSFileManager defaultManager] moveItemAtURL:fileURL toURL:renamedFileURL error:NULL])).to(beTruthy());
 
@@ -264,15 +264,15 @@
 
 		decomposedFileEntry = [index entryWithPath:[filename decomposedStringWithCanonicalMapping] error:NULL];
 		expect(decomposedFileEntry).notTo(beNil());
-		expect(@(fileStatusEqualsExpected(decomposedFileEntry.path, GTStatusDeltaStatusUnmodified, GTStatusDeltaStatusDeleted))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(decomposedFileEntry.path, GTDeltaTypeUnmodified, GTDeltaTypeDeleted))).to(beTruthy());
 
 		[index removeFile:filename error:NULL];
 		[index addFile:renamedFilename error:NULL];
 		[index write:NULL];
 
 		GTIndexEntry *precomposedRenamedFileEntry = [index entryWithPath:renamedFilename error:NULL];
 		expect(precomposedRenamedFileEntry).notTo(beNil());
-		expect(@(fileStatusEqualsExpected(precomposedFileEntry.path, GTStatusDeltaStatusRenamed, GTStatusDeltaStatusUntracked))).to(beTruthy());
+		expect(@(fileStatusEqualsExpected(precomposedFileEntry.path, GTDeltaTypeRenamed, GTDeltaTypeUntracked))).to(beTruthy());
 	});
 });
 
diff --git a/ObjectiveGitTests/GTRepository+StatusSpec.m b/ObjectiveGitTests/GTRepository+StatusSpec.m
@@ -27,7 +27,7 @@
 		expect(repository).notTo(beNil());
 	});
 
-	void (^updateIndexForSubpathAndExpectStatus)(NSString *, GTStatusDeltaStatus) = ^(NSString *subpath, GTStatusDeltaStatus expectedIndexStatus) {
+	void (^updateIndexForSubpathAndExpectStatus)(NSString *, GTDeltaType) = ^(NSString *subpath, GTDeltaType expectedIndexStatus) {
 		__block NSError *err = nil;
 		GTIndex *index = [repository indexWithError:&err];
 		expect(err).to(beNil());
@@ -42,7 +42,7 @@
 		expect(err).to(beNil());
 	};
 
-	void (^expectSubpathToHaveWorkDirStatus)(NSString *, GTStatusDeltaStatus) = ^(NSString *subpath, GTStatusDeltaStatus expectedWorkDirStatus) {
+	void (^expectSubpathToHaveWorkDirStatus)(NSString *, GTDeltaType) = ^(NSString *subpath, GTDeltaType expectedWorkDirStatus) {
 		__block NSError *err = nil;
 		NSDictionary *renamedOptions = @{ GTRepositoryStatusOptionsFlagsKey: @(GTRepositoryStatusFlagsIncludeIgnored | GTRepositoryStatusFlagsIncludeUntracked | GTRepositoryStatusFlagsRecurseUntrackedDirectories | GTRepositoryStatusFlagsRenamesIndexToWorkingDirectory) };
 		expect(@([repository enumerateFileStatusWithOptions:renamedOptions error:&err usingBlock:^(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop) {
@@ -52,55 +52,55 @@
 		expect(err).to(beNil());
 	};
 
-	void (^expectSubpathToHaveMatchingStatus)(NSString *, GTStatusDeltaStatus) = ^(NSString *subpath, GTStatusDeltaStatus status) {
+	void (^expectSubpathToHaveMatchingStatus)(NSString *, GTDeltaType) = ^(NSString *subpath, GTDeltaType status) {
 		expectSubpathToHaveWorkDirStatus(subpath, status);
 		updateIndexForSubpathAndExpectStatus(subpath, status);
 	};
 
 	it(@"should recognize untracked files", ^{
-		expectSubpathToHaveWorkDirStatus(@"UntrackedImage.png", GTStatusDeltaStatusUntracked);
+		expectSubpathToHaveWorkDirStatus(@"UntrackedImage.png", GTDeltaTypeUntracked);
 	});
 
 	it(@"should recognize added files", ^{
-		updateIndexForSubpathAndExpectStatus(@"UntrackedImage.png", GTStatusDeltaStatusAdded);
+		updateIndexForSubpathAndExpectStatus(@"UntrackedImage.png", GTDeltaTypeAdded);
 	});
 
 	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);
+		expectSubpathToHaveMatchingStatus(targetFileURL.lastPathComponent, GTDeltaTypeModified);
 	});
 
 	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);
+		updateIndexForSubpathAndExpectStatus(copyLocation.lastPathComponent, GTDeltaTypeCopied);
 	});
 
 	it(@"should recognize deleted files", ^{
 		expect(@([NSFileManager.defaultManager removeItemAtURL:targetFileURL error:&err])).to(beTruthy());
 		expect(err).to(beNil());
-		expectSubpathToHaveMatchingStatus(targetFileURL.lastPathComponent, GTStatusDeltaStatusDeleted);
+		expectSubpathToHaveMatchingStatus(targetFileURL.lastPathComponent, GTDeltaTypeDeleted);
 	});
 
 	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());
-		expectSubpathToHaveWorkDirStatus(moveLocation.lastPathComponent, GTStatusDeltaStatusRenamed);
+		expectSubpathToHaveWorkDirStatus(moveLocation.lastPathComponent, GTDeltaTypeRenamed);
 	});
 
 	it(@"should recognise ignored files", ^{ //at least in the default options
-		expectSubpathToHaveWorkDirStatus(@".DS_Store", GTStatusDeltaStatusIgnored);
+		expectSubpathToHaveWorkDirStatus(@".DS_Store", GTDeltaTypeIgnored);
 	});
 
 	it(@"should skip ignored files if asked", ^{
 		__block NSError *err = nil;
 		NSDictionary *options = @{ GTRepositoryStatusOptionsFlagsKey: @(0) };
 		BOOL enumerationSuccessful = [repository enumerateFileStatusWithOptions:options error:&err usingBlock:^(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop) {
-			expect(@(indexToWorkingDirectory.status)).notTo(equal(@(GTStatusDeltaStatusIgnored)));
+			expect(@(indexToWorkingDirectory.status)).notTo(equal(@(GTDeltaTypeIgnored)));
 		}];
 		expect(@(enumerationSuccessful)).to(beTruthy());
 		expect(err).to(beNil());
diff --git a/ObjectiveGitTests/GTRepositoryResetSpec.m b/ObjectiveGitTests/GTRepositoryResetSpec.m
@@ -25,7 +25,7 @@
 		countStagedFiles = ^{
 			__block NSUInteger count = 0;
 			[repository enumerateFileStatusWithOptions:nil error:NULL usingBlock:^(GTStatusDelta *headToIndex, GTStatusDelta *indexToWorkingDirectory, BOOL *stop) {
-				if (headToIndex.status != GTStatusDeltaStatusUnmodified) count++;
+				if (headToIndex.status != GTDeltaTypeUnmodified) count++;
 			}];
 
 			return count;

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ - (NSUInteger)deltaCount {`
`234`	`234`	`return git_diff_num_deltas(self.git_diff);`
`235`	`235`	`}`
`236`	`236`
`237`		`-- (NSUInteger)numberOfDeltasWithType:(GTDiffDeltaType)deltaType {`
	`237`	`+- (NSUInteger)numberOfDeltasWithType:(GTDeltaType)deltaType {`
`238`	`238`	`return git_diff_num_deltas_of_type(self.git_diff, (git_delta_t)deltaType);`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,12 @@ - (GTDiffFile *)newFile {`
`56`	`56`	`return [[GTDiffFile alloc] initWithGitDiffFile:self.git_diff_delta.new_file];`
`57`	`57`	`}`
`58`	`58`
`59`		`-- (GTDiffDeltaType)type {`
`60`		`- return (GTDiffDeltaType)self.git_diff_delta.status;`
	`59`	`+- (GTDeltaType)type {`
	`60`	`+ return (GTDeltaType)self.git_diff_delta.status;`
	`61`	`+}`
	`62`	`+`
	`63`	`+- (double)similarity {`
	`64`	`+ return (double)(self.git_diff_delta.similarity / 100.0);`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`#pragma mark Lifecycle`