Merge remote-tracking branch 'gitx/master'

Author: mxcl

Classes/Controllers/PBGitHistoryController.h

@@ -78,6 +78,7 @@
 - (void)showCommitsFromTree:(id)sender;
 
 // Find/Search methods
+- (void)setHistorySearch:(NSString *)searchString mode:(PBHistorySearchMode)mode;
 - (IBAction)selectNext:(id)sender;
 - (IBAction)selectPrevious:(id)sender;
 

Classes/Controllers/PBGitHistoryController.m

@@ -371,6 +371,11 @@ - (void)keyDown:(NSEvent*)event
 		[super keyDown: event];
 }
 
+- (void)setHistorySearch:(NSString *)searchString mode:(PBHistorySearchMode)mode
+{
+	[searchController setHistorySearch:searchString mode:mode];
+}
+
 // NSSearchField (actually textfields in general) prevent the normal Find operations from working. Setup custom actions for the
 // next and previous menuitems (in MainMenu.nib) so they will work when the search field is active. When searching for text in
 // a file make sure to call the Find panel's action method instead.
@@ -543,7 +548,7 @@ - (NSMenu *)tableColumnMenu
 - (void)showCommitsFromTree:(id)sender
 {
 	NSString *searchString = [(NSArray *)[sender representedObject] componentsJoinedByString:@" "];
-	[searchController setHistorySearch:searchString mode:PBHistorySearchModePath];
+	[self setHistorySearch:searchString mode:PBHistorySearchModePath];
 }
 
 - (void) checkoutFiles:(id)sender

Classes/Controllers/PBGitRepositoryDocument.m

@@ -111,7 +111,24 @@ - (void)selectRevisionSpecifier:(PBGitRevSpecifier *)specifier {
 	[self showHistoryView:self];
 }
 
-- (void)showWindows {
+- (void)showWindows
+{
+	NSScriptCommand *command = [NSScriptCommand currentCommand];
+
+	if (command) {
+		// Check if `gitx` has provided some arguments
+		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 isKindOfClass:[NSURL class]]) {
+			repoURL = [PBRepositoryFinder gitDirForURL:repoURL];
+			if ([repoURL isEqual:_repository.gitURL]) {
+				NSArray *arguments = command.arguments[@"openOptions"];
+				[self handleGitXScriptingArguments:arguments];
+			}
+		}
+	}
+
 	[[[self windowController] window] setTitle:[self displayName]];
 	[super showWindows];
 }

Classes/Controllers/PBGitSidebarController.h

@@ -27,9 +27,6 @@
 	PBSourceViewItem *stage;
 
 	PBSourceViewItem *branches, *remotes, *tags, *others, *submodules, *stashes;
-
-	PBGitHistoryController *historyViewController;
-	PBGitCommitController *commitViewController;
 }
 
 - (void) selectStage;
@@ -40,13 +37,9 @@
 
 - (IBAction) fetchPullPushAction:(id)sender;
 
-- (void)setHistorySearch:(NSString *)searchString mode:(PBHistorySearchMode)mode;
-
 @property(readonly) NSMutableArray *items;
 @property(readonly) PBSourceViewItem *remotes;
 @property(readonly) NSOutlineView *sourceView;
 @property(readonly) NSView *sourceListControlsView;
-@property(readonly) PBGitHistoryController *historyViewController;
-@property(readonly) PBGitCommitController *commitViewController;
 
 @end

Classes/Controllers/PBGitSidebarController.m

@@ -35,8 +35,6 @@ @implementation PBGitSidebarController
 @synthesize remotes;
 @synthesize sourceView;
 @synthesize sourceListControlsView;
