Merge pull request #117 from tiennou/develop

Develop

Author: tiennou

Classes/Controllers/PBGitCommitController.m

@@ -211,11 +211,10 @@ - (IBAction)signOff:(id)sender
 	NSString *userName = [config stringForKey:@"user.name"];
 	NSString *userEmail = [config stringForKey:@"user.email"];
 	if (!(userName && userEmail)) {
-		return [[repository windowController]
-				showMessageSheet:NSLocalizedString(@"User‘s name not set",
-												   @"Title for sheet that the user’s name is not set in the git configuration")
-				infoText:NSLocalizedString(@"Signing off a commit requires setting user.name and user.email in your git config",
-										   @"Information text for sheet that the user’s name is not set in the git configuration")];
+		return [self.windowController showMessageSheet:NSLocalizedString(@"User‘s name not set",
+																		 @"Title for sheet that the user’s name is not set in the git configuration")
+											  infoText:NSLocalizedString(@"Signing off a commit requires setting user.name and user.email in your git config",
+																		 @"Information text for sheet that the user’s name is not set in the git configuration")];
 	}
 
 	NSString *SOBline = [NSString stringWithFormat:NSLocalizedString(@"Signed-off-by: %@ <%@>",
@@ -412,7 +411,7 @@ - (void)commitFailed:(NSNotification *)notification
 				   NSLocalizedString(@"Commit failed: %@",
 									 @"Message in status bar when creating a commit has failed, including the reason for the failure"),
 				   reason];
-	[repository.windowController showMessageSheet:NSLocalizedString(@"Commit failed", @"Title for sheet that creating a commit has failed")
+	[self.windowController showMessageSheet:NSLocalizedString(@"Commit failed", @"Title for sheet that creating a commit has failed")
 										 infoText:reason];
 }
 
@@ -426,7 +425,7 @@ - (void)commitHookFailed:(NSNotification *)notification
 				   NSLocalizedString(@"Commit hook failed: %@",
 									 @"Message in status bar when running a commit hook failed, including the reason for the failure"),
 				   reason];
-	[repository.windowController showCommitHookFailedSheet:NSLocalizedString(@"Commit hook failed", @"Title for sheet that running a commit hook has failed")
+	[self.windowController showCommitHookFailedSheet:NSLocalizedString(@"Commit hook failed", @"Title for sheet that running a commit hook has failed")
 												  infoText:reason
 										  commitController:self];
 }
