Merge branch 'master' into experimental

Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m

Author: laullon

GLFileView.h

@@ -36,6 +36,11 @@
 +(BOOL)isStartDiff:(NSString *)line;
 +(BOOL)isStartBlock:(NSString *)line;
 
++(NSArray *)getFilesNames:(NSString *)line;
++(BOOL)isBinaryFile:(NSString *)line;
++(NSString*)mimeTypeForFileName:(NSString*)file;
++(BOOL)isImage:(NSString*)file;
+
 @property(retain) NSMutableArray *groups;
 @property(retain) NSString *logFormat;
 

GLFileView.m

@@ -181,7 +181,6 @@ - (MGScopeBarGroupSelectionMode)scopeBar:(MGScopeBar *)theScopeBar selectionMode
 
 - (void)scopeBar:(MGScopeBar *)theScopeBar selectedStateChanged:(BOOL)selected forItem:(NSString *)identifier inGroup:(int)groupNumber
 {
-	NSLog(@"startFile=%@ identifier=%@ groupNumber=%d",startFile,identifier,groupNumber);
 	if((groupNumber==0) && (startFile!=identifier)){
 		NSString *path = [NSString stringWithFormat:@"html/views/%@", identifier];
 		NSString *html = [[NSBundle mainBundle] pathForResource:@"index" ofType:@"html" inDirectory:path];
@@ -238,11 +237,10 @@ + (NSString *)parseDiffTree:(NSString *)txt withStats:(NSMutableDictionary *)sta
 	NSArray *lines = [txt componentsSeparatedByString:@"\n"];
 	NSMutableString *res=[NSMutableString string];
 	[res appendString:@"<table id='filelist'>"];
-	int i;
-	for (i=1; i<[lines count]; i++) {
-		NSString *line=[lines objectAtIndex:i];
-		NSArray *fields=[line componentsSeparatedByString:@" "];
-		NSArray *fileStatus=[[fields objectAtIndex:4] componentsSeparatedByString:@"\t"];
+	for (NSString *line in lines) {
+		if([line length]<98) continue;
+		line=[line substringFromIndex:97];
+		NSArray *fileStatus=[line componentsSeparatedByString:@"\t"];
 		NSString *status=[[fileStatus objectAtIndex:0] substringToIndex:1]; // ignore the score
 		NSString *file=[fileStatus objectAtIndex:1];
 		NSString *txt=file;
@@ -331,17 +329,19 @@ + (NSString *)parseDiff:(NSString *)txt
 		}else if(inDiff){
 			[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
 			if([self isBinaryFile:line]){
-				NSLog(@"line='%@'",line);
 				[res appendString:@"</td></tr></thead><tbody>"];
 				NSArray *files=[self getFilesNames:line];
-				NSLog(@"files='%@'",files);
 				if(![[files objectAtIndex:0] isAbsolutePath]){
 					[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'>%@</td></tr>",[files objectAtIndex:0]]];
-					[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'><img src='GitX://{SHA}:/prev/%@'/></td></tr>",[files objectAtIndex:0]]];
+					if([GLFileView isImage:[files objectAtIndex:0]]){
+						[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'><img src='GitX://{SHA}:/prev/%@'/></td></tr>",[files objectAtIndex:0]]];
+					}
 				}
 				if(![[files objectAtIndex:1] isAbsolutePath]){
 					[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'>%@</td></tr>",[files objectAtIndex:1]]];
-					[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'><img src='GitX://{SHA}/%@'/></td></tr>",[files objectAtIndex:1]]];
+					if([GLFileView isImage:[files objectAtIndex:1]]){
+						[res appendString:[NSString stringWithFormat:@"<tr><td colspan='3'><img src='GitX://{SHA}/%@'/></td></tr>",[files objectAtIndex:1]]];
+					}
 				}
 			}
 		}
@@ -362,7 +362,6 @@ +(NSArray *)getFilesNames:(NSString *)line
 {
 	NSString *a;
 	NSString *b;
-	NSLog(@"line='%@'",line);
 	NSScanner *scanner=[NSScanner scannerWithString:line];
 	if([scanner scanString:@"Binary files " intoString:NULL]){
 		[scanner scanUpToString:@" and" intoString:&a];
@@ -375,10 +374,34 @@ +(NSArray *)getFilesNames:(NSString *)line
 	if (![b isAbsolutePath]) {
 		b=[b substringFromIndex:2];
 	}
-
+	
 	return [NSArray arrayWithObjects:a,b,nil];
 }
 
++(NSString*)mimeTypeForFileName:(NSString*)name
+{
+    NSString *mimeType = nil;
+	NSInteger i=[name rangeOfString:@"." options:NSBackwardsSearch].location;
+	if(i!=NSNotFound){
+		NSString *ext=[name substringFromIndex:i+1];
+		CFStringRef UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (CFStringRef)ext, NULL);
+		if(UTI){
+			CFStringRef registeredType = UTTypeCopyPreferredTagWithClass(UTI, kUTTagClassMIMEType);
+			if(registeredType){
+				mimeType = NSMakeCollectable(registeredType);
+			}
+			CFRelease(UTI);
+		}
+	}
+    return mimeType;
+}
+
++(BOOL)isImage:(NSString*)file
+{
+	NSString *mimeType=[GLFileView mimeTypeForFileName:file];
+	return (mimeType!=nil) && ([mimeType rangeOfString:@"image/" options:NSCaseInsensitiveSearch].location!=NSNotFound);
+}
+
 +(BOOL)isBinaryFile:(NSString *)line
 {
 	return (([line length]>12) && [[line substringToIndex:12] isEqualToString:@"Binary files"]);

PBGitHistoryList.m

@@ -287,7 +287,7 @@ - (BOOL) selectedBranchNeedsNewGraph:(PBGitRevSpecifier *)rev
 
 - (BOOL) haveRefsBeenModified
 {
-	[repository reloadRefs];
+	//[repository reloadRefs];
 
 	NSMutableSet *currentRefSHAs = [NSMutableSet setWithArray:[repository.refs allKeys]];
 	[currentRefSHAs minusSet:lastRefSHAs];

PBGitRepository.h

@@ -146,8 +146,7 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (void)findInModeScriptCommand:(NSScriptCommand *)command;
 
 -(NSNumber *)countCommintsOf:(NSString *)branchs;
-+(bool)isLocalBranch:(NSString *)name;
-- (NSMenu *) menu;
++(bool)isLocalBranch:(NSString *)branch branchNameInto:(NSString **)name;
 
 @property (assign) BOOL hasChanged;
 @property (readonly) PBGitWindowController *windowController;

PBGitRepository.m

@@ -300,10 +300,6 @@ - (void) reloadRefs
 		PBGitRef *newRef = [PBGitRef refFromString:[components objectAtIndex:0]];
 		PBGitRevSpecifier *revSpec = [[PBGitRevSpecifier alloc] initWithRef:newRef];
 
-		if([PBGitRepository isLocalBranch:[components objectAtIndex:0]]){
-			[revSpec setAhead:[self countCommintsOf:[NSString stringWithFormat:@"origin..%@",[components objectAtIndex:0]]]];
-			[revSpec setBehind:[self countCommintsOf:[NSString stringWithFormat:@"%@..origin",[components objectAtIndex:0]]]];
-		}
 		[self addBranch:revSpec];
 		[self addRef:newRef fromParameters:components];
 		[oldBranches removeObject:revSpec];
@@ -322,21 +318,14 @@ - (void) reloadRefs
 	[[[self windowController] window] setTitle:[self displayName]];
 }
 
-+(bool)isLocalBranch:(NSString *)name
++(bool)isLocalBranch:(NSString *)branch branchNameInto:(NSString **)name
 {
-	NSScanner *scanner=[NSScanner scannerWithString:name];
-	return [scanner scanString:@"refs/heads/" intoString:NULL];
-}
-
--(NSNumber *)countCommintsOf:(NSString *)branchs
-{
-	NSArray *args = [NSArray arrayWithObjects:@"rev-list", branchs, nil];
-	NSString *o = [self outputForArguments:args];
-	if ([o length]==0) {
-		return NULL;
+	NSScanner *scanner=[NSScanner scannerWithString:branch];
+	bool is=[scanner scanString:@"refs/heads/" intoString:NULL];
+	if(is && (name)){
+		*name=[branch substringFromIndex:[scanner scanLocation]];
 	}
-	NSArray *commits = [o componentsSeparatedByString:@"\n"];
-	return [NSNumber numberWithInt:[commits count]];
+	return is;
 }
 
 - (void) lazyReload

PBGitSVBranchItem.h

@@ -11,9 +11,15 @@
 
 
 @interface PBGitSVBranchItem : PBSourceViewItem {
-
+	BOOL isCheckedOut;
+	NSNumber *behind;
+	NSNumber *ahead;
 }
 
 + (id)branchItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
 
+@property (assign) BOOL isCheckedOut;
+@property (assign) NSNumber *behind;
+@property (assign) NSNumber *ahead;
+
 @end

PBGitSVBranchItem.m

@@ -11,6 +11,8 @@
 
 @implementation PBGitSVBranchItem
 
+@synthesize isCheckedOut;
+@synthesize behind,ahead;
 
 + (id)branchItemWithRevSpec:(PBGitRevSpecifier *)revSpecifier
 {
@@ -30,4 +32,17 @@ - (NSImage *) icon
 	return branchImage;
 }
 
+
+- (NSString *) badge{
+	NSMutableString *badge=nil;
+	if(isCheckedOut || ahead || behind){
+		badge=[NSMutableString string];
+		if(isCheckedOut) [badge appendString:@"✔ "];
+		if(ahead) [badge appendFormat:@"+%@",ahead];
+		if(behind) [badge appendFormat:@"-%@",behind];
+	}
+	return badge;
+}
+
+
 @end

PBGitSVRemoteItem.h

@@ -11,9 +11,11 @@
 
 
 @interface PBGitSVRemoteItem : PBSourceViewItem {
-
+	BOOL alert;
 }
 
+@property (assign) BOOL alert;
+
 + (id)remoteItemWithTitle:(NSString *)title;
 
 @end

PBGitSVRemoteItem.m

@@ -12,6 +12,7 @@
 
 @implementation PBGitSVRemoteItem
 
+@synthesize alert;
 
 + (id)remoteItemWithTitle:(NSString *)title
 {
@@ -38,4 +39,8 @@ - (PBGitRef *) ref
 	return [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:self.title]];
 }
 
+- (NSString *)badge
+{
+	return (alert ? @"!" : nil);
+}
 @end

PBGitSidebarController.h

@@ -47,6 +47,9 @@
 
 - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
 
+-(NSNumber *)countCommintsOf:(NSString *)range;
+-(bool)remoteNeedFetch:(NSString *)remote;
+
 @property(readonly) NSMutableArray *items;
 @property(readonly) NSView *sourceListControlsView;
 @property(readonly) PBGitHistoryController *historyViewController;