Merge branch 'master' into gui-refresh

Author: alinx

ApplicationController.m

@@ -31,7 +31,7 @@ - (ApplicationController*)init
 
 	if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
 		if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
-			NSLog(@"Could not load QuickLook");
+			DLog(@"Could not load QuickLook");
 
 	/* Value Transformers */
 	NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
@@ -55,7 +55,7 @@ - (void)registerServices
 	int serviceVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"Services Version"];
 	if (serviceVersion < 2)
 	{
-		NSLog(@"Updating services menu…");
+		DLog(@"Updating services menu…");
 		NSUpdateDynamicServices();
 		[[NSUserDefaults standardUserDefaults] setInteger:2 forKey:@"Services Version"];
 	}
@@ -245,7 +245,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
     fileManager = [NSFileManager defaultManager];
     applicationSupportFolder = [self applicationSupportFolder];
     if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
-        [fileManager createDirectoryAtPath:applicationSupportFolder attributes:nil];
+        [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
     }
 
     url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];
@@ -414,7 +414,7 @@ - (IBAction)showHelp:(id)sender
 
 - (IBAction)reportAProblem:(id)sender
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.lighthouseapp.com/tickets"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/laullon/gitx/issues"]];
 }
 
 

Commands/PBCommandFactory.h

@@ -9,5 +9,5 @@
 #import "PBGitRepository.h"
 
 @protocol PBCommandFactory
-+ (NSArray *) commandsForObject:(NSObject *) object repository:(PBGitRepository *) repository;
++ (NSArray *) commandsForObject:(id<PBPresentable>) object repository:(PBGitRepository *) repository;
 @end

Commands/PBCommandWithParameter.m

