Merge branch 'branch-status'

Author: laullon

PBGitRepository.m

@@ -269,11 +269,6 @@ - (void) reloadRefs
 		PBGitRef *newRef = [PBGitRef refFromString:[components objectAtIndex:0]];
 		PBGitRevSpecifier *revSpec = [[PBGitRevSpecifier alloc] initWithRef:newRef];
 
-		NSString *bName;
-		if([PBGitRepository isLocalBranch:[components objectAtIndex:0] branchNameInto:&bName]){
-			[revSpec setAhead:[self countCommintsOf:[NSString stringWithFormat:@"origin/%@..%@",bName,bName]]];
-			[revSpec setBehind:[self countCommintsOf:[NSString stringWithFormat:@"%@..origin/%@",bName,bName]]];
-		}
 		[self addBranch:revSpec];
 		[self addRef:newRef fromParameters:components];
 		[oldBranches removeObject:revSpec];
@@ -299,19 +294,6 @@ +(bool)isLocalBranch:(NSString *)branch branchNameInto:(NSString **)name
 	return is;
 }
 
--(NSNumber *)countCommintsOf:(NSString *)branchs
-{
-	NSLog(@"branchs:'%@'",branchs);
-	NSArray *args = [NSArray arrayWithObjects:@"rev-list", branchs, nil];
-	int ret;
-	NSString *o = [self outputForArguments:args retValue:&ret];
-	if ((ret!=0) || ([o length]==0)) {
-		return NULL;
-	}
-	NSArray *commits = [o componentsSeparatedByString:@"\n"];
-	return [NSNumber numberWithInt:[commits count]];
-}
-
 - (void) lazyReload
 {
 	if (!hasChanged)

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

@@ -40,6 +40,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;

PBGitSidebarController.m

@@ -51,6 +51,7 @@ - (void)awakeFromNib
 	historyViewController = [[PBGitHistoryController alloc] initWithRepository:repository superController:superController];
 	commitViewController = [[PBGitCommitController alloc] initWithRepository:repository superController:superController];
 
+	[repository addObserver:self forKeyPath:@"refs" options:0 context:@"updateRefs"];
 	[repository addObserver:self forKeyPath:@"currentBranch" options:0 context:@"currentBranchChange"];
 	[repository addObserver:self forKeyPath:@"branches" options:(NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew) context:@"branchesModified"];
 
@@ -79,9 +80,7 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 		[sourceView reloadData];
 		[self selectCurrentBranch];
 		return;
-	}
-
-	if ([@"branchesModified" isEqualToString:context]) {
+	}else if ([@"branchesModified" isEqualToString:context]) {
 		NSInteger changeKind = [(NSNumber *)[change objectForKey:NSKeyValueChangeKindKey] intValue];
 
 		if (changeKind == NSKeyValueChangeInsertion) {
@@ -97,12 +96,49 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 			for (PBGitRevSpecifier *rev in removedRevSpecs)
 				[self removeRevSpec:rev];
 		}
-		return;
+	}else if ([@"updateRefs" isEqualToString:context]) {
+		for(PBGitSVRemoteItem* remote in [remotes children]){
+			NSLog(@"remote.title=%@",[remote title]);
+			[remote setAlert:[self remoteNeedFetch:[remote title]]];
+		}
+		
+		for(PBGitSVBranchItem* branch in [branches children]){
+			NSString *bName=[branch title];
+			[branch setAhead:[self countCommintsOf:[NSString stringWithFormat:@"origin/%@..%@",bName,bName]]];
+			[branch setBehind:[self countCommintsOf:[NSString stringWithFormat:@"%@..origin/%@",bName,bName]]];
+			[branch setIsCheckedOut:[branch.revSpecifier isEqual:[repository headRef]]];
+		}
+		
+	}else{
+		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
 	}
+}
 
-	[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+#pragma mark Badges Methods
+
+-(NSNumber *)countCommintsOf:(NSString *)range
+{
+	NSArray *args = [NSArray arrayWithObjects:@"rev-list", range, nil];
+	int ret;
+	NSString *o = [repository outputForArguments:args retValue:&ret];
+	if ((ret!=0) || ([o length]==0)) {
+		return NULL;
+	}
+	NSArray *commits = [o componentsSeparatedByString:@"\n"];
+	return [NSNumber numberWithInt:[commits count]];
+}
+
+
+-(bool)remoteNeedFetch:(NSString *)remote
+{
+	int ret;
+	NSArray *args = [NSArray arrayWithObjects:@"fetch", @"--dry-run", remote, nil];
+	NSString *o = [repository outputForArguments:args retValue:&ret];
+	return ((ret==0) && ([o length]!=0));
 }
 
+#pragma mark -----
+
 - (PBSourceViewItem *) selectedItem
 {
 	NSInteger index = [sourceView selectedRow];
@@ -223,14 +259,7 @@ - (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.behind=[item.revSpecifier behind];
-		cell.ahead=[item.revSpecifier ahead];
-	}else{
-		cell.behind=nil;
-		cell.ahead=nil;
-	}
+	[cell setBadge:[item badge]];
 	[cell setImage:[item icon]];
 }
 

PBSourceViewCell.h

@@ -9,16 +9,10 @@
 #import <Cocoa/Cocoa.h>
 #import "PBIconAndTextCell.h"
 
-
 @interface PBSourceViewCell : PBIconAndTextCell {
-	BOOL isCheckedOut;
-	NSNumber *behind;
-	NSNumber *ahead;
+	NSString *badge;
 }
 
-@property (assign) BOOL isCheckedOut;
-@property (assign) NSNumber *behind;
-@property (assign) NSNumber *ahead;
-
+@property (assign) NSString *badge;
 
 @end

PBSourceViewCell.m

@@ -15,8 +15,7 @@
 
 @implementation PBSourceViewCell
 
-@synthesize isCheckedOut;
-@synthesize behind,ahead;
+@synthesize badge;
 
 # pragma mark context menu delegate methods
 
@@ -35,11 +34,7 @@ - (NSMenu *) menuForEvent:(NSEvent *)event inRect:(NSRect)rect ofView:(NSOutline
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)outlineView
 {
-	if(behind || ahead || isCheckedOut){		
-		NSMutableString *badge=[NSMutableString string];
-		if(isCheckedOut) [badge appendString:@"✔ "];
-		if(ahead) [badge appendFormat:@"+%@",ahead];
-		if(behind) [badge appendFormat:@"-%@",behind];
+	if(badge){		
 		NSImage *checkedOutImage = [PBSourceViewBadge badge:badge forCell:self];
 		NSSize imageSize = [checkedOutImage size];
 		NSRect imageFrame;

PBSourceViewItem.h

@@ -26,6 +26,8 @@
 + (id)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
 + (id)itemWithTitle:(NSString *)title;
 
+- (NSString *)badge;
+
 - (void)addChild:(PBSourceViewItem *)child;
 - (void)removeChild:(PBSourceViewItem *)child;