Skip to content

Commit 7ab0a9c

Browse files
committed
Finalize context menu actions for fetch/push/pull/delete
1 parent 3179090 commit 7ab0a9c

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

Classes/Controllers/PBGitHistoryController.m

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
664664
- (IBAction)fetchRemote:(id)sender
665665
{
666666
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
667-
if (!refish)
667+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
668668
return;
669669

670670
[self.windowController performFetchForRef:refish];
@@ -673,7 +673,7 @@ - (IBAction)fetchRemote:(id)sender
673673
- (IBAction)pullRemote:(id)sender
674674
{
675675
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
676-
if (!refish)
676+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
677677
return;
678678

679679
[self.windowController performPullForBranch:refish remote:nil rebase:NO];
@@ -682,34 +682,33 @@ - (IBAction)pullRemote:(id)sender
682682
- (IBAction)pushUpdatesToRemote:(id)sender
683683
{
684684
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
685-
if (!refish)
685+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
686686
return;
687687

688-
PBGitRef *remoteRef = nil; // [(PBGitRef *)sender.refishs.firstObject remoteRef];
688+
PBGitRef *remoteRef = [(PBGitRef *)refish remoteRef];
689689

690690
[self.windowController performPushForBranch:nil toRemote:remoteRef];
691691
}
692692

693693
- (IBAction)pushDefaultRemoteForRef:(id)sender
694694
{
695695
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
696-
if (!refish)
696+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
697697
return;
698698

699-
PBGitRef *ref = nil;
699+
PBGitRef *ref = (PBGitRef *)refish;
700700

701701
[self.windowController performPushForBranch:ref toRemote:nil];
702702
}
703703

704704
- (IBAction)pushToRemote:(id)sender
705705
{
706706
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
707-
if (!refish)
707+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
708708
return;
709709

710-
PBGitRef *ref = nil;
711-
NSString *remoteName = [sender representedObject];
712-
PBGitRef *remoteRef = [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:remoteName]];
710+
PBGitRef *ref = (PBGitRef *)refish;
711+
PBGitRef *remoteRef = ref.remoteRef;
713712

714713
[self.windowController performPushForBranch:ref toRemote:remoteRef];
715714
}
@@ -762,7 +761,7 @@ - (IBAction)rebase:(id)sender
762761
}
763762
}
764763

765-
- (IBAction) rebaseHeadBranch:(id)sender
764+
- (IBAction)rebaseHeadBranch:(id)sender
766765
{
767766
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
768767
NSError *error = nil;
@@ -772,10 +771,10 @@ - (IBAction) rebaseHeadBranch:(id)sender
772771
}
773772
}
774773

775-
- (IBAction)showDeleteRefSheet:(PBRefMenuItem *)sender
774+
- (IBAction)showDeleteRefSheet:(id)sender
776775
{
777776
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
778-
if (!refish)
777+
if (!refish || ![refish isKindOfClass:[PBGitRef class]])
779778
return;
780779

781780
PBGitRef *ref = (PBGitRef *)refish;

0 commit comments

Comments
 (0)