@@ -453,7 +452,7 @@ - (void)indexChanged:(NSNotification *)notification
 
 - (void)indexOperationFailed:(NSNotification *)notification
 {
-	[repository.windowController showMessageSheet:NSLocalizedString(@"Index operation failed", @"Title for sheet that running an index operation has failed")
+	[self.windowController showMessageSheet:NSLocalizedString(@"Index operation failed", @"Title for sheet that running an index operation has failed")
 										 infoText:notification.userInfo[kNotificationDictionaryDescriptionKey]];
 }
 

Classes/Controllers/PBGitHistoryController.h

@@ -78,8 +78,6 @@
 - (void)showCommitsFromTree:(id)sender;
 
 // Repository Methods
-- (IBAction) createBranch:(id)sender;
-- (IBAction) createTag:(id)sender;
 - (IBAction) merge:(id)sender;
 - (IBAction) cherryPick:(id)sender;
 - (IBAction) rebase:(id)sender;

Classes/Controllers/PBGitHistoryController.m

@@ -6,6 +6,8 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 
+#import <Quartz/Quartz.h>
+
 #import "PBGitCommit.h"
 #import "PBGitTree.h"
 #import "PBGitRef.h"
@@ -30,8 +32,8 @@
 #import "GLFileView.h"
 #import "GitXCommitCopier.h"
 #import "NSSplitView+GitX.h"
-#import <Quartz/Quartz.h>
-
+#import "PBRefMenuItem.h"
+#import "PBGitStash.h"
 
 #define kHistorySelectedDetailIndexKey @"PBHistorySelectedDetailIndex"
 #define kHistoryDetailViewIndex 0
@@ -559,7 +561,13 @@ - (void) checkoutFiles:(id)sender
 	NSMutableArray *files = [NSMutableArray array];
 	for (NSString *filePath in [sender representedObject])
 		[files addObject:[filePath stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
-	[repository checkoutFiles:files fromRefish:self.selectedCommits.firstObject];
+
+	NSError *error = nil;
+	BOOL success = [repository checkoutFiles:files fromRefish:self.selectedCommits.firstObject error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+
 }
 
 - (void) diffFilesAction:(id)sender
@@ -632,45 +640,266 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 
 #pragma mark Repository Methods
 
-- (IBAction) createBranch:(id)sender
+- (id <PBGitRefish>)refishForSender:(id)sender
 {
-	PBGitRef *currentRef = [repository.currentBranch ref];
-	
-	PBGitCommit *selectedCommit = self.selectedCommits.firstObject;
-	if (!selectedCommits.firstObject || [selectedCommit hasRef:currentRef])
-		[PBCreateBranchSheet beginSheetWithRefish:currentRef windowController:self.windowController];
-	else
-		[PBCreateBranchSheet beginSheetWithRefish:selectedCommit windowController:self.windowController];
+	return [self refishForSender:sender refishTypes:nil];
 }
 
-- (IBAction) createTag:(id)sender
+- (id <PBGitRefish>)refishForSender:(id)sender refishTypes:(NSArray *)types
 {
-	PBGitCommit *selectedCommit = self.selectedCommits.firstObject;
-	if (!selectedCommit)
-		[PBCreateTagSheet beginSheetWithRefish:[repository.currentBranch ref] windowController:self.windowController];
-	else
-		[PBCreateTagSheet beginSheetWithRefish:selectedCommit windowController:self.windowController];
+	if ([sender isKindOfClass:[PBRefMenuItem class]]) {
+		id <PBGitRefish> refish = [[(PBRefMenuItem *)sender refishs] firstObject];
+
+		if (!types || [types indexOfObject:[refish refishType]] != NSNotFound)
+			return refish;
+		return nil;
+	}
+
+	if ([types indexOfObject:kGitXCommitType] == NSNotFound)
+		return nil;
+
+	return self.selectedCommits.firstObject;
+}
+
+- (IBAction)fetchRemote:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	[self.windowController performFetchForRef:refish];
+}
+
+- (IBAction)pullRemote:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	[self.windowController performPullForBranch:refish remote:nil rebase:NO];
+}
+
+- (IBAction)pushUpdatesToRemote:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	PBGitRef *remoteRef = nil; // [(PBGitRef *)sender.refishs.firstObject remoteRef];
+
+	[self.windowController performPushForBranch:nil toRemote:remoteRef];
+}
+
+- (IBAction)pushDefaultRemoteForRef:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	PBGitRef *ref = nil;
+
+	[self.windowController performPushForBranch:ref toRemote:nil];
+}
+
+- (IBAction)pushToRemote:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	PBGitRef *ref = nil;
+	NSString *remoteName = [sender representedObject];
+	PBGitRef *remoteRef = [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:remoteName]];
+
+	[self.windowController performPushForBranch:ref toRemote:remoteRef];
+}
+
+- (IBAction)merge:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXCommitType, kGitXTagType]];
+	if (!refish) return;
+
+	NSError *error = nil;
+	BOOL success = [repository mergeWithRefish:refish error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+}
+
+- (IBAction)checkout:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXCommitType, kGitXTagType]];
+	if (!selectedCommits) return;
+
+	NSError *error = nil;
+	BOOL success = [repository checkoutRefish:refish error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+}
+
+- (IBAction)cherryPick:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXCommitType]];
+	if (!refish) return;
+
+	NSError *error = nil;
+	BOOL success = [repository cherryPickRefish:refish error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+}
+
+- (IBAction)rebase:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish) return;
+
+	NSError *error = nil;
+	BOOL success = [repository rebaseBranch:nil onRefish:refish error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+}
+
+- (IBAction) rebaseHeadBranch:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	NSError *error = nil;
+	BOOL success = [self.repository rebaseBranch:nil onRefish:refish error:&error];
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	}
+}
+
+- (IBAction)showDeleteRefSheet:(PBRefMenuItem *)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
+	if (!refish)
+		return;
+
+	PBGitRef *ref = (PBGitRef *)refish;
+
+	void (^performDelete)(void) = ^{
+		NSError *error = nil;
+		BOOL success = [self.repository deleteRef:ref error:&error];
+		if (!success) {
+			[self.windowController showErrorSheet:error];
+		}
+		return;
+	};
+
+	if ([PBGitDefaults isDialogWarningSuppressedForDialog:kDialogDeleteRef]) {
+		performDelete();
+		return;
+	}
+
+	NSString *ref_desc = [NSString stringWithFormat:@"%@ '%@'", [ref refishType], [ref shortName]];
+
+	NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:@"Delete %@?", ref_desc]
+									 defaultButton:@"Delete"
+								   alternateButton:@"Cancel"
+									   otherButton:nil
+						 informativeTextWithFormat:@"Are you sure you want to remove the %@?", ref_desc];
+	[alert setShowsSuppressionButton:YES];
+
+	[alert beginSheetModalForWindow:self.windowController.window
+				  completionHandler:^(NSModalResponse returnCode) {
+					  if ([[alert suppressionButton] state] == NSOnState)
+						  [PBGitDefaults suppressDialogWarningForDialog:kDialogDeleteRef];
+
+					  if (returnCode == NSModalResponseOK) {
+						  performDelete();
+					  }
+				  }];
+}
+
+- (IBAction)diffWithHEAD:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:nil];
+	if (!refish)
+		return;
+
+	PBGitCommit *commit = [self.repository commitForRef:refish];
+
+	NSString *diff = [self.repository performDiff:commit against:nil forFiles:nil];
+
+	[PBDiffWindowController showDiff:diff];
 }
 
