merge to master

Author: laullon

.gitignore

@@ -1,8 +1,5 @@
 build
 build/revision
-*.xcodeproj/*.pbxuser
-*.xcodeproj/*.perspectivev3
-*.xcodeproj/*.mode1v3
-*.xcodeproj/*.tm_build_errors
-*.tmproj
+*.xcodeproj/
+!*.xcodeproj/project.pbxproj
 Nightly.app.zip

ApplicationController.h

@@ -9,33 +9,18 @@
 #import <Cocoa/Cocoa.h>
 #import "PBGitRepository.h"
 
-@class PBCLIProxy;
 @class PBCloneRepositoryPanel;
 
-@interface ApplicationController : NSObject <NSWindowDelegate>
+@interface ApplicationController : NSObject
 {
 	IBOutlet NSWindow *window;
 	IBOutlet id firstResponder;
 	NSPersistentStoreCoordinator *persistentStoreCoordinator;
 	NSManagedObjectModel *managedObjectModel;
 	NSManagedObjectContext *managedObjectContext;
 
-	PBCLIProxy *cliProxy;
-    NSString * cliArgs;
-
-    // CLI set state
-    BOOL launchedFromGitx;
-    NSString * deferredSelectSha;
-    NSArray * launchedDocuments;
-
 	PBCloneRepositoryPanel *cloneRepositoryPanel;
 }
-@property (retain) PBCLIProxy* cliProxy;
-@property (copy) NSString *cliArgs;
-@property (assign) BOOL launchedFromGitx;
-@property (copy) NSString *deferredSelectSha;
-
-+ (ApplicationController *) sharedApplicationController;
 
 - (NSPersistentStoreCoordinator *)persistentStoreCoordinator;
 - (NSManagedObjectModel *)managedObjectModel;

ApplicationController.m

@@ -10,82 +10,36 @@
 #import "PBGitRevisionCell.h"
 #import "PBGitWindowController.h"
 #import "PBRepositoryDocumentController.h"
-#import "PBCLIProxy.h"
 #import "PBServicesController.h"
 #import "PBGitXProtocol.h"
 #import "PBPrefsWindowController.h"
 #import "PBNSURLPathUserDefaultsTransfomer.h"
 #import "PBGitDefaults.h"
-#import "Sparkle/SUUpdater.h"
 #import "PBCloneRepositoryPanel.h"
-#import "BMScript.h"
-#import "PBGitSidebarController.h"
+#import "Sparkle/SUUpdater.h"
 
 @implementation ApplicationController
-@synthesize cliProxy;
-@synthesize cliArgs;
-@synthesize launchedFromGitx;
-@synthesize deferredSelectSha;
-
-static ApplicationController * sharedApplicationControllerInstance = nil; 
-
-+ (void) initialize {
-    if (sharedApplicationControllerInstance == nil)
-        sharedApplicationControllerInstance = [[self alloc] init];
-}
-
-+ (ApplicationController *) sharedApplicationController {
-    //Already set by +initialize.
-    return sharedApplicationControllerInstance;
-}
-
-+ (id) allocWithZone:(NSZone *) zone {
-    //Usually already set by +initialize.
-    if (sharedApplicationControllerInstance) {
-        //The caller expects to receive a new object, so implicitly retain it
-        //to balance out the eventual release message.
-        return [sharedApplicationControllerInstance retain];
-    } else {
-        //When not already set, +initialize is our caller.
-        //It's creating the shared instance, let this go through.
-        return [super allocWithZone: zone];
-    }
-}
-
-- (id) copyWithZone:(NSZone *) zone {
-    return self;
-}
-
-- (NSUInteger) retainCount {
-    return UINT_MAX; // denotes an object that cannot be released
-}
 
-- (ApplicationController *) init
+- (ApplicationController*)init
 {
-    //If sharedApplicationControllerInstance is nil, +initialize is our caller, so initialize the instance.
-    //If it is not nil, simply return the instance without re-initializing it.
-    if (sharedApplicationControllerInstance == nil) {
 #ifdef DEBUG_BUILD
-        [NSApp activateIgnoringOtherApps:YES];
+	[NSApp activateIgnoringOtherApps:YES];
 #endif
-        if(self = [super init]) {
-            if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
-                if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
-                    NSLog(@"Could not load QuickLook");
-
-            self.cliProxy = [PBCLIProxy new];
-            launchedFromGitx = NO;
-            cliArgs = nil;
-            deferredSelectSha = nil;
-        }
-        /* Value Transformers */
-        NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
-        [NSValueTransformer setValueTransformer:transformer forName:@"PBNSURLPathUserDefaultsTransfomer"];
-        // Make sure the PBGitDefaults is initialized, by calling a random method
-        [PBGitDefaults class];
-        return self;
-    }
-    return self;
+
+	if(!(self = [super init]))
+		return nil;
+
+	if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
+		if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
+			NSLog(@"Could not load QuickLook");
+
+	/* Value Transformers */
+	NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
+	[NSValueTransformer setValueTransformer:transformer forName:@"PBNSURLPathUserDefaultsTransfomer"];
+	
+	// Make sure the PBGitDefaults is initialized, by calling a random method
+	[PBGitDefaults class];
+	return self;
 }
 
 - (void)registerServices
