Fix the sodding gitx --client command; damn

I've missed this working for SIX FUCKING YEARS.

Author: mxcl

Classes/Controllers/ApplicationController.m

@@ -17,6 +17,8 @@
 #import "PBCloneRepositoryPanel.h"
 #import "OpenRecentController.h"
 #import "PBGitBinary.h"
+#import "PBGitRepositoryDocument.h"
+#import "PBRepositoryFinder.h"
 
 static OpenRecentController* recentsDialog = nil;
 
@@ -70,20 +72,34 @@ - (void)registerServices
 
 - (void)application:(NSApplication *)sender openFiles:(NSArray <NSString *> *)filenames {
 	PBRepositoryDocumentController * controller = [PBRepositoryDocumentController sharedDocumentController];
-	
+
+	NSScriptCommand *command = [NSScriptCommand currentCommand];
 	for (NSString * filename in filenames) {
 		NSURL * repository = [NSURL fileURLWithPath:filename];
-		[controller openDocumentWithContentsOfURL:repository display:YES
-								completionHandler:^void (NSDocument *document, BOOL documentWasAlreadyOpen, NSError *error) {
-									if (!document) {
-										NSLog(@"Error opening repository \"%@\": %@", repository.path, error);
-										[controller presentError:error];
-										[sender replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
-									}
-									else {
-										[sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
-									}
-								}];
+		[controller openDocumentWithContentsOfURL:repository display:YES completionHandler:^void (NSDocument *_document, BOOL documentWasAlreadyOpen, NSError *error) {
+			if (!_document) {
+				NSLog(@"Error opening repository \"%@\": %@", repository.path, error);
+				[controller presentError:error];
+				[sender replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
+			}
+			else {
+				[sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
+			}
+
+			if (command) {
+				PBGitRepositoryDocument *document = (id)_document;
+				NSURL *repoURL = [command directParameter];
+
+				// on app launch there may be many repositories opening, so double check that this is the right repo
+				if (repoURL) {
+					repoURL = [PBRepositoryFinder gitDirForURL:repoURL];
+					if ([repoURL isEqual:[document.fileURL URLByAppendingPathComponent:@".git"]]) {
+						NSArray *arguments = command.arguments[@"openOptions"];
+						[document handleGitXScriptingArguments:arguments];
+					}
+				}
+			}
+		}];
 	}
 }
 

Classes/Controllers/PBGitRepositoryDocument.h

@@ -29,4 +29,6 @@ extern NSString *PBGitRepositoryDocumentType;
 
 - (PBGitWindowController *)windowController;
 
+- (void)handleGitXScriptingArguments:(NSArray *)arguments;
+
 @end

Classes/Controllers/PBGitRepositoryDocument.m

@@ -111,25 +111,8 @@ - (void)selectRevisionSpecifier:(PBGitRevSpecifier *)specifier {
 	[self showHistoryView:self];
 }
 
-- (void)showWindows
-{
-	NSScriptCommand *command = [NSScriptCommand currentCommand];
-
-	if (command) {
-		NSURL *repoURL = [command directParameter];
-
-		// on app launch there may be many repositories opening, so double check that this is the right repo
-		if (repoURL) {
-			repoURL = [PBRepositoryFinder gitDirForURL:repoURL];
-			if ([repoURL isEqual:self.fileURL]) {
-				NSArray *arguments = command.arguments[@"openOptions"];
-				[self handleGitXScriptingArguments:arguments];
-			}
-		}
-	}
-
+- (void)showWindows {
 	[[[self windowController] window] setTitle:[self displayName]];
-
 	[super showWindows];
 }
 

Classes/PBCLIProxy.h

@@ -95,7 +95,6 @@
 		4A5D771114A9A9CC00DF6C68 /* GitXRelativeDateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D768914A9A9CC00DF6C68 /* GitXRelativeDateFormatter.m */; };
 		4A5D771214A9A9CC00DF6C68 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D768B14A9A9CC00DF6C68 /* main.m */; };
 		4A5D771314A9A9CC00DF6C68 /* PBChangedFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D768D14A9A9CC00DF6C68 /* PBChangedFile.m */; };
-		4A5D771414A9A9CC00DF6C68 /* PBCLIProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D768F14A9A9CC00DF6C68 /* PBCLIProxy.m */; };
 		4A5D771514A9A9CC00DF6C68 /* PBCommitList.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D769114A9A9CC00DF6C68 /* PBCommitList.m */; };
 		4A5D771614A9A9CC00DF6C68 /* PBGraphCellInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D769314A9A9CC00DF6C68 /* PBGraphCellInfo.m */; };
 		4A5D771714A9A9CC00DF6C68 /* PBNSURLPathUserDefaultsTransfomer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A5D769514A9A9CC00DF6C68 /* PBNSURLPathUserDefaultsTransfomer.m */; };
@@ -394,8 +393,6 @@
 		4A5D768B14A9A9CC00DF6C68 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		4A5D768C14A9A9CC00DF6C68 /* PBChangedFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBChangedFile.h; sourceTree = "<group>"; };
 		4A5D768D14A9A9CC00DF6C68 /* PBChangedFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBChangedFile.m; sourceTree = "<group>"; };
-		4A5D768E14A9A9CC00DF6C68 /* PBCLIProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCLIProxy.h; sourceTree = "<group>"; };
-		4A5D768F14A9A9CC00DF6C68 /* PBCLIProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PBCLIProxy.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		4A5D769014A9A9CC00DF6C68 /* PBCommitList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCommitList.h; sourceTree = "<group>"; };
 		4A5D769114A9A9CC00DF6C68 /* PBCommitList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCommitList.m; sourceTree = "<group>"; };
 		4A5D769214A9A9CC00DF6C68 /* PBGraphCellInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGraphCellInfo.h; sourceTree = "<group>"; };
@@ -746,8 +743,6 @@
 				373F9A1F1EAF97A200A77B4C /* NSSplitView+GitX.m */,
 				4A5D768C14A9A9CC00DF6C68 /* PBChangedFile.h */,
 				4A5D768D14A9A9CC00DF6C68 /* PBChangedFile.m */,
-				4A5D768E14A9A9CC00DF6C68 /* PBCLIProxy.h */,
-				4A5D768F14A9A9CC00DF6C68 /* PBCLIProxy.m */,
 				4A5D769014A9A9CC00DF6C68 /* PBCommitList.h */,
 				4A5D769114A9A9CC00DF6C68 /* PBCommitList.m */,
 				4A5D769214A9A9CC00DF6C68 /* PBGraphCellInfo.h */,
@@ -1268,7 +1263,6 @@
 				4A5D771214A9A9CC00DF6C68 /* main.m in Sources */,
 				2682AABB1929140E00271A4D /* GTOID+JavaScript.m in Sources */,
 				4A5D771314A9A9CC00DF6C68 /* PBChangedFile.m in Sources */,
-				4A5D771414A9A9CC00DF6C68 /* PBCLIProxy.m in Sources */,
 				4D3FB3E7198AEAAF000B4A58 /* PBGitRepositoryDocument.m in Sources */,
 				4A5D771514A9A9CC00DF6C68 /* PBCommitList.m in Sources */,
 				4A5D771614A9A9CC00DF6C68 /* PBGraphCellInfo.m in Sources */,
@@ -1521,7 +1515,6 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Werror=incompatible-pointer-types";
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = NO;
 				VALID_ARCHS = x86_64;
@@ -1568,7 +1561,6 @@
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_CFLAGS = "-Werror=incompatible-pointer-types";
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx;
 				VALID_ARCHS = x86_64;
 			};