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

Tidy up the commit message to ensure it won't break the diff view.

Browse Source 
Renamed the GLFileView's +parseHTML into something more meaningful regarding what it actually does.

Also, the method might need to be moved to somewhere else...
This commit is contained in:
Romain Muller
2011-04-30 13:03:15 -07:00
parent a775582c00
commit 3f416bb8e7
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GLFileView.h
+1 -1
View File
@@ -31,7 +31,7 @@
- (void)showFile;
- (void)didLoad;
- (NSString *)parseBlame:(NSString *)txt;
+ (NSString *)parseHTML:(NSString *)txt;
+ (NSString *)cleanupHTML:(NSString *)txt;
+ (NSString *)parseDiff:(NSString *)txt;
+ (NSString *)parseDiffTree:(NSString *)txt withStats:(NSMutableDictionary *)stats;
+ (NSString *)getFileName:(NSString *)line;
GLFileView.m
+11 -8
View File
@@ -110,7 +110,7 @@
if(startFile==@"fileview"){
fileTxt=[file textContents:&theError];
if(!theError)
fileTxt=[GLFileView parseHTML:fileTxt];
fileTxt=[GLFileView cleanupHTML:fileTxt];
}else if(startFile==@"blame"){
fileTxt=[file blame:&theError];
if(!theError)
@@ -240,13 +240,16 @@
[super closeView];
}
+ (NSString *) parseHTML:(NSString *)txt
+ (NSString *) cleanupHTML:(NSString *)txt
{
txt=[txt stringByReplacingOccurrencesOfString:@"&" withString:@"&"];
txt=[txt stringByReplacingOccurrencesOfString:@"<" withString:@"&lt;"];
txt=[txt stringByReplacingOccurrencesOfString:@">" withString:@"&gt;"];
NSMutableString *newTxt = [NSMutableString stringWithString:txt];
[newTxt replaceOccurrencesOfString:@"&" withString:@"&amp;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
[newTxt replaceOccurrencesOfString:@"<" withString:@"&lt;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
[newTxt replaceOccurrencesOfString:@">" withString:@"&gt;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
[newTxt replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
[newTxt replaceOccurrencesOfString:@"'" withString:@"&apos;" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])];
return txt;
return newTxt;
}
+ (NSString *)parseDiffTree:(NSString *)txt withStats:(NSMutableDictionary *)stats
@@ -296,7 +299,7 @@
+ (NSString *)parseDiff:(NSString *)txt
{
txt=[self parseHTML:txt];
txt=[self cleanupHTML:txt];
NSMutableString *res=[NSMutableString string];
NSScanner *scan=[NSScanner scannerWithString:txt];
@@ -504,7 +507,7 @@
- (NSString *) parseBlame:(NSString *)txt
{
txt=[GLFileView parseHTML:txt];
txt=[GLFileView cleanupHTML:txt];
NSArray *lines = [txt componentsSeparatedByString:@"\n"];
NSString *line;
PBWebHistoryController.m
+2 -1
View File
@@ -167,7 +167,8 @@
}
}else{
if (subj) {
[subject appendString:[NSString stringWithFormat:@"%@<br/>",[line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]]];
NSString *trimmedLine = [line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
[subject appendString:[NSString stringWithFormat:@"%@<br/>",[GLFileView cleanupHTML:trimmedLine]]];
}else{
NSArray *comps=[line componentsSeparatedByString:@" "];
if([comps count]==2){