Permalink
Browse files

Merge branch 'pu/pb/index_quick_fix' into stable

* pu/pb/index_quick_fix:
  CommitView: Don't keep rearranging when iterating over files
  IndexController: de-privatize the index-stopping stuff
  • Loading branch information...
2 parents 3324591 + 00731eb commit 2cdf2b60f53445cff2ad7225261b6c6d2f8932f5 @pieter committed Sep 14, 2009
Showing with 6 additions and 6 deletions.
  1. +3 −1 PBGitCommitController.m
  2. +3 −0 PBGitIndexController.h
  3. +0 −5 PBGitIndexController.m
@@ -11,7 +11,7 @@
#import "PBChangedFile.h"
#import "PBWebChangesController.h"
#import "NSString_RegEx.h"
-
+#import "PBGitIndexController.h"
@interface PBGitCommitController (PrivateMethods)
- (NSArray *) linesFromNotification:(NSNotification *)notification;
@@ -240,6 +240,7 @@ - (NSMutableDictionary *)dictionaryForLines:(NSArray *)lines
- (void) addFilesFromDictionary:(NSMutableDictionary *)dictionary staged:(BOOL)staged tracked:(BOOL)tracked
{
// Iterate over all existing files
+ [indexController stopTrackingIndex];
for (PBChangedFile *file in files) {
NSArray *fileStatus = [dictionary objectForKey:file.path];
// Object found, this is still a cached / uncached thing
@@ -270,6 +271,7 @@ - (void) addFilesFromDictionary:(NSMutableDictionary *)dictionary staged:(BOOL)s
file.hasUnstagedChanges = NO;
}
}
+ [indexController resumeTrackingIndex];
// Do new files
if (![[dictionary allKeys] count])
@@ -36,5 +36,8 @@
- (NSString *) stagedChangesForFile:(PBChangedFile *)file;
- (NSString *) unstagedChangesForFile:(PBChangedFile *)file;
+- (void)stopTrackingIndex;
+- (void)resumeTrackingIndex;
+
- (NSMenu *) menuForTable:(NSTableView *)table;
@end
@@ -12,11 +12,6 @@
#define FileChangesTableViewType @"GitFileChangedType"
-@interface PBGitIndexController (PrivateMethods)
-- (void)stopTrackingIndex;
-- (void)resumeTrackingIndex;
-@end
-
@implementation PBGitIndexController
@synthesize contextSize;

0 comments on commit 2cdf2b6

Please sign in to comment.