Create wrapper class around git_oid and use it

This is a convenience class to replace using NSStrings to store and compare SHAs. PBGitSHA has a much faster isEqual: function.

It is <NSCopying> compliant and implements isEqual: and hash so it can be used as a key in dictionaries.

Author: brotherbard

GitX.xcodeproj/project.pbxproj

@@ -73,6 +73,7 @@
 		D8E105471157C18200FC28A4 /* PBQLTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E105461157C18200FC28A4 /* PBQLTextView.m */; };
 		D8E3B2B810DC9FB2001096A3 /* ScriptingBridge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8E3B2B710DC9FB2001096A3 /* ScriptingBridge.framework */; };
 		D8E3B34D10DCA958001096A3 /* PBCreateTagSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D8E3B34C10DCA958001096A3 /* PBCreateTagSheet.m */; };
+		D8FBCF19115FA20C0098676A /* PBGitSHA.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FBCF18115FA20C0098676A /* PBGitSHA.m */; };
 		D8FDD9F711432A12005647F6 /* PBCloneRepositoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FDD9F511432A12005647F6 /* PBCloneRepositoryPanel.xib */; };
 		D8FDDA6A114335E8005647F6 /* PBGitSVBranchItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA5D114335E8005647F6 /* PBGitSVBranchItem.m */; };
 		D8FDDA6B114335E8005647F6 /* PBGitSVFolderItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA5F114335E8005647F6 /* PBGitSVFolderItem.m */; };
@@ -293,6 +294,8 @@
 		D8E3B34B10DCA958001096A3 /* PBCreateTagSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBCreateTagSheet.h; sourceTree = "<group>"; };
 		D8E3B34C10DCA958001096A3 /* PBCreateTagSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBCreateTagSheet.m; sourceTree = "<group>"; };
 		D8E3B38110DD4E2C001096A3 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBCreateTagSheet.xib; sourceTree = "<group>"; };
+		D8FBCF17115FA20C0098676A /* PBGitSHA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitSHA.h; sourceTree = "<group>"; };
+		D8FBCF18115FA20C0098676A /* PBGitSHA.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitSHA.m; sourceTree = "<group>"; };
 		D8FDD9F611432A12005647F6 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PBCloneRepositoryPanel.xib; sourceTree = "<group>"; };
 		D8FDDA5C114335E8005647F6 /* PBGitSVBranchItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitSVBranchItem.h; sourceTree = "<group>"; };
 		D8FDDA5D114335E8005647F6 /* PBGitSVBranchItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitSVBranchItem.m; sourceTree = "<group>"; };
@@ -828,6 +831,8 @@
 				F56524EF0E02D45200F03B52 /* PBGitCommit.m */,
 				F5C007730E731B48007B84B2 /* PBGitRef.h */,
 				F5C007740E731B48007B84B2 /* PBGitRef.m */,
+				D8FBCF17115FA20C0098676A /* PBGitSHA.h */,
+				D8FBCF18115FA20C0098676A /* PBGitSHA.m */,
 				D8295D281130A1DC00C838E8 /* PBGitHistoryList.h */,
 				D8295D291130A1DC00C838E8 /* PBGitHistoryList.m */,
 				F5FF4E160E0829C20006317A /* PBGitRevList.h */,
@@ -1175,6 +1180,7 @@
 				D8295D2A1130A1DC00C838E8 /* PBGitHistoryList.m in Sources */,
 				D8295DE01130E43900C838E8 /* PBGitHistoryGrapher.m in Sources */,
 				D8E105471157C18200FC28A4 /* PBQLTextView.m in Sources */,
