Merge branch 'experimental' of https://github.com/laullon/gitx into experimental

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

Author: laullon

PBGitSidebarController.m

@@ -48,7 +48,7 @@ - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGit
 	self = [super initWithRepository:theRepository superController:controller];
 	[sourceView setDelegate:self];
 	items = [NSMutableArray array];
-
+	
 	return self;
 }
 
@@ -57,19 +57,19 @@ - (void)awakeFromNib
 	[super awakeFromNib];
 	window.contentView = self.view;
 	[self populateList];
-
+	
 	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"];
 	[repository addObserver:self forKeyPath:@"stashController.stashes" options:NSKeyValueObservingOptionNew context:kObservingContextStashes];
 	[repository addObserver:self forKeyPath:@"submoduleController.submodules" options:NSKeyValueObservingOptionNew context:kObservingContextSubmodules];
-
-
+	
+	
 	[self menuNeedsUpdate:[actionButton menu]];
-
+	
 	if ([PBGitDefaults showStageView])
 		[self selectStage];
 	else
@@ -83,12 +83,12 @@ - (void)closeView
 {
 	[historyViewController closeView];
 	[commitViewController closeView];
-
+	
 	[repository removeObserver:self forKeyPath:@"currentBranch"];
 	[repository removeObserver:self forKeyPath:@"branches"];
 	[repository removeObserver:self forKeyPath:@"stashController.stashes"];
 	[repository removeObserver:self forKeyPath:@"submoduleController.submodules"];
-
+	
 	[super closeView];
 }
 
@@ -99,7 +99,7 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 		[self selectCurrentBranch];
 	}else if ([@"branchesModified" isEqualToString:context]) {
 		NSInteger changeKind = [(NSNumber *)[change objectForKey:NSKeyValueChangeKindKey] intValue];
-
+		
 		if (changeKind == NSKeyValueChangeInsertion) {
 			NSArray *newRevSpecs = [change objectForKey:NSKeyValueChangeNewKey];
 			for (PBGitRevSpecifier *rev in newRevSpecs) {
@@ -195,7 +195,7 @@ - (PBSourceViewItem *) selectedItem
 {
 	NSInteger index = [sourceView selectedRow];
 	PBSourceViewItem *item = [sourceView itemAtRow:index];
-
+	
 	return item;
 }
 
@@ -261,7 +261,7 @@ - (void)addRevSpec:(PBGitRevSpecifier *)rev
 		[sourceView reloadData];
 		return;
 	}
-
+	
 	NSArray *pathComponents = [[rev simpleRef] componentsSeparatedByString:@"/"];
 	if ([pathComponents count] < 2)
 		[branches addChild:[PBSourceViewItem itemWithRevSpec:rev]];
@@ -271,17 +271,17 @@ - (void)addRevSpec:(PBGitRevSpecifier *)rev
 		[tags addRev:rev toPath:[pathComponents subarrayWithRange:NSMakeRange(2, [pathComponents count] - 2)]];
 	else if ([[rev simpleRef] hasPrefix:@"refs/remotes/"])
 		[remotes addRev:rev toPath:[pathComponents subarrayWithRange:NSMakeRange(2, [pathComponents count] - 2)]];
-
+	
 	[sourceView reloadData];
 }
 
 - (void) removeRevSpec:(PBGitRevSpecifier *)rev
 {
 	PBSourceViewItem *item = [self itemForRev:rev];
-
+	
 	if (!item)
 		return;
-
+	
 	PBSourceViewItem *parent = item.parent;
 	[parent removeChild:item];
 	[sourceView reloadData];
@@ -298,19 +298,19 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)notification
 {
 	NSInteger index = [sourceView selectedRow];
 	PBSourceViewItem *item = [sourceView itemAtRow:index];
-
+	
 	if ([item revSpecifier]) {
 		if (![repository.currentBranch isEqual:[item revSpecifier]])
 			repository.currentBranch = [item revSpecifier];
 		[superController changeContentController:historyViewController];
 		[PBGitDefaults setShowStageView:NO];
 	}
-
+	
 	if (item == stage) {
 		[superController changeContentController:commitViewController];
 		[PBGitDefaults setShowStageView:YES];
 	}
-
+	
 	[self updateActionMenu];
 	[self updateRemoteControls];
 }
@@ -358,7 +358,7 @@ - (void)populateList
 	PBSourceViewItem *project = [PBSourceViewItem groupItemWithTitle:[repository projectName]];
 	project.showsActionButton = YES;
 	project.isUncollapsible = YES;
-
+	
 	stage = [PBGitSVStageItem stageItem];
 	[project addChild:stage];
 
@@ -369,18 +369,18 @@ - (void)populateList
 	others = [PBSourceViewItem groupItemWithTitle:@"Other"];
 	stashes = [PBSourceViewItem groupItemWithTitle:@"Stashes"];
 	submodules = [PBSourceViewItem groupItemWithTitle:@"Submodules"];
-
+	
 	for (PBGitRevSpecifier *rev in repository.branches)
 		[self addRevSpec:rev];
-
+	
 	[items addObject:project];
 	[items addObject:branches];
 	[items addObject:remotes];
 	[items addObject:tags];
 	[items addObject:others];
 	[items addObject:stashes];
 	[items addObject:submodules];
-
+	
 	[sourceView reloadData];
 	[sourceView expandItem:project];
 	[sourceView expandItem:branches expandChildren:YES];
@@ -396,7 +396,7 @@ - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id
 {
 	if (!item)
 		return [items objectAtIndex:index];
-
+	
 	return [[(PBSourceViewItem *)item children] objectAtIndex:index];
 }
 
@@ -409,7 +409,7 @@ - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id
 {
 	if (!item)
 		return [items count];
-
+	
 	return [[(PBSourceViewItem *)item children] count];
 }
 
@@ -430,7 +430,7 @@ - (void) addMenuItemsForRef:(PBGitRef *)ref toMenu:(NSMenu *)menu
 {
 	if (!ref)
 		return;
-
+	
 	for (NSMenuItem *menuItem in [historyViewController.refController menuItemsForRef:ref])
 		[menu addItem:menuItem];
 }
@@ -441,7 +441,7 @@ - (NSMenuItem *) actionIconItem
 	NSImage *actionIcon = [NSImage imageNamed:@"NSActionTemplate"];
 	[actionIcon setSize:NSMakeSize(12, 12)];
 	[actionIconItem setImage:actionIcon];
-
+	
 	return actionIconItem;
 }
 
