Merge pull request #177 from jspiro/master

improvements for stashes context menu

Author: laullon

Commands/PBCommand.h

@@ -14,16 +14,19 @@
 	PBGitRepository *repository;
 	NSString *displayName;
 	NSMutableArray *parameters;
+	BOOL confirmAction;
 	BOOL canBeFired;
 }
 
 @property BOOL canBeFired;
+@property (readonly) BOOL confirmAction;
 @property (readonly) PBGitRepository *repository;
 @property (strong) NSString *commandTitle;
 @property (strong) NSString *commandDescription;
 @property (readonly) NSString *displayName;
 
 - (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo;
+- (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo confirmAction:(BOOL) confirm;
 - (void) invoke;
 - (NSArray *) allParameters;
 - (void) appendParameters:(NSArray *) params;

Commands/PBCommand.m

@@ -15,19 +15,25 @@ @implementation PBCommand
 @synthesize commandTitle;
 @synthesize repository;
 @synthesize canBeFired;
+@synthesize confirmAction;
 
 - (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params {
 	return [self initWithDisplayName:aDisplayName parameters:params repository:nil];
 }
 
 - (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo {
+	return [self initWithDisplayName:aDisplayName parameters:params repository:repo confirmAction:FALSE];
+}
+
+- (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo confirmAction:(BOOL) confirm {
 	self = [super init];
 	if (self != nil) {
 		displayName = aDisplayName;
 		parameters = [[NSMutableArray alloc] initWithArray:params];
 		commandTitle = @"";
 		commandDescription = @"";
 		repository = repo;
+		confirmAction = confirm;
 		canBeFired = YES;
 	}
 	return self;
@@ -42,7 +48,20 @@ - (void) appendParameters:(NSArray *) params {
 }
 
 - (void) invoke {
-	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:[self allParameters] title:self.commandTitle description:self.commandDescription inRepository:self.repository];
+	int alertRet = NSAlertDefaultReturn;
+	
+	if (self.confirmAction) {
+		alertRet = [[NSAlert alertWithMessageText:self.commandTitle
+									defaultButton:nil
+								  alternateButton:@"Cancel"
+									  otherButton:nil
+						informativeTextWithFormat:[NSString stringWithFormat:@"Are you sure you wish to perform this action?\n\n%@?",self.commandDescription]]
+					runModal];
+	}
+	
+	if (alertRet == NSAlertDefaultReturn) {
+		[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:[self allParameters] title:self.commandTitle description:self.commandDescription inRepository:self.repository];
+	}
 }
 
 @end

Commands/PBStashCommandFactory.m

@@ -62,19 +62,19 @@ + (NSArray *) commandsForStash:(PBGitStash *) stash repository:(PBGitRepository
 	NSMutableArray *commands = [[NSMutableArray alloc] init];
 
 	NSArray *args = [NSArray arrayWithObjects:@"stash", @"apply", [stash name], nil];
-	PBCommand *command = [[PBCommand alloc] initWithDisplayName:@"Apply" parameters:args repository:repository];
+	PBCommand *command = [[PBCommand alloc] initWithDisplayName:@"Apply" parameters:args repository:repository confirmAction:TRUE];
 	command.commandTitle = command.displayName;
 	command.commandDescription = [NSString stringWithFormat:@"Applying stash: '%@'", stash];
 	[commands addObject:command];
 
 	args = [NSArray arrayWithObjects:@"stash", @"pop", [stash name], nil];
-	command = [[PBCommand alloc] initWithDisplayName:@"Pop" parameters:args repository:repository];
+	command = [[PBCommand alloc] initWithDisplayName:@"Pop" parameters:args repository:repository confirmAction:TRUE];
 	command.commandTitle = command.displayName;
 	command.commandDescription = [NSString stringWithFormat:@"Poping stash: '%@'", stash];
 	[commands addObject:command];
 
 	args = [NSArray arrayWithObjects:@"stash", @"drop", [stash name], nil];
-	command = [[PBCommand alloc] initWithDisplayName:@"Drop" parameters:args repository:repository];
+	command = [[PBCommand alloc] initWithDisplayName:@"Drop" parameters:args repository:repository confirmAction:TRUE];
 	command.commandTitle = command.displayName;
 	command.commandDescription = [NSString stringWithFormat:@"Dropping stash: '%@'", stash];
 	[commands addObject:command];