Starting port to ObjectiveGit.framework from wrappers around command-line git

Author: rowanj

PBGitRepository.h

@@ -91,6 +91,8 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (NSString *) projectName;
 - (NSString *)gitIgnoreFilename;
 - (BOOL)isBareRepository;
++ (BOOL)isBareRepository:(NSURL*)repositoryURL;
+
 
 - (void) reloadRefs;
 - (void) addRef:(PBGitRef *)ref fromParameters:(NSArray *)params;
@@ -139,4 +141,5 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 @property (assign) PBGitRevSpecifier *currentBranch;
 @property (assign) NSInteger currentBranchFilter;
 @property (retain) NSMutableDictionary* refs;
+
 @end

PBGitRepository.m

@@ -22,6 +22,10 @@
 #import "PBHistorySearchController.h"
 #import "PBGitRepositoryWatcher.h"
 
+
+#import <ObjectiveGit/GTRepository.h>
+#import <ObjectiveGit/git2/repository.h>
+
 NSString* PBGitRepositoryErrorDomain = @"GitXErrorDomain";
 
 @implementation PBGitRepository
@@ -39,21 +43,28 @@ - (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError *
 	return NO;
 }
 
-+ (BOOL) isBareRepository: (NSString*) path
++ (BOOL) isBareRepository: (NSURL*) url
 {
-	return [[PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"rev-parse", @"--is-bare-repository", nil] inDir:path] isEqualToString:@"true"];
+	NSError* pError;
+	GTRepository* gitRepo = [[GTRepository alloc] initWithURL:url error:&pError];
+
+	return gitRepo && git_repository_is_bare([gitRepo repo]);
+}
+
+- (BOOL) isBareRepository
+{
+	return [PBGitRepository isBareRepository:[self fileURL]];
 }
 
 + (NSURL *)gitDirForURL:(NSURL *)repositoryURL;
 {
 	if (![PBGitBinary path])
 		return nil;
 
-	NSString* repositoryPath = [repositoryURL path];
-
-	if ([self isBareRepository:repositoryPath])
+	if ([self isBareRepository:repositoryURL])
 		return repositoryURL;
 
+	NSString* repositoryPath = [repositoryURL path];
 	// Use rev-parse to find the .git dir for the repository being opened
 	int retValue = 1;
 	NSString *newPath = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"rev-parse", @"--git-dir", nil] inDir:repositoryPath retValue:&retValue];
@@ -79,7 +90,7 @@ + (NSURL*)baseDirForURL:(NSURL*)repositoryURL;
 	NSURL* gitDirURL         = [self gitDirForURL:repositoryURL];
 	NSString* repositoryPath = [gitDirURL path];
 
-	if (![self isBareRepository:repositoryPath]) {
+	if (![PBGitRepository isBareRepository:repositoryURL]) {
 		repositoryURL = [NSURL fileURLWithPath:[[repositoryURL path] stringByDeletingLastPathComponent]];
 	}
 
@@ -209,15 +220,6 @@ - (NSString*)gitIgnoreFilename
 	return [[self workingDirectory] stringByAppendingPathComponent:@".gitignore"];
 }
 
-- (BOOL)isBareRepository
-{
-	if([self workingDirectory]) {
-		return [PBGitRepository isBareRepository:[self workingDirectory]];
-	} else {
-		return true;
-	}
-}
-
 // Overridden to create our custom window controller
 - (void)makeWindowControllers
 {