Massive retain cycle breaking so view controllers and PBGitRepository get released when closing a document.

ksuther · ksuther · commit 64bf8d10eea9 · 2012-02-25T17:10:29.000-05:00
diff --git a/Controller/PBGitResetController.h b/Controller/PBGitResetController.h
@@ -13,7 +13,7 @@
 @protocol PBGitRefish;
 
 @interface PBGitResetController : NSObject {
-	PBGitRepository *repository;
+	__unsafe_unretained PBGitRepository *repository;
 }
 - (id) initWithRepository:(PBGitRepository *) repo;
 
diff --git a/Controller/PBSubmoduleController.h b/Controller/PBSubmoduleController.h
@@ -14,7 +14,7 @@
 
 @interface PBSubmoduleController : NSObject {
 @private
-	PBGitRepository *repository;
+	__unsafe_unretained PBGitRepository *repository;
     NSArray *submodules;
 }
 
diff --git a/GLFileView.h b/GLFileView.h
@@ -18,8 +18,8 @@
 @class PBGitGradientBarView;
 
 @interface GLFileView : PBWebController <MGScopeBarDelegate> {
-	IBOutlet PBGitHistoryController* historyController;
-	IBOutlet MGScopeBar *typeBar;
+	__unsafe_unretained PBGitHistoryController* historyController;
+	__unsafe_unretained MGScopeBar *typeBar;
 	NSMutableArray *groups;
 	NSString *logFormat;
 	NSString *diffType;
@@ -29,6 +29,9 @@
     PBGitTree *lastFile;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *historyController;
+@property(nonatomic, unsafe_unretained) IBOutlet MGScopeBar *typeBar;
+
 - (void)showFile;
 - (void)didLoad;
 - (NSString *)parseBlame:(NSString *)txt;
diff --git a/GLFileView.m b/GLFileView.m
@@ -30,6 +30,8 @@ + (NSString *)parseBinaryDiff:(NSString *)txt;
 
 @implementation GLFileView
 
+@synthesize historyController, typeBar;
+
 - (void) awakeFromNib
 {
 	NSString *formatFile = [[NSBundle mainBundle] pathForResource:@"format" ofType:@"html" inDirectory:@"html/views/log"];
diff --git a/PBCommitList.h b/PBCommitList.h
@@ -18,14 +18,18 @@
 // delegate: PBGitHistoryController
 @interface PBCommitList : NSTableView {
 	IBOutlet WebView* webView;
-	IBOutlet PBWebHistoryController *webController;
-	IBOutlet PBGitHistoryController *controller;
-	IBOutlet PBHistorySearchController *searchController;
+	__unsafe_unretained PBWebHistoryController *webController;
+	__unsafe_unretained PBGitHistoryController *controller;
+	__unsafe_unretained PBHistorySearchController *searchController;
 
     BOOL useAdjustScroll;
 	NSPoint mouseDownPoint;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBWebHistoryController *webController;
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;
+@property(nonatomic, unsafe_unretained) IBOutlet PBHistorySearchController *searchController;
+
 @property (readonly) NSPoint mouseDownPoint;
 @property (assign) BOOL useAdjustScroll;
 @end
diff --git a/PBCommitList.m b/PBCommitList.m
@@ -13,6 +13,7 @@
 
 @implementation PBCommitList
 
+@synthesize webController, controller, searchController;
 @synthesize mouseDownPoint;
 @synthesize useAdjustScroll;
 
diff --git a/PBGitCommit.h b/PBGitCommit.h
@@ -29,7 +29,7 @@ extern NSString * const kGitXCommitType;
 	int timestamp;
 	char sign;
 	id lineInfo;
-	PBGitRepository* repository;
+	__unsafe_unretained PBGitRepository* repository;
 }
 
 + (PBGitCommit *)commitWithRepository:(PBGitRepository*)repo andSha:(NSString *)newSha;
@@ -65,6 +65,6 @@ extern NSString * const kGitXCommitType;
 @property (readonly) NSString* details;
 @property (readonly) PBGitTree* tree;
 @property (readonly) NSArray* treeContents;
-@property (strong) PBGitRepository* repository;
+@property (unsafe_unretained) PBGitRepository* repository;
 @property (strong) id lineInfo;
 @end
diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
@@ -23,18 +23,12 @@
 
 // Controls the split history view from PBGitHistoryView.xib
 @interface PBGitHistoryController : PBViewController PROTOCOL_10_6(NSOutlineViewDelegate){
-	IBOutlet PBRefController *refController;
 	IBOutlet NSSearchField *searchField;
-	IBOutlet NSArrayController*  commitController;
 	IBOutlet NSSearchField *filesSearchField;
-	IBOutlet NSTreeController*  treeController;
 	IBOutlet NSOutlineView* fileBrowser;
 	NSArray *currentFileBrowserSelectionPath;
-	IBOutlet PBCommitList*  commitList;
-	IBOutlet NSSplitView *historySplitView;
 	IBOutlet PBWebHistoryController *webHistoryController;
 	QLPreviewPanel* previewPanel;
-	IBOutlet PBHistorySearchController *searchController;
 	IBOutlet GLFileView *fileView;
 
 	IBOutlet PBGitGradientBarView *upperToolbarView;
@@ -57,15 +51,15 @@
 	PBGitCommit *selectedCommitBeforeRefresh;
 }
 
-@property (readonly) NSTreeController* treeController;
-@property (readonly) NSSplitView *historySplitView;
+@property (unsafe_unretained) IBOutlet NSTreeController* treeController;
+@property (unsafe_unretained) IBOutlet NSSplitView *historySplitView;
 @property (nonatomic,assign) int selectedCommitDetailsIndex;
 @property (strong) PBGitCommit *webCommit;
 @property (strong) PBGitTree* gitTree;
-@property (readonly) NSArrayController *commitController;
-@property (readonly) PBRefController *refController;
-@property (readonly) PBHistorySearchController *searchController;
-@property (readonly) PBCommitList *commitList;
+@property (unsafe_unretained) IBOutlet NSArrayController *commitController;
+@property (unsafe_unretained) IBOutlet PBRefController *refController;
+@property (unsafe_unretained) IBOutlet PBHistorySearchController *searchController;
+@property (unsafe_unretained) PBCommitList *commitList;
 
 - (IBAction) setDetailedView:(id)sender;
 - (IBAction) setTreeView:(id)sender;
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
@@ -483,11 +483,12 @@ - (void)closeView
 {
 	[self saveSplitViewPosition];
 
-	if (commitController) {
-		[commitController removeObserver:self forKeyPath:@"selection"];
-		[commitController removeObserver:self forKeyPath:@"arrangedObjects.@count"];
-		[treeController removeObserver:self forKeyPath:@"selection"];
+	[commitController removeObserver:self forKeyPath:@"selection"];
+	[commitController removeObserver:self forKeyPath:@"arrangedObjects.@count"];
+	[treeController removeObserver:self forKeyPath:@"selection"];
 
+	//Only stop these observations if the nib got loaded
+	if ([self treeController]) {
 		[repository.revisionList removeObserver:self forKeyPath:@"isUpdating"];
 		[repository removeObserver:self forKeyPath:@"currentBranch"];
 		[repository removeObserver:self forKeyPath:@"refs"];
diff --git a/PBGitHistoryGrapher.h b/PBGitHistoryGrapher.h
@@ -17,7 +17,7 @@
 
 
 @interface PBGitHistoryGrapher : NSObject {
-	id delegate;
+	__unsafe_unretained id delegate;
 	NSOperationQueue *currentQueue;
 
 	NSMutableSet *searchSHAs;
diff --git a/PBGitHistoryList.h b/PBGitHistoryList.h
@@ -16,7 +16,7 @@
 @class PBGitHistoryGrapher;
 
 @interface PBGitHistoryList : NSObject {
-	PBGitRepository *repository;
+	__unsafe_unretained PBGitRepository *repository;
 
 	PBGitRevList *projectRevList;
 	PBGitRevList *currentRevList;
diff --git a/PBGitHistoryList.m b/PBGitHistoryList.m
@@ -85,10 +85,9 @@ - (void) updateHistory
 
 - (void)cleanup
 {
-	if (currentRevList) {
-		[currentRevList removeObserver:self forKeyPath:@"commits"];
-		[currentRevList cancel];
-	}
+	[currentRevList removeObserver:self forKeyPath:@"commits"];
+	[currentRevList cancel];
+	
 	[graphQueue cancelAllOperations];
 
 	[repository removeObserver:self forKeyPath:@"currentBranch"];
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -1965,9 +1965,4 @@ - (NSString*) parseSymbolicReference:(NSString*) reference
 	return nil;
 }
 
-- (void) finalize
-{
-	//DLog(@"Dealloc of repository");
-	[super finalize];
-}
 @end
diff --git a/PBGitRevList.h b/PBGitRevList.h
@@ -14,7 +14,7 @@
 @interface PBGitRevList : NSObject {
 	NSMutableArray *commits;
 
-	PBGitRepository *repository;
+	__unsafe_unretained PBGitRepository *repository;
 	PBGitRevSpecifier *currentRev;
 	BOOL isGraphing;
 
diff --git a/PBGitRevisionCell.h b/PBGitRevisionCell.h
@@ -16,10 +16,14 @@
 	PBGitCommit *objectValue;
 	PBGraphCellInfo *cellInfo;
 	NSTextFieldCell *textCell;
-	IBOutlet PBGitHistoryController *controller;
-	IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
+	__unsafe_unretained PBGitHistoryController *controller;
+	__unsafe_unretained id<PBRefContextDelegate> contextMenuDelegate;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;
+@property(nonatomic, unsafe_unretained) IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
+
+
 - (int) indexAtX:(float)x;
 - (NSRect) rectAtIndex:(int)index;
 - (void) drawLabelAtIndex:(int)index inRect:(NSRect)rect;
diff --git a/PBGitRevisionCell.m b/PBGitRevisionCell.m
@@ -13,6 +13,7 @@
 
 @implementation PBGitRevisionCell
 
+@synthesize controller, contextMenuDelegate;
 
 - (id) initWithCoder: (id) coder
 {
diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m
@@ -91,6 +91,7 @@ - (void)closeView
 	[commitViewController closeView];
 	[stashViewController closeView];
 	
+    [repository removeObserver:self forKeyPath:@"refs"];
 	[repository removeObserver:self forKeyPath:@"currentBranch"];
 	[repository removeObserver:self forKeyPath:@"branches"];
 	[repository removeObserver:self forKeyPath:@"stashController.stashes"];
diff --git a/PBHistorySearchController.h b/PBHistorySearchController.h
@@ -21,7 +21,7 @@ typedef enum historySearchModes {
 
 
 @interface PBHistorySearchController : NSObject {
-	PBGitHistoryController *historyController;
+	__unsafe_unretained PBGitHistoryController *historyController;
 	NSArrayController *commitController;
 
 	PBHistorySearchMode searchMode;
@@ -38,7 +38,7 @@ typedef enum historySearchModes {
 	NSPanel *rewindPanel;
 }
 
-@property (strong) IBOutlet PBGitHistoryController *historyController;
+@property (unsafe_unretained) IBOutlet PBGitHistoryController *historyController;
 @property (strong) IBOutlet NSArrayController *commitController;
 
 @property (strong) IBOutlet NSSearchField *searchField;
diff --git a/PBQLOutlineView.h b/PBQLOutlineView.h
@@ -10,7 +10,9 @@
 #import "PBGitHistoryController.h"
 
 @interface PBQLOutlineView : NSOutlineView {
-	IBOutlet PBGitHistoryController* controller;
+	__unsafe_unretained PBGitHistoryController *controller;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;
+
 @end
diff --git a/PBQLOutlineView.m b/PBQLOutlineView.m
@@ -11,6 +11,8 @@
 
 @implementation PBQLOutlineView
 
+@synthesize controller;
+
 - initWithCoder: (NSCoder *) coder
 {
 	id a = [super initWithCoder:coder];
diff --git a/PBQLTextView.h b/PBQLTextView.h
@@ -13,7 +13,9 @@
 
 
 @interface PBQLTextView : NSTextView {
-	IBOutlet PBGitHistoryController *controller;
+	__unsafe_unretained PBGitHistoryController *controller;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;
+
 @end
diff --git a/PBQLTextView.m b/PBQLTextView.m
@@ -12,6 +12,8 @@
 
 @implementation PBQLTextView
 
+@synthesize controller;
+
 - (void) keyDown: (NSEvent *) event
 {
 	if ([[event characters] isEqualToString:@" "]) {
diff --git a/PBRefController.h b/PBRefController.h
@@ -16,7 +16,7 @@
 @class PBRefMenuItem;
 
 @interface PBRefController : NSObject <PBRefContextDelegate> {
-	IBOutlet PBGitHistoryController *historyController;
+	__unsafe_unretained PBGitHistoryController *historyController;
 	IBOutlet NSArrayController *commitController;
 	IBOutlet PBCommitList *commitList;
 
@@ -25,6 +25,8 @@
     PBGitRef *actRef;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *historyController;
+
 - (void) fetchRemote:(PBRefMenuItem *)sender;
 - (void) pullRemote:(PBRefMenuItem *)sender;
 - (void) pushUpdatesToRemote:(PBRefMenuItem *)sender;
diff --git a/PBRefController.m b/PBRefController.m
@@ -27,6 +27,8 @@
 
 @implementation PBRefController
 
+@synthesize historyController;
+
 -(void)dealloc
 {
     actDropInfo = Nil;
diff --git a/PBStashController.h b/PBStashController.h
@@ -13,7 +13,7 @@
 
 @interface PBStashController : NSObject {
 @private
-    PBGitRepository *repository;
+    __unsafe_unretained PBGitRepository *repository;
 }
 
 - (id) initWithRepository:(PBGitRepository *) repo;
diff --git a/PBViewController.h b/PBViewController.h
@@ -11,16 +11,16 @@
 #import "PBGitWindowController.h"
 
 @interface PBViewController : NSViewController {
-	PBGitRepository *repository;
-	PBGitWindowController *superController;
+	__unsafe_unretained PBGitRepository *repository;
+	__unsafe_unretained PBGitWindowController *superController;
 
 	NSString *status;
 	BOOL isBusy;
 	BOOL hasViewLoaded;
 }
 
-@property (readonly) PBGitRepository *repository;
-@property (readonly) PBGitWindowController *superController;
+@property (readonly, unsafe_unretained) PBGitRepository *repository;
+@property (readonly, unsafe_unretained) PBGitWindowController *superController;
 @property(copy) NSString *status;
 @property(assign) BOOL isBusy;
 
diff --git a/PBWebController.h b/PBWebController.h
@@ -20,11 +20,11 @@
 	NSMapTable *callbacks;
 
 	// For the repository access
-	IBOutlet PBGitRepository *repository;
+	IBOutlet __unsafe_unretained PBGitRepository *repository;
 }
 
 @property (strong) NSString *startFile;
-@property (strong) PBGitRepository *repository;
+@property (unsafe_unretained) PBGitRepository *repository;
 
 - (WebScriptObject *) script;
 - (void) closeView;
diff --git a/PBWebHistoryController.h b/PBWebHistoryController.h
@@ -12,7 +12,9 @@
 @class PBGitHistoryController;
 
 @interface PBWebHistoryController : PBWebCommitController {
-	IBOutlet PBGitHistoryController* historyController;
+	__unsafe_unretained PBGitHistoryController* historyController;
 }
 
+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *historyController;
+
 @end
diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m
@@ -12,6 +12,8 @@
 
 @implementation PBWebHistoryController
 
+@synthesize historyController;
+
 - (void) awakeFromNib
 {
 	startFile = @"history";

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`@protocol PBGitRefish;`
`14`	`14`
`15`	`15`	`@interface PBGitResetController : NSObject {`
`16`		`- PBGitRepository *repository;`
	`16`	`+ __unsafe_unretained PBGitRepository *repository;`
`17`	`17`	`}`
`18`	`18`	`- (id) initWithRepository:(PBGitRepository *) repo;`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`@interface PBSubmoduleController : NSObject {`
`16`	`16`	`@private`
`17`		`- PBGitRepository *repository;`
	`17`	`+ __unsafe_unretained PBGitRepository *repository;`
`18`	`18`	`NSArray *submodules;`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ + (NSString )parseBinaryDiff:(NSString )txt;`
`30`	`30`
`31`	`31`	`@implementation GLFileView`
`32`	`32`
	`33`	`+@synthesize historyController, typeBar;`
	`34`	`+`
`33`	`35`	`- (void) awakeFromNib`
`34`	`36`	`{`
`35`	`37`	`NSString *formatFile = [[NSBundle mainBundle] pathForResource:@"format" ofType:@"html" inDirectory:@"html/views/log"];`
Original file line number	Diff line number	Diff line change
`@@ -1965,9 +1965,4 @@ - (NSString) parseSymbolicReference:(NSString) reference`
`1965`	`1965`	`return nil;`
`1966`	`1966`	`}`
`1967`	`1967`
`1968`		`-- (void) finalize`
`1969`		`-{`
`1970`		`- //DLog(@"Dealloc of repository");`
`1971`		`- [super finalize];`
`1972`		`-}`
`1973`	`1968`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`@implementation PBGitRevisionCell`
`15`	`15`
	`16`	`+@synthesize controller, contextMenuDelegate;`
`16`	`17`
`17`	`18`	`- (id) initWithCoder: (id) coder`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,9 @@`
`10`	`10`	`#import "PBGitHistoryController.h"`
`11`	`11`
`12`	`12`	`@interface PBQLOutlineView : NSOutlineView {`
`13`		`- IBOutlet PBGitHistoryController* controller;`
	`13`	`+ __unsafe_unretained PBGitHistoryController *controller;`
`14`	`14`	`}`
`15`	`15`
	`16`	`+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;`
	`17`	`+`
`16`	`18`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`@implementation PBQLOutlineView`
`13`	`13`
	`14`	`+@synthesize controller;`
	`15`	`+`
`14`	`16`	`- initWithCoder: (NSCoder *) coder`
`15`	`17`	`{`
`16`	`18`	`id a = [super initWithCoder:coder];`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@`
`13`	`13`
`14`	`14`
`15`	`15`	`@interface PBQLTextView : NSTextView {`
`16`		`- IBOutlet PBGitHistoryController *controller;`
	`16`	`+ __unsafe_unretained PBGitHistoryController *controller;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+@property(nonatomic, unsafe_unretained) IBOutlet PBGitHistoryController *controller;`
	`20`	`+`
`19`	`21`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`
`13`	`13`	`@implementation PBQLTextView`
`14`	`14`
	`15`	`+@synthesize controller;`
	`16`	`+`
`15`	`17`	`- (void) keyDown: (NSEvent *) event`
`16`	`18`	`{`
`17`	`19`	`if ([[event characters] isEqualToString:@" "]) {`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`
`28`	`28`	`@implementation PBRefController`
`29`	`29`
	`30`	`+@synthesize historyController;`
	`31`	`+`
`30`	`32`	`-(void)dealloc`
`31`	`33`	`{`
`32`	`34`	`actDropInfo = Nil;`