@@ -472,11 +472,11 @@ - (NSMenu *) menuForRow:(NSInteger)row
 	PBGitRef *ref = [viewItem ref];
 	if (!ref)
 		return nil;
-
+	
 	NSMenu *menu = [[NSMenu alloc] init];
 	[menu setAutoenablesItems:NO];
 	[self addMenuItemsForRef:ref toMenu:menu];
-
+	
 	return menu;
 }
 
@@ -485,7 +485,7 @@ - (void) menuNeedsUpdate:(NSMenu *)menu
 {
 	[actionButton removeAllItems];
 	[menu addItem:[self actionIconItem]];
-
+	
 	PBGitRef *ref = [[self selectedItem] ref];
 	[self addMenuItemsForRef:ref toMenu:menu];
 }
@@ -503,11 +503,11 @@ - (void) menuNeedsUpdate:(NSMenu *)menu
 - (void) updateRemoteControls
 {
 	BOOL hasRemote = NO;
-
+	
 	PBGitRef *ref = [[self selectedItem] ref];
 	if ([ref isRemote] || ([ref isBranch] && [[repository remoteRefForBranch:ref error:NULL] remoteName]))
 		hasRemote = YES;
-
+	
 	[remoteControls setEnabled:hasRemote forSegment:kFetchSegment];
 	[remoteControls setEnabled:hasRemote forSegment:kPullSegment];
 	[remoteControls setEnabled:hasRemote forSegment:kPushSegment];
@@ -522,26 +522,26 @@ - (void) updateRemoteControls
 - (IBAction) fetchPullPushAction:(id)sender
 {
 	NSInteger selectedSegment = [sender selectedSegment];
-
+	
 	if (selectedSegment == kAddRemoteSegment) {
 		[PBAddRemoteSheet beginAddRemoteSheetForRepository:repository];
 		return;
 	}
-
+	
 	NSInteger index = [sourceView selectedRow];
 	PBSourceViewItem *item = [sourceView itemAtRow:index];
 	PBGitRef *ref = [[item revSpecifier] ref];
-
+	
 	if (!ref && (item.parent == remotes))
 		ref = [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:[item title]]];
-
+	
 	if (![ref isRemote] && ![ref isBranch])
 		return;
-
+	
 	PBGitRef *remoteRef = [repository remoteRefForBranch:ref error:NULL];
 	if (!remoteRef)
 		return;
-
+	
 	if (selectedSegment == kFetchSegment)
 		[repository beginFetchFromRemoteForRef:ref];
 	else if (selectedSegment == kPullSegment)

PBSourceViewCell.h

@@ -10,14 +10,13 @@
 #import "PBIconAndTextCell.h"
 
 @interface PBSourceViewCell : PBIconAndTextCell {
+	NSString *badge;
 	BOOL showsActionButton;
 
 	BOOL iMouseDownInInfoButton;
     BOOL iMouseHoveredInInfoButton;
     SEL iInfoButtonAction;
-	NSString *badge;
 }
-
 @property (nonatomic) BOOL showsActionButton;
 @property (nonatomic) SEL iInfoButtonAction;
 @property (assign) NSString *badge;

PBSourceViewCell.m

@@ -14,11 +14,9 @@ @interface PBSourceViewCell()
 - (NSRect)infoButtonRectForBounds:(NSRect)bounds;
 @end
 
-
 @implementation PBSourceViewCell
 @synthesize iInfoButtonAction;
 @synthesize showsActionButton;
-
 @synthesize badge;
 
 # pragma mark context menu delegate methods