Keep track of refs using NSMenuItem -representedObject instead of ivars

Author: tiennou

Classes/Controllers/PBGitHistoryController.m

@@ -640,25 +640,9 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 
 #pragma mark Repository Methods
 
-- (id <PBGitRefish>)refishForSender:(id)sender
-{
-	return [self refishForSender:sender refishTypes:nil];
-}
-
 - (id <PBGitRefish>)refishForSender:(id)sender refishTypes:(NSArray *)types
 {
-	if ([sender isKindOfClass:[PBRefMenuItem class]]) {
-		id <PBGitRefish> refish = [[(PBRefMenuItem *)sender refishs] firstObject];
-
-		if (!types || [types indexOfObject:[refish refishType]] != NSNotFound)
-			return refish;
-		return nil;
-	}
-
-	if ([types indexOfObject:kGitXCommitType] == NSNotFound)
-		return nil;
-
-	return self.selectedCommits.firstObject;
+	return [self.windowController performSelector:@selector(refishForSender:refishTypes:) withObject:sender withObject:types];
 }
 
 - (IBAction)fetchRemote:(id)sender

Classes/Controllers/PBGitWindowController.m

@@ -95,6 +95,7 @@ - (BOOL) validateMenuItem:(NSMenuItem *)menuItem remoteTitle:(NSString *)localis
 
 	if (ref.isRemote) {
 		menuItem.title = [NSString stringWithFormat:NSLocalizedString(localisationKeyWithRemote, @""), ref.remoteName];
+		menuItem.representedObject = ref;
 		return YES;
 	}
 
@@ -268,6 +269,24 @@ - (void)revealURLsInFinder:(NSArray <NSURL *> *)fileURLs
 
 #pragma mark IBActions
 
+- (id <PBGitRefish>)refishForSender:(id)sender refishTypes:(NSArray *)types
+{
+	if ([sender isKindOfClass:[NSMenuItem class]]) {
+		id <PBGitRefish> refish = nil;
+		if ([(refish = [(NSMenuItem *)sender representedObject]) conformsToProtocol:@protocol(PBGitRefish)]) {
+			if (!types || [types indexOfObject:[refish refishType]] != NSNotFound)
+				return refish;
+		}
+
+		return nil;
+	}
+
+	if ([types indexOfObject:kGitXCommitType] == NSNotFound)
+		return nil;
+
+	return sidebarController.historyViewController.selectedCommits.firstObject;
+}
+
 - (IBAction) showAddRemoteSheet:(id)sender
 {
 	[self addRemote:sender];
@@ -324,6 +343,7 @@ - (void)performFetchForRef:(PBGitRef *)ref
 }
 
 - (IBAction) fetchRemote:(id)sender {
+	/* FIXME: this is wrong, you can right-click in the sidebar but try to fetch the *selected* ref */
 	PBGitRef *ref = [self selectedItem].ref;
 	[self performFetchForRef:ref];
 }
@@ -520,10 +540,9 @@ - (void) createBranch:(id)sender
 {
 	PBGitRef *currentRef = [self.repository.currentBranch ref];
 
-	id <PBGitRefish> refish = nil;
-	if ([sender isKindOfClass:[PBRefMenuItem class]]) {
-		refish = [[(PBRefMenuItem *)sender refishs] firstObject];
-	} else {
+	/* WIP: must check */
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:nil];
+	if (!refish) {
 		PBGitCommit *selectedCommit = sidebarController.historyViewController.selectedCommits.firstObject;
 		if (!selectedCommit || [selectedCommit hasRef:currentRef]) {
 			refish = currentRef;
@@ -554,12 +573,11 @@ - (void) createBranch:(id)sender
 	}];
 }
 
-- (void) createTag:(PBRefMenuItem *)sender
+- (IBAction) createTag:(id)sender
 {
-	id <PBGitRefish> refish = nil;
-	if ([sender isKindOfClass:[PBRefMenuItem class]]) {
-		refish = [sender refishs].firstObject;
-	} else {
+	/* WIP: must check */
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:nil];
+	if (!refish) {
 		PBGitCommit *selectedCommit = sidebarController.historyViewController.selectedCommits.firstObject;
 		if (selectedCommit)
 			refish = selectedCommit;

Classes/Views/PBRefMenuItem.h

@@ -11,10 +11,8 @@
 #import "PBGitCommit.h"
 
 @interface PBRefMenuItem : NSMenuItem {
-	NSArray<id<PBGitRefish>> *refishs;
 }
 
-@property NSArray<id<PBGitRefish>> *refishs;
 
 + (PBRefMenuItem *) separatorItem;
 + (NSArray *) defaultMenuItemsForRef:(PBGitRef *)refs inRepository:(PBGitRepository *)repo target:(id)target;

Classes/Views/PBRefMenuItem.m

@@ -11,7 +11,6 @@
 #import "PBGitRevSpecifier.h"
 
 @implementation PBRefMenuItem
-@synthesize refishs;
 
 + (PBRefMenuItem *) itemWithTitle:(NSString *)title action:(SEL)selector enabled:(BOOL)isEnabled
 {
@@ -57,7 +56,9 @@ + (PBRefMenuItem *) separatorItem
 
 	for (PBRefMenuItem *item in items) {
 		item.target = target;
-		item.refishs = @[ref];
+		if (!item.representedObject) {
+			item.representedObject = ref;
+		}
 	}
 
 	return items;
@@ -170,11 +171,11 @@ + (PBRefMenuItem *) separatorItem
 			for (NSString *remote in remoteNames) {
 				PBRefMenuItem *remoteItem = [PBRefMenuItem itemWithTitle:remote action:@selector(pushToRemote:) enabled:YES];
 				remoteItem.target = target;
-				remoteItem.refishs = @[ref];
 				remoteItem.representedObject = remote;
 				[remotesMenu addItem:remoteItem];
 			}
 			[pushToItem setSubmenu:remotesMenu];
+			pushToItem.representedObject = ref;
 			[items addObject:pushToItem];
 		}
 	}
@@ -194,7 +195,9 @@ + (PBRefMenuItem *) separatorItem
 
 	for (PBRefMenuItem *item in items) {
 		item.target = target;
-		item.refishs = @[ref];
+		if (!item.representedObject) {
+			item.representedObject = ref;
+		}
 	}
 
 	return items;
@@ -251,7 +254,9 @@ + (PBRefMenuItem *) separatorItem
 
 	for (PBRefMenuItem *item in items) {
 		item.target = target;
-		item.refishs = commits;
+		if (!item.representedObject) {
+			item.representedObject = isSingleCommitSelection ? firstCommit : commits;
+		}
 	}
 
 	return items;