Merge branch 'refs/heads/branch-status'

Author: laullon

PBGitRepository.h

@@ -128,6 +128,9 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 // for the scripting bridge
 - (void)findInModeScriptCommand:(NSScriptCommand *)command;
 
+-(NSNumber *)countCommintsOf:(NSString *)branchs;
++(bool)isLocalBranch:(NSString *)name;
+
 
 @property (assign) BOOL hasChanged;
 @property (readonly) PBGitWindowController *windowController;

PBGitRepository.m

@@ -269,6 +269,10 @@ - (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];
@@ -284,6 +288,23 @@ - (void) reloadRefs
 	[[[self windowController] window] setTitle:[self displayName]];
 }
 
++(bool)isLocalBranch:(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;
+	}
+	NSArray *commits = [o componentsSeparatedByString:@"\n"];
+	return [NSNumber numberWithInt:[commits count]];
+}
+
 - (void) lazyReload
 {
 	if (!hasChanged)

PBGitRevSpecifier.h

@@ -14,6 +14,8 @@
 	NSArray *parameters;
 	NSURL *workingDirectory;
 	BOOL isSimpleRef;
+	NSNumber *behind;
+	NSNumber *ahead;
 }
 
 - (id) initWithParameters:(NSArray *)params description:(NSString *)descrip;
@@ -37,5 +39,7 @@
 @property(readonly) NSArray *parameters;
 @property(retain)   NSURL *workingDirectory;
 @property(readonly) BOOL isSimpleRef;
+@property(assign) NSNumber *behind;
+@property(assign) NSNumber *ahead;
 
 @end

PBGitRevSpecifier.m

@@ -13,6 +13,7 @@ @implementation PBGitRevSpecifier
 
 @synthesize parameters, description, workingDirectory;
 @synthesize isSimpleRef;
+@synthesize behind,ahead;
 
 
 // internal designated init

PBGitSidebarController.m

@@ -223,8 +223,14 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item
 
 - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(PBSourceViewCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(PBSourceViewItem *)item
 {
-	cell.isCheckedOut = [item.revSpecifier isEqual:[repository headRef]];
-
+	if(item.revSpecifier!=NULL){
+		cell.isCheckedOut = [item.revSpecifier isEqual:[repository headRef]];
+		cell.behind=[item.revSpecifier behind];
+		cell.ahead=[item.revSpecifier ahead];
+	}else{
+		cell.behind=nil;
+		cell.ahead=nil;
+	}
 	[cell setImage:[item icon]];
 }
 

PBSourceViewBadge.h

@@ -13,6 +13,7 @@
 
 }
 
++ (NSImage *) badge:(NSString *)badge forCell:(NSTextFieldCell *)cell;
 + (NSImage *) checkedOutBadgeForCell:(NSTextFieldCell *)cell;
 + (NSImage *) numericBadge:(NSInteger)number forCell:(NSTextFieldCell *)cell;
 

PBSourceViewCell.h

@@ -12,8 +12,13 @@
 
 @interface PBSourceViewCell : PBIconAndTextCell {
 	BOOL isCheckedOut;
+	NSNumber *behind;
+	NSNumber *ahead;
 }
 
 @property (assign) BOOL isCheckedOut;
+@property (assign) NSNumber *behind;
+@property (assign) NSNumber *ahead;
+
 
 @end

PBSourceViewCell.m

@@ -16,16 +16,17 @@
 @implementation PBSourceViewCell
 
 @synthesize isCheckedOut;
+@synthesize behind,ahead;
 
 # pragma mark context menu delegate methods
 
 - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutlineView *)view
 {
 	NSPoint point = [view convertPoint:[event locationInWindow] fromView:nil];
 	NSInteger row = [view rowAtPoint:point];
-
+	
 	PBGitSidebarController *controller = [view delegate];
-
+	
 	return [controller menuForRow:row];
 }
 
@@ -34,21 +35,25 @@ - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutline
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)outlineView
 {
-	if (isCheckedOut) {
-		NSImage *checkedOutImage = [PBSourceViewBadge checkedOutBadgeForCell:self];
+	if(behind || ahead || isCheckedOut){		
+		NSMutableString *badge=[NSMutableString string];
+		if(isCheckedOut) [badge appendString:@"✔ "];
+		if(ahead) [badge appendFormat:@"+%@",ahead];
+		if(behind) [badge appendFormat:@"-%@",behind];
+		NSImage *checkedOutImage = [PBSourceViewBadge badge:badge forCell:self];
 		NSSize imageSize = [checkedOutImage size];
 		NSRect imageFrame;
 		NSDivideRect(cellFrame, &imageFrame, &cellFrame, imageSize.width + 3, NSMaxXEdge);
 		imageFrame.size = imageSize;
-
+		
 		if ([outlineView isFlipped])
 			imageFrame.origin.y += floor((cellFrame.size.height + imageFrame.size.height) / 2);
 		else
 			imageFrame.origin.y += ceil((cellFrame.size.height - imageFrame.size.height) / 2);
-
+		
 		[checkedOutImage compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver];
 	}
-
+	
 	[super drawWithFrame:cellFrame inView:outlineView];
 }