From 34f72ba27ab7217caae8b6453dba82558a866159 Mon Sep 17 00:00:00 2001
From: Johannes Gilger <heipei@hackvalue.de>
Date: Wed, 17 Jun 2009 13:07:39 +0200
Subject: [PATCH] PBGitIndexController: Renamed "Revert" to "Discard"

In keeping consistent with the Discard-Hunk functionality we rename the
former "Revert changes" on file-level to "Discard changes". Along with
the menu-item all the functions and variables have been renamed
accordingly. Also get rid of an unnecessary force-function.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 PBGitIndexController.m | 56 ++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/PBGitIndexController.m b/PBGitIndexController.m
index 9ecec78..97169f1 100644
--- a/PBGitIndexController.m
+++ b/PBGitIndexController.m
@@ -157,8 +157,18 @@
 	return [commitController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-files", [self contextParameter], @"--", file.path, nil]];
 }
 
-- (void) forceRevertChangesForFiles:(NSArray *)files
+- (void)discardChangesForFiles:(NSArray *)files force:(BOOL)force
 {
+	if(!force) {
+		int ret = [[NSAlert alertWithMessageText:@"Discard changes"
+					   defaultButton:nil
+					 alternateButton:@"Cancel"
+					     otherButton:nil
+			       informativeTextWithFormat:@"Are you sure you wish to discard the changes to this file?\n\nYou cannot undo this operation."] runModal];
+		if (ret != NSAlertDefaultReturn)
+			return;
+	}
+
 	NSArray *paths = [files valueForKey:@"path"];
 	NSString *input = [paths componentsJoinedByString:@"\0"];
 
@@ -166,7 +176,7 @@
 	int ret = 1;
 	[commitController.repository outputForArguments:arguments inputString:input retValue:&ret];
 	if (ret) {
-		[[commitController.repository windowController] showMessageSheet:@"Reverting changes failed" infoText:[NSString stringWithFormat:@"Reverting changes failed with error code %i", ret]];
+		[[commitController.repository windowController] showMessageSheet:@"Discarding changes failed" infoText:[NSString stringWithFormat:@"Discarding changes failed with error code %i", ret]];
 		return;
 	}
 
@@ -174,18 +184,6 @@
 		file.hasUnstagedChanges = NO;
 }
 
-- (void) revertChangesForFiles:(NSArray *)files
-{
-	int ret = [[NSAlert alertWithMessageText:@"Revert changes"
-					 defaultButton:nil
-				   alternateButton:@"Cancel"
-					   otherButton:nil
-		 informativeTextWithFormat:@"Are you sure you wish to revert changes?\n\n You cannot undo this operation."] runModal];
-
-	if (ret == NSAlertDefaultReturn)
-		[self forceRevertChangesForFiles:files];
-}
-
 
 # pragma mark Context Menu methods
 - (BOOL) allSelectedCanBeIgnored:(NSArray *)selectedFiles
@@ -244,19 +242,19 @@
 		if (!file.hasUnstagedChanges)
 			return menu;
 
-	NSMenuItem *revertItem = [[NSMenuItem alloc] initWithTitle:@"Revert Changes…" action:@selector(revertFilesAction:) keyEquivalent:@""];
-	[revertItem setTarget:self];
-	[revertItem setAlternate:NO];
-	[revertItem setRepresentedObject:selectedFiles];
+	NSMenuItem *discardItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(discardFilesAction:) keyEquivalent:@""];
+	[discardItem setTarget:self];
+	[discardItem setAlternate:NO];
+	[discardItem setRepresentedObject:selectedFiles];
 
-	[menu addItem:revertItem];
+	[menu addItem:discardItem];
 
-	NSMenuItem *revertForceItem = [[NSMenuItem alloc] initWithTitle:@"Revert Changes" action:@selector(forceRevertFilesAction:) keyEquivalent:@""];
-	[revertForceItem setTarget:self];
-	[revertForceItem setAlternate:YES];
-	[revertForceItem setRepresentedObject:selectedFiles];
-	[revertForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
-	[menu addItem:revertForceItem];
+	NSMenuItem *discardForceItem = [[NSMenuItem alloc] initWithTitle:@"Discard changes" action:@selector(forceDiscardFilesAction:) keyEquivalent:@""];
+	[discardForceItem setTarget:self];
+	[discardForceItem setAlternate:YES];
+	[discardForceItem setRepresentedObject:selectedFiles];
+	[discardForceItem setKeyEquivalentModifierMask:NSAlternateKeyMask];
+	[menu addItem:discardForceItem];
 	
 	return menu;
 }
@@ -288,18 +286,18 @@
 	[commitController refresh:NULL];
 }
 
-- (void) revertFilesAction:(id) sender
+- (void)discardFilesAction:(id) sender
 {
 	NSArray *selectedFiles = [sender representedObject];
 	if ([selectedFiles count] > 0)
-		[self revertChangesForFiles:selectedFiles];
+		[self discardChangesForFiles:selectedFiles force:FALSE];
 }
 
-- (void) forceRevertFilesAction:(id) sender
+- (void)forceDiscardFilesAction:(id) sender
 {
 	NSArray *selectedFiles = [sender representedObject];
 	if ([selectedFiles count] > 0)
-		[self forceRevertChangesForFiles:selectedFiles];
+		[self discardChangesForFiles:selectedFiles force:TRUE];
 }
 
 - (void) showInFinderAction:(id) sender