Stash support

Classes/Controllers/PBDiffWindowController.m

@@ -34,7 +34,7 @@ + (void) showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)
 	if (!diffCommit)
 		diffCommit = [startCommit.repository headCommit];
 
-	NSString *commitSelector = [NSString stringWithFormat:@"%@..%@", [startCommit realSha], [diffCommit realSha]];
+	NSString *commitSelector = [NSString stringWithFormat:@"%@..%@", startCommit.SHA, diffCommit.SHA];
 	NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"diff", @"--no-ext-diff", commitSelector, nil];
 
 	if (![PBGitDefaults showWhitespaceDifferences])

Classes/Controllers/PBGitCommitController.h

@@ -22,19 +22,32 @@
 	PBGitIndex *index;
 
 	IBOutlet PBCommitMessageView *commitMessageView;
+
+	BOOL stashKeepIndex;
+
 	IBOutlet NSArrayController *unstagedFilesController;
 	IBOutlet NSArrayController *cachedFilesController;
+	IBOutlet NSArrayController *trackedFilesController;
+
+	IBOutlet NSTabView *controlsTabView;
 	IBOutlet NSButton *commitButton;
+	IBOutlet NSButton *stashButton;
 
 	IBOutlet PBGitIndexController *indexController;
 	IBOutlet PBWebChangesController *webController;
 	IBOutlet PBNiceSplitView *commitSplitView;
 }
 
 @property(readonly) PBGitIndex *index;
+@property(assign) BOOL stashKeepIndex;
 
 - (IBAction) refresh:(id) sender;
 - (IBAction) commit:(id) sender;
 - (IBAction) forceCommit:(id) sender;
-- (IBAction)signOff:(id)sender;
+- (IBAction) signOff:(id)sender;
+- (IBAction) stashChanges:(id) sender;
+
+- (NSView *) nextKeyViewFor:(NSView *)view;
+- (NSView *) previousKeyViewFor:(NSView *)view;
+
 @end

Classes/Controllers/PBGitCommitController.m

@@ -14,13 +14,16 @@
 #import "PBNiceSplitView.h"
 #import "PBGitRepositoryWatcher.h"
 #import "PBCommitMessageView.h"
+#import "PBGitIndexController.h"
 
 #import <ObjectiveGit/GTRepository.h>
 #import <ObjectiveGit/GTConfiguration.h>
 
 #define kCommitSplitViewPositionDefault @"Commit SplitView Position"
+#define kControlsTabIndexCommit 0
+#define kControlsTabIndexStash  1
 
-@interface PBGitCommitController ()
+@interface PBGitCommitController () <NSTextViewDelegate>
 - (void)refreshFinished:(NSNotification *)notification;
 - (void)commitWithVerification:(BOOL) doVerify;
 - (void)commitStatusUpdated:(NSNotification *)notification;
@@ -36,6 +39,7 @@ - (void)saveCommitSplitViewPosition;
 @implementation PBGitCommitController
 
 @synthesize index;
