mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Nathan Kinsinger
dc56af4aa6
NSURL's don't play nice with NSDistantObject, use the newly created NSURL instead of the NSDistantObject proxy. This fixes problems with rev specifiers created using the gitx tool crashing GitX the second time they are viewed because the NSConnection to the tool has been closed.
75 lines
2.3 KiB
Objective-C
75 lines
2.3 KiB
Objective-C
//
|
|
// PBCLIProxy.m
|
|
// GitX
|
|
//
|
|
// Created by Ciarán Walsh on 15/08/2008.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import "PBCLIProxy.h"
|
|
#import "PBRepositoryDocumentController.h"
|
|
#import "PBGitRevSpecifier.h"
|
|
#import "PBGitRepository.h"
|
|
#import "PBGitWindowController.h"
|
|
#import "PBGitBinary.h"
|
|
#import "PBDiffWindowController.h"
|
|
|
|
@implementation PBCLIProxy
|
|
@synthesize connection;
|
|
|
|
- (id)init
|
|
{
|
|
if (self = [super init]) {
|
|
self.connection = [NSConnection new];
|
|
[self.connection setRootObject:self];
|
|
|
|
if ([self.connection registerName:ConnectionName] == NO)
|
|
NSBeep();
|
|
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)openRepository:(NSURL*)repositoryPath arguments: (NSArray*) args error:(NSError**)error;
|
|
{
|
|
// FIXME I found that creating this redundant NSURL reference was necessary to
|
|
// work around an apparent bug with GC and Distributed Objects
|
|
// I am not familiar with GC though, so perhaps I was doing something wrong.
|
|
NSURL* url = [NSURL fileURLWithPath:[repositoryPath path]];
|
|
NSArray* arguments = [NSArray arrayWithArray:args];
|
|
|
|
PBGitRepository *document = [[PBRepositoryDocumentController sharedDocumentController] documentForLocation:url];
|
|
if (!document) {
|
|
if (error) {
|
|
NSString *suggestion = [PBGitBinary path] ? @"this isn't a git repository" : @"GitX can't find your git binary";
|
|
|
|
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"Could not create document. Perhaps %@", suggestion]
|
|
forKey:NSLocalizedFailureReasonErrorKey];
|
|
|
|
*error = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:2 userInfo:userInfo];
|
|
}
|
|
return NO;
|
|
}
|
|
|
|
if ([arguments count] > 0 && ([[arguments objectAtIndex:0] isEqualToString:@"--commit"] ||
|
|
[[arguments objectAtIndex:0] isEqualToString:@"-c"]))
|
|
[document.windowController showCommitView:self];
|
|
else {
|
|
PBGitRevSpecifier* rev = [[PBGitRevSpecifier alloc] initWithParameters:arguments];
|
|
rev.workingDirectory = url;
|
|
document.currentBranch = [document addBranch: rev];
|
|
[document.windowController showHistoryView:self];
|
|
}
|
|
[NSApp activateIgnoringOtherApps:YES];
|
|
|
|
return YES;
|
|
}
|
|
|
|
- (void)openDiffWindowWithDiff:(NSString *)diff
|
|
{
|
|
PBDiffWindowController *diffController = [[PBDiffWindowController alloc] initWithDiff:[diff copy]];
|
|
[diffController showWindow:nil];
|
|
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
|
|
}
|
|
@end
|