Merge branch 'crash-on-new-repo' of github.com:tiennou/gitx into tiennou-crash-on-new-repo

Conflicts:
	Classes/git/PBGitGrapher.mm
	Classes/git/PBGitLane.h

Author: rowanj

Classes/Controllers/PBGitHistoryController.h

@@ -20,7 +20,7 @@
 @class QLPreviewPanel;
 @class PBCommitList;
 @class GLFileView;
-@class PBGitSHA;
+@class GTOID;
 @class PBHistorySearchController;
 
 @interface PBGitHistoryController : PBViewController {
@@ -69,7 +69,7 @@
 - (IBAction) setTreeView:(id)sender;
 - (IBAction) setBranchFilter:(id)sender;
 
-- (void)selectCommit:(PBGitSHA *)commit;
+- (void)selectCommit:(GTOID *)commit;
 - (IBAction) refresh:(id)sender;
 - (IBAction) toggleQLPreviewPanel:(id)sender;
 - (IBAction) openSelectedFile:(id)sender;

Classes/Controllers/PBGitHistoryController.m

@@ -6,7 +6,6 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 
-#import "PBGitSHA.h"
 #import "PBGitCommit.h"
 #import "PBGitTree.h"
 #import "PBGitRef.h"
@@ -488,7 +487,7 @@ - (void) scrollSelectionToTopOfViewFrom:(NSInteger)oldIndex
     commitList.useAdjustScroll = NO;
 }
 
-- (NSArray *) selectedObjectsForSHA:(PBGitSHA *)commitSHA
+- (NSArray *) selectedObjectsForSHA:(GTOID *)commitSHA
 {
 	NSPredicate *selection = [NSPredicate predicateWithFormat:@"sha == %@", commitSHA];
 	NSArray *selectedCommits = [[commitController content] filteredArrayUsingPredicate:selection];
@@ -499,7 +498,7 @@ - (NSArray *) selectedObjectsForSHA:(PBGitSHA *)commitSHA
 	return selectedCommits;
 }
 
