Rewire delete-reference sheet

Author: tiennou

Classes/Controllers/PBGitHistoryController.m

@@ -768,6 +768,48 @@ - (IBAction) rebaseHeadBranch:(id)sender
 	}
 }
 
+- (IBAction)showDeleteRefSheet:(PBRefMenuItem *)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		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();
+					  }
+				  }];
+}
+
 #pragma mark -
 #pragma mark Quick Look
 

Classes/Controllers/PBRefController.m

@@ -144,60 +144,6 @@ - (IBAction) showTagInfoSheet:(PBRefMenuItem *)sender
 }
 
 
-#pragma mark Remove a branch, remote or tag
-
-- (IBAction)showDeleteRefSheet:(PBRefMenuItem *)sender
-{
-	id<PBGitRefish> refish = sender.refishs.firstObject;
-	if ([refish refishType] == kGitXCommitType)
-		return;
-
-	PBGitRef *ref = (PBGitRef *)refish;
-
-	if ([PBGitDefaults isDialogWarningSuppressedForDialog:kDialogDeleteRef]) {
-		NSError *error = nil;
-		BOOL success = [historyController.repository deleteRef:ref error:&error];
-		if (!success) {
-			[historyController.windowController showErrorSheet:error];
-		}
-		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:[historyController.windowController window]
-					  modalDelegate:self
-					 didEndSelector:@selector(deleteRefSheetDidEnd:returnCode:contextInfo:)
-						contextInfo:(__bridge_retained void*)ref];
-}
-
-- (void)deleteRefSheetDidEnd:(NSAlert *)sheet returnCode:(int)returnCode contextInfo:(void  *)contextInfo
-{
-    [[sheet window] orderOut:nil];
-
-	if ([[sheet suppressionButton] state] == NSOnState)
-        [PBGitDefaults suppressDialogWarningForDialog:kDialogDeleteRef];
-
-	if (returnCode == NSAlertDefaultReturn) {
-		PBGitRef *ref = (__bridge PBGitRef *)contextInfo;
-
-		NSError *error = nil;
-		BOOL success = [historyController.repository deleteRef:ref error:&error];
-		if (!success) {
-			[historyController.windowController showErrorSheet:error];
-		}
-	}
-}
-
-
-
 #pragma mark Contextual menus
 
 - (NSArray<NSMenuItem *> *) menuItemsForRef:(PBGitRef *)ref