@@ -16,7 +16,7 @@ @implementation PBCommandWithParameter
 @synthesize parameterDisplayName;
 
 - initWithCommand:(PBCommand *) aCommand parameterName:(NSString *) param parameterDisplayName:(NSString *) paramDisplayName {
-	if (self = [super initWithDisplayName:[aCommand displayName] parameters:nil repository:[aCommand repository]]) {
+	if ((self = [super initWithDisplayName:[aCommand displayName] parameters:nil repository:[aCommand repository]])) {
 		command = [aCommand retain];
 		parameterName = [param retain];
 		parameterDisplayName = [paramDisplayName retain];

Commands/PBOpenDocumentCommand.m

@@ -13,7 +13,7 @@
 @implementation PBOpenDocumentCommand
 
 - (id) initWithDocumentAbsolutePath:(NSString *) path {
-	if (self = [super initWithDisplayName:@"Open" parameters:nil repository:nil]) {
+	if ((self = [super initWithDisplayName:@"Open" parameters:nil repository:nil])) {
 		documentURL = [[NSURL alloc] initWithString:path];
 	}
 	return self;

Commands/PBRemoteCommandFactory.m

@@ -58,7 +58,7 @@ + (NSArray *) commandsForSubmodule:(PBGitSubmodule *) submodule inRepository:(PB
 	return commands;
 }
 
-+ (NSArray *) commandsForObject:(NSObject *) object repository:(PBGitRepository *) repository {
++ (NSArray *) commandsForObject:(id<PBPresentable>) object repository:(PBGitRepository *) repository {
 	if ([object isKindOfClass:[PBGitSubmodule class]]) {
 		return [PBRemoteCommandFactory commandsForSubmodule:(id)object inRepository:repository];
 	}

Commands/PBRevealWithFinderCommand.m

@@ -17,7 +17,7 @@ - (id) initWithDocumentAbsolutePath:(NSString *) path {
 		return nil;
 	}
 
-	if (self = [super initWithDisplayName:@"Reveal in Finder" parameters:nil repository:nil]) {
+	if ((self = [super initWithDisplayName:@"Reveal in Finder" parameters:nil repository:nil])) {
 		documentURL = [[NSURL alloc] initWithString:path];
 	}
 	return self;

Commands/PBStashCommandFactory.m

@@ -22,7 +22,7 @@ + (NSArray *) commandsForRef:(PBGitRef *) ref repository:(PBGitRepository *) rep
 
 @implementation PBStashCommandFactory
 
-+ (NSArray *) commandsForObject:(NSObject *) object repository:(PBGitRepository *) repository {
++ (NSArray *) commandsForObject:(id<PBPresentable>) object repository:(PBGitRepository *) repository {
 	NSArray *cmds = nil;
 	if ([object isKindOfClass:[PBGitStash class]]) {
 		cmds = [PBStashCommandFactory commandsForStash:(id)object repository:repository];

Controller/PBArgumentPickerController.m

@@ -13,7 +13,7 @@
 @implementation PBArgumentPickerController
 
 - initWithCommandWithParameter:(PBCommandWithParameter *) aCommand {
-	if (self = [super initWithWindowNibName:@"PBArgumentPicker" owner:self]) {
+	if ((self = [super initWithWindowNibName:@"PBArgumentPicker" owner:self])) {
 		cmdWithParameter = [aCommand retain];
 	}
 	return self;

Controller/PBGitResetController.h

@@ -7,8 +7,10 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "PBResetSheet.h"
 
 @class PBGitRepository;
+@protocol PBGitRefish;
 
 @interface PBGitResetController : NSObject {
 	PBGitRepository *repository;
@@ -17,8 +19,8 @@
 
 - (NSArray *) menuItems;
 
-
 // actions
+- (void) resetToRefish: (id<PBGitRefish>) spec type: (PBResetType) type;
 - (void) resetHardToHead;
 
 @end

Controller/PBGitResetController.m

@@ -9,36 +9,25 @@
 #import "PBGitResetController.h"
 #import "PBGitRepository.h"
 #import "PBCommand.h"
+#import "PBGitRefish.h"
+#import "PBResetSheet.h"
 
-static NSString * const kCommandKey = @"command";
 
 @implementation PBGitResetController
 
 - (id) initWithRepository:(PBGitRepository *) repo {
-	if (self = [super init]){
+	if ((self = [super init])){
         repository = [repo retain];
     }
     return self;
 }
 
 - (void) resetHardToHead {
-	NSAlert *alert = [NSAlert alertWithMessageText:@"Reseting working copy and index"
-									 defaultButton:@"Cancel"
-								   alternateButton:nil
-									   otherButton:@"Reset"
-						 informativeTextWithFormat:@"Are you sure you want to reset your working copy and index? All changes to them will be gone!"];
-	
-	NSArray *arguments = [NSArray arrayWithObjects:@"reset", @"--hard", @"HEAD", nil];
-	PBCommand *cmd = [[PBCommand alloc] initWithDisplayName:@"Reset hard to HEAD" parameters:arguments repository:repository];
-	cmd.commandTitle = cmd.displayName;
-	cmd.commandDescription = @"Reseting head";
-	
-	NSMutableDictionary *info = [NSMutableDictionary dictionaryWithObject:cmd forKey:kCommandKey];
-	
-	[alert beginSheetModalForWindow:[repository.windowController window]
-					  modalDelegate:self
-					 didEndSelector:@selector(confirmResetSheetDidEnd:returnCode:contextInfo:)
-						contextInfo:info];
+    [self resetToRefish: [PBGitRef refFromString: @"HEAD"] type: PBResetTypeHard];
+}
+
+- (void) resetToRefish:(id<PBGitRefish>) refish type:(PBResetType)type {
+    [PBResetSheet beginResetSheetForRepository: repository refish: refish andType: type];
 }
 
 - (void) reset {
@@ -70,18 +59,4 @@ - (void) dealloc {
 	[super dealloc];
 }
 
-#pragma mark -
-#pragma mark Confirm Window
-
-- (void) confirmResetSheetDidEnd:(NSAlert *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
-{
-    [[sheet window] orderOut:nil];
-	
-	if (returnCode != NSAlertDefaultReturn) {
-		PBCommand *cmd = [(NSDictionary *)contextInfo objectForKey:kCommandKey];
-		[cmd invoke];
-	}
-}
-
-
 @end