+@synthesize stashKeepIndex;
 
 - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller
 {
@@ -62,11 +66,13 @@ - (void)awakeFromNib
 	[super awakeFromNib];
 
 	commitMessageView.repository = self.repository;
+	commitMessageView.delegate = self;
 
 	[commitMessageView setTypingAttributes:[NSDictionary dictionaryWithObject:[NSFont fontWithName:@"Monaco" size:12.0] forKey:NSFontAttributeName]];
 
 	[unstagedFilesController setFilterPredicate:[NSPredicate predicateWithFormat:@"hasUnstagedChanges == 1"]];
 	[cachedFilesController setFilterPredicate:[NSPredicate predicateWithFormat:@"hasStagedChanges == 1"]];
+    [trackedFilesController setFilterPredicate:[NSPredicate predicateWithFormat:@"status > 0"]];
 
 	[unstagedFilesController setSortDescriptors:[NSArray arrayWithObjects:
 		[[NSSortDescriptor alloc] initWithKey:@"status" ascending:false],
@@ -126,6 +132,8 @@ - (IBAction)signOff:(id)sender
 
 - (void) refresh:(id) sender
 {
+	[controlsTabView selectTabViewItemAtIndex:kControlsTabIndexCommit];
+
 	self.isBusy = YES;
 	self.status = @"Refreshing index…";
 	[index refresh];
@@ -139,6 +147,12 @@ - (void) updateView
 	[self refresh:nil];
 }
 
+- (IBAction) stashChanges:(id)sender
+{
+    NSLog(@"stash changes: %@", stashKeepIndex ? @"keep index" : @"");
+    [self.repository stashSaveWithKeepIndex:stashKeepIndex];
+}
+
 - (IBAction) commit:(id) sender
 {
     [self commitWithVerification:YES];
@@ -229,12 +243,12 @@ - (void)indexChanged:(NSNotification *)notification
 {
 	[cachedFilesController rearrangeObjects];
 	[unstagedFilesController rearrangeObjects];
-    if ([[cachedFilesController arrangedObjects] count]) {
-        [commitButton setEnabled:YES];
-    } else {
-        [commitButton setEnabled:NO];
-    }
-
+
+    NSUInteger tracked = [[trackedFilesController arrangedObjects] count];
+    NSUInteger staged = [[cachedFilesController arrangedObjects] count];
+
+    [commitButton setEnabled:(staged > 0)];
+    [stashButton setEnabled:(staged > 0 || tracked > 0)];
 }
 
 - (void)indexOperationFailed:(NSNotification *)notification
@@ -316,4 +330,70 @@ - (void)restoreCommitSplitViewPositiion
 	[commitSplitView setHidden:NO];
 }
 
+#pragma mark Handle "alt" key-down/up events
+// to toggle commit/stash controls
+
+- (void)flagsChanged:(NSEvent *)theEvent
+{
+    BOOL altDown = !!([theEvent modifierFlags] & NSAlternateKeyMask);
+    int currIndex = [controlsTabView indexOfTabViewItem:controlsTabView.selectedTabViewItem];
+    int desiredIndex = altDown ? kControlsTabIndexStash : kControlsTabIndexCommit;
+    if (currIndex != desiredIndex) {
+        [controlsTabView selectTabViewItemAtIndex:desiredIndex];
+    }
+}
+
+#pragma mark NSTextView delegate methods
+
+- (void)focusTable:(NSTableView *)table
+{
+    if ([table numberOfRows] > 0) {
+        if ([table numberOfSelectedRows] == 0) {
+            [table selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO];
+        }
+        [[table window] makeFirstResponder:table];
+    }
+}
+
+- (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector;
+{
+    if (commandSelector == @selector(insertTab:)) {
+        [self focusTable:indexController.stagedTable];
+        return YES;
+    } else if (commandSelector == @selector(insertBacktab:)) {
+        [self focusTable:indexController.unstagedTable];
+        return YES;
+	}
+    return NO;
+}
+
+# pragma mark Key View Chain
+
+-(NSView *)nextKeyViewFor:(NSView *)view
+{
+    NSView * next = nil;
+    if (view == indexController.unstagedTable) {
+        next = commitMessageView;
+    }
+    else if (view == commitMessageView) {
+        next = indexController.stagedTable;
+    }
+    else if (view == indexController.stagedTable) {
+        next = commitButton;
+    }
+    return next;
+}
+
+-(NSView *)previousKeyViewFor:(NSView *)view
+{
+    NSView * next = nil;
+    if (view == indexController.stagedTable) {
+        next = commitMessageView;
+    }
+    else if (view == commitMessageView) {
+        next = indexController.unstagedTable;
+    }
+    return next;
+}
+
 @end

Classes/Controllers/PBGitHistoryController.m

@@ -296,9 +296,9 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 		[self updateStatus];
 
 		if ([repository.currentBranch isSimpleRef])
-			[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
+			[self selectCommit:[repository OIDForRef:repository.currentBranch.ref]];
 		else
-			[self selectCommit:[[self firstCommit] sha]];
+			[self selectCommit:self.firstCommit.OID];
 		return;
 	}
 
@@ -322,7 +322,11 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
     } else if ([menuItem action] == @selector(setTreeView:)) {
 		[menuItem setState:(self.selectedCommitDetailsIndex == kHistoryTreeViewIndex) ? NSOnState : NSOffState];
     }
-    return YES;
+
+    if ([self respondsToSelector:[menuItem action]])
+        return YES;
+
+    return [[self nextResponder] validateMenuItem:menuItem];
 }
 
 - (IBAction) setDetailedView:(id)sender
@@ -382,7 +386,7 @@ - (void) copyCommitInfo
 	PBGitCommit *commit = [[commitController selectedObjects] objectAtIndex:0];
 	if (!commit)
 		return;
-	NSString *info = [NSString stringWithFormat:@"%@ (%@)", [[commit realSha] substringToIndex:10], [commit subject]];
+	NSString *info = [NSString stringWithFormat:@"%@ (%@)", [commit.SHA substringToIndex:10], commit.subject];
 
 	NSPasteboard *a =[NSPasteboard generalPasteboard];
 	[a declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
@@ -395,7 +399,7 @@ - (void) copyCommitSHA
 	PBGitCommit *commit = [[commitController selectedObjects] objectAtIndex:0];
 	if (!commit)
 		return;
-	NSString *info = [[commit realSha] substringWithRange:NSMakeRange(0, 7)];
+	NSString *info = [commit.SHA substringWithRange:NSMakeRange(0, 7)];
 
 	NSPasteboard *a =[NSPasteboard generalPasteboard];
 	[a declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
@@ -487,9 +491,9 @@ - (void) scrollSelectionToTopOfViewFrom:(NSInteger)oldIndex
     commitList.useAdjustScroll = NO;
 }
 
-- (NSArray *) selectedObjectsForSHA:(GTOID *)commitSHA
+- (NSArray *) selectedObjectsForOID:(GTOID *)commitOID
 {
-	NSPredicate *selection = [NSPredicate predicateWithFormat:@"sha == %@", commitSHA];
+	NSPredicate *selection = [NSPredicate predicateWithFormat:@"OID == %@", commitOID];
 	NSArray *selectedCommits = [[commitController content] filteredArrayUsingPredicate:selection];
 
 	if (([selectedCommits count] == 0) && [self firstCommit])
@@ -498,14 +502,14 @@ - (NSArray *) selectedObjectsForSHA:(GTOID *)commitSHA
 	return selectedCommits;
 }
 
-- (void)selectCommit:(GTOID *)commitSHA
+- (void)selectCommit:(GTOID *)commitOID
 {
-	if (!forceSelectionUpdate && [[[[commitController selectedObjects] lastObject] sha] isEqual:commitSHA])
+	if (!forceSelectionUpdate && [[[commitController.selectedObjects lastObject] OID] isEqual:commitOID])
 		return;
 
 	NSInteger oldIndex = [[commitController selectionIndexes] firstIndex];
 
-	NSArray *selectedCommits = [self selectedObjectsForSHA:commitSHA];
+	NSArray *selectedCommits = [self selectedObjectsForOID:commitOID];
 	[commitController setSelectedObjects:selectedCommits];
 
 	[self scrollSelectionToTopOfViewFrom:oldIndex];
@@ -564,31 +568,6 @@ - (void)showCommitsFromTree:(id)sender
 	[searchController setHistorySearch:searchString mode:kGitXPathSearchMode];
 }
 
-- (void)showInFinderAction:(id)sender
-{
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *path;
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
-
-	for (NSString *filePath in [sender representedObject]) {
-		path = [workingDirectory stringByAppendingPathComponent:filePath];
-		[ws selectFile: path inFileViewerRootedAtPath:path];
-	}
-
-}
-
-- (void)openFilesAction:(id)sender
-{
-	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *path;
-	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
-
-	for (NSString *filePath in [sender representedObject]) {
-		path = [workingDirectory stringByAppendingPathComponent:filePath];
-		[ws openFile:path];
-	}
-}
-
 - (void) checkoutFiles:(id)sender
 {
 	NSMutableArray *files = [NSMutableArray array];
@@ -627,7 +606,7 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 	PBGitRef *headRef = [[repository headRef] ref];
 	NSString *headRefName = [headRef shortName];
 	NSString *diffTitle = [NSString stringWithFormat:@"Diff %@ with %@", multiple ? @"files" : @"file", headRefName];
-	BOOL isHead = [[selectedCommit sha] isEqual:[repository headSHA]];
+	BOOL isHead = [selectedCommit.OID isEqual:repository.headOID];
 	NSMenuItem *diffItem = [[NSMenuItem alloc] initWithTitle:diffTitle
 													  action:isHead ? nil : @selector(diffFilesAction:)
 											   keyEquivalent:@""];
@@ -644,7 +623,6 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 
 	NSArray *menuItems = [NSArray arrayWithObjects:historyItem, diffItem, checkoutItem, finderItem, openFilesItem, nil];
 	for (NSMenuItem *item in menuItems) {
-		[item setTarget:self];
 		[item setRepresentedObject:filePaths];
 	}
 

Classes/Controllers/PBGitIndexController.h

@@ -18,10 +18,16 @@
 	IBOutlet NSTableView *stagedTable;	
 }
 
+@property (readonly) NSTableView *unstagedTable;
+@property (readonly) NSTableView *stagedTable;
+
 - (IBAction) rowClicked:(NSCell *) sender;
 - (IBAction) tableClicked:(NSTableView *)tableView;
 
 - (NSMenu *) menuForTable:(NSTableView *)table;
+- (NSView *) nextKeyViewFor:(NSView *)view;
+- (NSView *) previousKeyViewFor:(NSView *)view;
+
 
 - (void) stageSelectedFiles;
 - (void) unstageSelectedFiles;