Merge remote-tracking branch 'upstream/master'

Author: slavikus

ObjectiveGit/GTCredential.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///
 /// credentialBlock - a block that will be called when credentials are requested.
 ///                   Must not be nil.
-+ (instancetype)providerWithBlock:(GTCredential *(^)(GTCredentialType type, NSString *URL, NSString *userName))credentialBlock;
++ (instancetype)providerWithBlock:(GTCredential * _Nullable(^)(GTCredentialType type, NSString *URL, NSString *userName))credentialBlock;
 
 /// Default credential provider method.
 ///
@@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// type     - the credential types allowed by the operation.
 /// URL      - the URL the operation is authenticating against.
 /// userName - the user name provided by the operation. Can be nil, and might be ignored.
-- (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(nullable NSString *)userName;
+- (GTCredential * _Nullable)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(nullable NSString *)userName;
 @end
 
 /// The GTCredential class is used to provide authentication data.

ObjectiveGit/GTDiffHunk.h

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

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

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

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

ObjectiveGitTests/GTDiffSpec.m

@@ -112,6 +112,10 @@
 			[patch enumerateHunksUsingBlock:^(GTDiffHunk *hunk, BOOL *stop) {
 				expect(hunk.header).to(equal(@"@@ -4,7 +4,7 @@"));
 				expect(@(hunk.lineCount)).to(equal(@8));
+				expect(@(hunk.oldStart)).to(equal(@4));
+				expect(@(hunk.oldLines)).to(equal(@7));
+				expect(@(hunk.newStart)).to(equal(@4));
+				expect(@(hunk.newLines)).to(equal(@7));
 
 				NSArray *expectedLines = @[ @"//",
 				@"//  Created by Joe Ricioppo on 9/29/10.",

ObjectiveGitTests/GTRemoteSpec.m

@@ -61,6 +61,21 @@
 		expect(remote.URLString).to(equal(newURLString));
 	});
 
+	it(@"push URL string", ^{
+		expect(remote.pushURLString).to(beNil());
+		
+		NSString *newURLString = @"https://github.com/github/Test_App.git";
+		
+		__block NSError *error = nil;
+		expect(@([remote updatePushURLString:newURLString error:&error])).to(beTruthy());
+		expect(error).to(beNil());
+		
+		// Reload remote from disk to pick up the change
+		remote = configuration.remotes[0];
+		
+		expect(remote.pushURLString).to(equal(newURLString));
+	});
+
 	it(@"fetch refspecs", ^{
 		expect(remote.fetchRefspecs).to(equal(@[ fetchRefspec ]));