Use the dialog method to alert when moving branch labels

Author: tiennou

Classes/Controllers/PBRefController.m

@@ -110,21 +110,6 @@ - (NSDragOperation)tableView:(NSTableView*)tv
 	return NSDragOperationNone;
 }
 
-- (void) dropRef:(NSDictionary *)dropInfo
-{
-	PBGitRef *ref = [dropInfo objectForKey:@"dragRef"];
-	PBGitCommit *oldCommit = [dropInfo objectForKey:@"oldCommit"];
-	PBGitCommit *dropCommit = [dropInfo objectForKey:@"dropCommit"];
-	if (!ref || ! oldCommit || !dropCommit)
-		return;
-
-	if (![historyController.repository updateReference:ref toPointAtCommit:dropCommit])
-
-	[dropCommit addRef:ref];
-	[oldCommit removeRef:ref];
-	[historyController.commitList reloadData];
-}
-
 - (BOOL)tableView:(NSTableView *)aTableView
 	   acceptDrop:(id <NSDraggingInfo>)info
 			  row:(NSInteger)row
@@ -149,17 +134,6 @@ - (BOOL)tableView:(NSTableView *)aTableView
 
 	PBGitCommit *dropCommit = [[commitController arrangedObjects] objectAtIndex:row];
 
-	NSDictionary *dropInfo = [NSDictionary dictionaryWithObjectsAndKeys:
-							  ref, @"dragRef",
-							  oldCommit, @"oldCommit",
-							  dropCommit, @"dropCommit",
-							  nil];
-
-	if ([PBGitDefaults isDialogWarningSuppressedForDialog:kDialogAcceptDroppedRef]) {
-		[self dropRef:dropInfo];
-		return YES;
-	}
-
 	NSString *subject = [dropCommit subject];
 	if ([subject length] > 99)
 		subject = [[subject substringToIndex:99] stringByAppendingString:@"…"];
@@ -168,19 +142,22 @@ - (BOOL)tableView:(NSTableView *)aTableView
 	alert.messageText = [NSString stringWithFormat:NSLocalizedString(@"Move %@: %@", @""), [ref refishType], [ref shortName]];
 	alert.informativeText = [NSString stringWithFormat:NSLocalizedString(@"Move the %@ to point to the commit: %@", @""), [ref refishType], subject];
 
-	[alert addButtonWithTitle:@"Move"];
-	[alert addButtonWithTitle:@"Cancel"];
-    [alert setShowsSuppressionButton:YES];
-
-	[alert beginSheetModalForWindow:historyController.windowController.window
-				  completionHandler:^(NSModalResponse returnCode) {
-					  if (returnCode == NSAlertFirstButtonReturn) {
-						  [self dropRef:dropInfo];
-					  }
-
-					  if ([[alert suppressionButton] state] == NSOnState)
-						  [PBGitDefaults suppressDialogWarningForDialog:kDialogAcceptDroppedRef];
-				  }];
+	[alert addButtonWithTitle:NSLocalizedString(@"Move", @"Move branch label - default button")];
+	[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Move branch label - cancel button")];
+
+	PBGitWindowController *wc = historyController.windowController;
+	[wc confirmDialog:alert
+suppressionIdentifier:kDialogAcceptDroppedRef
+			forAction:^{
+				NSError *error = nil;
+				if (![wc.repository updateReference:ref toPointAtCommit:dropCommit error:&error]) {
+					[wc showErrorSheet:error];
+					return;
+				}
+
+				[dropCommit addRef:ref];
+				[oldCommit removeRef:ref];
+			}];
 
 	return YES;
 }

Classes/git/PBGitRepository.h

@@ -83,7 +83,7 @@ typedef enum branchFilterTypes {
 
 - (BOOL)ignoreFilePaths:(NSArray *)filePaths error:(NSError **)error;
 
-- (BOOL)updateReference:(PBGitRef *)ref toPointAtCommit:(PBGitCommit *)newCommit;
+- (BOOL)updateReference:(PBGitRef *)ref toPointAtCommit:(PBGitCommit *)newCommit error:(NSError **)error;
 - (NSString *)performDiff:(PBGitCommit *)startCommit against:(PBGitCommit *)diffCommit forFiles:(NSArray *)filePaths;
 
 - (NSURL *) gitURL ;

Classes/git/PBGitRepository.m

@@ -1081,12 +1081,17 @@ - (BOOL) deleteRef:(PBGitRef *)ref error:(NSError **)error
 	return YES;
 }
 
-- (BOOL)updateReference:(PBGitRef *)ref toPointAtCommit:(PBGitCommit *)newCommit {
-	NSError *error = nil;
-	BOOL success = [self launchTaskWithArguments:@[@"update-ref", @"-mUpdate from GitX", ref.ref, newCommit.SHA] error:&error];
+- (BOOL)updateReference:(PBGitRef *)ref toPointAtCommit:(PBGitCommit *)newCommit error:(NSError **)error {
+	NSError *gitError = nil;
+	BOOL success = [self launchTaskWithArguments:@[@"update-ref", @"-mUpdate from GitX", ref.ref, newCommit.SHA] error:&gitError];
 	if (!success) {
-		PBLogError(error);
+		NSString *title = NSLocalizedString(@"Reference update failed", @"Reference update failure - error title");
+		NSString *message = NSLocalizedString(@"The reference %@ couldn't be update", @"Reference update failure - error message");
+		message = [NSString stringWithFormat:message, ref.shortName];
+
+		return PBReturnError(error, title, message, gitError);
 	}
+	[self reloadRefs];
 	return success;
 }