Install GitCleanUpMechanism when Error occurs.

Here Clean Up Git Remotes, when adding an Remote fails

Author: Robert Kyriakis

ApplicationController.h

@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
 
 @class PBCloneRepositoryPanel;
 
@@ -21,6 +20,7 @@
 
 	PBCloneRepositoryPanel *cloneRepositoryPanel;
 
+    NSDictionary *notificationUserInfo;
 }
 
 - (NSPersistentStoreCoordinator *)persistentStoreCoordinator;

ApplicationController.m

@@ -18,6 +18,12 @@
 #import "PBCloneRepositoryPanel.h"
 #import "Sparkle/SUUpdater.h"
 #import "AIURLAdditions.h"
+#import "PBGitRepository.h"
+
+@interface ApplicationController ()
+- (void) cleanUpRemotesOnError;
+@end
+
 
 @implementation ApplicationController
 
@@ -72,7 +78,10 @@ - (void)applicationWillFinishLaunching:(NSNotification*)notification
 
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
-	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getArguments:) name:@"GitCommandSent" object:Nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cleanGitAfterErrorMessage:) name:@"ErrorMessageDidEnd" object:Nil];
+     
+    [[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
     [[SUUpdater sharedUpdater] setDelegate:self];
 
     if ([PBGitDefaults useAskPasswd]) {
@@ -392,6 +401,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 			[PBGitDefaults setPreviousDocumentPaths:paths];
 		}
 	}
+    
+    [self removeObserver:self forKeyPath:@"ErrorMessageDidEnd"];
+    [self removeObserver:self forKeyPath:@"GitCommandSent"];
 }
 
 /**
@@ -443,5 +455,34 @@ - (IBAction)reportAProblem:(id)sender
 }
 
 
+#pragma mark - Observer methods
+
+- (void)getArguments:(NSNotification*)notification
+{
+    notificationUserInfo = [notification userInfo];
+}
+
+
+- (void)cleanGitAfterErrorMessage:(NSNotification*)notification
+{
+    // When adding a remote occurs an error the remote
+    // will be set on git and has to be removed to clean the remotes list
+    [self cleanUpRemotesOnError];
+    
+    
+    
+}
+
+#pragma mark - Extensions
+- (void) cleanUpRemotesOnError
+{    
+    // check, if arguments was to add a remote
+    if ( ([(NSString*)[notificationUserInfo valueForKey:@"Arg0"] compare:@"remote"] == NSOrderedSame) &&
+        ([(NSString*)[notificationUserInfo valueForKey:@"Arg1"] compare:@"add"] == NSOrderedSame)
+        )
+    {
+        [[notificationUserInfo valueForKey:@"Repository"] deleteRemoteWithName:[notificationUserInfo valueForKey:@"Arg3"]];
+    }
+}
 
 @end

PBCloneRepositoryPanel.m

@@ -87,7 +87,7 @@ - (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText
 	[alert beginSheetModalForWindow:[self window]
 					  modalDelegate:self 
 					 didEndSelector:@selector(messageSheetDidEnd:returnCode:contextInfo:)
-						contextInfo:NULL];
+						contextInfo:Nil];
 }
 
 

PBGitRepository.h

@@ -81,6 +81,7 @@ dispatch_queue_t PBGetWorkQueue();
 - (BOOL) createBranch:(NSString *)branchName atRefish:(id <PBGitRefish>)ref;
 - (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id <PBGitRefish>)commitSHA;
 - (BOOL) deleteRemote:(PBGitRef *)ref;
+- (BOOL) deleteRemoteWithName:(NSString *)remoteName;
 - (BOOL) deleteRemoteBranch:(PBGitRef *)ref;
 - (BOOL) deleteRef:(PBGitRef *)ref;
 

PBGitRepository.m

@@ -1199,6 +1199,27 @@ - (BOOL) deleteRemote:(PBGitRef *)ref
 	return YES;
 }
 
+
+- (BOOL) deleteRemoteWithName:(NSString *)remoteName
+{
+    if (!remoteName)
+		return NO;
+
+	int retValue = 1;
+	NSArray *arguments = [NSArray arrayWithObjects:@"remote", @"rm", remoteName, nil];
+	NSString * output = [self outputForArguments:arguments retValue:&retValue];
+    if (retValue) {
+		NSString *message = [NSString stringWithFormat:@"There was an error deleting the remote: %@\n\n", remoteName];
+		[self.windowController showErrorSheetTitle:@"Delete remote failed!" message:message arguments:arguments output:output];
+		return NO;
+	}
+
+    [self reloadRefs];
+	return YES;
+}
+
+
+
 - (BOOL) deleteRemoteBranch:(PBGitRef *)ref
 {
     BOOL retVal = YES;

PBGitWindowController.m

@@ -143,11 +143,23 @@ - (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText
 - (void)showErrorSheet:(NSError *)error
 {
 	if ([[error domain] isEqualToString:PBGitRepositoryErrorDomain])
+    {
 		[PBGitXMessageSheet beginMessageSheetForWindow:[self window] withError:error];
+    }
 	else
-		[[NSAlert alertWithError:error] beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
+    {
+		[[NSAlert alertWithError:error] beginSheetModalForWindow:[self window] 
+                                                   modalDelegate:self 
+                                                  didEndSelector:@selector(showErrorSheetAlertDidEnd:returnCode:contextInfo:) 
+                                                     contextInfo:Nil];
+    }
 }
 
+- (void) showErrorSheetAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)code contextInfo:(void *)info
+{
+    [[alert window] orderOut:nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"ErrorMessageDidEnd" object:self];
+}
 
 - (void)windowDidBecomeKey:(NSNotification *)notification
 {

PBGitXMessageSheet.m

@@ -56,6 +56,7 @@ - (IBAction)closeMessageSheet:(id)sender
 {
 	[NSApp endSheet:[self window]];
 	[[self window] orderOut:self];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"ErrorMessageDidEnd" object:self];
 }
 
 
@@ -70,10 +71,21 @@ - (void)beginMessageSheetForWindow:(NSWindow *)parentWindow withMessageText:(NSS
 	[self setInfoString:info];
 	[self resizeWindow];
 
-	[NSApp beginSheet:[self window] modalForWindow:parentWindow modalDelegate:self didEndSelector:nil contextInfo:NULL];
+	[NSApp beginSheet:[self window] 
+       modalForWindow:parentWindow 
+        modalDelegate:self 
+       didEndSelector:@selector(messageSheetForWindowDidEnd:returnCode:contextInfo:) 
+          contextInfo:Nil];
 }
 
 
+- (void)messageSheetForWindowDidEnd:(NSWindow*)window returnCode:(NSInteger)code contextInfo:(void *)info
+{
+	[window orderOut:Nil];
+}
+
+
+
 - (void)setInfoString:(NSString *)info
 {
 	NSDictionary *attributes = [NSDictionary dictionaryWithObject:[NSFont labelFontOfSize:[NSFont smallSystemFontSize]]

PBRemoteProgressSheet.m

@@ -49,6 +49,7 @@ @implementation PBRemoteProgressSheet
 
 
 static PBRemoteProgressSheet *sheet;
+static PBGitRepository *repository;
 
 #pragma mark -
 #pragma mark PBRemoteProgressSheet
@@ -64,7 +65,9 @@ + (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)
 
 + (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription  inRepository:(PBGitRepository *)repo
 {
-	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:args title:theTitle description:theDescription inDir:[repo workingDirectory] windowController:repo.windowController];
+	repository = repo;
+    
+    [PBRemoteProgressSheet beginRemoteProgressSheetForArguments:args title:theTitle description:theDescription inDir:[repo workingDirectory] windowController:repo.windowController];
 }
 
 
@@ -96,6 +99,15 @@ - (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)
 
 	gitTask = [PBEasyPipe taskForCommand:[PBGitBinary path] withArgs:arguments inDir:dir];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(taskCompleted:) name:NSTaskDidTerminateNotification object:gitTask];
+    
+    NSMutableDictionary *argDict = [NSMutableDictionary new];
+    [argDict setValue:repository forKey:[NSString stringWithFormat:@"Repository"]];
+    
+    for (int i=0; i<[arguments count]; i++)
+    {
+        [argDict setValue:[arguments objectAtIndex:i] forKey:[NSString stringWithFormat:@"Arg%d",i]];
+    }
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"GitCommandSent" object:self userInfo:argDict];
 
 	// having intermittent problem with long running git tasks not sending a termination notice, so periodically check whether the task is done
 	taskTimer = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(checkTask:) userInfo:nil repeats:YES];