Merge branch 'fix/modern-refs'

Author: tiennou

Classes/git/PBGitRef.h

@@ -9,6 +9,8 @@
 #import <Cocoa/Cocoa.h>
 #import "PBGitRefish.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 extern NSString * const kGitXTagType;
 extern NSString * const kGitXBranchType;
 extern NSString * const kGitXRemoteType;
@@ -20,33 +22,31 @@ extern NSString * const kGitXBranchRefPrefix;
 extern NSString * const kGitXRemoteRefPrefix;
 extern NSString * const kGitXStashRefPrefix;
 
-
 @interface PBGitRef : NSObject <PBGitRefish>
 
-// <PBGitRefish>
-- (NSString *) refishName;
-- (NSString *) shortName;
-- (NSString *) refishType;
++ (instancetype)refFromString:(NSString *)s;
+- (instancetype)initWithString:(NSString *)s;
 
-- (NSString *) tagName;
-- (NSString *) branchName;
-- (NSString *) remoteName;
-- (NSString *) remoteBranchName;
 
-- (NSString *) type;
-- (BOOL) isBranch;
-- (BOOL) isTag;
-- (BOOL) isRemote;
-- (BOOL) isRemoteBranch;
-- (BOOL) isStash;
+@property (nullable, readonly) NSString *tagName;
+@property (nullable, readonly) NSString *branchName;
+@property (nullable, readonly) NSString *remoteName;
+@property (nullable, readonly) NSString *remoteBranchName;
 
-- (PBGitRef *) remoteRef;
+@property (nullable, readonly) NSString *type;
 
-- (BOOL) isEqualToRef:(PBGitRef *)otherRef;
+@property (readonly, getter=isBranch) BOOL branch;
+@property (readonly, getter=isTag) BOOL tag;
+@property (readonly, getter=isRemote) BOOL remote;
+@property (readonly, getter=isRemoteBranch) BOOL remoteBranch;
+@property (readonly, getter=isStash) BOOL stash;
 
-+ (PBGitRef*) refFromString: (NSString*) s;
-- (PBGitRef*) initWithString: (NSString*) s;
+- (nullable PBGitRef *)remoteRef;
 
-@property(nonatomic, strong, readonly) NSString* ref;
+- (BOOL)isEqualToRef:(PBGitRef *)otherRef;
+
+@property(nonatomic, strong, readonly) NSString *ref;
 
 @end
+
+NS_ASSUME_NONNULL_END

Classes/git/PBGitRef.m

@@ -22,13 +22,29 @@
 
 @interface PBGitRef ()
 
-@property(nonatomic, strong) NSString* ref;
+@property (nonatomic, strong) NSString *ref;
 
 @end
 
 @implementation PBGitRef
 
-@synthesize ref;
++ (instancetype)refFromString:(NSString *)s
+{
+	return [[PBGitRef alloc] initWithString:s];
+}
+
+- (instancetype)initWithString:(NSString *)s
+{
+	self = [super init];
+	if (!self) return nil;
+
+	_ref = s;
+	return self;
+}
+
+- (NSString *)debugDescription {
+	return [NSString stringWithFormat:@"<%@: %p ref: %@", NSStringFromClass([self class]), self, self.ref];
+}
 
 - (NSString *) tagName
 {
@@ -51,7 +67,7 @@ - (NSString *) remoteName
 	if (![self isRemote])
 		return nil;
 
-	return (NSString *)[[ref componentsSeparatedByString:@"/"] objectAtIndex:2];
+	return (NSString *)[[self.ref componentsSeparatedByString:@"/"] objectAtIndex:2];
 }
 
 - (NSString *) remoteBranchName
@@ -77,35 +93,35 @@ - (NSString *) type
 
 - (BOOL) isBranch
 {
-	return [ref hasPrefix:kGitXBranchRefPrefix];
+	return [self.ref hasPrefix:kGitXBranchRefPrefix];
 }
 
 - (BOOL) isTag
 {
-	return [ref hasPrefix:kGitXTagRefPrefix];
+	return [self.ref hasPrefix:kGitXTagRefPrefix];
 }
 
 - (BOOL) isRemote
 {
-	return [ref hasPrefix:kGitXRemoteRefPrefix];
+	return [self.ref hasPrefix:kGitXRemoteRefPrefix];
 }
 
 - (BOOL) isRemoteBranch
 {
 	if (![self isRemote])
 		return NO;
 
-	return ([[ref componentsSeparatedByString:@"/"] count] > 3);
+	return ([[self.ref componentsSeparatedByString:@"/"] count] > 3);
 }
 
 - (BOOL) isStash
 {
-	return [ref hasPrefix:kGitXStashRefPrefix];
+	return [self.ref hasPrefix:kGitXStashRefPrefix];
 }
 
 - (BOOL) isEqualToRef:(PBGitRef *)otherRef
 {
-	return [ref isEqualToString:[otherRef ref]];
+	return [self.ref isEqualToString:[otherRef ref]];
 }
 
 - (PBGitRef *) remoteRef
@@ -116,25 +132,6 @@ - (PBGitRef *) remoteRef
 	return [PBGitRef refFromString:[kGitXRemoteRefPrefix stringByAppendingString:[self remoteName]]];
 }
 
-+ (PBGitRef*) refFromString: (NSString*) s
-{
-	return [[PBGitRef alloc] initWithString:s];
-}
-
-- (PBGitRef*) initWithString: (NSString*) s
-{
-	self = [super init];
-	if (!self) {
-		return nil;
-	}
-	ref = s;
-	return self;
-}
-
-- (NSString *)debugDescription {
-	return [NSString stringWithFormat:@"<%@: %p ref: %@", NSStringFromClass([self class]), self, ref];
-}
-
 + (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
 {
 	return NO;
@@ -149,16 +146,16 @@ + (BOOL)isKeyExcludedFromWebScript:(const char *)name {
 
 - (NSString *) refishName
 {
-	return ref;
+	return self.ref;
 }
 
 - (NSString *) shortName
 {
     if ([self isStash])
-        return [ref substringFromIndex:5];
+        return [self.ref substringFromIndex:5];
 	if ([self type])
-		return [ref substringFromIndex:[[self type] length] + 7];
-	return ref;
+		return [self.ref substringFromIndex:[[self type] length] + 7];
+	return self.ref;
 }
 
 - (NSString *) refishType

Classes/git/PBGitRepository.h

@@ -49,7 +49,7 @@ typedef enum branchFilterTypes {
 @property (nonatomic, readonly, strong) NSArray <PBGitRevSpecifier *> *branches;
 @property (nonatomic, strong) NSMutableOrderedSet <PBGitRevSpecifier *> *branchesSet;
 @property (nonatomic, strong) PBGitRevSpecifier *currentBranch;
-@property (nonatomic, strong) NSMutableDictionary* refs;
+@property (nonatomic, strong) NSMutableDictionary <GTOID *, NSMutableArray <PBGitRef *> *> *refs;
 @property (readonly, strong) GTRepository* gtRepo;
 @property (nonatomic, readonly) BOOL isShallowRepository;
 

Classes/git/PBGitRepository.m

@@ -323,7 +323,7 @@ - (GTOID *)OIDForRef:(PBGitRef *)ref
 
 	for (GTOID *sha in refs)
 	{
-		NSMutableSet *refsForSha = [refs objectForKey:sha];
+		NSMutableArray *refsForSha = [refs objectForKey:sha];
 		for (PBGitRef *existingRef in refsForSha)
 		{
 			if ([existingRef isEqualToRef:ref])