After cloneTo is asked, if user want to create a new Remote to the clone

Robert Kyriakis · Robert Kyriakis · commit 12d40084969a · 2012-01-08T17:38:26.000+01:00
diff --git a/ApplicationController.m b/ApplicationController.m
@@ -402,8 +402,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 		}
 	}
     
-    [self removeObserver:self forKeyPath:@"ErrorMessageDidEnd"];
-    [self removeObserver:self forKeyPath:@"GitCommandSent"];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 /**
diff --git a/Controller/GlobalProtocols.h b/Controller/GlobalProtocols.h
@@ -0,0 +1,15 @@
+//
+//  GlobalProtocols.h
+//  GitX
+//
+//  Created by Robert Kyriakis on 08.01.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol Messages
+@required
+- (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText;
+- (void)showErrorSheet:(NSError *)error;
+@end
diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
@@ -82,9 +82,9 @@
 		65D58BC7132D48C2003F7290 /* PBResetSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D58BC6132D48C0003F7290 /* PBResetSheet.m */; };
 		770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; };
 		77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; };
-		812F400914ACF14E0032373A /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
 		812BDD8B14AA0B110072748D /* PBChangeRemoteUrlSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 812BDD8914AA0B110072748D /* PBChangeRemoteUrlSheet.xib */; };
 		812BDD8F14AA0E9C0072748D /* PBChangeRemoteUrlSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 812BDD8E14AA0E9C0072748D /* PBChangeRemoteUrlSheet.m */; };
+		812F400914ACF14E0032373A /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
 		8166B9CF149E1BC0007C8619 /* PBRenameSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 8166B9CE149E1BC0007C8619 /* PBRenameSheet.m */; };
 		81840633149E1AA00014646A /* PBRenameSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 81840631149E1AA00014646A /* PBRenameSheet.xib */; };
 		89087CA613A3E46B00911503 /* PBWebCommitController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89087CA513A3E46B00911503 /* PBWebCommitController.m */; };
@@ -348,6 +348,7 @@
 		812BDD8A14AA0B110072748D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBChangeRemoteUrlSheet.xib; sourceTree = "<group>"; };
 		812BDD8D14AA0E9C0072748D /* PBChangeRemoteUrlSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBChangeRemoteUrlSheet.h; sourceTree = "<group>"; };
 		812BDD8E14AA0E9C0072748D /* PBChangeRemoteUrlSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBChangeRemoteUrlSheet.m; sourceTree = "<group>"; };
+		81401EB114B9DE12003683C1 /* GlobalProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GlobalProtocols.h; path = Controller/GlobalProtocols.h; sourceTree = "<group>"; };
 		8166B9CD149E1BC0007C8619 /* PBRenameSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBRenameSheet.h; sourceTree = "<group>"; };
 		8166B9CE149E1BC0007C8619 /* PBRenameSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBRenameSheet.m; sourceTree = "<group>"; };
 		81840632149E1AA00014646A /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBRenameSheet.xib; sourceTree = "<group>"; };
@@ -980,6 +981,7 @@
 				F5E927F90E883EF600056E75 /* Commit */,
 				D82F435F111B9C6D00A25A39 /* Sheets */,
 				8998B1AB13A55A9B00121729 /* Stash */,
+				81401EB114B9DE12003683C1 /* GlobalProtocols.h */,
 				77C8280B06725ACE000B614F /* ApplicationController.h */,
 				77C8280C06725ACE000B614F /* ApplicationController.m */,
 				93CB42C00EAB7B2200530609 /* PBGitDefaults.h */,
diff --git a/PBAddRemoteSheet.h b/PBAddRemoteSheet.h
@@ -20,9 +20,11 @@
 
 	NSOpenPanel *browseSheet;
 	NSView      *browseAccessoryView;
+    
+    NSString *remoteUrl;
 }
 
