Merge remote-tracking branch 'laullon/master'

Author: Uwe Hees

English.lproj/Preferences.xib

@@ -430,8 +430,10 @@ + (NSString *)parseDiffHeader:(NSString *)txt
 
 +(NSString *)getFileName:(NSString *)line
 {
-    NSRange b = [line rangeOfString:@"b/"];
-    NSString *file=[line substringFromIndex:b.location+2];
+    NSRange b = [line rangeOfString:@" b/"];
+    NSString *file=[line substringFromIndex:b.location+3];
+    DLog(@"line=%@",line);
+    DLog(@"file=%@",file);
     return file;
 }
 

GLFileView.m

@@ -232,6 +232,7 @@
 		F5FE6C030EB13BC900F30D12 /* PBServicesController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FE6C020EB13BC900F30D12 /* PBServicesController.m */; };
 		F5FF4E180E0829C20006317A /* PBGitRevList.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E170E0829C20006317A /* PBGitRevList.mm */; };
 		F5FF4E7A0E082E440006317A /* PBGitGrapher.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E790E082E440006317A /* PBGitGrapher.mm */; };
+		FA8DFF3E131AEE2700C0F289 /* Start_iTerm2.applescript in Resources */ = {isa = PBXBuildFile; fileRef = FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -575,6 +576,7 @@
 		F5FF4E170E0829C20006317A /* PBGitRevList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitRevList.mm; sourceTree = "<group>"; };
 		F5FF4E780E082E440006317A /* PBGitGrapher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGrapher.h; sourceTree = "<group>"; };
 		F5FF4E790E082E440006317A /* PBGitGrapher.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitGrapher.mm; sourceTree = "<group>"; };
+		FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = Start_iTerm2.applescript; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -815,6 +817,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */,
 				316E7200131EE9C600AFBB36 /* list_Template.png */,
 				316E7201131EE9C600AFBB36 /* sidebar_Template.png */,
 				21025C1012947AB200D87200 /* sourceListAction.png */,
@@ -1360,6 +1363,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FA8DFF3E131AEE2700C0F289 /* Start_iTerm2.applescript in Resources */,
 				F5E92A1B0E88550E00056E75 /* empty_file.png in Resources */,
 				913D5E500E55645900CECEA2 /* gitx in Resources */,
 				551BF176112F3F4B00265053 /* gitx_askpasswd in Resources */,

GitX.xcodeproj/project.pbxproj

@@ -35,6 +35,9 @@
 + (void) setBranchFilter:(NSInteger)state;
 + (NSInteger)historySearchMode;
 + (void)setHistorySearchMode:(NSInteger)mode;
++ (BOOL) isUseITerm2;
++ (BOOL) isITerm2Available;
++ (void) setITerm2Available:(BOOL)iTerm2Available;
 
 
 // Suppressed Dialog Warnings

PBGitDefaults.h

@@ -28,6 +28,8 @@
 #define kBranchFilterState @"PBBranchFilter"
 #define kHistorySearchMode @"PBHistorySearchMode"
 #define kSuppressedDialogWarnings @"Suppressed Dialog Warnings"
+#define kUseITerm2 @"PBUseITerm2"
+#define kITerm2Available @"PBITerm2Available"
 
 
 @implementation PBGitDefaults
@@ -61,6 +63,10 @@ + (void)initialize
                       forKey:kOpenPreviousDocumentsOnLaunch];
 	[defaultValues setObject:[NSNumber numberWithInteger:kGitXBasicSeachMode]
                       forKey:kHistorySearchMode];
+	[defaultValues setObject:[NSNumber numberWithBool:NO]
+					  forKey:kUseITerm2];
+	[defaultValues setObject:[NSNumber numberWithBool:NO]
+					  forKey:kITerm2Available];
 	[[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];
 }
 
@@ -183,6 +189,28 @@ + (void)setHistorySearchMode:(NSInteger)mode
 	[[NSUserDefaults standardUserDefaults] setInteger:mode forKey:kHistorySearchMode];
 }
 
