Merge branch 'master' into new_nullable_annotation

Author: alehed

.travis.yml

@@ -1,12 +1,12 @@
-osx_image: xcode7
+osx_image: xcode8
 language: objective-c
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode7.3
+    - osx_image: xcode8
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode7.3
+    - osx_image: xcode8
       env:
         - SCHEME="ObjectiveGit iOS"
 before_install:

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v4.0.0"
-github "Quick/Quick" "v0.9.2"
-github "ZipArchive/ZipArchive" "v1.1"
+github "Quick/Nimble" "v4.1.0"
+github "Quick/Quick" "v0.9.3"
+github "ZipArchive/ZipArchive" "v1.6.2"
 github "jspahrsummers/xcconfigs" "0.9"

Carthage/Checkouts/Nimble

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2012 libgit2 contributors
+Copyright (c) 2016 libgit2 contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Carthage/Checkouts/Quick

@@ -29,8 +29,12 @@
 
 #import <Foundation/Foundation.h>
 
+/// The error domain used by Objective-Git
 extern NSString * const GTGitErrorDomain;
 
+/// Error userinfo keys
+extern NSString * const GTGitErrorOID;
+
 @interface NSError (Git)
 
 /// Describes the given libgit2 error code, using any message provided by

Carthage/Checkouts/ZipArchive

@@ -31,6 +31,7 @@
 #import "git2/errors.h"
 
 NSString * const GTGitErrorDomain = @"GTGitErrorDomain";
+NSString * const GTGitErrorOID = @"GTOID";
 
 @implementation NSError (Git)
 

LICENSE

@@ -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.
 ///

ObjectiveGit/Categories/NSError+Git.h

@@ -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);
 }
 

ObjectiveGit/Categories/NSError+Git.m

@@ -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.
 ///

ObjectiveGit/GTDiff.h

@@ -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

ObjectiveGit/GTDiff.m

@@ -22,6 +22,18 @@ NS_ASSUME_NONNULL_BEGIN
 /// The number of lines represented in the hunk.
 @property (nonatomic, readonly) NSUInteger lineCount;
 
+/// The starting line number in the old file
+@property (nonatomic, readonly) NSUInteger oldStart;
+
+/// The number of lines in the old file
+@property (nonatomic, readonly) NSUInteger oldLines;
+
+/// The starting line number in the new file
+@property (nonatomic, readonly) NSUInteger newStart;
+
+/// The number of lines in the new file
+@property (nonatomic, readonly) NSUInteger newLines;
+
 - (instancetype)init NS_UNAVAILABLE;
 
 /// Designated initialiser.

ObjectiveGit/GTDiffDelta.h

@@ -40,6 +40,10 @@ - (instancetype)initWithPatch:(GTDiffPatch *)patch hunkIndex:(NSUInteger)hunkInd
 	int result = git_patch_get_hunk(&_git_hunk, &gitLineCount, patch.git_patch, hunkIndex);
 	if (result != GIT_OK) return nil;
 	_lineCount = gitLineCount;
+	_oldStart = self.git_hunk->old_start;
+	_oldLines = self.git_hunk->old_lines;
+	_newStart = self.git_hunk->new_start;
+	_newLines = self.git_hunk->new_lines;
 
 	_patch = patch;
 	_hunkIndex = hunkIndex;

ObjectiveGit/GTDiffDelta.m

@@ -117,6 +117,16 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns a (possibly empty) array of GTCommits, or nil if an error occurs.
 - (NSArray<GTCommit *> * _Nullable)allObjectsWithError:(NSError **)error;
 
+/// Get the next OID.
+///
+/// success - If not NULL, this will be set to whether getting the next object
+///           was successful. This will be YES if the receiver is exhausted, so
+///           it can be used to interpret the meaning of a nil return value.
+/// error   - If not NULL, set to any error that occurs during traversal.
+///
+/// Returns nil if an error occurs or the enumeration is done.
+- (nullable GTOID *)nextOIDWithSuccess:(nullable BOOL *)success error:(NSError **)error;
+
 /// Gets the next commit.
 ///
 /// success - If not NULL, this will be set to whether getting the next object

ObjectiveGit/GTDiffHunk.h