-- (void)selectCommit:(PBGitSHA *)commitSHA
+- (void)selectCommit:(GTOID *)commitSHA
 {
 	if (!forceSelectionUpdate && [[[[commitController selectedObjects] lastObject] sha] isEqual:commitSHA])
 		return;

Classes/Controllers/PBHistorySearchController.m

@@ -16,7 +16,6 @@
 #import "PBEasyPipe.h"
 #import "PBGitBinary.h"
 #import "PBGitCommit.h"
-#import "PBGitSHA.h"
 
 @interface PBHistorySearchController ()
 
@@ -448,7 +447,7 @@ - (void)parseBackgroundSearchResults:(NSNotification *)notification
 	for (NSString *resultSHA in resultsArray) {
 		NSUInteger index = 0;
 		for (PBGitCommit *commit in [commitController arrangedObjects]) {
-			if ([resultSHA isEqualToString:commit.sha.string]) {
+			if ([resultSHA isEqualToString:commit.sha.SHA]) {
 				[indexes addIndex:index];
 				break;
 			}

Classes/Controllers/PBRepositoryDocumentController.m

@@ -34,8 +34,10 @@ - (id)makeUntitledDocumentOfType:(NSString *)typeName error:(NSError *__autorele
 	[op setAllowsMultipleSelection:NO];
 	[op setMessage:@"Initialize a repository here:"];
 	[op setTitle:@"New Repository"];
-	if ([op runModal] != NSFileHandlingPanelOKButton)
+	if ([op runModal] != NSFileHandlingPanelOKButton) {
+        *outError = [NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil];
         return nil;
+    }
 
     BOOL success = [GTRepository initializeEmptyRepositoryAtFileURL:[op URL] error:outError];
     if (!success)

Classes/Controllers/PBWebHistoryController.h

@@ -14,14 +14,14 @@
 #import "PBRefContextDelegate.h"
 
 
-@class PBGitSHA;
+@class GTOID;
 
 
 @interface PBWebHistoryController : PBWebController {
 	IBOutlet PBGitHistoryController* historyController;
 	IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
 
-	PBGitSHA* currentSha;
+	GTOID* currentSha;
 	NSString* diff;
 }
 

Classes/Controllers/PBWebHistoryController.m

@@ -8,7 +8,7 @@
 
 #import "PBWebHistoryController.h"
 #import "PBGitDefaults.h"
-#import "PBGitSHA.h"
+#import <ObjectiveGit/GTConfiguration.h>
 #import "PBGitRef.h"
 #import "PBGitRevSpecifier.h"
 
@@ -71,7 +71,7 @@ - (void) changeContentTo: (PBGitCommit *) content
 	// but this caused some funny behaviour because NSTask's and NSThread's don't really
 	// like each other. Instead, just do it async.
 
-	NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", [currentSha string], nil];
+	NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", [currentSha SHA], nil];
 	if (![PBGitDefaults showWhitespaceDifferences])
 		[taskArguments insertObject:@"-w" atIndex:1];
 
@@ -103,7 +103,7 @@ - (void)commitDetailsLoaded:(NSNotification *)notification
 
 - (void)selectCommit:(NSString *)sha
 {
-	[historyController selectCommit:[PBGitSHA shaWithString:sha]];
+	[historyController selectCommit: [GTOID oidWithSHA: sha]];
 }
 
 - (void) sendKey: (NSString*) key

Classes/Util/PBEasyPipe.m

@@ -21,6 +21,12 @@ + (NSTask *) taskForCommand:(NSString *)cmd withArgs:(NSArray *)args inDir:(NSSt
 	NSTask* task = [[NSTask alloc] init];
 	[task setLaunchPath:cmd];
 	[task setArguments:args];
+
+    // Prepare ourselves a nicer environment
+    NSMutableDictionary *env = [[[NSProcessInfo processInfo] environment] mutableCopy];
+    [env removeObjectsForKeys:@[@"MallocStackLogging", @"MallocStackLoggingNoCompact", @"NSZombieEnabled"]];
+    [task setEnvironment:env];
+
 	if (dir)
 		[task setCurrentDirectoryPath:dir];
 

Classes/Views/GLFileView.m

@@ -10,7 +10,6 @@
 
 #import "GLFileView.h"
 #import "PBGitTree.h"
-#import "PBGitSHA.h"
 #import "PBGitCommit.h"
 #import "PBGitHistoryController.h"
 
@@ -110,7 +109,7 @@ - (void) showFile
 
 - (void) selectCommit:(NSString*)c
 {
-	[historyController selectCommit:[PBGitSHA shaWithString:c]];
+	[historyController selectCommit: [GTOID oidWithSHA: c]];
 }
 
 #pragma mark MGScopeBarDelegate methods

Classes/Views/PBCommitMessageView.m

@@ -59,7 +59,7 @@ - (void)drawRect:(NSRect)aRect
         NSRectFill(line);
 
         // and one for the body of the commit message
-        lineWidth = lineWidth = characterWidth * [PBGitDefaults commitMessageViewVerticalBodyLineLength];
+        lineWidth = characterWidth * [PBGitDefaults commitMessageViewVerticalBodyLineLength];
         [[NSColor darkGrayColor] set];
         padding = [[self textContainer] lineFragmentPadding];
         line.origin.x = padding + lineWidth;

Classes/Views/PBGitRevisionCell.m

@@ -8,7 +8,6 @@
 
 #import "PBGitRevisionCell.h"
 #import "PBGitRef.h"
-#import "PBGitSHA.h"
 #import "PBGitCommit.h"
 #import "PBGitRevSpecifier.h"
 #import "RoundedRectangle.h"
@@ -107,10 +106,10 @@ - (void) drawLineFromColumn: (int) from toColumn: (int) to inRect: (NSRect) r of
 
 - (BOOL) isCurrentCommit
 {
-	PBGitSHA *thisSha = [self.objectValue sha];
+	GTOID *thisSha = [self.objectValue sha];
 
 	PBGitRepository* repository = [self.objectValue repository];
-	PBGitSHA *currentSha = [repository headSHA];
+	GTOID *currentSha = [repository headSHA];
 
 	return [currentSha isEqual:thisSha];
 }