Remove things that aren't needed now that PBGitRepository is more NSDoc-like

tiennou · tiennou · commit d3592f39241d · 2013-06-13T20:51:43.000+02:00
Also, switch repository creation to GTRepository.
diff --git a/Classes/Controllers/ApplicationController.m b/Classes/Controllers/ApplicationController.m
@@ -9,7 +9,6 @@
 #import "ApplicationController.h"
 #import "PBGitRevisionCell.h"
 #import "PBGitWindowController.h"
-#import "PBRepositoryDocumentController.h"
 #import "PBServicesController.h"
 #import "PBGitXProtocol.h"
 #import "PBPrefsWindowController.h"
@@ -70,7 +69,7 @@ - (void)registerServices
 
 - (BOOL)applicationShouldOpenUntitledFile:(NSApplication *)sender
 {
-	if(!started || [[[PBRepositoryDocumentController sharedDocumentController] documents] count])
+	if(!started || [[[NSDocumentController sharedDocumentController] documents] count])
 		return NO;
 	return YES;
 }
diff --git a/Classes/Controllers/OpenRecentController.m b/Classes/Controllers/OpenRecentController.m
@@ -8,7 +8,6 @@
 
 #import "OpenRecentController.h"
 #import "PBGitDefaults.h"
-#import "PBRepositoryDocumentController.h"
 
 @implementation OpenRecentController
 
