Move all menuitem-related actions to the window controller

Author: tiennou

Classes/Controllers/PBGitHistoryController.h

@@ -77,11 +77,6 @@
 - (NSArray *)menuItemsForPaths:(NSArray *)paths;
 - (void)showCommitsFromTree:(id)sender;
 
-// Repository Methods
-- (IBAction) merge:(id)sender;
-- (IBAction) cherryPick:(id)sender;
-- (IBAction) rebase:(id)sender;
-
 // Find/Search methods
 - (IBAction)selectNext:(id)sender;
 - (IBAction)selectPrevious:(id)sender;

Classes/Controllers/PBGitHistoryController.m

@@ -8,32 +8,22 @@
 
 #import <Quartz/Quartz.h>
 
-#import "PBGitCommit.h"
+#import "PBGitHistoryController.h"
 #import "PBGitTree.h"
 #import "PBGitRef.h"
 #import "PBGitHistoryList.h"
 #import "PBGitRevSpecifier.h"
-#import "PBGitHistoryController.h"
 #import "PBWebHistoryController.h"
-#import "PBGitGrapher.h"
-#import "PBGitRevisionCell.h"
 #import "PBCommitList.h"
-#import "PBCreateBranchSheet.h"
-#import "PBCreateTagSheet.h"
-#import "PBAddRemoteSheet.h"
-#import "PBGitSidebarController.h"
 #import "PBGitGradientBarView.h"
 #import "PBDiffWindowController.h"
 #import "PBGitDefaults.h"
-#import "PBGitRevList.h"
 #import "PBHistorySearchController.h"
 #import "PBGitRepositoryWatcher.h"
 #import "PBQLTextView.h"
 #import "GLFileView.h"
 #import "GitXCommitCopier.h"
 #import "NSSplitView+GitX.h"
-#import "PBRefMenuItem.h"
-#import "PBGitStash.h"
 
 #define kHistorySelectedDetailIndexKey @"PBHistorySelectedDetailIndex"
 #define kHistoryDetailViewIndex 0
@@ -638,244 +628,6 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 	return menuItems;
 }
 
