Commit: 64ff8a53e751cddf9197009ebf7e9aa26d778f80 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• Revision: 64ff8a53e751cddf9197009ebf7e9aa26d778f80 (tree)
• Zeit: 2012-08-18 22:30:24
• Autor: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Go to SCM Status is now a toggle

This is implemented by invoking “go back” if already showing an SCM URL. If there is no history (unlikely) then we instead “go up (parent)” which should take us to the root of the repository.

Ändern Zusammenfassung

• modified: Frameworks/OakFileBrowser/src/OakFileBrowser.mm

Diff

--- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
+++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm
@@ -831,12 +831,21 @@ static struct data_source_options_map_t { NSString* const name; NSUInteger flag;
 
 - (IBAction)goToSCMDataSource:(id)sender
 {
-	for(NSURL* selectedURL in self.selectedURLs)
+	if([url.scheme isEqualToString:@"scm"])
 	{
-		if([selectedURL isFileURL] && path::is_directory([[selectedURL path] fileSystemRepresentation]))
-			return [self pushURL:[FSSCMDataSource scmURLWithPath:[selectedURL path]]];
+		if(historyController.previousURL)
+				[self goBack:sender];
+		else	[self goToParentFolder:sender];
+	}
+	else
+	{
+		for(NSURL* selectedURL in self.selectedURLs)
+		{
+			if([selectedURL isFileURL] && path::is_directory([[selectedURL path] fileSystemRepresentation]))
+				return [self pushURL:[FSSCMDataSource scmURLWithPath:[selectedURL path]]];
+		}
+		[self pushURL:[FSSCMDataSource scmURLWithPath:[url path]]];
 	}
-	[self pushURL:[FSSCMDataSource scmURLWithPath:[url path]]];
 }
 
 - (IBAction)goBack:(id)sender             { if(historyController.previousURL) { [self setURL:historyController.previousURL]; [historyController retreat:self]; [outlineViewDelegate scrollToOffset:historyController.currentURLScrollOffset]; [self updateView]; } }