-+ (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo;
++ (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo withRemoteURL:(NSString*)url;
 
 - (IBAction) browseFolders:(id)sender;
 - (IBAction) addRemote:(id)sender;
diff --git a/PBAddRemoteSheet.m b/PBAddRemoteSheet.m
@@ -14,7 +14,7 @@
 
 @interface PBAddRemoteSheet ()
 
-- (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo;
+- (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo withRemoteURL:(NSString*)url;
 - (void) openAddRemoteSheet;
 
 @end
@@ -37,18 +37,19 @@ @implementation PBAddRemoteSheet
 #pragma mark -
 #pragma mark PBAddRemoteSheet
 
-+ (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo
++ (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo withRemoteURL:(NSString*)url;
 {
     if(!sheet){
         sheet = [[self alloc] initWithWindowNibName:@"PBAddRemoteSheet"];
     }
-	[sheet beginAddRemoteSheetForRepository:repo];
+	[sheet beginAddRemoteSheetForRepository:repo withRemoteURL:url];
 }
 
 
-- (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo
+- (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo withRemoteURL:(NSString*)url
 {
 	self.repository = repo;
+    remoteUrl = url;
 
 	[self window];
 	[self openAddRemoteSheet];
@@ -58,6 +59,12 @@ - (void) beginAddRemoteSheetForRepository:(PBGitRepository *)repo
 - (void) openAddRemoteSheet
 {
 	[self.errorMessage setStringValue:@""];
+    
+    if (remoteUrl)
+    {
+        [remoteURL setStringValue:remoteUrl];
+        [remoteURL setEnabled:NO]; 
+    }
 
 	[NSApp beginSheet:[self window] modalForWindow:[self.repository.windowController window] modalDelegate:self didEndSelector:nil contextInfo:NULL];
 }
@@ -100,7 +107,7 @@ - (IBAction) addRemote:(id)sender
 {
 	[self.errorMessage setStringValue:@""];
 
-	NSString *name = [[self.remoteName stringValue] copy];
+	NSString *name = [self.remoteName stringValue];
 
 	if ([name isEqualToString:@""]) {
 		[self.errorMessage setStringValue:@"Remote name is required"];
@@ -112,7 +119,7 @@ - (IBAction) addRemote:(id)sender
 		return;
 	}
 
-	NSString *url = [[self.remoteURL stringValue] copy];
+	NSString *url = [self.remoteURL stringValue];
 	if ([url isEqualToString:@""]) {
 		[self.errorMessage setStringValue:@"Remote URL is required"];
 		return;
diff --git a/PBCloneRepositoryPanel.h b/PBCloneRepositoryPanel.h
@@ -7,9 +7,10 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "GlobalProtocols.h"
 
 
-@interface PBCloneRepositoryPanel : NSWindowController {
+@interface PBCloneRepositoryPanel : NSWindowController <Messages> {
 	NSTextField *repositoryURL;
 	NSTextField *destinationPath;
 	NSTextField *errorMessage;
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
@@ -695,7 +695,7 @@ - (IBAction) createTag:(id)sender
 
 - (IBAction) showAddRemoteSheet:(id)sender
 {
-	[PBAddRemoteSheet beginAddRemoteSheetForRepository:self.repository];
+	[PBAddRemoteSheet beginAddRemoteSheetForRepository:self.repository withRemoteURL:Nil];
 }
 
 - (IBAction) merge:(id)sender
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -935,6 +935,9 @@ - (void) cloneRepositoryToPath:(NSString *)path bare:(BOOL)isBare
 	NSString *description = [NSString stringWithFormat:@"Cloning the repository %@ to %@", [self projectName], path];
 	NSString *title = @"Cloning Repository";
 	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:arguments title:title description:description inRepository:self];
+    
+    NSDictionary *userInfoDict = [NSDictionary dictionaryWithObject:path forKey:@"CloneToPath"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"CloneToOperationInProgress" object:self userInfo:userInfoDict];
 }
 
 - (void) beginAddRemote:(NSString *)remoteName forURL:(NSString *)remoteURL
diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m
@@ -575,7 +575,7 @@ - (IBAction) fetchPullPushAction:(id)sender
 	NSInteger selectedSegment = [sender selectedSegment];
 	
 	if (selectedSegment == kAddRemoteSegment) {
-		[PBAddRemoteSheet beginAddRemoteSheetForRepository:repository];
+		[PBAddRemoteSheet beginAddRemoteSheetForRepository:repository withRemoteURL:Nil];
 		return;
 	}
 	
diff --git a/PBGitWindowController.h b/PBGitWindowController.h
@@ -8,14 +8,15 @@
 
 #import <Cocoa/Cocoa.h>
 #import "PBGitRepository.h"
+#import "GlobalProtocols.h"
 
 #define kGitSplitViewMinWidth 150.0f
 #define kGitSplitViewMaxWidth 300.0f
 
 @class PBViewController, PBGitSidebarController, PBGitCommitController;
 
 // Controls the main repository window from RepositoryWindow.xib
-@interface PBGitWindowController : NSWindowController PROTOCOL_10_6(NSWindowDelegate){
+@interface PBGitWindowController : NSWindowController PROTOCOL_10_6(NSWindowDelegate,Messages){
 
 	PBViewController *contentController;
 
@@ -33,6 +34,8 @@
     
     NSArray *splitViews;
     NSMutableArray *splitViewsSize;
+    BOOL addRemoteAfterCloneTo;
+    NSString *remoteURL;
 }
 
 @property (strong) PBGitRepository *repository;
diff --git a/PBGitWindowController.m b/PBGitWindowController.m
@@ -15,6 +15,7 @@
 #import "PBCommitHookFailedSheet.h"
 #import "PBGitXMessageSheet.h"
 #import "PBGitSidebarController.h"
+#import "PBAddRemoteSheet.h"
 
 #ifndef MAC_OS_X_VERSION_10_7
 #define NSApplicationPresentationAutoHideToolbar 0
@@ -32,7 +33,12 @@ - (id)initWithRepository:(PBGitRepository*)theRepository displayDefault:(BOOL)di
 		return nil;
     
 	self.repository = theRepository;
+    addRemoteAfterCloneTo = NO;
+    remoteURL = nil;
     
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cloneToInProgress:) name:@"CloneToOperationInProgress" object:Nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(successMessageSheetDidOrderOut:) name:@"SuccessMessageSheetDidOrderOut" object:Nil];
+     
 	return self;
 }
 
@@ -45,7 +51,10 @@ - (void)windowWillClose:(NSNotification *)notification
     
 	if (contentController)
 		[contentController removeObserver:self forKeyPath:@"status"];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
+
 - (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
 {
     return NSApplicationPresentationAutoHideToolbar | NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock;
@@ -374,4 +383,22 @@ - (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSiz
 	[mainView setFrame:mainFrame];
 }
 
+
+#pragma mark - Observer methods
+- (void)cloneToInProgress:(NSNotification*)notification
+{
+    addRemoteAfterCloneTo = YES;
+    remoteURL = [[notification userInfo] objectForKey:@"CloneToPath"];
+}
+
+
+- (void)successMessageSheetDidOrderOut:(NSNotification*)notification
+{
+    if (addRemoteAfterCloneTo)
+    {
+        addRemoteAfterCloneTo = NO;
+        [PBAddRemoteSheet beginAddRemoteSheetForRepository:repository withRemoteURL:remoteURL];
+    }
+}
+
 @end
diff --git a/PBGitXMessageSheet.m b/PBGitXMessageSheet.m
@@ -81,6 +81,7 @@ - (void)beginMessageSheetForWindow:(NSWindow *)parentWindow withMessageText:(NSS
 - (void)messageSheetForWindowDidEnd:(NSWindow*)window returnCode:(NSInteger)code contextInfo:(void *)info
 {
 	[window orderOut:Nil];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"SuccessMessageSheetDidOrderOut" object:nil];
 }
 
 
diff --git a/PBRemoteProgressSheet.h b/PBRemoteProgressSheet.h
@@ -7,7 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-
+#import "GlobalProtocols.h"
 
 extern NSString * const kGitXProgressDescription;
 extern NSString * const kGitXProgressSuccessDescription;
@@ -46,7 +46,7 @@ extern NSString * const kGitXProgressErrorInfo;
     NSNumber *sourceFilesCount;
 }
 
-+ (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController *)windowController;
++ (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController<Messages>*)windowController;
 
 + (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inRepository:(PBGitRepository *)repo;
 
diff --git a/PBRemoteProgressSheet.m b/PBRemoteProgressSheet.m
@@ -25,7 +25,7 @@
 
 
 @interface PBRemoteProgressSheet ()
-- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController *)windowController;
+- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController<Messages>*)windowController;
 - (void) showSuccessMessage;
 - (void) showErrorMessage;
 - (NSString *) progressTitle;
@@ -60,7 +60,7 @@ @implementation PBRemoteProgressSheet
 #pragma mark -
 #pragma mark PBRemoteProgressSheet
 
-+ (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController *)windowController
++ (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController<Messages>*)windowController
 {
     if(!sheet) {
         sheet = [[self alloc] initWithWindowNibName:@"PBRemoteProgressSheet"];
@@ -77,7 +77,7 @@ + (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)
 }
 
 
-- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController *)windowController
+- (void) beginRemoteProgressSheetForArguments:(NSArray *)args title:(NSString *)theTitle description:(NSString *)theDescription inDir:(NSString *)dir windowController:(NSWindowController<Messages>*)windowController
 {
 	controller  = windowController;
 	arguments   = args;
@@ -286,8 +286,7 @@ - (void) showSuccessMessage
 	[info appendString:[self commandDescription]];
 	[info appendString:[self standardOutputDescription]];
 
-	if ([controller respondsToSelector:@selector(showMessageSheet:infoText:)])
-		[(PBGitWindowController *)controller showMessageSheet:[self successTitle] infoText:info];
+    [(NSWindowController<Messages>*)controller showMessageSheet:[self successTitle] infoText:info];
 }
 
 
@@ -305,8 +304,7 @@ - (void) showErrorMessage
 								   nil];
 	NSError *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:errorUserInfo];
 
-	if ([controller respondsToSelector:@selector(showErrorSheet:)])
-		[(PBGitWindowController *)controller showErrorSheet:error];
+    [(NSWindowController<Messages>*)controller showErrorSheet:error];
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -402,8 +402,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`
`405`		`- [self removeObserver:self forKeyPath:@"ErrorMessageDidEnd"];`
`406`		`- [self removeObserver:self forKeyPath:@"GitCommandSent"];`
	`405`	`+ [[NSNotificationCenter defaultCenter] removeObserver:self];`
`407`	`406`	`}`
`408`	`407`
`409`	`408`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ - (IBAction) createTag:(id)sender`
`695`	`695`
`696`	`696`	`- (IBAction) showAddRemoteSheet:(id)sender`
`697`	`697`	`{`
`698`		`- [PBAddRemoteSheet beginAddRemoteSheetForRepository:self.repository];`
	`698`	`+ [PBAddRemoteSheet beginAddRemoteSheetForRepository:self.repository withRemoteURL:Nil];`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`- (IBAction) merge:(id)sender`
Original file line number	Diff line number	Diff line change
`@@ -935,6 +935,9 @@ - (void) cloneRepositoryToPath:(NSString *)path bare:(BOOL)isBare`
`935`	`935`	`NSString *description = [NSString stringWithFormat:@"Cloning the repository %@ to %@", [self projectName], path];`
`936`	`936`	`NSString *title = @"Cloning Repository";`
`937`	`937`	`[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:arguments title:title description:description inRepository:self];`
	`938`	`+`
	`939`	`+ NSDictionary *userInfoDict = [NSDictionary dictionaryWithObject:path forKey:@"CloneToPath"];`
	`940`	`+ [[NSNotificationCenter defaultCenter] postNotificationName:@"CloneToOperationInProgress" object:self userInfo:userInfoDict];`
`938`	`941`	`}`
`939`	`942`
`940`	`943`	`- (void) beginAddRemote:(NSString )remoteName forURL:(NSString )remoteURL`
Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ - (IBAction) fetchPullPushAction:(id)sender`
`575`	`575`	`NSInteger selectedSegment = [sender selectedSegment];`
`576`	`576`
`577`	`577`	`if (selectedSegment == kAddRemoteSegment) {`
`578`		`- [PBAddRemoteSheet beginAddRemoteSheetForRepository:repository];`
	`578`	`+ [PBAddRemoteSheet beginAddRemoteSheetForRepository:repository withRemoteURL:Nil];`
`579`	`579`	`return;`
`580`	`580`	`}`
`581`	`581`