Merge remote-tracking branch 'tiennou/master' into ssp

Sep102 · Jul 4, 2016 · c1d8f15 · c1d8f15
2 parents a890f7e + 29cf62f
commit c1d8f15
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/Classes/Controllers/PBGitRepositoryDocument.h b/Classes/Controllers/PBGitRepositoryDocument.h
@@ -10,6 +10,7 @@
 
 @class PBGitRepository;
 @class PBGitRevSpecifier;
+@class PBGitWindowController;
 
 extern NSString *PBGitRepositoryDocumentType;
 
@@ -30,4 +31,6 @@ extern NSString *PBGitRepositoryDocumentType;
 
 - (void)selectRevisionSpecifier:(PBGitRevSpecifier *)specifier;
 
+- (PBGitWindowController *)windowController;
+
 @end
diff --git a/Classes/Controllers/PBGitRepositoryDocument.m b/Classes/Controllers/PBGitRepositoryDocument.m
@@ -54,6 +54,8 @@ - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSEr
 	if (!_repository)
 		return NO;
 
+	[_repository setDocument:self];
+
 	return YES;
 }
 

diff --git a/Classes/git/PBGitRepository.h b/Classes/git/PBGitRepository.h
@@ -70,6 +70,8 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 // Designated initializer
 - (id)initWithURL:(NSURL *)repositoryURL error:(NSError **)error;
 
+- (void)setDocument:(NSDocument *)document; // Backward-compatibility while PBGitRepository gets "modelized";
+
 - (void) cloneRepositoryToPath:(NSString *)path bare:(BOOL)isBare;
 - (void) beginAddRemote:(NSString *)remoteName forURL:(NSString *)remoteURL;
 - (void) beginFetchFromRemoteForRef:(PBGitRef *)ref;

diff --git a/Classes/git/PBGitRepository.m b/Classes/git/PBGitRepository.m
@@ -10,6 +10,7 @@
 #import "PBGitCommit.h"
 #import "PBGitIndex.h"
 #import "PBGitWindowController.h"
+#import "PBGitRepositoryDocument.h"
 #import "PBGitBinary.h"
 
 #import "NSFileHandleExt.h"
@@ -32,6 +33,8 @@ @interface PBGitRepository () {
 	__strong GTOID* _headOID;
 	__strong GTRepository* _gtRepo;
 	PBGitIndex *_index;
+
+	PBGitRepositoryDocument *_document;
 }
 
 @property (nonatomic, strong) NSNumber *hasSVNRepoConfig;
@@ -91,6 +94,19 @@ - (void) dealloc
 	[watcher stop];
 }
 
+#pragma mark -
+#pragma mark Backward-compatibility
+// PBGitRepository is responsible for both repository actions and document management
+// This is here for the time being while the controller code gets updated to use PBGitRepositoryDocument.
+
+- (void)setDocument:(NSDocument *)document {
+	_document = (PBGitRepositoryDocument *)document;
+}
+
+- (PBGitWindowController *)windowController {
+	return _document.windowController;
+}
+
 #pragma mark -
 #pragma mark Properties/General methods