Add »Pull« Menu-Items to Repository Menu

Author: ssp

Classes/Controllers/PBGitSidebarController.h

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

Classes/Controllers/PBGitSidebarController.m

@@ -31,6 +31,7 @@ - (void) updateRemoteControls;
 
 @implementation PBGitSidebarController
 @synthesize items;
+@synthesize remotes;
 @synthesize sourceView;
 @synthesize sourceListControlsView;
 @synthesize historyViewController;

Classes/Controllers/PBGitWindowController.h

@@ -51,6 +51,9 @@
 - (IBAction) fetchRemote:(id)sender;
 - (IBAction) fetchAllRemotes:(id)sender;
 
+- (IBAction) pullRemote:(id)sender;
+- (IBAction) pullDefaultRemote:(id)sender;
+
 - (IBAction) stashSave:(id) sender;
 - (IBAction) stashSaveWithKeepIndex:(id) sender;
 - (IBAction) stashPop:(id) sender;

Classes/Controllers/PBGitWindowController.m

@@ -68,19 +68,33 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 		[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 [self validateMenuItem:menuItem remoteTitle:@"Fetch “%@”" plainTitle:@"Fetch"];
+	} else if (menuItem.action == @selector(pullRemote:)) {
+		return [self validateMenuItem:menuItem remoteTitle:@"Pull From “%@”" plainTitle:@"Pull"];
 	}
 
 	return YES;
 }
 
+- (BOOL) validateMenuItem:(NSMenuItem *)menuItem remoteTitle:(NSString *)localisationKeyWithRemote plainTitle:(NSString *)localizationKeyWithoutRemote
+{
+	PBSourceViewItem *item = [self selectedItem];
+	PBGitRef *ref = item.ref;
+
+	if (!ref && (item.parent == sidebarController.remotes)) {
+		ref = [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:item.title]];
+	}
+	
+	if (ref.isRemote) {
+		menuItem.title = [NSString stringWithFormat:NSLocalizedString(localisationKeyWithRemote, @""), ref.remoteName];
+		return YES;
+	}
+
+	menuItem.title = NSLocalizedString(localizationKeyWithoutRemote, @"");
+	return NO;
+}
+
+
 - (void) awakeFromNib
 {
 	[[self window] setDelegate:self];
@@ -261,15 +275,30 @@ - (IBAction) showAddRemoteSheet:(id)sender
 
 
 - (IBAction) fetchRemote:(id)sender {
-	NSOutlineView *sourceView = sidebarController.sourceView;
-	PBSourceViewItem *item = [sourceView itemAtRow:sourceView.selectedRow];
-	[repository beginFetchFromRemoteForRef:item.ref];
+	PBGitRef *ref = [self selectedItem].ref;
+	[repository beginFetchFromRemoteForRef:ref];
 }
 
 - (IBAction) fetchAllRemotes:(id)sender {
 	[repository beginFetchFromRemoteForRef:nil];
 }
 
+- (IBAction) pullRemote:(id)sender {
+	PBGitRef *ref = [self selectedItem].revSpecifier.ref;
+	PBGitRef *remoteRef = [repository remoteRefForBranch:ref error:NULL];
+	[repository beginPullFromRemote:remoteRef forRef:ref];
+}
+
+- (IBAction) pullDefaultRemote:(id)sender {
+	PBGitRef *ref = [self selectedItem].revSpecifier.ref;
+	[repository beginPullFromRemote:nil forRef:ref];
+}
+
+- (PBSourceViewItem *) selectedItem {
+	NSOutlineView *sourceView = sidebarController.sourceView;
+	return [sourceView itemAtRow:sourceView.selectedRow];
+}
+
 - (IBAction) stashSave:(id) sender
 {
     [repository stashSaveWithKeepIndex:NO];

English.lproj/MainMenu.xib

@@ -401,6 +401,19 @@
                                     <action selector="fetchAllRemotes:" target="-1" id="gQf-4H-0cg"/>
                                 </connections>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" id="CDX-1D-7tK"/>
+                            <menuItem title="Pull" id="ka6-UF-ky7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="pullRemote:" target="-1" id="Uq3-eV-MxO"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Pull From Default Remote" id="hpV-fp-aO8">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="pullDefaultRemote:" target="-1" id="X3P-VB-IDo"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="bMk-cx-k5H"/>
                             <menuItem title="Stash Save" keyEquivalent="y" id="Zqy-z5-0Jz">
                                 <connections>