-#pragma mark Repository Methods
-
-- (id <PBGitRefish>)refishForSender:(id)sender refishTypes:(NSArray *)types
-{
-	return [self.windowController performSelector:@selector(refishForSender:refishTypes:) withObject:sender withObject:types];
-}
-
-- (IBAction)pullRemote:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
-	if (!refish || ![refish isKindOfClass:[PBGitRef class]])
-		return;
-
-	[self.windowController performPullForBranch:refish remote:nil rebase:NO];
-}
-
-- (IBAction)pushUpdatesToRemote:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
-	if (!refish || ![refish isKindOfClass:[PBGitRef class]])
-		return;
-
-	PBGitRef *remoteRef = [(PBGitRef *)refish remoteRef];
-
-	[self.windowController performPushForBranch:nil toRemote:remoteRef];
-}
-
-- (IBAction)pushDefaultRemoteForRef:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
-	if (!refish || ![refish isKindOfClass:[PBGitRef class]])
-		return;
-
-	PBGitRef *ref = (PBGitRef *)refish;
-
-	[self.windowController performPushForBranch:ref toRemote:nil];
-}
-
-- (IBAction)pushToRemote:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
-	if (!refish || ![refish isKindOfClass:[PBGitRef class]])
-		return;
-
-	PBGitRef *ref = (PBGitRef *)refish;
-	PBGitRef *remoteRef = ref.remoteRef;
-
-	[self.windowController performPushForBranch:ref toRemote:remoteRef];
-}
-
-- (IBAction)merge:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType, kGitXCommitType, kGitXTagType]];
-	if (!refish) return;
-
-	NSError *error = nil;
-	BOOL success = [repository mergeWithRefish:refish error:&error];
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	}
-}
-
-- (IBAction)checkout:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType, kGitXCommitType, kGitXTagType]];
-	if (!refish) return;
-
-	NSError *error = nil;
-	BOOL success = [repository checkoutRefish:refish error:&error];
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	}
-}
-
-- (IBAction)cherryPick:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXCommitType]];
-	if (!refish) return;
-
-	NSError *error = nil;
-	BOOL success = [repository cherryPickRefish:refish error:&error];
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	}
-}
-
-- (IBAction)rebase:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
-	if (!refish) return;
-
-	NSError *error = nil;
-	BOOL success = [repository rebaseBranch:nil onRefish:refish error:&error];
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	}
-}
-
-- (IBAction)rebaseHeadBranch:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
-	NSError *error = nil;
-	BOOL success = [self.repository rebaseBranch:nil onRefish:refish error:&error];
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	}
-}
-
-- (IBAction)showDeleteRefSheet:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
-	if (!refish || ![refish isKindOfClass:[PBGitRef class]])
-		return;
-
-	PBGitRef *ref = (PBGitRef *)refish;
-
-	void (^performDelete)(void) = ^{
-		NSError *error = nil;
-		BOOL success = [self.repository deleteRef:ref error:&error];
-		if (!success) {
-			[self.windowController showErrorSheet:error];
-		}
-		return;
-	};
-
-	if ([PBGitDefaults isDialogWarningSuppressedForDialog:kDialogDeleteRef]) {
-		performDelete();
-		return;
-	}
-
-	NSString *ref_desc = [NSString stringWithFormat:@"%@ '%@'", [ref refishType], [ref shortName]];
-
-	NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"Delete %@?", ref_desc]
-									 defaultButton:@"Delete"
-								   alternateButton:@"Cancel"
-									   otherButton:nil
-						 informativeTextWithFormat:@"Are you sure you want to remove the %@?", ref_desc];
-	[alert setShowsSuppressionButton:YES];
-
-	[alert beginSheetModalForWindow:self.windowController.window
-				  completionHandler:^(NSModalResponse returnCode) {
-					  if ([[alert suppressionButton] state] == NSOnState)
-						  [PBGitDefaults suppressDialogWarningForDialog:kDialogDeleteRef];
-
-					  if (returnCode == NSModalResponseOK) {
-						  performDelete();
-					  }
-				  }];
-}
-
-- (IBAction)diffWithHEAD:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:nil];
-	if (!refish)
-		return;
-
-	PBGitCommit *commit = [self.repository commitForRef:refish];
-
-	NSString *diff = [self.repository performDiff:commit against:nil forFiles:nil];
-
-	[PBDiffWindowController showDiff:diff];
-}
-
-- (IBAction)stashPop:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
-	PBGitStash *stash = [self.repository stashForRef:refish];
-	NSError *error = nil;
-	BOOL success = [self.repository stashPop:stash error:&error];
-
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	} else {
-		[self.windowController showCommitView:sender];
-	}
-}
-
-- (IBAction)stashApply:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
-	PBGitStash *stash = [self.repository stashForRef:refish];
-	NSError *error = nil;
-	BOOL success = [self.repository stashApply:stash error:&error];
-
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	} else {
-		[self.windowController showCommitView:sender];
-	}
-}
-
-- (IBAction)stashDrop:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
-	PBGitStash *stash = [self.repository stashForRef:refish];
-	NSError *error = nil;
-	BOOL success = [self.repository stashDrop:stash error:&error];
-
-	if (!success) {
-		[self.windowController showErrorSheet:error];
-	} else {
-		[self.windowController showHistoryView:sender];
-	}
-}
-
-- (IBAction)stashViewDiff:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
-	PBGitStash *stash = [self.repository stashForRef:refish];
-	[PBDiffWindowController showDiffWindowWithFiles:nil fromCommit:stash.ancestorCommit diffCommit:stash.commit];
-}
-
-- (IBAction)showTagInfoSheet:(id)sender
-{
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXTagType]];
-	if (!refish)
-		return;
-
-	PBGitRef *ref = (PBGitRef *)refish;
-
-	NSError *error = nil;
-	NSString *tagName = [ref tagName];
-	NSString *tagRef = [@"refs/tags/" stringByAppendingString:tagName];
-	GTObject *object = [self.repository.gtRepo lookUpObjectByRevParse:tagRef error:&error];
-	if (!object) {
-		NSLog(@"Couldn't look up ref %@:%@", tagRef, [error debugDescription]);
-		return;
-	}
-	NSString *title = [NSString stringWithFormat:@"Info for tag: %@", tagName];
-	NSString *info = @"";
-	if ([object isKindOfClass:[GTTag class]]) {
-		GTTag *tag = (GTTag*)object;
-		info = tag.message;
-	}
-
-	[self.windowController showMessageSheet:title infoText:info];
-}
-
 #pragma mark -
 #pragma mark Quick Look