+				D8FBCF19115FA20C0098676A /* PBGitSHA.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

PBGitCommit.h

@@ -10,23 +10,21 @@
 #import "PBGitRepository.h"
 #import "PBGitTree.h"
 #import "PBGitRefish.h"
-#include "git/oid.h"
+#import "PBGitSHA.h"
 
 
 extern NSString * const kGitXCommitType;
 
 
 @interface PBGitCommit : NSObject <PBGitRefish> {
-	git_oid sha;
-	git_oid *parentShas;
-	int nParents;
+	PBGitSHA *sha;
 
 	NSString* subject;
 	NSString* author;
 	NSString *committer;
 	NSString* details;
 	NSString *_patch;
-	NSArray* parents;
+	NSArray *parents;
 	NSString *realSHA;
 
 	int timestamp;
@@ -35,8 +33,8 @@ extern NSString * const kGitXCommitType;
 	PBGitRepository* repository;
 }
 
-+ (id) commitWithRepository:(PBGitRepository*)repo andSha:(git_oid)newSha;
-- (id) initWithRepository:(PBGitRepository *)repo andSha:(git_oid)sha;
++ (PBGitCommit *)commitWithRepository:(PBGitRepository*)repo andSha:(PBGitSHA *)newSha;
+- (id)initWithRepository:(PBGitRepository *)repo andSha:(PBGitSHA *)newSha;
 
 - (void) addRef:(PBGitRef *)ref;
 - (void) removeRef:(id)ref;
@@ -51,14 +49,13 @@ extern NSString * const kGitXCommitType;
 - (NSString *) shortName;
 - (NSString *) refishType;
 
-@property (readonly) git_oid *sha;
+@property (readonly) PBGitSHA *sha;
 @property (copy) NSString* subject;
 @property (copy) NSString* author;
 @property (copy) NSString *committer;
-@property (readonly) NSArray* parents; // TODO: remove this and its uses
+@property (retain) NSArray *parents;
 
-@property (assign) git_oid *parentShas;
-@property (assign) int nParents, timestamp;
+@property (assign) int timestamp;
 
 @property (retain) NSMutableArray* refs;
 @property (readonly) NSDate *date;

PBGitCommit.m

@@ -7,6 +7,7 @@
 //
 
 #import "PBGitCommit.h"
+#import "PBGitSHA.h"
 #import "PBGitDefaults.h"
 
 
@@ -15,24 +16,11 @@
 
 @implementation PBGitCommit
 
-@synthesize repository, subject, timestamp, author, parentShas, nParents, sign, lineInfo;
+@synthesize repository, subject, timestamp, author, sign, lineInfo;
+@synthesize sha;
+@synthesize parents;
 @synthesize committer;
 
-- (NSArray *) parents
-{
-	if (nParents == 0)
-		return NULL;
-
-	int i;
-	NSMutableArray *p = [NSMutableArray arrayWithCapacity:nParents];
-	for (i = 0; i < nParents; ++i)
-	{
-		char *s = git_oid_mkhex(parentShas + i);
-		[p addObject:[NSString stringWithUTF8String:s]];
-		free(s);
-	}
-	return p;
-}
 
 - (NSDate *)date
 {
@@ -50,17 +38,12 @@ - (NSArray*) treeContents
 	return self.tree.children;
 }
 
-- (git_oid *)sha
-{
-	return &sha;
-}
-
-+ commitWithRepository:(PBGitRepository*)repo andSha:(git_oid)newSha
++ (PBGitCommit *)commitWithRepository:(PBGitRepository*)repo andSha:(PBGitSHA *)newSha
 {
-	return [[[self alloc] initWithRepository:repo andSha:newSha] autorelease];
+	return [[self alloc] initWithRepository:repo andSha:newSha];
 }
 
-- initWithRepository:(PBGitRepository*) repo andSha:(git_oid)newSha
+- (id)initWithRepository:(PBGitRepository*) repo andSha:(PBGitSHA *)newSha
 {
 	details = nil;
 	repository = repo;
@@ -70,34 +53,38 @@ - (git_oid *)sha
 
 - (NSString *)realSha
 {
-	if (!realSHA) {
-		char *hex = git_oid_mkhex(&sha);
-		realSHA = [NSString stringWithUTF8String:hex];
-		free(hex);
-	}
-
-	return realSHA;
+	return sha.string;
 }
 
-- (BOOL) isOnSameBranchAs:(PBGitCommit *)other
+- (BOOL) isOnSameBranchAs:(PBGitCommit *)otherCommit
 {
-	if (!other)
+	if (!otherCommit)
 		return NO;
 
-	NSString *mySHA = [self realSha];
-	NSString *otherSHA = [other realSha];
-
-	if ([otherSHA isEqualToString:mySHA])
+	if ([self isEqual:otherCommit])
 		return YES;
 
-	return [repository isOnSameBranch:otherSHA asSHA:mySHA];
+	return [repository isOnSameBranch:otherCommit.sha asSHA:self.sha];
 }
 
 - (BOOL) isOnHeadBranch
 {
 	return [self isOnSameBranchAs:[repository headCommit]];
 }
 
+- (BOOL)isEqual:(id)otherCommit
+{
+	if (![otherCommit isMemberOfClass:[PBGitCommit class]])
+		return NO;
+
+	return [self.sha isEqual:[(PBGitCommit *)otherCommit sha]];
+}
+
+- (NSUInteger)hash
+{
+	return [self.sha hash];
+}
+
 // FIXME: Remove this method once it's unused.
 - (NSString*) details
 {
@@ -150,17 +137,16 @@ - (BOOL) hasRef:(PBGitRef *)ref
 
 - (NSMutableArray *)refs
 {
-	return [[repository refs] objectForKey:[self realSha]];
+	return [[repository refs] objectForKey:[self sha]];
 }
 
 - (void) setRefs:(NSMutableArray *)refs
 {
-	[[repository refs] setObject:refs forKey:[self realSha]];
+	[[repository refs] setObject:refs forKey:[self sha]];
 }
 
 - (void)finalize
 {
-	free(parentShas);
 	[super finalize];
 }
 

PBGitGrapher.mm

@@ -39,8 +39,10 @@ - (void) decorateCommit: (PBGitCommit *) commit
 	int i = 0, newPos = -1;
 	std::list<PBGitLane *> *currentLanes = new std::list<PBGitLane *>;
 	std::list<PBGitLane *> *previousLanes = (std::list<PBGitLane *> *)pl;
+	NSArray *parents = [commit parents];
+	int nParents = [parents count];
 
-	int maxLines = (previousLanes->size() + commit.nParents + 2) * 2;
+	int maxLines = (previousLanes->size() + nParents + 2) * 2;
 	struct PBGitGraphLine *lines = (struct PBGitGraphLine *)malloc(sizeof(struct PBGitGraphLine) * maxLines);
 	int currentLine = 0;
 
@@ -55,14 +57,14 @@ - (void) decorateCommit: (PBGitCommit *) commit
 			i++;
 			// This is our commit! We should do a "merge": move the line from
 			// our upperMapping to their lowerMapping
-			if ((*it)->isCommit([commit sha])) {
+			if ((*it)->isCommit([[commit sha] oid])) {
 				if (!didFirst) {
 					didFirst = YES;
 					currentLanes->push_back(*it);
 					currentLane = currentLanes->back();
 					newPos = currentLanes->size();
 					add_line(lines, &currentLine, 1, i, newPos,(*it)->index());
-					if (commit.nParents)
+					if (nParents)
 						add_line(lines, &currentLine, 0, newPos, newPos,(*it)->index());
 				}
 				else {
@@ -84,8 +86,9 @@ - (void) decorateCommit: (PBGitCommit *) commit
 	//Add your own parents
 
 	// If we already did the first parent, don't do so again
-	if (!didFirst && currentLanes->size() < MAX_LANES && commit.nParents) {
-		PBGitLane *newLane = new PBGitLane(commit.parentShas);
+	if (!didFirst && currentLanes->size() < MAX_LANES && nParents) {
+		git_oid parentOID = [[parents objectAtIndex:0] oid];
+		PBGitLane *newLane = new PBGitLane(&parentOID);
 		currentLanes->push_back(newLane);
 		newPos = currentLanes->size();
 		add_line(lines, &currentLine, 0, newPos, newPos, newLane->index());
@@ -97,15 +100,15 @@ - (void) decorateCommit: (PBGitCommit *) commit
 	// This boolean will tell us if that happened
 	BOOL addedParent = NO;
 
-	int parentIndex;
-	for (parentIndex = 1; parentIndex < commit.nParents; ++parentIndex) {
-		git_oid *parent = commit.parentShas + parentIndex;
+	int parentIndex = 0;
+	for (parentIndex = 1; parentIndex < nParents; ++parentIndex) {
+		git_oid parentOID = [[parents objectAtIndex:parentIndex] oid];
 		int i = 0;
 		BOOL was_displayed = NO;
 		std::list<PBGitLane *>::iterator it = currentLanes->begin();
 		for (; it != currentLanes->end(); ++it) {
 			i++;
-			if ((*it)->isCommit(parent)) {
+			if ((*it)->isCommit(parentOID)) {
 				add_line(lines, &currentLine, 0, i, newPos,(*it)->index());
 				was_displayed = YES;
 				break;
@@ -119,7 +122,7 @@ - (void) decorateCommit: (PBGitCommit *) commit
 
 		// Really add this parent
 		addedParent = YES;
-		PBGitLane *newLane = new PBGitLane(parent);
+		PBGitLane *newLane = new PBGitLane(&parentOID);
 		currentLanes->push_back(newLane);
 		add_line(lines, &currentLine, 0, currentLanes->size(), newPos, newLane->index());
 	}
@@ -138,8 +141,8 @@ - (void) decorateCommit: (PBGitCommit *) commit
 		previous.numColumns = currentLanes->size();
 
 	// Update the current lane to point to the new parent
-	if (currentLane && commit.nParents > 0)
-		currentLane->setSha(commit.parentShas[0]);
+	if (currentLane && nParents > 0)
+		currentLane->setSha([[parents objectAtIndex:0] oid]);
 	else
 		currentLanes->remove(currentLane);
 

PBGitHistoryController.h

@@ -17,6 +17,7 @@
 @class PBRefController;
 @class QLPreviewPanel;
 @class PBCommitList;
+@class PBGitSHA;
 
 @interface PBGitHistoryController : PBViewController {
 	IBOutlet PBRefController *refController;
@@ -58,7 +59,7 @@
 - (IBAction) setTreeView:(id)sender;
 - (IBAction) setBranchFilter:(id)sender;
 
-- (void) selectCommit: (NSString*) commit;
+- (void)selectCommit:(PBGitSHA *)commit;
 - (IBAction) refresh:(id)sender;
 - (IBAction) toggleQLPreviewPanel:(id)sender;
 - (IBAction) openSelectedFile:(id)sender;

PBGitHistoryController.m

@@ -236,7 +236,7 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 		if ([repository.currentBranch isSimpleRef])
 			[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
 		else
-			[self selectCommit:[[self firstCommit] realSha]];
+			[self selectCommit:[[self firstCommit] sha]];
 		return;
 	}
 
@@ -385,9 +385,9 @@ - (void) scrollSelectionToTopOfViewFrom:(NSInteger)oldIndex
     commitList.useAdjustScroll = NO;
 }
 
-- (NSArray *) selectedObjectsForSHA:(NSString *)commitSHA
+- (NSArray *) selectedObjectsForSHA:(PBGitSHA *)commitSHA
 {
-	NSPredicate *selection = [NSPredicate predicateWithFormat:@"realSha == %@", commitSHA];
+	NSPredicate *selection = [NSPredicate predicateWithFormat:@"sha == %@", commitSHA];
 	NSArray *selectedCommits = [[commitController content] filteredArrayUsingPredicate:selection];
 
 	if (([selectedCommits count] == 0) && [self firstCommit])
@@ -396,9 +396,9 @@ - (NSArray *) selectedObjectsForSHA:(NSString *)commitSHA
 	return selectedCommits;
 }
 
-- (void) selectCommit:(NSString *)commitSHA
+- (void)selectCommit:(PBGitSHA *)commitSHA
 {
-	if (!forceSelectionUpdate && [[selectedCommit realSha] isEqualToString:commitSHA])
+	if (!forceSelectionUpdate && [[selectedCommit sha] isEqual:commitSHA])
 		return;
 
 	NSInteger oldIndex = [[commitController selectionIndexes] firstIndex];
@@ -521,7 +521,7 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 	PBGitRef *headRef = [[repository headRef] ref];
 	NSString *headRefName = [headRef shortName];
 	NSString *diffTitle = [NSString stringWithFormat:@"Diff %@ with %@", multiple ? @"files" : @"file", headRefName];
-	BOOL isHead = [[selectedCommit realSha] isEqualToString:[repository headSHA]];
+	BOOL isHead = [[selectedCommit sha] isEqual:[repository headSHA]];
 	NSMenuItem *diffItem = [[NSMenuItem alloc] initWithTitle:diffTitle
 													  action:isHead ? nil : @selector(diffFilesAction:)
 											   keyEquivalent:@""];

PBGitHistoryGrapher.m

@@ -8,6 +8,7 @@
 
 #import "PBGitHistoryGrapher.h"
 #import "PBGitGrapher.h"
+#import "PBGitSHA.h"
 
 
 @implementation PBGitHistoryGrapher
@@ -41,13 +42,13 @@ - (void) graphCommits:(NSArray *)revList
 	NSInteger counter = 0;
 
 	for (PBGitCommit *commit in revList) {
-		NSString *commitSHA = [commit realSha];
+		PBGitSHA *commitSHA = [commit sha];
 		if (viewAllBranches || [searchSHAs containsObject:commitSHA]) {
 			[grapher decorateCommit:commit];
 			[commits addObject:commit];
 			if (!viewAllBranches) {
 				[searchSHAs removeObject:commitSHA];
-				[searchSHAs addObjectsFromArray:commit.parents];
+				[searchSHAs addObjectsFromArray:[commit parents]];
 			}
 		}
 		if (++counter % 2000 == 0) {