mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
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
This commit is contained in:
@@ -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 @@
|
||||
- (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 @@
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user