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

Parse diff hunks from merge diffs.

Browse Source 
For now only the differences to the first parent are shown.
This commit is contained in:
Uwe Hees
2011-05-07 09:07:04 +02:00
parent a67e25c426
commit 62b6dba983
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GLFileView.m
+9 -5
View File
@@ -381,13 +381,17 @@
line=[lines nextObject];
DLog(@"-=%@=-",line);
NSString *header=[line substringFromIndex:3];
NSRange hr = NSMakeRange(0, [header rangeOfString:@" @@"].location);
header=[header substringWithRange:hr];
int arity = 0; /* How many files are merged here? Count the '@'! */
while ([line characterAtIndex:arity] == '@')
arity++;
NSRange hr = NSMakeRange(arity+1, [line rangeOfString:@" @@"].location-arity-1);
NSString *header=[line substringWithRange:hr];
NSArray *pos=[header componentsSeparatedByString:@" "];
NSArray *pos_l=[[pos objectAtIndex:0] componentsSeparatedByString:@","];
NSArray *pos_r=[[pos objectAtIndex:1] componentsSeparatedByString:@","];
NSArray *pos_r=[[pos objectAtIndex:arity-1] componentsSeparatedByString:@","];
l_line=abs([[pos_l objectAtIndex:0]integerValue]);
r_line=[[pos_r objectAtIndex:0]integerValue];
@@ -403,7 +407,7 @@
[res appendString:[NSString stringWithFormat:@"<tr class='r'><td class='l'></td><td class='r'>%d</td>",r_line++]];
}
if(![s isEqualToString:@"\\"]){
[res appendString:[NSString stringWithFormat:@"<td class='code'>%@</td></tr>",[line substringFromIndex:1]]];
[res appendString:[NSString stringWithFormat:@"<td class='code'>%@</td></tr>",[line substringFromIndex:arity-1]]];
}
}
return res;