show index in lower pane

Author: David Catmull

PBStashContentController.m

@@ -24,10 +24,13 @@ - (void) awakeFromNib
 - (void) showStash:(PBGitStash*)stash
 {
 	NSString *stashRef = [NSString stringWithFormat:@"refs/%@", [stash name]];
-	NSString *stashSha = [repository shaForRef:[PBGitRef refFromString:stashRef]];
-	PBGitCommit *commit = [PBGitCommit commitWithRepository:repository andSha:stashSha];
+	NSString *stashSHA = [repository shaForRef:[PBGitRef refFromString:stashRef]];
+	PBGitCommit *commit = [repository commitForSHA:stashSHA];
+	NSString *indexSHA = [commit.parents objectAtIndex:1];
+	PBGitCommit *indexCommit = [repository commitForSHA:indexSHA];
 
   [unstagedController changeContentTo:commit];
+	[stagedController changeContentTo:indexCommit];
 }
 
 - (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex

PBWebCommitController.h

@@ -32,6 +32,8 @@
 - (NSString*) refsForCurrentCommit;
 // Look up a PBGitRef based on its SHA.
 - (PBGitRef*) refFromString:(NSString*)refString;
+// Choose which parents should be used for the diff
+- (NSArray*) chooseDiffParents:(NSArray*)parents;
 // Context menu items to be displayed for a file.
 - (NSArray*) menuItemsForPath:(NSString*)path;
 

PBWebCommitController.m

@@ -104,7 +104,7 @@ - (void)commitDetailsLoaded:(NSNotification *)notification
 		}
 	}
 
-	NSString *parents = [parentsArray componentsJoinedByString:@" "];
+	NSString *parents = [[self chooseDiffParents:parentsArray] componentsJoinedByString:@" "];
 
 	// File Stats
 	NSMutableDictionary *stats = [self parseStats:details];
@@ -136,6 +136,11 @@ - (NSString*) refsForCurrentCommit
   return @"";
 }
 
+- (NSArray*) chooseDiffParents:(NSArray *)parents
+{
+	return parents;
+}
+
 - (NSMutableDictionary *)parseStats:(NSString *)txt
 {
 	NSArray *lines = [txt componentsSeparatedByString:@"\n"];

PBWebStashController.m

@@ -19,4 +19,9 @@ - (NSArray*) menuItemsForPath:(NSString*)path
 	return [[stashController superController] menuItemsForPaths:[NSArray arrayWithObject:path]];
 }
 
+- (NSArray*) chooseDiffParents:(NSArray *)parents
+{
+	return [NSArray arrayWithObject:[parents objectAtIndex:0]];
+}
+
 @end