@@ -109,34 +63,16 @@ - (void)registerServices
 
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
+	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
+
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
 	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
 	setenv( "DISPLAY", "localhost:0", 1 );
 
-    char * launchedfromgitx = getenv("GITX_LAUNCHED_FROM_CLI");
-    char * cliargs = getenv("GITX_CLI_ARGUMENTS");
-
-    self.launchedFromGitx = (launchedfromgitx ? YES : NO);
-
-    if (cliargs) {
-        self.cliArgs = [NSString stringWithUTF8String:(cliargs)];
-    }
-
-    // NSLog(@"[%@ %s] launchedFromGitx = %@", [self class], _cmd, (launchedFromGitx ? @"YES" : @"NO"));
-    // NSLog(@"[%@ %s] cliArgs = %@", [self class], _cmd, cliArgs);
-
 	[self registerServices];
 
-    if ([cliArgs isEqualToString:@"--all"]) {
-        [PBGitDefaults setBranchFilter:kGitXAllBranchesFilter];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    } else if ([cliArgs isEqualToString:@"--local"]) {
-        [PBGitDefaults setBranchFilter:kGitXLocalRemoteBranchesFilter];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
-
     BOOL hasOpenedDocuments = NO;
-    launchedDocuments = [[[PBRepositoryDocumentController sharedDocumentController] documents] copy];
+    NSArray *launchedDocuments = [[[PBRepositoryDocumentController sharedDocumentController] documents] copy];
 
 	// Only try to open a default document if there are no documents open already.
 	// For example, the application might have been launched by double-clicking a .git repository,
@@ -154,7 +90,7 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
         }
     }
 
