On failure at CreateTag, CreateBrach and RenameRef it is show detailed what the error was

Robert Kyriakis · Robert Kyriakis · commit fec9b6c8416d · 2012-01-10T00:05:35.000+01:00
diff --git a/PBCreateBranchSheet.m b/PBCreateBranchSheet.m
@@ -86,13 +86,37 @@ - (IBAction) createBranch:(id)sender
 		[self.errorMessageField setHidden:NO];
 		return;
 	}
-
-	if ([self.repository refExists:ref checkOnRemotesWithoutBranches:YES]) {
-		[self.errorMessageField setStringValue:@"Refname already exists local as tag or branch or remote as tag!"];
-		[self.errorMessageField setHidden:NO];
-		return;
-	}
-
+    
+    NSString *refExistsReturnMessage;
+    if([self.repository refExists:ref checkOnRemotesWithoutBranches:YES resultMessage:&refExistsReturnMessage])
+    {
+        NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
+                                              code:0
+                                          userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                    refExistsReturnMessage, NSLocalizedDescriptionKey,
+                                                    @"Select other branchname.", NSLocalizedRecoverySuggestionErrorKey,
+                                                    nil]
+                           ];
+        [[NSAlert alertWithError:error]runModal];
+        return;
+    }
+    else
+    {
+        if (refExistsReturnMessage != @"")
+        {
+           int returnButton = [[NSAlert alertWithMessageText:refExistsReturnMessage
+                             defaultButton:@"Yes"
+                           alternateButton:@"No"
+                               otherButton:nil
+                 informativeTextWithFormat:@"Still want to create the %@ %@?",[ref refishType],[ref shortName]] runModal];
+            
+            if (returnButton == NSAlertAlternateReturn)
+            {
+                return;
+            }
+        }
+    }
+	
 	[self closeCreateBranchSheet:self];
 
 	[self.repository createBranch:name atRefish:self.startRefish];
diff --git a/PBCreateTagSheet.m b/PBCreateTagSheet.m
@@ -68,11 +68,36 @@ - (IBAction) createTag:(id)sender
 		return;
 	}
     
-	if ([self.repository refExists:ref checkOnRemotesWithoutBranches:YES]) {
-		[self.errorMessageField setStringValue:@"Refname already exists local as tag or branch or remote as tag!"];
-		[self.errorMessageField setHidden:NO];
-		return;
-	}
+    NSString *refExistsReturnMessage;
+    if([self.repository refExists:ref checkOnRemotesWithoutBranches:YES resultMessage:&refExistsReturnMessage])
+    {
+        NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
+                                              code:0
+                                          userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                    refExistsReturnMessage, NSLocalizedDescriptionKey,
+                                                    @"Select other tagname.", NSLocalizedRecoverySuggestionErrorKey,
+                                                    nil]
+                           ];
+        [[NSAlert alertWithError:error]runModal];
+        return;
+    }
+    else
+    {
+        if (refExistsReturnMessage != @"")
+        {
+            int returnButton = [[NSAlert alertWithMessageText:refExistsReturnMessage
+                                                defaultButton:@"Yes"
+                                              alternateButton:@"No"
+                                                  otherButton:nil
+                                    informativeTextWithFormat:@"Still want to create the %@ %@?",[ref refishType],[ref shortName]] runModal];
+            
+            if (returnButton == NSAlertAlternateReturn)
+            {
+                return;
+            }
+        }
+    }
+
 	[self closeCreateTagSheet:sender];
 
 	NSString *message = [self.tagMessageText string];
diff --git a/PBGitRepository.h b/PBGitRepository.h
@@ -82,7 +82,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) isRemoteConnected:(PBGitRef *)ref;
+- (BOOL) isRemoteConnected:(NSString*)remoteName;
 - (BOOL) deleteRemoteBranch:(PBGitRef *)ref;
 - (BOOL) deleteRemoteTag:(PBGitRef *)ref;
 - (BOOL) deleteRef:(PBGitRef *)ref;
@@ -128,9 +128,9 @@ dispatch_queue_t PBGetWorkQueue();
 - (BOOL)isSHAOnHeadBranch:(NSString *)testSHA;
 - (BOOL)isRefOnHeadBranch:(PBGitRef *)testRef;
 - (BOOL)checkRefFormat:(NSString *)refName;
