From 6959a157d74f3e356a87cbbc343d888238176022 Mon Sep 17 00:00:00 2001
From: German Laullon <laullon@gmail.com>
Date: Thu, 9 Dec 2010 21:32:24 -0800
Subject: [PATCH] some diff bug

---
 GLFileView.m                   | 58 ++++++++++++++++------------------
 html/views/diff/diffWindow.css | 16 ++++------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/GLFileView.m b/GLFileView.m
index f9d7086..decb261 100644
--- a/GLFileView.m
+++ b/GLFileView.m
@@ -226,19 +226,22 @@
 + (NSString *) parseDiff:(NSString *)txt
 {
 	txt=[self parseHTML:txt];
-	  
+	
 	NSArray *lines = [txt componentsSeparatedByString:@"\n"];
 	NSString *line;
 	NSMutableString *res=[NSMutableString string];
 	BOOL inDiff=FALSE;
-	int i=0;
-	line=[lines objectAtIndex:i++];
-	while(i<[lines count]){
+	BOOL inBlock=FALSE;
+	
+	int l_int,l_line,l_end;
+	int r_int,r_line,r_end;
+	int i;
+	for (i=0; i<[lines count]; i++) {
+		line=[lines objectAtIndex:i];
+		
 		if([GLFileView isStartBlock:line]){
-
-			int l_int,l_line,l_end;
-			int r_int,r_line,r_end;
-			
+			[res appendString:@"</td></tr></thead><tbody>"];
+			inDiff=FALSE;
 			NSString *header=[line substringFromIndex:3];
 			NSRange hr = NSMakeRange(0, [header rangeOfString:@" @@"].location);
 			header=[header substringWithRange:hr];
@@ -254,34 +257,27 @@
 			r_end=r_line+[[pos_r objectAtIndex:1]integerValue];
 			
 			[res appendString:[NSString stringWithFormat:@"<tr class='header'><td colspan='3'>%@</td></tr>",line]];
-			
-			do{
-				line=[lines objectAtIndex:i++];
-				NSString *s=[line substringToIndex:1];
-				
-				if([s isEqualToString:@" "]){
-					[res appendString:[NSString stringWithFormat:@"<tr><td class='l'>%d</td><td class='r'>%d</td>",l_line++,r_line++]];
-				}else if([s isEqualToString:@"-"]){
-					[res appendString:[NSString stringWithFormat:@"<tr class='l'><td class='l'>%d</td><td class='r'></td>",l_line++]];
-				}else if([s isEqualToString:@"+"]){
-					[res appendString:[NSString stringWithFormat:@"<tr class='r'><td class='l'></td><td class='r'>%d</td>",r_line++]];
-				}
-				[res appendString:[NSString stringWithFormat:@"<td class='code'>%@</td></tr>",line]];		
-				//NSLog(@"%@ %d(%d)-%d(%d)",s,l_line,(l_int+l_count),r_line,(r_int+r_count));
-			}while((l_line<l_end) || (r_line<r_end));
-			
+			inBlock=TRUE;
+		}else if(inBlock){
+			NSString *s=[line substringToIndex:1];
+			if([s isEqualToString:@" "]){
+				[res appendString:[NSString stringWithFormat:@"<tr><td class='l'>%d</td><td class='r'>%d</td>",l_line++,r_line++]];
+			}else if([s isEqualToString:@"-"]){
+				[res appendString:[NSString stringWithFormat:@"<tr class='l'><td class='l'>%d</td><td class='r'></td>",l_line++]];
+			}else if([s isEqualToString:@"+"]){
+				[res appendString:[NSString stringWithFormat:@"<tr class='r'><td class='l'></td><td class='r'>%d</td>",r_line++]];
+			}
+			[res appendString:[NSString stringWithFormat:@"<td class='code'>%@</td></tr>",[line substringFromIndex:1]]];		
+			if(!(l_line<l_end) && !(r_line<r_end))
+				inBlock=FALSE;
 		}else if([GLFileView isStartDiff:line]){
 			if(inDiff)
 				[res appendString:@"</tbody></table>"];
 			inDiff=TRUE;
 			[res appendString:@"<table class='diff'><thead><tr><td colspan='3'>"];
-			do{
-				[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
-				line=[lines objectAtIndex:i++];
-			}while(![GLFileView isStartBlock:line]);
-			[res appendString:@"</td></tr></thead><tbody>"];
-		}else{
-			line=[lines objectAtIndex:i++];
+			[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
+		}else if(inDiff){
+			[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
 		}
 	}
 	if(inDiff)
diff --git a/html/views/diff/diffWindow.css b/html/views/diff/diffWindow.css
index fbe0f9e..d752659 100644
--- a/html/views/diff/diffWindow.css
+++ b/html/views/diff/diffWindow.css
@@ -3,8 +3,7 @@ table.diff {
 	border: 1px solid #8f8f8f;
 	width: 100%;
 	border-collapse: collapse;
-	margin-right: 5px;
-	margin-left: 5px;
+	margin-bottom: 10px;
 }
 
 table.diff tr td {
@@ -48,17 +47,14 @@ table.diff thead tr td p {
 	margin: 0;
 }
 
-#diff table.diff thead {
-	background-image: -webkit-gradient(linear,left top,left bottom, color-stop(0, rgba(244, 244, 244,1)), color-stop(1, rgba(215,215,215,1)));
+table.diff thead {
+	background-image: -webkit-gradient(linear,left top,left bottom, color-stop(0, rgba(206,206,206,1)), color-stop(1, rgba(166,166,166,1)));
 }
 
-#diff table.diff thead tr td {
+table.diff thead tr td {
 	padding: 5px;
 }
 
-#diff table.diff tbody tr.header {
-	background-image: -webkit-gradient(linear,left top,left bottom, color-stop(0, rgba(206,206,206,1)), color-stop(1, rgba(166,166,166,1)));
-/* Saf4
-
-+, Chrome */
+table.diff tbody tr.header {
+	background-image: -webkit-gradient(linear,left top,left bottom, color-stop(0, rgba(244, 244, 244,1)), color-stop(1, rgba(215,215,215,1)));
 }
\ No newline at end of file