@@ -77,9 +76,9 @@ - (IBAction) tableDoubleClick:(id)sender
 {
 	[self changeSelection:self];
 	if(selectedResult != nil) {
-		[[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
-																						 display:YES
-																						   error:nil];
+		[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
+                                                                               display:YES
+                                                                                 error:nil];
 	}
 	[self hide];
 }
@@ -88,9 +87,9 @@ - (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySe
     BOOL result = NO;
     if (commandSelector == @selector(insertNewline:)) {
 		if(selectedResult != nil) {
-			[[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
-																							 display:YES
-																							   error:nil];
+			[[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:selectedResult
+                                                                                   display:YES
+                                                                                     error:nil];
 		}
 		[self hide];
 //		[searchWindow makeKeyAndOrderFront: nil];
diff --git a/Classes/Controllers/PBGitSidebarController.m b/Classes/Controllers/PBGitSidebarController.m
@@ -16,7 +16,6 @@
 #import "PBAddRemoteSheet.h"
 #import "PBGitDefaults.h"
 #import "PBHistorySearchController.h"
-#import "PBRepositoryDocumentController.h"
 
 @interface PBGitSidebarController ()
 
@@ -225,9 +224,9 @@ - (void)doubleClicked:(id)object {
         PBGitSVSubmoduleItem *subModule = [sourceView itemAtRow:rowNumber];
         
         NSURL *url = [NSURL fileURLWithPath:subModule.submodule.path];
-        [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url
-																						 display:YES
-																						   error:nil];
+        [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url
+                                                                               display:YES
+                                                                                 error:nil];
 
         ;
     }
diff --git a/Classes/Controllers/PBRepositoryDocumentController.h b/Classes/Controllers/PBRepositoryDocumentController.h
@@ -7,14 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRevSpecifier.h"
-
 
 @interface PBRepositoryDocumentController : NSDocumentController
-{
-
-}
 
-- (id) documentForLocation:(NSURL*) url;
-- (void)initNewRepositoryAtURL:(NSURL *)url;
 @end
diff --git a/Classes/Controllers/PBRepositoryDocumentController.m b/Classes/Controllers/PBRepositoryDocumentController.m
@@ -13,6 +13,8 @@
 #import "PBGitBinary.h"
 #import "GitRepoFinder.h"
 
+#import <ObjectiveGit/GTRepository.h>
+
 @implementation PBRepositoryDocumentController
 // This method is overridden to configure the open panel to only allow
 // selection of directories
@@ -24,60 +26,23 @@ - (NSInteger)runModalOpenPanel:(NSOpenPanel *)openPanel forTypes:(NSArray *)exte
 	return [openPanel runModal];
 }
 
-// Convert paths to the .git dir before searching for an already open document
-- (id)documentForURL:(NSURL *)URL
-{
-	NSURL* fileURL = [GitRepoFinder fileURLForURL:URL];
-	id result = [super documentForURL:fileURL];
-	return result;
-}
-
-- (void)noteNewRecentDocumentURL:(NSURL*)URL
-{
-	NSURL* fileURL = [GitRepoFinder fileURLForURL:URL];
-	[super noteNewRecentDocumentURL:fileURL];
-}
-
-- (id) documentForLocation:(NSURL*) url
-{
-	id document = [self documentForURL:url];
-	if (!document) {
-		
-		if (!(document = [[PBGitRepository alloc] initWithURL:url]))
-			return nil;
-
-		[self addDocument:document];
-	}
-	else
-		[document showWindows];
-
-	return document;
-}
-
-- (void)initNewRepositoryAtURL:(NSURL *)url
-{
-	int terminationStatus;
-	NSString *result = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:[NSArray arrayWithObjects:@"init", @"-q", nil] inDir:[url path] retValue:&terminationStatus];
-
-	if (terminationStatus == 0)
-		[self openDocumentWithContentsOfURL:url display:YES error:NULL];
-	else
-		NSRunAlertPanel(@"Failed to create new Git repository", @"Git returned the following error when trying to create the repository: %@", nil, nil, nil, result);
-}
-
-- (IBAction)newDocument:(id)sender
-{
+- (id)makeUntitledDocumentOfType:(NSString *)typeName error:(NSError *__autoreleasing *)outError {
 	NSOpenPanel *op = [NSOpenPanel openPanel];
 
 	[op setCanChooseFiles:NO];
 	[op setCanChooseDirectories:YES];
 	[op setAllowsMultipleSelection:NO];
 	[op setMessage:@"Initialize a repository here:"];
 	[op setTitle:@"New Repository"];
-	if ([op runModal] == NSFileHandlingPanelOKButton)
-		[self initNewRepositoryAtURL:[op URL]];
-}
+	if ([op runModal] != NSFileHandlingPanelOKButton)
+        return nil;
 
+    BOOL success = [GTRepository initializeEmptyRepositoryAtURL:[op URL] error:outError];
+    if (!success)
+        return nil; // Repo creation failed
+
+    return [[PBGitRepository alloc] initWithContentsOfURL:[op URL] ofType:PBGitRepositoryDocumentType error:outError];
+}
 
 - (BOOL)validateMenuItem:(NSMenuItem *)item
 {
diff --git a/Classes/Controllers/PBServicesController.m b/Classes/Controllers/PBServicesController.m
@@ -7,7 +7,6 @@
 //
 
 #import "PBServicesController.h"
-#import "PBRepositoryDocumentController.h"
 #import "PBGitRepository.h"
 
 @implementation PBServicesController
diff --git a/Classes/PBCLIProxy.m b/Classes/PBCLIProxy.m
@@ -7,7 +7,6 @@
 //
 
 #import "PBCLIProxy.h"
-#import "PBRepositoryDocumentController.h"
 #import "PBGitRevSpecifier.h"
 #import "PBGitRepository.h"
 #import "PBGitWindowController.h"
@@ -38,7 +37,7 @@ - (BOOL)openRepository:(NSURL*)repositoryPath arguments: (NSArray*) args error:(
 	NSURL* url = [NSURL fileURLWithPath:[repositoryPath path]];
 	NSArray* arguments = [NSArray arrayWithArray:args];
 
-	PBGitRepository *document = [[PBRepositoryDocumentController sharedDocumentController] documentForLocation:url];
+	PBGitRepository *document = [[NSDocumentController sharedDocumentController] documentForURL:url];
 	if (!document) {
 		if (error) {
 			NSString *suggestion = [PBGitBinary path] ? @"this isn't a git repository" : @"GitX can't find your git binary";
diff --git a/Classes/Util/NSApplication+GitXScripting.m b/Classes/Util/NSApplication+GitXScripting.m
@@ -9,9 +9,11 @@
 #import "NSApplication+GitXScripting.h"
 #import "GitXScriptingConstants.h"
 #import "PBDiffWindowController.h"
-#import "PBRepositoryDocumentController.h"
+#import "PBGitRepository.h"
 #import "PBCloneRepositoryPanel.h"
 
+#import <ObjectiveGit/GTRepository.h>
+
 
 @implementation NSApplication (GitXScripting)
 
@@ -27,9 +29,24 @@ - (void)showDiffScriptCommand:(NSScriptCommand *)command
 
 - (void)initRepositoryScriptCommand:(NSScriptCommand *)command
 {
+    NSError *error = nil;
 	NSURL *repositoryURL = [command directParameter];
-	if (repositoryURL)
-		[[PBRepositoryDocumentController sharedDocumentController] initNewRepositoryAtURL:repositoryURL];
+	if (!repositoryURL)
+        return;
+
+    BOOL success = [GTRepository initializeEmptyRepositoryAtURL:repositoryURL error:&error];
+    if (!success) {
+        NSLog(@"Failed to create repository at %@: %@", repositoryURL, error);
+        return;
+    }
+
+    [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:repositoryURL
+                                                                           display:YES
+                                                                 completionHandler:^(NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
+                                                                     if (error) {
+                                                                         NSLog(@"Failed to open repository at %@: %@", repositoryURL, error);
+                                                                     }
+                                                                 }];
 }
 
 - (void)cloneRepositoryScriptCommand:(NSScriptCommand *)command
diff --git a/Classes/Views/PBCloneRepositoryPanel.m b/Classes/Views/PBCloneRepositoryPanel.m
@@ -8,7 +8,6 @@
 
 #import "PBCloneRepositoryPanel.h"
 #import "PBRemoteProgressSheet.h"
-#import "PBRepositoryDocumentController.h"
 #import "PBGitDefaults.h"
 
 
@@ -166,7 +165,7 @@ - (void) messageSheetDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)code cont
 	NSURL *documentURL = [NSURL fileURLWithPath:path];
 	
 	NSError *error = nil;
-	id document = [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:documentURL display:YES error:&error];
+	id document = [[NSDocumentController sharedDocumentController] openDocumentWithContentsOfURL:documentURL display:YES error:&error];
 	if (!document && error)
 			[self showErrorSheet:error];
 	else {
diff --git a/Classes/git/PBGitRepository.h b/Classes/git/PBGitRepository.h
@@ -15,6 +15,8 @@
 @class GTConfiguration;
 
 extern NSString* PBGitRepositoryErrorDomain;
+extern NSString *PBGitRepositoryDocumentType;
+
 typedef enum branchFilterTypes {
 	kGitXAllBranchesFilter = 0,
 	kGitXLocalRemoteBranchesFilter,
@@ -133,7 +135,6 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (NSString*) parseSymbolicReference:(NSString*) ref;
 - (NSString*) parseReference:(NSString*) ref;
 
-- (id) initWithURL: (NSURL*) path;
 - (void) forceUpdateRevisions;
 - (NSURL*) getIndexURL;
 
diff --git a/Classes/git/PBGitRepository.m b/Classes/git/PBGitRepository.m
@@ -28,6 +28,8 @@
 #import <ObjectiveGit/GTIndex.h>
 #import <ObjectiveGit/GTConfiguration.h>
 
+NSString *PBGitRepositoryDocumentType = @"Git Repository";
+
 @interface PBGitRepository ()
 
 @property (nonatomic, strong) NSNumber *hasSVNRepoConfig;
@@ -136,29 +138,6 @@ - (void)close
 	[super close];
 }
 
-- (id) initWithURL: (NSURL*) path
-{
-	if (![PBGitBinary path])
-		return nil;
-
-    self = [self initWithContentsOfURL:path ofType:@"" error:NULL];
-	if (!self)
-	{
-		NSLog(@"Failed to initWithURL:%@", path);
-		return nil;
-	}
-
-	// We don't want the window controller to display anything yet..
-	// We'll leave that to the caller of this method.
-#ifndef CLI
-	[self addWindowController:[[PBGitWindowController alloc] initWithRepository:self displayDefault:NO]];
-#endif
-
-	[self showWindows];
-
-	return self;
-}
-
 - (void) forceUpdateRevisions
 {
 	[revisionList forceUpdate];
