From 12bb9623a477a5ae7b81bce96015b202fd3efa5c Mon Sep 17 00:00:00 2001 From: Romain Muller Date: Mon, 9 May 2011 22:18:17 -0700 Subject: [PATCH 1/2] NULL-safe escapeHTML: --- GLFileView.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GLFileView.m b/GLFileView.m index 6d4e7e5..92baab9 100644 --- a/GLFileView.m +++ b/GLFileView.m @@ -242,6 +242,8 @@ + (NSString *) escapeHTML:(NSString *)txt { + if (txt == nil) + return txt; NSMutableString *newTxt = [NSMutableString stringWithString:txt]; [newTxt replaceOccurrencesOfString:@"&" withString:@"&" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])]; [newTxt replaceOccurrencesOfString:@"<" withString:@"<" options:NSLiteralSearch range:NSMakeRange(0, [newTxt length])]; From e546078dd96a55213ffe9883556778c499bdabae Mon Sep 17 00:00:00 2001 From: Romain Muller Date: Mon, 9 May 2011 22:32:13 -0700 Subject: [PATCH 2/2] Fixed issue with the initial commit by adding --root in diff-tree arguments. --- PBWebHistoryController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m index a870c30..d6ea41c 100644 --- a/PBWebHistoryController.m +++ b/PBWebHistoryController.m @@ -107,11 +107,11 @@ NSMutableDictionary *stats=[self parseStats:details]; // File list - NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]]; + NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]]; NSString *fileList=[GLFileView parseDiffTree:dt withStats:stats]; // Diffs list - NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]]; + NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--root", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]]; NSString *diffs=[GLFileView parseDiff:d]; NSString *html=[NSString stringWithFormat:@"%@%@
%@
",header,fileList,diffs];