Merge pull request libgit2#188 from libgit2/thread-safe

Thread safety

Author: jspahrsummers

Classes/GTBranch.m

@@ -30,12 +30,6 @@
 #import "GTCommit.h"
 #import "NSError+Git.h"
 
-
-@interface GTBranch ()
-@property (nonatomic, strong) GTReference *reference;
-@property (nonatomic, strong) GTRepository *repository;
-@end
-
 @implementation GTBranch
 
 - (NSString *)description {
@@ -56,9 +50,6 @@ - (NSUInteger)hash {
 
 #pragma mark API
 
-@synthesize reference;
-@synthesize repository;
-
 + (NSString *)localNamePrefix {
 	return @"refs/heads/";
 }
@@ -76,22 +67,25 @@ + (id)branchWithReference:(GTReference *)ref repository:(GTRepository *)repo {
 }
 
 - (id)initWithName:(NSString *)branchName repository:(GTRepository *)repo error:(NSError **)error {
-	if((self = [super init])) {
-		self.reference = [GTReference referenceByLookingUpReferencedNamed:branchName inRepository:repo error:error];
-		if(self.reference == nil) {
-            return nil;
-        }
-		
-		self.repository = repo;
-	}
-	return self;
+	NSParameterAssert(branchName != nil);
+	NSParameterAssert(repo != nil);
+
+	GTReference *ref = [GTReference referenceByLookingUpReferencedNamed:branchName inRepository:repo error:error];
+	if (ref == nil) return nil;
+
+	return [self initWithReference:ref repository:repo];
 }
 
 - (id)initWithReference:(GTReference *)ref repository:(GTRepository *)repo {
-	if((self = [super init])) {
-		self.reference = ref;
-		self.repository = repo;
-	}
+	NSParameterAssert(ref != nil);
+	NSParameterAssert(repo != nil);
+
+	self = [super init];
+	if (self == nil) return nil;
+
+	_repository = repo;
+	_reference = ref;
+
 	return self;
 }
 
@@ -100,8 +94,6 @@ - (NSString *)name {
 }
 
 - (NSString *)shortName {
-	if (![self.reference isValid]) return nil;
-
 	const char *name;
 	int gitError = git_branch_name(&name, self.reference.git_reference);
 	if (gitError != GIT_OK) return nil;
@@ -122,7 +114,7 @@ - (NSString *)sha {
 }
 
 - (NSString *)remoteName {
-	if (self.branchType == GTBranchTypeLocal || ![self.reference isValid]) return nil;
+	if (self.branchType == GTBranchTypeLocal) return nil;
 
 	const char *name;
 	int gitError = git_branch_name(&name, self.reference.git_reference);
@@ -145,7 +137,7 @@ - (GTCommit *)targetCommitAndReturnError:(NSError **)error {
 }
 
 - (NSUInteger)numberOfCommitsWithError:(NSError **)error {
-	GTEnumerator *enumerator = [[GTEnumerator alloc] initWithRepository:repository error:error];
+	GTEnumerator *enumerator = [[GTEnumerator alloc] initWithRepository:self.repository error:error];
 	if (enumerator == nil) return NSNotFound;
 
 	if (![enumerator pushSHA:self.sha error:error]) return NSNotFound;
@@ -181,19 +173,12 @@ - (NSArray *)uniqueCommitsRelativeToBranch:(GTBranch *)otherBranch error:(NSErro
 }
 
 - (BOOL)deleteWithError:(NSError **)error {
-	if (!self.reference.valid) {
-		if (error != NULL) *error = GTReference.invalidReferenceError;
-		return NO;
-	}
-
 	int gitError = git_branch_delete(self.reference.git_reference);
-	if(gitError != GIT_OK) {
+	if (gitError != GIT_OK) {
 		if(error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to delete branch."];
 		return NO;
 	}
-	
-	self.reference = nil;
-	
+
 	return YES;
 }
 
@@ -203,12 +188,6 @@ - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success
 		return self;
 	}
 
-	if (!self.reference.valid) {
-		if (success != NULL) *success = NO;
-		if (error != NULL) *error = GTReference.invalidReferenceError;
-		return NO;
-	}
-
 	git_reference *trackingRef = NULL;
 	int gitError = git_branch_upstream(&trackingRef, self.reference.git_reference);
 

Classes/GTCommit.m

@@ -35,13 +35,6 @@
 #import "NSString+Git.h"
 #import "NSDate+GTTimeAdditions.h"
 
-@interface GTCommit ()
-@property (nonatomic, strong) GTSignature *author;
-@property (nonatomic, strong) GTSignature *committer;
-@property (nonatomic, copy) NSArray *parents;
-@end
-
-
 @implementation GTCommit
 
 - (NSString *)description {
@@ -133,18 +126,11 @@ - (NSTimeZone *)commitTimeZone {
 }
 
 - (GTSignature *)author {
-	if (_author == nil) {
-		_author = [[GTSignature alloc] initWithGitSignature:git_commit_author(self.git_commit)];
-	}
-	
-	return _author;
+	return [[GTSignature alloc] initWithGitSignature:git_commit_author(self.git_commit)];
 }
 
 - (GTSignature *)committer {
-	if (_committer == nil) {
-		_committer = [[GTSignature alloc] initWithGitSignature:git_commit_committer(self.git_commit)];
-	}
-	return _committer;
+	return [[GTSignature alloc] initWithGitSignature:git_commit_committer(self.git_commit)];
 }
 
 - (GTTree *)tree {
@@ -160,22 +146,18 @@ - (GTTree *)tree {
 }
 
 - (NSArray *)parents {
-	if(_parents == nil) {
-		unsigned int numberOfParents = git_commit_parentcount(self.git_commit);
-		NSMutableArray *parents = [NSMutableArray arrayWithCapacity:numberOfParents];
-		
-		for (unsigned int i = 0; i < numberOfParents; i++) {
-			git_commit *parent = NULL;
-			int parentResult = git_commit_parent(&parent, self.git_commit, i);
-			if (parentResult != GIT_OK) continue;
-
-			[parents addObject:(GTCommit *)[GTObject objectWithObj:(git_object *)parent inRepository:self.repository]];
-		}
-		
-		_parents = [parents copy];
-	}
+	unsigned numberOfParents = git_commit_parentcount(self.git_commit);
+	NSMutableArray *parents = [NSMutableArray arrayWithCapacity:numberOfParents];
 
-	return _parents;
+	for (unsigned i = 0; i < numberOfParents; i++) {
+		git_commit *parent = NULL;
+		int parentResult = git_commit_parent(&parent, self.git_commit, i);
+		if (parentResult != GIT_OK) continue;
+
+		[parents addObject:(GTCommit *)[GTObject objectWithObj:(git_object *)parent inRepository:self.repository]];
+	}
+
+	return parents;
 }
 
 @end

Classes/GTConfiguration+Private.h

@@ -12,8 +12,6 @@
 
 @interface GTConfiguration ()
 
-@property (nonatomic, readwrite, weak) GTRepository *repository;
-
 // Initializes the receiver.
 //
 // config     - The libgit2 config. Cannot be NULL.

Classes/GTConfiguration.h

@@ -14,7 +14,7 @@
 @interface GTConfiguration : NSObject
 
 @property (nonatomic, readonly, assign) git_config *git_config;
-@property (nonatomic, readonly, weak) GTRepository *repository;
+@property (nonatomic, readonly, strong) GTRepository *repository;
 @property (nonatomic, readonly, copy) NSArray *configurationKeys;
 
 // The GTRemotes in the config. If the configuration isn't associated with any

Classes/GTConfiguration.m

@@ -18,7 +18,7 @@ @implementation GTConfiguration
 #pragma mark Lifecycle
 
 - (void)dealloc {
-	git_config_free(self.git_config);
+	git_config_free(_git_config);
 }
 
 - (id)initWithGitConfig:(git_config *)config repository:(GTRepository *)repository {

Classes/GTIndex.h

@@ -30,9 +30,14 @@
 #include "git2.h"
 
 @class GTIndexEntry;
+@class GTRepository;
 
 @interface GTIndex : NSObject
 
+// The repository in which the index resides. This may be nil if the index was
+// created with -initWithFileURL:error:.
+@property (nonatomic, readonly, strong) GTRepository *repository;
+
 // The underlying libgit2 index.
 @property (nonatomic, readonly) git_index *git_index;
 
@@ -55,11 +60,12 @@
 
 // Initializes the receiver with the given libgit2 index.
 //
-// index - The libgit2 index from which the index should be created. Cannot be
-//         NULL.
+// index      - The libgit2 index from which the index should be created. Cannot
+//              be NULL.
+// repository - The repository in which the index resides. Cannot be nil.
 //
 // Returns the initialized object.
-- (id)initWithGitIndex:(git_index *)index;
+- (id)initWithGitIndex:(git_index *)index repository:(GTRepository *)repository;
 
 // Refresh the index from the datastore
 //

Classes/GTIndex.m

@@ -64,13 +64,15 @@ - (id)initWithFileURL:(NSURL *)fileURL error:(NSError **)error {
 	return self;
 }
 
-- (id)initWithGitIndex:(git_index *)index {
+- (id)initWithGitIndex:(git_index *)index repository:(GTRepository *)repository {
 	NSParameterAssert(index != NULL);
+	NSParameterAssert(repository != nil);
 
 	self = [super init];
 	if (self == nil) return nil;
 
 	_git_index = index;
+	_repository = repository;
 
 	return self;
 }

Classes/GTIndexEntry.m

@@ -31,7 +31,6 @@
 #import "NSError+Git.h"
 #import "NSString+Git.h"
 
-
 @implementation GTIndexEntry
 
 #pragma mark NSObject

Classes/GTObject.m

@@ -37,11 +37,6 @@
 #import "GTBlob.h"
 #import "GTTag.h"
 
-@interface GTObject ()
-@property (nonatomic, assign) git_object *git_object;
-@end
-
-
 @implementation GTObject
 
 - (NSString *)description {
@@ -65,13 +60,16 @@ - (BOOL)isEqual:(id)otherObject {
 
 #pragma mark API 
 
-@synthesize git_object;
+- (id)initWithObj:(git_object *)object inRepository:(GTRepository *)repo {
+	NSParameterAssert(object != NULL);
+	NSParameterAssert(repo != nil);
+
+	self = [super init];
+	if (self == nil) return nil;
+
+	_repository = repo;
+	_git_object = object;
 
-- (id)initWithObj:(git_object *)theObject inRepository:(GTRepository *)theRepo {
-	if((self = [super init])) {
-		_repository = theRepo;
-		self.git_object = theObject;
-	}
 	return self;
 }
 
@@ -112,7 +110,10 @@ - (NSString *)shortSha {
 }
 
 - (GTOdbObject *)odbObjectWithError:(NSError **)error {
-    return [self.repository.objectDatabase objectWithOid:git_object_id(self.git_object) error:error];
+	GTObjectDatabase *database = [self.repository objectDatabaseWithError:error];
+	if (database == nil) return nil;
+
+	return [database objectWithOid:git_object_id(self.git_object) error:error];
 }
 
 @end

Classes/GTObjectDatabase.h

@@ -28,11 +28,17 @@
 
 @interface GTObjectDatabase : NSObject
 
-@property (nonatomic, assign) git_odb *git_odb;
-@property (nonatomic, readonly, weak) GTRepository *repository;
+@property (nonatomic, readonly, assign) git_odb *git_odb;
+@property (nonatomic, readonly, strong) GTRepository *repository;
 
-+ (id)objectDatabaseWithRepository:(GTRepository *)repository;
-- (id)initWithRepository:(GTRepository *)repository;
+// Initializes the object database with the given repository.
+//
+// repo  - The repository from which the object database should be created.
+//         Cannot be nil.
+// error - The error if one occurred.
+//
+// Returns the initialized object.
+- (id)initWithRepository:(GTRepository *)repo error:(NSError **)error;
 
 - (GTOdbObject *)objectWithOid:(const git_oid *)oid error:(NSError **)error;
 - (GTOdbObject *)objectWithSha:(NSString *)sha error:(NSError **)error;