mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Pieter de Bie
1d19bd64df
This changes PBChangedFile to read in files by using NSString's stringWithContentsOfFile: method. It still uses the UTF8 encoding scheme so that we can capture binary files. This should perhaps be loosened to also allow other encodings.
114 lines
2.7 KiB
Objective-C
114 lines
2.7 KiB
Objective-C
//
|
|
// PBChangedFile.m
|
|
// GitX
|
|
//
|
|
// Created by Pieter de Bie on 22-09-08.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import "PBChangedFile.h"
|
|
#import "PBEasyPipe.h"
|
|
|
|
@implementation PBChangedFile
|
|
|
|
@synthesize path, status, hasCachedChanges, hasUnstagedChanges;
|
|
|
|
- (id) initWithPath:(NSString *)p andRepository:(PBGitRepository *)r
|
|
{
|
|
path = p;
|
|
repository = r;
|
|
return self;
|
|
}
|
|
|
|
- (NSString *) cachedChangesAmend:(BOOL) amend
|
|
{
|
|
if (amend)
|
|
return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", @"--cached", @"HEAD^", @"--", path, nil]];
|
|
|
|
return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", @"--cached", @"--", path, nil]];
|
|
}
|
|
|
|
- (NSString *)unstagedChanges
|
|
{
|
|
if (status == NEW) {
|
|
NSStringEncoding encoding;
|
|
NSError *error = nil;
|
|
NSString *contents = [NSString stringWithContentsOfFile:[[repository workingDirectory] stringByAppendingPathComponent:path] usedEncoding:&encoding error:&error];
|
|
if (error)
|
|
return nil;
|
|
|
|
return contents;
|
|
}
|
|
|
|
return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", @"--", path, nil]];
|
|
}
|
|
|
|
|
|
- (NSImage *) icon
|
|
{
|
|
NSString *filename;
|
|
switch (status) {
|
|
case NEW:
|
|
filename = @"new_file";
|
|
break;
|
|
case DELETED:
|
|
filename = @"deleted_file";
|
|
break;
|
|
default:
|
|
filename = @"empty_file";
|
|
break;
|
|
}
|
|
NSString *p = [[NSBundle mainBundle] pathForResource:filename ofType:@"png"];
|
|
return [[NSImage alloc] initByReferencingFile: p];
|
|
}
|
|
|
|
- (void) stageChanges
|
|
{
|
|
if (status == DELETED)
|
|
[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"rm", path, nil]];
|
|
else
|
|
[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"add", path, nil]];
|
|
|
|
self.hasUnstagedChanges = NO;
|
|
self.hasCachedChanges = YES;
|
|
}
|
|
|
|
- (void) unstageChangesAmend:(BOOL) amend
|
|
{
|
|
if (amend)
|
|
[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"reset", @"HEAD^", @"--", path, nil]];
|
|
else
|
|
[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"reset", @"--", path, nil]];
|
|
self.hasCachedChanges = NO;
|
|
self.hasUnstagedChanges = YES;
|
|
}
|
|
|
|
- (void) forceRevertChanges
|
|
{
|
|
[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"checkout", @"--", path, nil]];
|
|
self.hasUnstagedChanges = NO;
|
|
}
|
|
|
|
- (void) revertChanges
|
|
{
|
|
int ret = [[NSAlert alertWithMessageText:@"Revert changes"
|
|
defaultButton:nil
|
|
alternateButton:@"Cancel"
|
|
otherButton:nil
|
|
informativeTextWithFormat:@"Are you sure you wish to revert the changes in '%@'?\n\n You cannot undo this operation.", path] runModal];
|
|
|
|
if (ret == NSAlertDefaultReturn)
|
|
[self forceRevertChanges];
|
|
}
|
|
|
|
+ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
|
|
{
|
|
return NO;
|
|
}
|
|
|
|
+ (BOOL)isKeyExcludedFromWebScript:(const char *)name {
|
|
return NO;
|
|
}
|
|
|
|
@end
|