Merge pull request brotherbard#101 from barrywardell/master

Improvements to commit view

Author: laullon

PBWebCommitController.h

@@ -19,11 +19,13 @@
 
 	NSString* currentSha;
 	NSString* diff;
+	BOOL showLongDiffs;
 }
 
 - (void) changeContentTo: (PBGitCommit *) content;
 - (void) sendKey: (NSString*) key;
 - (void) openFileMerge:(NSString*)file sha:(NSString *)sha sha2:(NSString *)sha2;
+- (void) showLongDiff;
 
 - (void) didLoad;
 // Called when a commit or parent link is clicked.

PBWebCommitController.m

@@ -32,8 +32,14 @@ @implementation PBWebCommitController
 
 @synthesize diff;
 
+- (void) showLongDiff
+{
+	showLongDiffs = TRUE;
+}
+
 - (void) awakeFromNib
 {
+	showLongDiffs = FALSE;
 	startFile = @"history";
 	[super awakeFromNib];
 }
@@ -118,10 +124,16 @@ - (void)commitDetailsLoaded:(NSNotification *)notification
 	[args addObjectsFromArray:parents];
 	[args addObject:currentSha];
 	NSString *d = [repository outputInWorkdirForArguments:args];
-	NSString *diffs = [GLFileView parseDiff:d];
-	
-	NSString *html = [NSString stringWithFormat:@"%@%@<div id='diffs'>%@</div>",header,fileList,diffs];
-	
+	NSString *html;
+	if(showLongDiffs || [d length] < 200000)
+	{
+		showLongDiffs = FALSE;
+		NSString *diffs = [GLFileView parseDiff:d];
+		html = [NSString stringWithFormat:@"%@%@<div id='diffs'>%@</div>",header,fileList,diffs];
+	} else {
+		html = [NSString stringWithFormat:@"%@%@<div id='diffs'><p>This is a very large commit. It may take a long time to load the diff. Click <a href='' onclick='showFullDiff(); return false;'>here</a> to show anyway.</p></div>",header,fileList,currentSha];
+	}
+
 	html = [html stringByReplacingOccurrencesOfString:@"{SHA_PREV}" withString:[NSString stringWithFormat:@"%@^",currentSha]];
 	html = [html stringByReplacingOccurrencesOfString:@"{SHA}" withString:currentSha];
 
@@ -216,13 +228,20 @@ - (NSArray *)parseHeader:(NSString *)text
 - (NSString *)htmlForHeader:(NSArray *)header withRefs:(NSString *)badges
 {
 	NSString *last_mail = @"";
+	NSMutableString *subjectFirst = [NSMutableString string];
 	NSMutableString *auths=[NSMutableString string];
 	NSMutableString *refs=[NSMutableString string];
 	NSMutableString *subject=[NSMutableString string];
+	NSMutableString *all=[NSMutableString string];
 
 	for (NSDictionary *item in header) {
 		if ([[item objectForKey:kHeaderKeyName] isEqualToString:@"subject"]) {
-			[subject appendString:[NSString stringWithFormat:@"%@<br/>",[GLFileView escapeHTML:[item objectForKey:kHeaderKeyContent]]]];
+			if ([subjectFirst isEqualToString:@""]) {
+				[subjectFirst appendString:[NSString stringWithFormat:@"%@",[GLFileView escapeHTML:[item objectForKey:kHeaderKeyContent]]]];
+			} else {
+				[subject appendString:[NSString stringWithFormat:@"%@<br/>",[GLFileView escapeHTML:[item objectForKey:kHeaderKeyContent]]]];
+			}
+
 		}else{
 			if([[item objectForKey:kHeaderKeyContent] isKindOfClass:[NSString class]]){
 				[refs appendString:[NSString stringWithFormat:@"<tr><td>%@</td><td><a href='' onclick='selectCommit(this.innerHTML); return false;'>%@</a></td></tr>",[item objectForKey:kHeaderKeyName],[item objectForKey:kHeaderKeyContent]]];
@@ -251,7 +270,17 @@ - (NSString *)htmlForHeader:(NSArray *)header withRefs:(NSString *)badges
 		}
 	}	
 
-	return [NSString stringWithFormat:@"<div id='header' class='clearfix'><table class='references'>%@</table><p class='subject'>%@</p>%@<div id='badges'>%@</div></div>",refs,subject,auths,badges];
+	[all appendString:[NSString stringWithFormat:@"<div id='header' class='clearfix'><table class='references'>%@</table><p class='subject'>%@</p>%@",refs,subjectFirst,auths]];
+
+	if (![badges isEqualToString:@""])
+		[all appendString:[NSString stringWithFormat:@"<div id='badges'>%@</div>",badges]];
+
+	[all appendString:@"</div>"];
+
+	if (![subject isEqualToString:@""])
+		[all appendString:[NSString stringWithFormat:@"<p class='subjectDetail'>%@</p>",subject]];
+
+	return all;
 }
 
 - (NSString *) arbitraryHashForString:(NSString*)concat {

html/views/history/history.css

@@ -102,6 +102,11 @@ a.servicebutton {
 	font-size: 13px;
 	padding: 5px;
 	float: none;
+	font-weight: bold;
+}
+
+p.subjectDetail {
+    padding: 5px;
 }
 
 #files {
@@ -198,6 +203,7 @@ a.showdiff {
 
 #filelist tr td {
 	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #ccc;
 }
 
 #filelist a {
@@ -308,7 +314,6 @@ a.showdiff {
 }
 
 #diffs {
-	-webkit-box-shadow: inset 0px 5px 5px #ccc;
 	width: 100%;
 	display: block;
 	padding-top: 10px;

html/views/history/history.js

@@ -21,3 +21,7 @@ var showCommit = function(data){
 	$("commit").innerHTML=data;
 }
 
+var showFullDiff = function() {
+    Controller.showLongDiff();
+    Controller.updateView();
+}