-	// Try to find the current directory, to open that as a repository...
+	// Try to find the current directory, to open that as a repository
 	if ([PBGitDefaults openCurDirOnLaunch] && !hasOpenedDocuments) {
 		NSString *curPath = [[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"];
         NSURL *url = nil;
@@ -166,47 +102,9 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
             hasOpenedDocuments = YES;
 	}
 
-    launchedDocuments = [[[PBRepositoryDocumentController sharedDocumentController] documents] copy];
-
-    // ...to bring the launched documents to the front
-    for (PBGitRepository *document in launchedDocuments) {
-
-        PBGitWindowController * wc = [(PBGitRepository *)document windowController];
-        PBGitHistoryController * historyViewController = wc.historyController;
-        NSArrayController * ccontroller = historyViewController.commitController;
-
-        // determine what to show right after start - stage or standard history view?
-        if ([cliArgs isEqualToString:@"--commit"] || [cliArgs isEqualToString:@"-c"]) {
-            [wc showCommitView:self];
-            launchedFromGitx = NO;
-        } else {
-            [wc showHistoryView:self];
-        }
-
-        if ([cliArgs hasPrefix:@"--author"]) {
-            NSArray * components = [cliArgs componentsSeparatedByString:@"="];
-            NSString * author = [components objectAtIndex:1];
-            [ccontroller setFilterPredicate:[NSPredicate predicateWithFormat:@"author contains[c] %@", author]];
-            [historyViewController.commitList selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
-        } else if ([cliArgs hasPrefix:@"--subject"]) {
-            NSArray * components = [cliArgs componentsSeparatedByString:@"="];
-            NSString * subject = [components objectAtIndex:1];
-            [ccontroller setFilterPredicate:[NSPredicate predicateWithFormat:@"subject contains[c] %@", subject]];
-        } else if ([cliArgs hasPrefix:@"--sha"]) {
-            NSArray * components = [cliArgs componentsSeparatedByString:@"="];
-            NSString * sha = [components objectAtIndex:1];
-            [ccontroller setFilterPredicate:[NSPredicate predicateWithFormat:@"realSha contains[c] %@", sha]];
-        } else if ([cliArgs hasPrefix:@"-S"]) {
-            NSString * subject = [cliArgs substringFromIndex:2];
-            [ccontroller setFilterPredicate:[NSPredicate predicateWithFormat:@"subject contains[c] %@", subject]];
-        }
-
+    // to bring the launched documents to the front
+    for (PBGitRepository *document in launchedDocuments)
         [document showWindows];
-    }
-
-    if (launchedFromGitx) {
-        [self performSelector:@selector(finalizeCLILaunch:) withObject:self afterDelay:0.5];
-    }
 
 	if (![[NSApplication sharedApplication] isActive])
 		return;
@@ -217,42 +115,14 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 		[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
 }
 
-- (void) finalizeCLILaunch:(id)object {
-    for (PBGitRepository * document in launchedDocuments) {
-        BOOL success = [[[(PBGitRepository *)document windowController] historyController] selectCommit:self.deferredSelectSha];
-        // NSLog(@"[%@ %s] trying to select commit with sha %@ (success = %@)", [self class], _cmd, self.deferredSelectSha, BMStringFromBOOL(success));
-        if (success) {
-            PBGitWindowController * wc = [(PBGitRepository *)document windowController];
-            PBGitHistoryController * histController = wc.historyController;
-            PBCommitList * clist = histController.commitList;
-            // updating the selection with the selection seems redundant but it also updates the row select indicator
-            [clist selectRowIndexes:[clist selectedRowIndexes] byExtendingSelection:NO];
-            [histController scrollSelectionToTopOfViewFrom:0];
-            [histController updateKeys];
-        }
-    }
-    // Reset CLI indication status so KVO all over the controllers can go the intended ways again...
-    self.deferredSelectSha = nil;
-    self.launchedFromGitx = NO;
-}
-
-
-- (void) windowWillClose:(id)sender
+- (void) windowWillClose: sender
 {
-    if ([[[sender object] windowController] isKindOfClass:[PBPrefsWindowController class]] ) {
-        for (PBGitRepository * doc in [[PBRepositoryDocumentController sharedDocumentController] documents]) {
-            [[[doc windowForSheet] contentView] setNeedsDisplay:YES];
-        }
-    } else {
-        [firstResponder terminate: sender];
-    }	
+	[firstResponder terminate: sender];
 }
 
 - (IBAction)openPreferencesWindow:(id)sender
 {
-    DBPrefsWindowController * prefsWindowController = [PBPrefsWindowController sharedPrefsWindowController];
-    [[prefsWindowController window] setDelegate:self];
-	[prefsWindowController showWindow:nil];
+	[[PBPrefsWindowController sharedPrefsWindowController] showWindow:nil];
 }
 
 - (IBAction)showAboutPanel:(id)sender
@@ -376,7 +246,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
     fileManager = [NSFileManager defaultManager];
     applicationSupportFolder = [self applicationSupportFolder];
     if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
-        [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
+        [fileManager createDirectoryAtPath:applicationSupportFolder attributes:nil];
     }
 
     url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];

CWQuickLook.h

@@ -1,4 +1,3 @@
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
 @interface QLPreviewPanel : NSPanel
 + (id)sharedPreviewPanel;
 
@@ -90,5 +89,4 @@
 - (void)setShowsAddToiPhoto:(BOOL)fp8;
 - (void)setShowsiChatTheater:(BOOL)fp8;
 - (void)setShowsFullscreen:(BOOL)fp8;
-@end
-#endif
+@end

DBPrefsWindowController.h

@@ -42,7 +42,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController <NSAnimationDelegate, NSToolbarDelegate> {
+@interface DBPrefsWindowController : NSWindowController {
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;

DBPrefsWindowController.m

@@ -74,13 +74,13 @@ - (void)windowDidLoad
 		// Create a new window to display the preference views.
 		// If the developer attached a window to this controller
 		// in Interface Builder, it gets replaced with this one.
-	NSWindow *window = [[[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
+	NSPanel *panel = [[[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
 												    styleMask:(NSTitledWindowMask |
 															   NSClosableWindowMask |
 															   NSMiniaturizableWindowMask)
 													  backing:NSBackingStoreBuffered
 													    defer:YES] autorelease];
-	[self setWindow:window];
+	[self setWindow:panel];
 	contentSubview = [[[NSView alloc] initWithFrame:[[[self window] contentView] frame]] autorelease];
 	[contentSubview setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
 	[[[self window] contentView] addSubview:contentSubview];