-- (IBAction) merge:(id)sender
+- (IBAction)stashPop:(id)sender
 {
-	PBGitCommit *selectedCommit = self.selectedCommits.firstObject;
-	if (selectedCommit)
-		[repository mergeWithRefish:selectedCommit];
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
+	PBGitStash *stash = [self.repository stashForRef:refish];
+	NSError *error = nil;
+	BOOL success = [self.repository stashPop:stash error:&error];
+
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	} else {
+		[self.windowController showCommitView:sender];
+	}
 }
 
-- (IBAction) cherryPick:(id)sender
+- (IBAction)stashApply:(id)sender
 {
-	PBGitCommit *selectedCommit = self.selectedCommits.firstObject;
-	if (selectedCommit)
-		[repository cherryPickRefish:selectedCommit];
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
+	PBGitStash *stash = [self.repository stashForRef:refish];
+	NSError *error = nil;
+	BOOL success = [self.repository stashApply:stash error:&error];
+
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	} else {
+		[self.windowController showCommitView:sender];
+	}
 }
 
-- (IBAction) rebase:(id)sender
+- (IBAction)stashDrop:(id)sender
 {
-	PBGitCommit *selectedCommit = self.selectedCommits.firstObject;
-	if (selectedCommit)
-		[repository rebaseBranch:nil onRefish:selectedCommit];
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
+	PBGitStash *stash = [self.repository stashForRef:refish];
+	NSError *error = nil;
+	BOOL success = [self.repository stashDrop:stash error:&error];
+
+	if (!success) {
+		[self.windowController showErrorSheet:error];
+	} else {
+		[self.windowController showHistoryView:sender];
+	}
+}
+
+- (IBAction)stashViewDiff:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXStashType]];
+	PBGitStash *stash = [self.repository stashForRef:refish];
+	[PBDiffWindowController showDiffWindowWithFiles:nil fromCommit:stash.ancestorCommit diffCommit:stash.commit];
+}
+
+- (IBAction)showTagInfoSheet:(id)sender
+{
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXTagType]];
+	if (!refish)
+		return;
+
+	PBGitRef *ref = (PBGitRef *)refish;
+
+	NSError *error = nil;
+	NSString *tagName = [ref tagName];
+	NSString *tagRef = [@"refs/tags/" stringByAppendingString:tagName];
+	GTObject *object = [self.repository.gtRepo lookUpObjectByRevParse:tagRef error:&error];
+	if (!object) {
+		NSLog(@"Couldn't look up ref %@:%@", tagRef, [error debugDescription]);
+		return;
+	}
+	NSString *title = [NSString stringWithFormat:@"Info for tag: %@", tagName];
+	NSString *info = @"";
+	if ([object isKindOfClass:[GTTag class]]) {
+		GTTag *tag = (GTTag*)object;
+		info = tag.message;
+	}
+
+	[self.windowController showMessageSheet:title infoText:info];
 }
 
 #pragma mark -

Classes/Controllers/PBGitRepositoryDocument.m

@@ -52,7 +52,6 @@ - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSEr
 		return NO;
 	}
 
-	[_repository setDocument:self];
 
 	return YES;
 }