Grab the repository from the document instead of through the initializer

Author: tiennou

Classes/Controllers/PBGitRepositoryDocument.m

@@ -85,7 +85,7 @@ - (void)makeWindowControllers
 {
     // Create our custom window controller
 #ifndef CLI
-	[self addWindowController: [[PBGitWindowController alloc] initWithRepository:self.repository displayDefault:YES]];
+	[self addWindowController:[[PBGitWindowController alloc] init]];
 #endif
 }
 

Classes/Controllers/PBGitWindowController.h

@@ -27,11 +27,11 @@
 	__weak IBOutlet NSProgressIndicator *progressIndicator;
 }
 
-@property (nonatomic, strong)  PBGitRepository *repository;
+@property (nonatomic, strong) PBGitRepository *repository;
 /* This is assign because that's what NSWindowController says :-S */
 @property (assign) PBGitRepositoryDocument *document;
 
-- (id)initWithRepository:(PBGitRepository*)theRepository displayDefault:(BOOL)display;
+- (instancetype)init;
 
 - (void)changeContentController:(PBViewController *)controller;
 

Classes/Controllers/PBGitWindowController.m

@@ -22,24 +22,28 @@
 #import "PBGitRef.h"
 #import "PBError.h"
 #import "PBRepositoryDocumentController.h"
+#import "PBGitRepositoryDocument.h"
 #import "PBRefMenuItem.h"
 #import "PBRemoteProgressSheet.h"
 
 @implementation PBGitWindowController
 
-@synthesize repository;
 @dynamic document;
 
-- (id)initWithRepository:(PBGitRepository*)theRepository displayDefault:(BOOL)displayDefault
+- (instancetype)init
 {
-	if (!(self = [self initWithWindowNibName:@"RepositoryWindow"]))
+	self = [super initWithWindowNibName:@"RepositoryWindow"];
+	if (!self)
 		return nil;
 
-	self.repository = theRepository;
-
 	return self;
 }
 
+- (PBGitRepository *)repository
+{
+	return [self.document repository];
+}
+
 - (void)synchronizeWindowTitleWithDocumentName
 {
     [super synchronizeWindowTitleWithDocumentName];
@@ -65,10 +69,10 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
 	if ([menuItem action] == @selector(showCommitView:)) {
 		[menuItem setState:(contentController == sidebarController.commitViewController) ? YES : NO];
-		return ![repository isBareRepository];
+		return ![self.repository isBareRepository];
 	} else if ([menuItem action] == @selector(showHistoryView:)) {
 		[menuItem setState:(contentController != sidebarController.commitViewController) ? YES : NO];
-		return ![repository isBareRepository];
+		return ![self.repository isBareRepository];
 	} else if (menuItem.action == @selector(fetchRemote:)) {
 		return [self validateMenuItem:menuItem remoteTitle:@"Fetch “%@”" plainTitle:@"Fetch"];
 	} else if (menuItem.action == @selector(pullRemote:)) {
@@ -108,7 +112,8 @@ - (void) windowDidLoad
 	[[self window] setFrameUsingName:@"GitX"];
 	[[self window] setRepresentedURL:self.repository.workingDirectoryURL];
 
-	sidebarController = [[PBGitSidebarController alloc] initWithRepository:repository superController:self];
+	sidebarController = [[PBGitSidebarController alloc] initWithRepository:self.repository superController:self];
+
 	[[sidebarController view] setFrame:[sourceSplitView bounds]];
 	[sourceSplitView addSubview:[sidebarController view]];
 	[sourceListControlsView addSubview:sidebarController.sourceListControlsView];
@@ -283,7 +288,7 @@ - (IBAction)addRemote:(id)sender
 																			windowController:self];
 		[progressSheet beginProgressSheetForBlock:^{
 			NSError *error = nil;
-			BOOL success = [repository addRemote:remoteName withURL:remoteURL error:&error];
+			BOOL success = [self.repository addRemote:remoteName withURL:remoteURL error:&error];
 			return success ? nil : error;
 		} completionHandler:^(NSError *error) {
 			if (error) {
@@ -292,7 +297,7 @@ - (IBAction)addRemote:(id)sender
 			}
 
 			// Now fetch that remote
-			PBGitRef *remoteRef = [repository refForName:remoteName];
+			PBGitRef *remoteRef = [self.repository refForName:remoteName];
 			[self performFetchForRef:remoteRef];
 		}];
 	}];
