From 3b38beb4c406baf9d887c54ab615463c9cdde45b Mon Sep 17 00:00:00 2001 From: Kamal Fariz Mahyuddin Date: Tue, 15 Feb 2011 22:47:22 +0800 Subject: [PATCH 1/2] Add clickable commit SHAs in blame view --- GLFileView.m | 8 +++++++- html/views/blame/blame.js | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/GLFileView.m b/GLFileView.m index bec36c65c..8bf71128d 100644 --- a/GLFileView.m +++ b/GLFileView.m @@ -194,6 +194,7 @@ - (NSString *) parseBlame:(NSString *)txt line=[lines objectAtIndex:i]; NSArray *header=[line componentsSeparatedByString:@" "]; if([header count]==4){ + NSString *commitID = (NSString *)[header objectAtIndex:0]; int nLines=[(NSString *)[header objectAtIndex:3] intValue]; [res appendFormat:@"\n",nLines]; line=[lines objectAtIndex:++i]; @@ -206,6 +207,11 @@ - (NSString *) parseBlame:(NSString *)txt summary=[line stringByReplacingOccurrencesOfString:@"summary" withString:@""]; } } + NSRange trunc_c={0,7}; + NSString *truncate_c=commitID; + if([commitID length]>8){ + truncate_c=[commitID substringWithRange:trunc_c]; + } NSRange trunc={0,30}; NSString *truncate_a=author; if([author length]>30){ @@ -215,7 +221,7 @@ - (NSString *) parseBlame:(NSString *)txt if([summary length]>30){ truncate_s=[summary substringWithRange:trunc]; } - NSString *block=[NSString stringWithFormat:@"

%@

%@

\n\n",truncate_a,truncate_s]; + NSString *block=[NSString stringWithFormat:@"

%@

%@

%@

\n\n",commitID,truncate_c,truncate_a,truncate_s]; [headers setObject:block forKey:[header objectAtIndex:0]]; } [res appendString:[headers objectForKey:[header objectAtIndex:0]]]; diff --git a/html/views/blame/blame.js b/html/views/blame/blame.js index a89326bc7..5bcbc627e 100644 --- a/html/views/blame/blame.js +++ b/html/views/blame/blame.js @@ -7,3 +7,7 @@ var showFile = function(txt) { SyntaxHighlighter.highlight(); return; } + +var selectCommit = function(a) { + Controller.selectCommit_(a); +} \ No newline at end of file From 56a38e202a5a8c925ad88e56827864f57c7a7d59 Mon Sep 17 00:00:00 2001 From: Kamal Fariz Mahyuddin Date: Tue, 15 Feb 2011 23:08:29 +0800 Subject: [PATCH 2/2] Put SHA on same line as author --- GLFileView.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GLFileView.m b/GLFileView.m index 8bf71128d..0bc3bd366 100644 --- a/GLFileView.m +++ b/GLFileView.m @@ -212,16 +212,16 @@ - (NSString *) parseBlame:(NSString *)txt if([commitID length]>8){ truncate_c=[commitID substringWithRange:trunc_c]; } - NSRange trunc={0,30}; + NSRange trunc={0,22}; NSString *truncate_a=author; - if([author length]>30){ + if([author length]>22){ truncate_a=[author substringWithRange:trunc]; } NSString *truncate_s=summary; if([summary length]>30){ truncate_s=[summary substringWithRange:trunc]; } - NSString *block=[NSString stringWithFormat:@"

%@

%@

%@

\n\n",commitID,truncate_c,truncate_a,truncate_s]; + NSString *block=[NSString stringWithFormat:@"

%@ %@

%@

\n\n",commitID,truncate_c,truncate_a,truncate_s]; [headers setObject:block forKey:[header objectAtIndex:0]]; } [res appendString:[headers objectForKey:[header objectAtIndex:0]]];