Add menu items for Fetch “Remotename” and Fetch All

* adds Fetch All option
* adds Fetch to the menu

Author: ssp

Classes/Controllers/PBGitSidebarController.h

@@ -42,6 +42,7 @@
 - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
 
 @property(readonly) NSMutableArray *items;
+@property(readonly) NSOutlineView *sourceView;
 @property(readonly) NSView *sourceListControlsView;
 @property(readonly) PBGitHistoryController *historyViewController;
 @property(readonly) PBGitCommitController *commitViewController;

Classes/Controllers/PBGitSidebarController.m

@@ -31,6 +31,7 @@ - (void) updateRemoteControls;
 
 @implementation PBGitSidebarController
 @synthesize items;
+@synthesize sourceView;
 @synthesize sourceListControlsView;
 @synthesize historyViewController;
 @synthesize commitViewController;
@@ -480,5 +481,4 @@ - (IBAction) fetchPullPushAction:(id)sender
 	}
 }
 
-
 @end

Classes/Controllers/PBGitWindowController.h

@@ -45,7 +45,12 @@
 - (IBAction) revealInFinder:(id)sender;
 - (IBAction) openInTerminal:(id)sender;
 - (IBAction) refresh:(id)sender;
+
 - (IBAction) showAddRemoteSheet:(id)sender;
+
+- (IBAction) fetchRemote:(id)sender;
+- (IBAction) fetchAllRemotes:(id)sender;
+
 - (IBAction) stashSave:(id) sender;
 - (IBAction) stashSaveWithKeepIndex:(id) sender;
 - (IBAction) stashPop:(id) sender;

Classes/Controllers/PBGitWindowController.m

@@ -15,6 +15,9 @@
 #import "PBGitSidebarController.h"
 #import "RJModalRepoSheet.h"
 #import "PBAddRemoteSheet.h"
+#import "PBSourceViewItem.h"
+#import "PBGitRevSpecifier.h"
+#import "PBGitRef.h"
 
 @interface PBGitWindowController ()
 
@@ -64,7 +67,17 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 	} else if ([menuItem action] == @selector(showHistoryView:)) {
 		[menuItem setState:(contentController != sidebarController.commitViewController) ? YES : NO];
 		return ![repository isBareRepository];
+	} else if (menuItem.action == @selector(fetchRemote:)) {
+		NSOutlineView *sourceView = sidebarController.sourceView;
+		PBSourceViewItem *item = [sourceView itemAtRow:sourceView.selectedRow];
+		if (item.ref.isRemote) {
+			menuItem.title = [NSString stringWithFormat:NSLocalizedString(@"Fetch “%@”", @"Fetch ”Remote Name“"), item.ref.remoteName];
+			return YES;
+		}
+		menuItem.title = NSLocalizedString(@"Fetch", @"Fetch (without Remote Name for inactive menu item)");
+		return NO;
 	}
+	
 	return YES;
 }
 
@@ -246,6 +259,17 @@ - (IBAction) showAddRemoteSheet:(id)sender
 	[[[PBAddRemoteSheet alloc] initWithRepository:self.repository] show];
 }
 
+
+- (IBAction) fetchRemote:(id)sender {
+	NSOutlineView *sourceView = sidebarController.sourceView;
+	PBSourceViewItem *item = [sourceView itemAtRow:sourceView.selectedRow];
+	[repository beginFetchFromRemoteForRef:item.ref];
+}
+
+- (IBAction) fetchAllRemotes:(id)sender {
+	[repository beginFetchFromRemoteForRef:nil];
+}
+
 - (IBAction) stashSave:(id) sender
 {
     [repository stashSaveWithKeepIndex:NO];
@@ -269,6 +293,7 @@ - (void)flagsChanged:(NSEvent *)theEvent {
 }
 
 
+
 #pragma mark -
 #pragma mark SplitView Delegates
 

Classes/git/PBGitRepository.m

@@ -690,20 +690,27 @@ - (void) beginFetchFromRemoteForRef:(PBGitRef *)ref
 {
 	NSMutableArray *arguments = [NSMutableArray arrayWithObject:@"fetch"];
 
-	if (![ref isRemote]) {
-		NSError *error = nil;
-		ref = [self remoteRefForBranch:ref error:&error];
-		if (!ref) {
-			if (error)
-				[self.windowController showErrorSheet:error];
-			return;
+	NSString * remoteName;
+	if (ref != nil) {
+		if (![ref isRemote]) {
+			NSError *error = nil;
+			ref = [self remoteRefForBranch:ref error:&error];
+			if (!ref) {
+				if (error)
+					[self.windowController showErrorSheet:error];
+				return;
+			}
 		}
+		remoteName = [ref remoteName];
+		[arguments addObject:remoteName];
 	}
-	NSString *remoteName = [ref remoteName];
-	[arguments addObject:remoteName];
-
-	NSString *description = [NSString stringWithFormat:@"Fetching all tracking branches from %@", remoteName];
-	NSString *title = @"Fetching from remote";
+	else {
+		remoteName = @"all remotes";
+		[arguments addObject:@"--all"];
+	}
+	
+	NSString *description = [NSString stringWithFormat:@"Fetching all tracking branches for %@", remoteName];
+	NSString *title = @"Fetching…";
 	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:arguments title:title description:description inRepository:self];
 }
 

English.lproj/MainMenu.xib

@@ -389,6 +389,19 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="943"/>
+                            <menuItem title="Fetch" id="hAa-UP-Llb">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="fetchRemote:" target="-1" id="zxl-J9-UiW"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Fetch All" id="OAK-L4-wE7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="fetchAllRemotes:" target="-1" id="gQf-4H-0cg"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="bMk-cx-k5H"/>
                             <menuItem title="Stash Save" keyEquivalent="y" id="Zqy-z5-0Jz">
                                 <connections>
                                     <action selector="stashSave:" target="-1" id="VkG-km-8Nw"/>