-@synthesize historyViewController;
-@synthesize commitViewController;
 
 - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller
 {
@@ -53,9 +51,6 @@ - (void)awakeFromNib
 	window.contentView = self.view;
 	[self populateList];
 
-	historyViewController = [[PBGitHistoryController alloc] initWithRepository:repository superController:superController];
-	commitViewController = [[PBGitCommitController alloc] initWithRepository:repository superController:superController];
-
 	[repository addObserver:self forKeyPath:@"currentBranch" options:0 context:@"currentBranchChange"];
 	[repository addObserver:self forKeyPath:@"branches" options:(NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew) context:@"branchesModified"];
    	[repository addObserver:self forKeyPath:@"stashes" options:0 context:@"stashesModified"];
@@ -83,9 +78,6 @@ - (void)dealloc
 
 - (void)closeView
 {
-	[historyViewController closeView];
-	[commitViewController closeView];
-
 	[repository removeObserver:self forKeyPath:@"currentBranch"];
 	[repository removeObserver:self forKeyPath:@"branches"];
 	[repository removeObserver:self forKeyPath:@"stashes"];
@@ -215,11 +207,6 @@ - (void) removeRevSpec:(PBGitRevSpecifier *)rev
 	[sourceView reloadData];
 }
 
-- (void)setHistorySearch:(NSString *)searchString mode:(PBHistorySearchMode)mode
-{
-	[historyViewController.searchController setHistorySearch:searchString mode:mode];
-}
-
 - (void) openSubmoduleFromMenuItem:(NSMenuItem *)menuItem
 {
     [self openSubmoduleAtURL:[menuItem representedObject]];
@@ -244,12 +231,12 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)notification
 	if ([item revSpecifier]) {
 		if (![repository.currentBranch isEqual:[item revSpecifier]])
 			repository.currentBranch = [item revSpecifier];
-		[superController changeContentController:historyViewController];
+		[superController changeContentController:superController.historyViewController];
 		[PBGitDefaults setShowStageView:NO];
 	}
 
 	if (item == stage) {
-		[superController changeContentController:commitViewController];
+		[superController changeContentController:superController.commitViewController];
 		[PBGitDefaults setShowStageView:YES];
 	}
 
@@ -258,12 +245,22 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)notification
 }
 
 - (void)doubleClicked:(id)object {
-    NSInteger rowNumber = [sourceView selectedRow];
-    if ([[sourceView itemAtRow:rowNumber] isKindOfClass:[PBGitSVSubmoduleItem class]]) {
-        PBGitSVSubmoduleItem *subModule = [sourceView itemAtRow:rowNumber];
-
-        [self openSubmoduleAtURL:[subModule path]];
-    }
+	NSInteger rowNumber = [sourceView selectedRow];
+	
+	id item = [sourceView itemAtRow:rowNumber];
+	if ([item isKindOfClass:[PBGitSVSubmoduleItem class]]) {
+		PBGitSVSubmoduleItem *subModule = item;
+
+		[self openSubmoduleAtURL:[subModule path]];
+	} else if ([item isKindOfClass:[PBGitSVBranchItem class]]) {
+		PBGitSVBranchItem *branch = item;
+		
+		NSError *error = nil;
+		BOOL success = [repository checkoutRefish:[branch ref] error:&error];
+		if (!success) {
+			[self.windowController showErrorSheet:error];
+		}
+	}
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
@@ -392,7 +389,7 @@ - (void) addMenuItemsForRef:(PBGitRef *)ref toMenu:(NSMenu *)menu
 	if (!ref)
 		return;
 
-	for (NSMenuItem *menuItem in [historyViewController.refController menuItemsForRef:ref])
+	for (NSMenuItem *menuItem in [superController.historyViewController.refController menuItemsForRef:ref])
 		[menu addItem:menuItem];
 }
 

Classes/Controllers/PBGitWindowController.h

@@ -9,10 +9,11 @@
 #import <Cocoa/Cocoa.h>
 #import "PBHistorySearchMode.h"
 
-#undef GITX_DEPRECATED
-#define GITX_DEPRECATED
-
-@class PBViewController, PBGitSidebarController, PBGitCommitController, PBGitRepository;
+@class PBViewController;
+@class PBGitSidebarController;
+@class PBGitCommitController;
+@class PBGitHistoryController;
+@class PBGitRepository;
 @class RJModalRepoSheet;
 @class PBGitRef;
 @class PBGitRepositoryDocument;
@@ -21,6 +22,9 @@
 	__weak PBViewController *contentController;
 
 	PBGitSidebarController *sidebarController;
+	PBGitHistoryController *_historyViewController;
+	PBGitCommitController *_commitViewController;
+
 	__weak IBOutlet NSView *sourceListControlsView;
 	__weak IBOutlet NSSplitView *splitView;
 	__weak IBOutlet NSView *sourceSplitView;
@@ -33,6 +37,8 @@
 @property (nonatomic, strong) PBGitRepository *repository;
 /* This is assign because that's what NSWindowController says :-S */
 @property (assign) PBGitRepositoryDocument *document;
+@property (readonly) PBGitHistoryController *historyViewController;
+@property (readonly) PBGitCommitController *commitViewController;
 
 - (instancetype)init;