@@ -309,7 +314,7 @@ - (void)performFetchForRef:(PBGitRef *)ref
 
 	[progressSheet beginProgressSheetForBlock:^{
 		NSError *error = nil;
-		BOOL success = [repository fetchRemoteForRef:ref error:&error];
+		BOOL success = [self.repository fetchRemoteForRef:ref error:&error];
 		return (success ? nil : error);
 	} completionHandler:^(NSError *error) {
 		if (error) {
@@ -345,7 +350,7 @@ - (void)performPullForBranch:(PBGitRef *)branchRef remote:(PBGitRef *)remoteRef
 
 	[progressSheet beginProgressSheetForBlock:^{
 		NSError *error = nil;
-		BOOL success = [repository pullBranch:branchRef fromRemote:remoteRef rebase:rebase error:&error];
+		BOOL success = [self.repository pullBranch:branchRef fromRemote:remoteRef rebase:rebase error:&error];
 		return success ? nil : error;
 	} completionHandler:^(NSError *error) {
 		if (error) {
@@ -397,7 +402,7 @@ - (void)performPushForBranch:(PBGitRef *)branchRef toRemote:(PBGitRef *)remoteRe
 
 		[progressSheet beginProgressSheetForBlock:^{
 			NSError *error = nil;
-			BOOL success = [repository pushBranch:branchRef toRemote:remoteRef error:&error];
+			BOOL success = [self.repository pushBranch:branchRef toRemote:remoteRef error:&error];
 			return (success ? nil : error);
 		} completionHandler:^(NSError *error) {
 			if (error) {
@@ -445,26 +450,26 @@ - (PBSourceViewItem *) selectedItem {
 - (IBAction) stashSave:(id) sender
 {
 	NSError *error = nil;
-	BOOL success = [repository stashSaveWithKeepIndex:NO error:&error];
+	BOOL success = [self.repository stashSaveWithKeepIndex:NO error:&error];
 
 	if (!success) [self showErrorSheet:error];
 }
 
 - (IBAction) stashSaveWithKeepIndex:(id) sender
 {
 	NSError *error = nil;
-	BOOL success = [repository stashSaveWithKeepIndex:YES error:&error];
+	BOOL success = [self.repository stashSaveWithKeepIndex:YES error:&error];
 
 	if (!success) [self showErrorSheet:error];
 }
 
 - (IBAction) stashPop:(id) sender
 {
-	if ([repository.stashes count] <= 0) return;
+	if ([self.repository.stashes count] <= 0) return;
 
-	PBGitStash * latestStash = [repository.stashes objectAtIndex:0];
+	PBGitStash * latestStash = [self.repository.stashes objectAtIndex:0];
 	NSError *error = nil;
-	BOOL success = [repository stashPop:latestStash error:&error];
+	BOOL success = [self.repository stashPop:latestStash error:&error];
 
 	if (!success) [self showErrorSheet:error];
 }
@@ -513,7 +518,7 @@ - (IBAction) refresh:(id)sender
 
 - (void) createBranch:(id)sender
 {
-	PBGitRef *currentRef = [repository.currentBranch ref];
+	PBGitRef *currentRef = [self.repository.currentBranch ref];
 
 	id <PBGitRefish> refish = nil;
 	if ([sender isKindOfClass:[PBRefMenuItem class]]) {
@@ -559,7 +564,7 @@ - (void) createTag:(PBRefMenuItem *)sender
 		if (selectedCommit)
 			refish = selectedCommit;
 		else
-			refish = repository.currentBranch.ref;
+			refish = self.repository.currentBranch.ref;
 	}
 
 	[PBCreateTagSheet beginSheetWithRefish:refish windowController:self completionHandler:^(PBCreateTagSheet *sheet, NSModalResponse returnCode) {