@@ -145,16 +145,34 @@ - (void)resetWithOptions:(GTEnumeratorOptions)options {
 
 #pragma mark Enumerating
 
-- (GTCommit *)nextObjectWithSuccess:(BOOL *)success error:(NSError **)error {
+- (GTOID *)nextOIDWithSuccess:(BOOL *)success error:(NSError **)error {
 	git_oid oid;
+
 	int gitError = git_revwalk_next(&oid, self.walk);
 	if (gitError == GIT_ITEROVER) {
 		if (success != NULL) *success = YES;
 		return nil;
 	}
+	if (gitError != GIT_OK) {
+		if (success != NULL) *success = NO;
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Enumeration failed"];
+		return nil;
+	}
+
+	if (success != NULL) *success = YES;
+	return [GTOID oidWithGitOid:&oid];
+}
+
+- (GTCommit *)nextObjectWithSuccess:(BOOL *)success error:(NSError **)error {
+	GTOID *oid = [self nextOIDWithSuccess:success error:error];
+	if (oid == nil) {
+		// We don't care whether the iteration completed, or an error occurred,
+		// there's nothing to lookup.
+		return nil;
+	}
 
 	// Ignore error if we can't lookup object and just return nil.
-	GTCommit *commit = [self.repository lookUpObjectByGitOid:&oid objectType:GTObjectTypeCommit error:error];
+	GTCommit *commit = [self.repository lookUpObjectByOID:oid objectType:GTObjectTypeCommit error:error];
 	if (success != NULL) *success = (commit != nil);
 	return commit;
 }

ObjectiveGit/GTDiffHunk.m

@@ -8,17 +8,8 @@
 
 #import "GTReflog.h"
 
-@class GTReference;
-
 @interface GTReflog ()
 
 - (instancetype _Nullable)init NS_UNAVAILABLE;
 
-/// Initializes the receiver with a reference. Designated initializer.
-///
-/// reference - The reference whose reflog is being represented. Cannot be nil.
-///
-/// Returns the initialized object.
-- (instancetype _Nullable)initWithReference:(GTReference * _Nonnull)reference NS_DESIGNATED_INITIALIZER;
-
 @end

ObjectiveGit/GTEnumerator.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @class GTSignature;
+@class GTReference;
 @class GTReflogEntry;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -20,6 +21,13 @@ NS_ASSUME_NONNULL_BEGIN
 /// The number of reflog entries.
 @property (nonatomic, readonly, assign) NSUInteger entryCount;
 
+/// Initializes the receiver with a reference. Designated initializer.
+///
+/// reference - The reference whose reflog is being represented. Cannot be nil.
+///
+/// Returns the initialized object.
+- (nullable instancetype)initWithReference:(nonnull GTReference *)reference NS_DESIGNATED_INITIALIZER;
+
 /// Writes a new entry to the reflog.
 ///
 /// committer - The committer for the reflog entry. Cannot be nil.

ObjectiveGit/GTEnumerator.m

@@ -119,6 +119,16 @@ typedef enum {
 /// if updating or saving the remote failed.
 - (BOOL)updateURLString:(NSString *)URLString error:(NSError **)error;
 
+/// Updates the push URL string for this remote.
+///
+/// URLString - The URLString to update to. May not be nil.
+/// error     - If not NULL, this will be set to any error that occurs when
+///             updating the URLString or saving the remote.
+///
+/// Returns YES if the push URLString was successfully updated, NO and an error
+/// if updating or saving the remote failed.
+- (BOOL)updatePushURLString:(NSString *)URLString error:(NSError **)error;
+
 /// Adds a fetch refspec to this remote.
 ///
 /// fetchRefspec - The fetch refspec string to add. May not be nil.

ObjectiveGit/GTReflog+Private.h

@@ -204,6 +204,21 @@ - (BOOL)updateURLString:(NSString *)URLString error:(NSError **)error {
 	return YES;
 }
 
+- (BOOL)updatePushURLString:(NSString *)URLString error:(NSError **)error {
+	NSParameterAssert(URLString != nil);
+	
+	if ([self.pushURLString isEqualToString:URLString]) return YES;
+	
+	int gitError = git_remote_set_pushurl(self.repository.git_repository, self.name.UTF8String, URLString.UTF8String);
+	if (gitError != GIT_OK) {
+		if (error != NULL) {
+			*error = [NSError git_errorFor:gitError description:@"Failed to update remote push URL string."];
+		}
+		return NO;
+	}
+	return YES;
+}
+
 - (BOOL)addFetchRefspec:(NSString *)fetchRefspec error:(NSError **)error {
 	NSParameterAssert(fetchRefspec != nil);
 

ObjectiveGit/GTReflog.h

@@ -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;
 		}

ObjectiveGit/GTRemote.h

@@ -110,6 +110,16 @@ extern NSString * const GTRepositoryCloneOptionsCloneLocal;
 /// A NSURL pointing to a local file that contains PEM-encoded certificate chain.
 extern NSString *const GTRepositoryCloneOptionsServerCertificateURL;
 
+/// Repository extended open control flags for
+/// +initWithURL:flags:ceilingDirs:error:.
+///
+/// See respository.h for documentation of each individual flag.
+typedef NS_OPTIONS(NSInteger, GTRepositoryOpenFlags) {
+	GTRepositoryOpenNoSearch = GIT_REPOSITORY_OPEN_NO_SEARCH,
+	GTRepositoryOpenCrossFS = GIT_REPOSITORY_OPEN_CROSS_FS,
+	GTRepositoryOpenBare = GIT_REPOSITORY_OPEN_BARE,
+};
+
 /// Initialization flags associated with `GTRepositoryInitOptionsFlags` for
 /// +initializeEmptyRepositoryAtFileURL:options:error:.
 ///
@@ -209,6 +219,17 @@ typedef NS_ENUM(NSInteger, GTRepositoryStateType) {
 /// Returns the initialized repository, or nil if an error occurred.
 - (instancetype _Nullable)initWithURL:(NSURL *)localFileURL error:(NSError **)error;
 
+/// Convenience initializer to find and open a repository with extended controls.
+///
+/// localFileURL    - The file URL for the new repository. Cannot be nil.
+/// flags           - A combination of the `GTRepositoryOpenFlags` flags.
+/// ceilingDirURLs  - An array of URLs at which the search for a containing
+///                   repository should terminate. Can be NULL.
+/// error           - The error if one occurs.
+///
+/// Returns the initialized repository, or nil if an error occurred.
+- (nullable instancetype)initWithURL:(NSURL *)localFileURL flags:(NSInteger)flags ceilingDirs:(nullable NSArray<NSURL *> *)ceilingDirURLs error:(NSError **)error;
+
 - (instancetype)init NS_UNAVAILABLE;
 
 /// Initializes the receiver to wrap the given repository object. Designated initializer.