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

openFileMerge on "diff with..."

Browse Source
This commit is contained in:
German Laullon
2011-04-22 15:47:02 -07:00
parent 09011b82e9
commit cc10bda032
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBWebDiffController.m
+9 -2
View File
@@ -7,7 +7,6 @@
//
#import "PBWebDiffController.h"
#import "GLFileView.h"
@implementation PBWebDiffController
@@ -47,7 +46,15 @@
if ([diff length] == 0)
[script callWebScriptMethod:@"setMessage" withArguments:[NSArray arrayWithObject:@"There are no differences"]];
else
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:[GLFileView parseDiff:diff]]];
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:diff]];
}
// TODO: need to be refactoring
- (void) openFileMerge:(NSString*)file sha:(NSString *)sha sha2:(NSString *)sha2;
{
NSArray *args=[NSArray arrayWithObjects:@"difftool",@"--no-prompt",@"--tool=opendiff",sha,sha2,file,nil];
[repository handleInWorkDirForArguments:args];
}
@end