-- (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteCheck;
-- (BOOL)refExistsOnRemote:(PBGitRef*)ref remoteName:(NSString*)remote;
-- (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref;
+- (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteCheck resultMessage:(NSString**)result;
+- (BOOL)refExistsOnRemote:(PBGitRef*)ref remoteName:(NSString*)remote resultMessage:(NSString**)result;
+- (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result;
 - (BOOL)tagExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote;
 - (PBGitRef *)refForName:(NSString *)name;
 
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -573,10 +573,14 @@ - (BOOL) checkRefFormat:(NSString *)refName
 	return YES;
 }
 
-- (BOOL) refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteCheck
+- (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteCheck resultMessage:(NSString**)result
 {
     if (!ref)
     {
+        if (result)
+        {
+            *result = @"Ref is Nil, can't progress check existence!";
+        }
         return NO;
     }
     
@@ -607,44 +611,93 @@ - (BOOL) refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChe
     arguments = [NSArray arrayWithObjects:@"for-each-ref", [NSString stringWithFormat:@"%@%@",kGitXBranchRefPrefix,refShortName], nil];
     output = [self outputInWorkdirForArguments:arguments retValue:&retValue];
     if (![output isEqualToString:@""])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"%@ exists already local as branch!",refShortName];
+        }
         return YES;
+    }
 
     // Check local refs/tags/ for ref
     arguments = [NSArray arrayWithObjects:@"for-each-ref", [NSString stringWithFormat:@"%@%@",kGitXTagRefPrefix,refShortName], nil];
     output = [self outputInWorkdirForArguments:arguments retValue:&retValue];
     if (![output isEqualToString:@""])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"%@ exists already local as tag!",refShortName];
+        }
         return YES;
+    }
     
     // Check if any remote exists with refShortName
     NSArray *repoRemotes = [self remotes];
     if ([repoRemotes containsObject:refShortName])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"%@ exists already local as remotename!",refShortName];
+        }
         return YES;
-    
-    // Check Branches and Tags on any Remotes
+    }
+
+    NSMutableString *completeResults = [NSMutableString string];
+
+    // Check Tags on any Remotes
     if (repoRemotes && remoteCheck)
     {
+
         for (int i=0; i<[repoRemotes count]; i++)
         {
             // Check Remote connection
-            PBGitRef *remoteRef = [PBGitRef refFromString:[NSString stringWithFormat:@"%@%@",kGitXRemoteRefPrefix,[repoRemotes objectAtIndex:i]]];
-            if ([self isRemoteConnected:remoteRef])
+            if ([self isRemoteConnected:[repoRemotes objectAtIndex:i]])
             {
                 // Check remote refs/tags/ for ref
                 arguments = [NSArray arrayWithObjects:@"ls-remote", @"-t",[repoRemotes objectAtIndex:i] ,refShortName, nil];
                 output = [self outputInWorkdirForArguments:arguments retValue:&retValue];
                 if (![output isEqualToString:@""])
+                {
+                    [completeResults appendFormat:@"%@ exists already as tag on remote %@!",refShortName,[repoRemotes objectAtIndex:i]];
+                    if (result)
+                    {
+                        *result = completeResults;
+                    }
                     return YES;
+                }
+            }
+            else
+            {
+                [completeResults appendFormat:@"Remote %@ is actually not connected, can't check for existing refname there!\n",[repoRemotes objectAtIndex:i]];
             }
         }
     }
     
+    if (result)
+    {
+        *result = completeResults;
+    }
     return NO;
 }
 
-- (BOOL)refExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote
+
+- (BOOL)refExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote resultMessage:(NSString**)result
 {
-    if ((!ref) || (![self hasRemotes]))
+    if (!remote)
+    {
+        if (result)
+        {
+            *result = @"Remotename is Nil, can't progress check existence!";
+        }
+        return NO;
+    }
+    
+    if (!ref)
     {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"Ref is Nil, can't progress check existence on remote %@!",remote];
+        }
         return NO;
     }
     
@@ -663,36 +716,112 @@ - (BOOL)refExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote
         refShortName = [ref remoteBranchName];
     }
     
+    if (![self hasRemotes])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"Repository has no remotes, can't progress check existence from %@ %@ on remote %@!",[ref refishType],refShortName,remote];
+        }
+        return NO;
+    }
+    
+    if (![self isRemoteConnected:remote])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"Remote %@ is actually not connected, can't check for existing refname there!",remote];
+        }
+        return NO;
+    }
+    
     int retValue = 1;
-    // Check remote refs/tags/ and refs/heads for ref
-    NSArray *arguments = [NSArray arrayWithObjects:@"ls-remote", @"-t", @"-h", remote, refShortName, nil];
+    // Check remote refs/tags/ for ref
+    NSArray *arguments = [NSArray arrayWithObjects:@"ls-remote", @"-t", remote, refShortName, nil];
     NSString *output = [self outputInWorkdirForArguments:arguments retValue:&retValue];
     if (![output isEqualToString:@""])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"%@ exists as tag on remote %@!",refShortName,remote];
+        }
         return YES;
+    }
     
+    // Check remote refs/tags/ for ref
+    arguments = [NSArray arrayWithObjects:@"ls-remote", @"-h", remote, refShortName, nil];
+    output = [self outputInWorkdirForArguments:arguments retValue:&retValue];
+    if (![output isEqualToString:@""])
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"%@ exists as branch on remote %@!",refShortName,remote];
+        }
+        return YES;
+    }
+
     return NO;
 }
 