++ (BOOL) isUseITerm2
+{
+	[self isITerm2Available];
+	return [[NSUserDefaults standardUserDefaults] boolForKey:kUseITerm2];
+}
+
++ (BOOL) isITerm2Available 
+{
+	NSString *iTermPath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"com.googlecode.iterm2"];
+	[self setITerm2Available:[[NSFileManager defaultManager] fileExistsAtPath:iTermPath]];
+	
+	return [[NSUserDefaults standardUserDefaults] boolForKey:kITerm2Available];
+}
+
++ (void) setITerm2Available:(BOOL)iTerm2Available 
+{
+	if (!iTerm2Available)
+		[[NSUserDefaults standardUserDefaults] setBool:iTerm2Available forKey:kUseITerm2];
+	
+	[[NSUserDefaults standardUserDefaults] setBool:iTerm2Available forKey:kITerm2Available];
+	[[NSUserDefaults standardUserDefaults] synchronize];
+}
 
 
 // Suppressed Dialog Warnings

PBGitDefaults.m

@@ -140,6 +140,15 @@ - (void)windowDidBecomeKey:(NSNotification *)notification
 	if ([PBGitDefaults refreshAutomatically]) {
 		[contentController refresh:nil];
 	}
+	
+	if ([PBGitDefaults isUseITerm2]) {
+		[terminalItem setImage:[[NSWorkspace sharedWorkspace] iconForFile:[[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"com.googlecode.iterm2"]]];
+		[terminalItem setLabel:@"iTerm"];
+	}
+	else {
+		[terminalItem setImage:[[NSWorkspace sharedWorkspace] iconForFile:@"/Applications/Utilities/Terminal.app/"]];
+		[terminalItem setLabel:@"Terminal"];
+	}
 }
 
 - (void)showErrorSheetTitle:(NSString *)title message:(NSString *)message arguments:(NSArray *)arguments output:(NSString *)output
@@ -161,12 +170,25 @@ - (IBAction) revealInFinder:(id)sender
 
 - (IBAction) openInTerminal:(id)sender
 {
-	TerminalApplication *term = [SBApplication applicationWithBundleIdentifier: @"com.apple.Terminal"];
 	NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
-	NSString *cmd = [NSString stringWithFormat: @"cd \"%@\"; clear; echo '# Opened by GitX:'; git status", workingDirectory];
-	[term doScript: cmd in: nil];
-	[NSThread sleepForTimeInterval: 0.1];
-	[term activate];
+	
+	if ([PBGitDefaults isUseITerm2]) {
+		NSStringEncoding encoding;		 
+		NSString *resourcePath = [[[NSBundle bundleForClass:[self class]] resourcePath] stringByAppendingPathComponent:@"Start_iTerm2.applescript"];
+		NSString *scriptSource = [NSString stringWithContentsOfFile:resourcePath usedEncoding:&encoding error:nil];
+		NSString *iTerm2StartScript = [scriptSource stringByReplacingOccurrencesOfString:@"%%workDir%%" withString:workingDirectory];
+		
+		NSAppleScript *scriptObject = [[NSAppleScript alloc] initWithSource:iTerm2StartScript];
+		[scriptObject executeAndReturnError:nil];
+	}
+	else {
+		TerminalApplication *term = [SBApplication applicationWithBundleIdentifier:@"com.apple.Terminal"];	
+		NSString *cmd = [NSString stringWithFormat: @"cd \"%@\"; clear; echo '# Opened by GitX:'; git status", workingDirectory];	
+		[term doScript: cmd in: nil];
+		[NSThread sleepForTimeInterval: 0.1];
+		[term activate];
+	}
+	
 }
 
 - (IBAction) cloneTo:(id)sender

PBGitWindowController.m

@@ -0,0 +1,16 @@
+tell application "iTerm"
+	activate
+	try
+		set myterm to the first terminal
+	on error
+		set myterm to (make new terminal)
+	end try
+	tell myterm
+		launch session "gitx"
+		tell the last session
+			set name to "Opened by GitX"
+			exec command "/bin/bash"
+			write text "cd %%workDir%%; clear; echo '# Opened by GitX:'; git status"
+		end tell
+	end tell
+end tell