Review.

libgit2 · jspahrsummers · Sep 11, 2014 · Jul 3, 2013 · Jul 3, 2013 · Jul 3, 2013
commit 9ae2de93121531848befdd7c9d81798c410e275f
diff --git a/Classes/GTBranch.m b/Classes/GTBranch.m
@@ -129,7 +129,7 @@ - (NSString *)remoteName {
 }
 
 - (GTRemote *)remote {
-	return [GTRemote remoteWithName:[self remoteName] inRepository:[self repository]];
+	return [GTRemote remoteWithName:self.remoteName inRepository:self.repository];
 }
 
 - (GTCommit *)targetCommitAndReturnError:(NSError **)error {

diff --git a/Classes/GTRemote.h b/Classes/GTRemote.h
@@ -29,7 +29,7 @@ typedef enum {
 @property (nonatomic, readonly, strong) GTRepository *repository;
 @property (nonatomic, readonly, copy) NSString *name;
 @property (nonatomic, readonly, copy) NSString *URLString;
-@property (nonatomic, readonly, getter = isConnected) BOOL connected;
+@property (nonatomic, readonly, getter=isConnected) BOOL connected;
 
 
 + (instancetype)remoteWithName:(NSString *)name inRepository:(GTRepository *)repo;
@@ -40,8 +40,7 @@ typedef enum {
 // The underlying `git_remote` object.
 - (git_remote *)git_remote __attribute__((objc_returns_inner_pointer));
 
-- (BOOL)fetchWithError:(NSError **)error credentials:(int (^)(git_cred **cred, GTCredentialType allowedTypes, NSURL *url))credBlock progress:(void (^)(NSString *message, int length))progressBlock completion:(int (^)(GTRemoteCompletionType type))completionBlock updateTips:(int (^)(GTReference *ref, GTOID *a, GTOID *b))updateTipsBlock;
-
-- (void)stop;
+- (BOOL)fetchWithError:(NSError **)error credentials:(int (^)(git_cred **cred, GTCredentialType allowedTypes, NSString *url, NSString *username))credBlock progress:(void (^)(NSString *message, int length))progressBlock completion:(int (^)(GTRemoteCompletionType type))completionBlock updateTips:(int (^)(GTReference *ref, GTOID *a, GTOID *b))updateTipsBlock;
 
+- (void)cancelOperation;
 @end
diff --git a/Classes/GTRemote.m b/Classes/GTRemote.m
@@ -12,12 +12,13 @@
 #import "NSError+Git.h"
 
 @interface GTRemote () {
-	GTRepository *repository;
+	GTRepository *_repository;
 }
 @property (nonatomic, readonly, assign) git_remote *git_remote;
 @end
 
 @implementation GTRemote
+@synthesize repository;
 
 - (void)dealloc {
 	if (_git_remote != NULL) git_remote_free(_git_remote);
@@ -41,18 +42,22 @@ + (instancetype)remoteWithName:(NSString *)name inRepository:(GTRepository *)rep
 }
 
 - (instancetype)initWithName:(NSString *)name inRepository:(GTRepository *)repo {
+	NSParameterAssert(name != nil);
+	NSParameterAssert(repository != nil);
+
 	self = [super init];
 	if (self == nil) return nil;
 
 	int gitError = git_remote_load(&_git_remote, repo.git_repository, name.UTF8String);
 	if (gitError != GIT_OK) return nil;
 
-	repository = repo;
+	_repository = repo;
 
 	return self;
 }
 
 - (id)initWithGitRemote:(git_remote *)remote {
+	NSParameterAssert(remote != NULL);
 	self = [super init];
 	if (self == nil) return nil;
 
@@ -62,10 +67,10 @@ - (id)initWithGitRemote:(git_remote *)remote {
 }
 
 - (GTRepository *)repository {
-	if (repository == nil) {
-		repository = [[GTRepository alloc] initWithGitRepository:git_remote_owner(self.git_remote)];
+	if (_repository == nil) {
+		_repository = [[GTRepository alloc] initWithGitRepository:git_remote_owner(self.git_remote)];
 	}
-	return repository;
+	return _repository;
 }
 
 - (NSString *)name {
@@ -84,7 +89,7 @@ - (NSString *)URLString {
 
 #pragma mark Fetch
 
-typedef int  (^GTCredentialAcquireBlock)(git_cred **cred, GTCredentialType allowedTypes, NSURL *url);
+typedef int  (^GTCredentialAcquireBlock)(git_cred **cred, GTCredentialType allowedTypes, NSString *url, NSString *username);
 
 typedef void (^GTRemoteFetchProgressBlock)(NSString *message, int length);
 
@@ -100,7 +105,7 @@ - (NSString *)URLString {
 	__unsafe_unretained GTRemoteFetchUpdateTipsBlock updateTipsBlock;
 } GTRemoteFetchInfo;
 
-static int fetch_cred_acquire_cb(git_cred **cred, const char *urlStr, const char *username_from_url, unsigned int allowed_types, void *payload) {
+static int fetch_cred_acquire_cb(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
 	GTRemoteFetchInfo *info = (GTRemoteFetchInfo *)payload;
 
 	if (info->credBlock == nil) {
@@ -109,10 +114,7 @@ static int fetch_cred_acquire_cb(git_cred **cred, const char *urlStr, const char
 		return GIT_ERROR;
 	}
 
-	NSURL *url = [NSURL URLWithString:@(urlStr)];
-	NSCAssert(url != nil, @"Failed to convert %s to an URL", urlStr);
-
-	return info->credBlock(cred, (GTCredentialType)allowed_types, url);
+	return info->credBlock(cred, (GTCredentialType)allowed_types, @(url), @(username_from_url));
 }
 
 static void fetch_progress(const char *str, int len, void *payload) {
@@ -190,7 +192,7 @@ - (BOOL)fetchWithError:(NSError **)error credentials:(GTCredentialAcquireBlock)c
 	return YES;
 }
 
-- (void)stop {
+- (void)cancelOperation {
 	git_remote_stop(self.git_remote);
 }