-- (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref
+
+- (BOOL)refExistsOnAnyRemote:(PBGitRef*)ref resultMessage:(NSString**)result
 {
     if (!ref)
     {
+        if (result)
+        {
+            *result = @"Ref is Nil, can't progress check existence on any remotes!";
+        }
         return NO;
     }
-    
+
+    NSMutableString *completeResult = [NSMutableString string];
+
     if ([self hasRemotes])
     {
         NSArray *repoRemotes = [self remotes];
+        NSString *oneResult;
         for (int i=0; i<[repoRemotes count]; i++)
         {
-            if ([self refExistsOnRemote:ref remoteName:[repoRemotes objectAtIndex:i]])
+            if ([self refExistsOnRemote:ref remoteName:[repoRemotes objectAtIndex:i] resultMessage:&oneResult])
+            {
+                if (oneResult)
+                {
+                    [completeResult appendString:oneResult];
+                }
+                
+                if (result)
+                {
+                    *result = completeResult;
+                }
+                
                 return YES;
+            }
+            else
+            {
+                if (oneResult)
+                {
+                    [completeResult appendString:oneResult];
+                }
+            }
         }
     }
-    
+    else
+    {
+        if (result)
+        {
+            *result = [NSString stringWithFormat:@"Repository has no remotes, can't progress check existence from %@ on any remotes!",[ref shortName]];
+        }
+        return NO;
+    }
+
+    if (result)
+    {
+        *result = completeResult;
+    }
     return NO;
 }
 
+
 - (BOOL)tagExistsOnRemote:(PBGitRef *)ref remoteName:(NSString *)remote
 {
     if ((!ref) || (![self hasRemotes]) || (![ref isTag]))
@@ -817,7 +946,7 @@ - (PBGitRef *) remoteRefForBranch:(PBGitRef *)branch error:(NSError **)error
 		if (remoteName && ([remoteName isKindOfClass:[NSString class]] && (![remoteName isEqualToString:@""]))) {
 			PBGitRef *remoteRef = [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:remoteName]];
 			// check that the remote is a valid ref and exists
-			if ([self checkRefFormat:[remoteRef ref]] && [self refExists:remoteRef checkOnRemotesWithoutBranches:NO])
+			if ([self checkRefFormat:[remoteRef ref]] && [self refExists:remoteRef checkOnRemotesWithoutBranches:NO resultMessage:Nil])
 				return remoteRef;
 		}
 	}
@@ -894,17 +1023,17 @@ - (void) changeRemote:(PBGitRef *)ref toURL:(NSURL*)newUrl;
 }
 
 
-- (BOOL)isRemoteConnected:(PBGitRef *)ref
+- (BOOL)isRemoteConnected:(NSString*)remoteName
 {
-    if ((![ref isRemote]) || (![[self remotes] containsObject:[ref remoteName]]))
+    if (!remoteName)
         return NO;
     
     // Send a command to the remote and check the ExitCode
     int gitRetValue = 1;
-    NSArray *arguments = [NSArray arrayWithObjects:@"ls-remote", [ref remoteName], nil];
-    NSLog(@"Start testing connection to remote %@",[ref remoteName]);
+    NSArray *arguments = [NSArray arrayWithObjects:@"ls-remote", remoteName, nil];
+    NSLog(@"Start testing connection to remote %@",remoteName);
     [self outputInWorkdirForArguments:arguments retValue:&gitRetValue];
-    NSLog(@"Stop testing connection to remote %@",[ref remoteName]);
+    NSLog(@"Stop testing connection to remote %@",remoteName);
     if (gitRetValue)
     {
         return NO;
@@ -1385,10 +1514,10 @@ - (BOOL) deleteRemoteTag:(PBGitRef *)ref
     
     for (int i=0; i<[remotes count]; i++)
     {
-        if ([self refExistsOnRemote:ref remoteName:[remotes objectAtIndex:i]])
+        if ([self refExistsOnRemote:ref remoteName:[remotes objectAtIndex:i] resultMessage:Nil])
         {
             BOOL remoteConnected = YES;
-            if (![self isRemoteConnected:[PBGitRef refFromString:[NSString stringWithFormat:@"%@%@",kGitXRemoteRefPrefix,[remotes objectAtIndex:i]]]])
+            if (![self isRemoteConnected:[remotes objectAtIndex:i]])
             {
                 NSString *info = [NSString stringWithFormat:@"Remote %@ is not conneted!",[remotes objectAtIndex:i]];
                 NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
@@ -1459,7 +1588,7 @@ - (BOOL) deleteRef:(PBGitRef *)ref
     }
     else if ([ref refishType] == kGitXTagType)
     {
-        if ([self refExistsOnAnyRemote:ref])
+        if ([self refExistsOnAnyRemote:ref resultMessage:Nil])
         {
             [self deleteRemoteTag:ref];
         }
diff --git a/PBRefController.m b/PBRefController.m
diff --git a/PBRenameSheet.m b/PBRenameSheet.m
