kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a freeze when staging/unstaging thousands of files

Browse Source
This commit is contained in:
Mikhail Emelchenkov
2010-06-20 18:40:55 +04:00
committed by Nathan Kinsinger
parent 7f17378a86
commit d968f8f0c7
1 changed files with 95 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitIndex.m
+95 -42
View File
@@ -251,30 +251,57 @@ NSString *PBGitIndexOperationFailed = @"PBGitIndexOperationFailed";
- (BOOL)stageFiles:(NSArray *)stageFiles
{
// Input string for update-index
// This will be a list of filenames that
// should be updated. It's similar to
// "git add -- <files>
NSMutableString *input = [NSMutableString string];
for (PBChangedFile *file in stageFiles) {
[input appendFormat:@"%@\0", file.path];
}
// Do staging files by chunks of 1000 files each, to prevent program freeze (because NSPipe has limited capacity)
int ret = 1;
[repository outputForArguments:[NSArray arrayWithObjects:@"update-index", @"--add", @"--remove", @"-z", @"--stdin", nil]
inputString:input
retValue:&ret];
int filesCount = [stageFiles count];
// Prepare first iteration
int loopFrom = 0;
int loopTo = 1000;
if (loopTo > filesCount)
loopTo = filesCount;
int loopCount = 0;
int i = 0;
// Staging
while (loopCount < filesCount) {
// Input string for update-index
// This will be a list of filenames that
// should be updated. It's similar to
// "git add -- <files>
NSMutableString *input = [NSMutableString string];
if (ret) {
[self postOperationFailed:[NSString stringWithFormat:@"Error in staging files. Return value: %i", ret]];
return NO;
}
for (i = loopFrom; i < loopTo; i++) {
loopCount++;
PBChangedFile *file = [stageFiles objectAtIndex:i];
[input appendFormat:@"%@\0", file.path];
}
int ret = 1;
[repository outputForArguments:[NSArray arrayWithObjects:@"update-index", @"--add", @"--remove", @"-z", @"--stdin", nil]
inputString:input
retValue:&ret];
for (PBChangedFile *file in stageFiles)
{
file.hasUnstagedChanges = NO;
file.hasStagedChanges = YES;
if (ret) {
[self postOperationFailed:[NSString stringWithFormat:@"Error in staging files. Return value: %i", ret]];
return NO;
}
for (i = loopFrom; i < loopTo; i++) {
PBChangedFile *file = [stageFiles objectAtIndex:i];
file.hasUnstagedChanges = NO;
file.hasStagedChanges = YES;
}
// Prepare next iteration
loopFrom = loopCount;
loopTo = loopFrom + 1000;
if (loopTo > filesCount)
loopTo = filesCount;
}
[self postIndexChange];
@@ -284,27 +311,53 @@ NSString *PBGitIndexOperationFailed = @"PBGitIndexOperationFailed";
// TODO: Refactor with above. What's a better name for this?
- (BOOL)unstageFiles:(NSArray *)unstageFiles
{
NSMutableString *input = [NSMutableString string];
for (PBChangedFile *file in unstageFiles) {
[input appendString:[file indexInfo]];
}
int ret = 1;
[repository outputForArguments:[NSArray arrayWithObjects:@"update-index", @"-z", @"--index-info", nil]
inputString:input
retValue:&ret];
if (ret)
{
[self postOperationFailed:[NSString stringWithFormat:@"Error in unstaging files. Return value: %i", ret]];
return NO;
}
for (PBChangedFile *file in unstageFiles)
{
file.hasUnstagedChanges = YES;
file.hasStagedChanges = NO;
// Do unstaging files by chunks of 1000 files each, to prevent program freeze (because NSPipe has limited capacity)
int filesCount = [unstageFiles count];
// Prepare first iteration
int loopFrom = 0;
int loopTo = 1000;
if (loopTo > filesCount)
loopTo = filesCount;
int loopCount = 0;
int i = 0;
// Unstaging
while (loopCount < filesCount) {
NSMutableString *input = [NSMutableString string];
for (i = loopFrom; i < loopTo; i++) {
loopCount++;
PBChangedFile *file = [unstageFiles objectAtIndex:i];
[input appendString:[file indexInfo]];
}
int ret = 1;
[repository outputForArguments:[NSArray arrayWithObjects:@"update-index", @"-z", @"--index-info", nil]
inputString:input
retValue:&ret];
if (ret)
{
[self postOperationFailed:[NSString stringWithFormat:@"Error in unstaging files. Return value: %i", ret]];
return NO;
}
for (i = loopFrom; i < loopTo; i++) {
PBChangedFile *file = [unstageFiles objectAtIndex:i];
file.hasUnstagedChanges = YES;
file.hasStagedChanges = NO;
}
// Prepare next iteration
loopFrom = loopCount;
loopTo = loopFrom + 1000;
if (loopTo > filesCount)
loopTo = filesCount;
}
[self postIndexChange];