Ensure that the previously selected commit remains selected after ref…

…reshing. Fixes brotherbard#87, brotherbard#91, brotherbard#102, #124.
kelan · Jun 6, 2012 · 3e045a4 · 3e045a4
1 parent aae5e7c
commit 3e045a4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
@@ -48,7 +48,6 @@
 	PBGitTree *gitTree;
 	PBGitCommit *webCommit;
 	PBGitCommit *selectedCommit;
-	PBGitCommit *selectedCommitBeforeRefresh;
 }
 
 @property (unsafe_unretained) IBOutlet NSTreeController* treeController;

diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
@@ -248,16 +248,20 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 	}else if ([context isEqualToString:@"branchFilterChange"]) {
 		[PBGitDefaults setBranchFilter:repository.currentBranchFilter];
 		[self updateBranchFilterMatrix];
-	}else if([context isEqualToString:@"updateCommitCount"] || [(NSString *)context isEqualToString:@"revisionListUpdating"]) {
-		[self updateStatus];
-
-		if (selectedCommitBeforeRefresh && [repository commitForSHA:[selectedCommitBeforeRefresh sha]])
-			[self selectCommit:[selectedCommitBeforeRefresh sha]];
-		else if ([repository.currentBranch isSimpleRef])
-			[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
-		else
-			[self selectCommit:[[self firstCommit] sha]];
-	}else{
+	}
+    else if([context isEqualToString:@"updateCommitCount"] || [(NSString *)context isEqualToString:@"revisionListUpdating"]) {
+        // Only refresh the selected commit when the revision list has finished graphing
+        if (isBusy && !repository.revisionList.isUpdating) {
+            if (selectedCommit && [repository commitForSHA:[selectedCommit sha]])
+                [self selectCommit:[selectedCommit sha]];
+            else if ([repository.currentBranch isSimpleRef])
+                [self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
+            else
+                [self selectCommit:[[self firstCommit] sha]];
+        }
+        [self updateStatus];
+	}
+    else{
 		[super observeValueForKeyPath:keyPath ofObject:object change:change context:ctx];
 	}
 
@@ -408,9 +412,7 @@ - (void) updateQuicklookForce:(BOOL)force
 
 - (IBAction) refresh:(id)sender
 {
-	selectedCommitBeforeRefresh = selectedCommit;
 	[repository forceUpdateRevisions];
-	selectedCommitBeforeRefresh = NULL;
 }
 
 - (void) updateView